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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-08-21 20:21:06 -04:00
parent ae25b88a68
commit 43c192aab0
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/JOB/job_offer_invidual.mailfile
+7 -10
View File
@@ -56,7 +56,7 @@ Subject: {{subject}} - {{title}}
<table width="70" align="left" border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="70" style="padding: 0 20px 20px 0;">
<img class="fix" src="https://{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
<img class="fix" src="{{server_name}}/assets/images/wrenchboard-icon.gif" width="70" height="70" border="0" alt="WrenchBoard" />
</td>
</tr>
</table>
@@ -101,7 +101,7 @@ Subject: {{subject}} - {{title}}
</tr>
<tr>
<td class="bodycopy">
You have received a job offer from a <a href="https://{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> user with details below.
You have received a job offer from a <a href="{{server_name}}/eoffer?offerID={{offer_code}}">{{site_name}}</a> user with details below.
</td>
</tr>
@@ -134,7 +134,7 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
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>
@@ -188,7 +188,7 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
</td>
</tr>
<tr>
<td><h4>Please <a href ="https://{{server_name}}/eoffer?offerID={{offer_code}}">login</a> into your account to accept this offer.</h4>
<td><h4>Please <a href ="{{server_name}}/eoffer?offerID={{offer_code}}">login</a> into your account to accept this offer.</h4>
</td>
</tr>
</table>
@@ -218,7 +218,7 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
<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>
@@ -227,12 +227,12 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
<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>
@@ -251,8 +251,5 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/src/include/wrenchboard_api.h
+1
View File
@@ -21,6 +21,7 @@ enum { PARTNER_STRIPE };
#define OFFER_EXTEND 555
#define OFFER_SENDTOME 777
#define OFFER_RESEND 888
#define WEBSITE_LOGIN 1100
#define MOBILE_LOGIN 1101
wrenchboard/src/shared_tool/jobs.cc
+14
View File
@@ -372,6 +372,18 @@ long WrenchConcludeJobsOffer(CVars in, CVars &out) {
const PGresult *res = pgsql_query("SELECT * FROM members_jobs_offer WHERE offer_code='%s' AND status = 1", in["offer_code"].c_str());
if (res != NULL && pgsql_num_rows(res) > 0) {
// now job is valid
if( offer_result == OFFER_RESEND){
if (load_db_record(outx, "SELECT o.id AS offer_id, 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.offer_code='%s' AND o.email IS NOT NULL", in["offer_code"].c_str())) {
job_email(JOBS_INDIVIDUAL_OFFER_MAIL, outx, out); // make sure job went to individual
out["result"] = "OK";
}
return PHP_CREATED_OK;
}
load_db_record(out, "SELECT jo.member_id AS owner_member_id,jo.id AS offer_id, j.id AS job_id,jo.added::date AS added_date,j.title,j.description, j.timeline_days, j.price,jo.offer_code,jo.job_description,jo.expire FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id WHERE jo.expire > now() AND jo.status = 1 AND jo.client_id = %lu AND jo.offer_code='%s'", in["member_id"].Long(), in["offer_code"].c_str());
@@ -392,6 +404,8 @@ long WrenchConcludeJobsOffer(CVars in, CVars &out) {
break;
case OFFER_SENDTOME:
job_email(JOBS_OFFER_SENDTOME_MAIL, in, out); // the email will come from
break;