WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-09-22 21:09:31 -04:00
parent 75a5004fce
commit 90be9fd8b9
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/JOB/job_offer_cancel.mailfile
+8 -9
View File
@@ -89,7 +89,7 @@ img {height: auto;}
<table width="115" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="115" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
</td>
</tr>
</table>
@@ -101,7 +101,7 @@ img {height: auto;}
<table class="col380" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 380px;">
<tr>
<td class="bodycopy">
<h4>The offer below from a <a href="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> with details below is canceled.</h4>
<h4>The offer below from a <a href="{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> with details below is canceled.</h4>
</td>
</tr>
@@ -123,7 +123,7 @@ img {height: auto;}
Offer ID
</td>
<td class="bodycopy">
<a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
<a href ="{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
</td>
</tr>
@@ -180,7 +180,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
@@ -201,7 +201,7 @@ img {height: auto;}
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -210,12 +210,12 @@ img {height: auto;}
<tr>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="https://www.facebook.com/wrenchboard/">
<img src="https://{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
<img src="{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
</a>
</td>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="http://www.twitter.com/">
<img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
<img src="{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
</a>
</td>
</tr>
@@ -235,7 +235,6 @@ img {height: auto;}
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/email/JOB/job_offer_rejected.mailfile
+7 -10
View File
@@ -89,7 +89,7 @@ img {height: auto;}
<table width="115" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="115" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/article1.png" width="115" height="115" border="0" alt="" />
</td>
</tr>
</table>
@@ -101,7 +101,7 @@ img {height: auto;}
<table class="col380" align="left" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 380px;">
<tr>
<td class="bodycopy">
<h4>You have rejected the job offer from a <a href="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> user with details below.</h4>
<h4>You have rejected the job offer from a <a href="{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> user with details below.</h4>
</td>
</tr>
@@ -123,7 +123,7 @@ img {height: auto;}
Offer ID
</td>
<td class="bodycopy">
<a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
<a href ="{{server_name}}/eoffer?offerID={{offer_code}}">{{offer_code}}</a>
</td>
</tr>
@@ -187,7 +187,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding borderbottom">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard_email_banner.jpg" width="100%" border="0" alt="" />
</td>
</tr>
<tr>
@@ -208,7 +208,7 @@ img {height: auto;}
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
<tr>
@@ -217,12 +217,12 @@ img {height: auto;}
<tr>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="https://www.facebook.com/wrenchboard/">
<img src="https://{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
<img src="{{server_name}}/assets/images/brands/facebook.png" width="37" height="37" alt="Facebook" border="0" />
</a>
</td>
<td width="37" style="text-align: center; padding: 0 10px 0 10px;">
<a href="http://www.twitter.com/">
<img src="https://{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
<img src="{{server_name}}/assets/images/brands/twitter.png" width="37" height="37" alt="Twitter" border="0" />
</a>
</td>
</tr>
@@ -241,8 +241,5 @@ img {height: auto;}
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/src/shared_tool/email.cc
+1 -1
View File
@@ -590,7 +590,7 @@ long job_email(long mailtype, CVars in, CVars &out) {
case JOBS_OFFER_CANCEL_MAIL:
if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status = 3", in["offer_id"].Long())) {
if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu ", in["offer_id"].Long())) {
vars2form(x, form);
form.LetStr("subject", "Job Offer Canceled");
form.LetStr("email", x["email"].c_str());
wrenchboard/src/shared_tool/jobs.cc
+1 -1
View File
@@ -488,7 +488,7 @@ long WrenchConcludeJobsOffer(CVars in, CVars &out) {
if (WrenchRefundoffer(y, out) == PHP_CREATED_OK) {
pgsql_exec("UPDATE members_jobs_offer SET status = 4 WHERE id = %lu AND offer_code='%s' ", out["offer_id"].Long(), in["offer_code"].c_str());
// REFUND THE MONEY
job_email(JOBS_OFFER_CANCEL_MAIL, in, out); // the email will come from offer table
job_email(JOBS_OFFER_CANCEL_MAIL, y, out); // the email will come from offer table
}
}
break;
wrenchboard/src/shared_tool/payments.cc
+5 -3
View File
@@ -662,9 +662,11 @@ long WrenchRefundoffer( CVars in, CVars &out )
}
long retDb2 = load_db_record( out, "SELECT * FROM members_payments WHERE id =%lu AND what_offer = %lu AND member_id=%lu AND code = 'OFDPS' AND status = 1 AND flags = 4 AND confirmation IS NOT NULL",payment_id,offer_id,member_id);
long retDb2 = load_db_record( out, "SELECT id AS current_payment_id, * FROM members_payments WHERE id =%lu AND what_offer = %lu AND member_id=%lu AND code = 'OFDPS' AND status = 1 AND flags = 4 AND confirmation IS NOT NULL",payment_id,offer_id,member_id);
if (retDb2)
{
long current_payment_id = out["current_payment_id"].Long();
CVars x;
x["member_id"] = in["member_id"]; x["member_id"].set_valid( true );
x["code"] = in["code"]; x["code"].set_valid( true );
@@ -683,13 +685,13 @@ long WrenchRefundoffer( CVars in, CVars &out )
ret = PHP_CREATED_OK;
x["flags"] = FLAG_START; x["flags"].set_valid( true ); // done not completed yet
// now generate the confirmation
// pgsql_exec("UPDATE members SET balance=balance + %lu WHERE id = %lu",x["amount"].Long() + x["fee"].Long(),in["member_id"].Long() );
char confirmation[15] = "";
Confirmation(payment_id, confirmation, sizeof (confirmation)); // this stamp the offer code directly in that call
UpdateMemberWallet( member_id, wallet_id,x["amount"].Long(), payment_id); // correct this dont send amount
x["flags"] = FLAG_OK; x["flags"].set_valid( true );
x["payment_id"] = payment_id; x["payment_id"].set_valid( true );
pgsql_exec("UPDATE members_payments SET flags = %lu WHERE id = %lu",x["flags"].Long(),payment_id );
pgsql_exec("UPDATE members_payments SET flags = %lu WHERE id = %lu",x["flags"].Long(),payment_id );
pgsql_exec("UPDATE members_payments SET flags = 7 WHERE id = %lu",current_payment_id );
//pgsql_exec("UPDATE members_jobs_offer SET payment_id = %lu WHERE id = %lu",x["payment_id"].Long(),x["what_offer"].Long() );
load_db_record( out, "SELECT * FROM members_payments WHERE id = %lu ", payment_id );
} else {