From 2c9c14ad0c212658194a0d25c156e8364a6cf474 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 4 Sep 2022 15:29:48 -0400 Subject: [PATCH 01/47] fix --- www/assets/images/download-android.jpg | Bin 0 -> 10385 bytes www/assets/images/download-apple.jpg | Bin 0 -> 10616 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/assets/images/download-android.jpg create mode 100644 www/assets/images/download-apple.jpg diff --git a/www/assets/images/download-android.jpg b/www/assets/images/download-android.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0a2d3b45cbea8c1f97cfe5f717e820fb00024729 GIT binary patch literal 10385 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 literal 0 HcmV?d00001 diff --git a/www/assets/images/download-apple.jpg b/www/assets/images/download-apple.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b8ceaa0de2f38d08840bca6d97065e2cfa727162 GIT binary patch literal 10616 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 Date: Sun, 4 Sep 2022 15:29:51 -0400 Subject: [PATCH 02/47] fix --- .../email/JOB/job_offer_invidual.mailfile | 182 ++++++++---------- wrenchboard/src/shared_tool/email.cc | 11 +- 2 files changed, 92 insertions(+), 101 deletions(-) diff --git a/wrenchboard/email/JOB/job_offer_invidual.mailfile b/wrenchboard/email/JOB/job_offer_invidual.mailfile index c46ca62a..b87276f0 100644 --- a/wrenchboard/email/JOB/job_offer_invidual.mailfile +++ b/wrenchboard/email/JOB/job_offer_invidual.mailfile @@ -10,7 +10,7 @@ Subject: {{subject}} - {{title}} body {margin: 0; padding: 0; min-width: 100%!important;} img {height: auto;} .content {width: 100%; max-width: 600px;} - .header {padding: 40px 30px 20px 30px;} + .header {padding: 10px 30px 10px 30px;} .innerpadding {padding: 30px 30px 30px 30px;} .borderbottom {border-bottom: 1px solid #f2eeed;} .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;} @@ -23,7 +23,8 @@ Subject: {{subject}} - {{title}} .footer {padding: 20px 30px 15px 30px;} .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;} .footercopy a {color: #ffffff; text-decoration: underline;} - + .sect-text {font-weight: bold; } + .big-danger{ font-weight: bold; font-size: 18px; line-height: 20px; color:red;} @media only screen and (max-width: 550px), screen and (max-device-width: 550px) { body[yahoo] .hide {display: none!important;} body[yahoo] .buttonwrapper {background-color: transparent!important;} @@ -53,93 +54,76 @@ Subject: {{subject}} - {{title}} - + + + diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 9dfa6f93..ec46d454 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -924,7 +924,7 @@ long test_email(CVars in, CVars &out) { form.LetStr("subject", "This is Test Email"); form.LetStr("email", in["email"].c_str()); form.Email("ALERT/template.mailfile"); -*/ + 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 >0", in["offer_id"].Long())) { vars2form(x, form); if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { @@ -941,6 +941,15 @@ long test_email(CVars in, CVars &out) { form.Email("JOB/job_interest_client.mailfile"); } + } + ,to_char(now(), 'yyyy') AS YYYY + */ + logfmt(logINFO, "JOBS_INDIVIDUAL_OFFER_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,to_char(now(), 'yyyy') AS YYYY 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 Recieved"); + form.LetStr("email", x["email"].c_str()); + form.Email("JOB/job_offer_invidual.mailfile"); } return 0; From c71397903ba474ca576982aa575107e3d6633a6b Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 4 Sep 2022 19:14:40 -0400 Subject: [PATCH 03/47] fix --- wrenchboard/email/JOB/job_message.mailfile | 34 +++++++++++++++----- wrenchboard/email/JOB/job_message_m.mailfile | 19 +++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/wrenchboard/email/JOB/job_message.mailfile b/wrenchboard/email/JOB/job_message.mailfile index 2a284f6f..9c348b02 100644 --- a/wrenchboard/email/JOB/job_message.mailfile +++ b/wrenchboard/email/JOB/job_message.mailfile @@ -83,7 +83,7 @@ img {height: auto;}
- - - - -
- WrenchBoard -
- - - - - -
- - +
- -
- {{site_name}} + + WrenchBoard
+ {{site_trade_name}}
-
- +
- - - - - - - - -
- Dear {{email}}, -
-You have received a job offer from a {{site_name}} user with details below. + + + + + + - -
+ Hi, {{email}}, +
+ You have received a job offer from a {{site_name}} user with details below. -
-
- - - - - - - - -
- - - - - - + + + + + + + + + + - - - - - - - -
- Title - -{{title}} -
+ Please login into your account to accept this offer. +
+ Offer Expire : {{expire2}} +
- Offer ID - - {{offer_code}} +
+ + + + + + + + + + + + - - + +
+Title + +{{title}} +
+Offer ID + +{{offer_code}} +
Description @@ -148,7 +132,7 @@ You have received a job offer from a Duration @@ -157,49 +141,47 @@ You have received a job offer from a Price {{price}} Naira
- Detail + +Detail - {{job_description}} +{{job_description}} +
+
- Offer Expire - - {{expire2}} -
-

Please login into your account to accept this offer.

-
- +
+ + + + + +
+ + Apple + + + + Android + +
+
Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. @@ -217,8 +199,8 @@ You have received a job offer from a
- ® {{site_name}} 2022
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. + ® {{site_name}} {{YYYY}}
+ You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.
-You have received a job message from {{site_name}} details below. +You have received a job message from {{site_name}} details below.
@@ -100,7 +100,25 @@ You have received a job message from - +
+ + + + +
+ +Apple + + + +Android + +
+ + + + + @@ -144,7 +162,7 @@ You have received a job message from login into your account to reply this message. +
Title : @@ -114,7 +132,7 @@ You have received a job message from -{{contract}} +{{contract}}

Please login into your account to reply this message.
@@ -157,7 +175,7 @@ You have received a job message from - + @@ -178,7 +196,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi ® {{site_name}} 2022
-You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. +You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. @@ -187,12 +205,12 @@ You received this email because a user sent a job to you from {{site_name}}. If -Facebook +Facebook -Twitter +Twitter diff --git a/wrenchboard/email/JOB/job_message_m.mailfile b/wrenchboard/email/JOB/job_message_m.mailfile index 60b5831d..525a3d7d 100644 --- a/wrenchboard/email/JOB/job_message_m.mailfile +++ b/wrenchboard/email/JOB/job_message_m.mailfile @@ -97,6 +97,25 @@ You have sent a message + + + + + + + +
+ +Apple + + + +Android + +
+ + + From 6b362482e4d41305116dd8fa2908c4d0d3957203 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 9 Sep 2022 18:26:19 -0400 Subject: [PATCH 04/47] Fix AJAX message sending --- www/application/controllers/Proj.php | 217 +++++++++++--------- www/application/views/jobs/view_thisjob.php | 1 + 2 files changed, 118 insertions(+), 100 deletions(-) diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 98acbca2..0a43411d 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -370,106 +370,115 @@ class Proj extends Users_Controller { } public function thisjob() { + $data = $this->getSessionArray(); $data['redirect_to'] = '/proj/active/'; $uploaded = false; if (!isset($_SESSION['username']) or $_SESSION['username'] == '') { redirect(home); + return; + } + + ob_start(); + + $message = ""; + $res = -1; + // echo rand(100,9999). " ameye 1"; + + if ($_POST) { + $ajax = $this->input->post('ajax'); + $jobID = $this->input->post('jobID'); } else { - $message = ""; - // echo rand(100,9999). " ameye 1"; + $ajax = $this->input->get('ajax'); + $jobID = $this->input->get('jobID'); + $message = $this->input->get('message'); + } + $data['jobID'] = $jobID; - if ($_POST) { - $ajax = $this->input->post('ajax'); - $jobID = $this->input->post('jobID'); - } else { - $ajax = $this->input->get('ajax'); - $jobID = $this->input->get('jobID'); - $message = $this->input->get('message'); - } - $data['jobID'] = $jobID; + //$mybalance = 10666; + //$data['mybalance'] = $mybalance; - //$mybalance = 10666; - //$data['mybalance'] = $mybalance; + $this->load->model('backend_model'); + // echo rand(100,9999). " ameye 2"; + if ($_POST && !isset($_POST['uploadForm'])) { + // echo rand(100,9999). " ameye 2222-2222"; + // exit; + $msgArray = array(); + $msgArray['message'] = trim($this->input->post('jobmessage')); + $msgArray['contract'] = $this->input->post('contractId'); + $msgArray['msg_type'] = 'TEXT'; + $msgArray['member_id'] = $_SESSION['member_id']; // = $ret->email; - $this->load->model('backend_model'); - // echo rand(100,9999). " ameye 2"; - if ($_POST && !isset($_POST['uploadForm'])) { - // echo rand(100,9999). " ameye 2222-2222"; - // exit; - $msgArray = array(); - $msgArray['message'] = trim($this->input->post('jobmessage')); - $msgArray['contract'] = $this->input->post('contractId'); + if (trim($msgArray['message']) != '') { // NOTE THAT IT msg_type is IMPORTTANT $msgArray['msg_type'] = 'TEXT'; - $msgArray['member_id'] = $_SESSION['member_id']; // = $ret->email; + $msgArray['action'] = WRENCHBOARD_CONTRACT_MESSAGE; - if ($msgArray['message'] != '') { // NOTE THAT IT msg_type is IMPORTTANT - $msgArray['msg_type'] = 'TEXT'; - $msgArray['action'] = WRENCHBOARD_CONTRACT_MESSAGE; - - $out = array(); - $res = $this->backend_model->wrenchboard_api($msgArray, $out); - } - } else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) { - list ($message, $uploaded) = $this->process_files($_FILES["fileToUpload"]); + $out = array(); + $res = $this->backend_model->wrenchboard_api($msgArray, $out); + } else { + $res = "Message is empty!"; } + } else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) { + list ($message, $uploaded) = $this->process_files($_FILES["fileToUpload"]); + } - $data = $this->load_files($data, $jobID); - //$this->load_files($data, $jobID); + $data = $this->load_files($data, $jobID); + //$this->load_files($data, $jobID); - $data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit"); + $data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit"); - $this->load->model('dash_model'); - $out = $this->dash_model->getDashData($data); - $data['active_task'] = $out['active_task']; - $data['active_pass_due'] = $out['active_pass_due']; - $data['current_balance'] = $out['current_balance']; - $data['new_message'] = $out['new_message']; - $data['message'] = $message; + $this->load->model('dash_model'); + $out = $this->dash_model->getDashData($data); + $data['active_task'] = $out['active_task']; + $data['active_pass_due'] = $out['active_pass_due']; + $data['current_balance'] = $out['current_balance']; + $data['new_message'] = $out['new_message']; + $data['message'] = $message; + $data['this_is_client'] = false; + $data['this_is_project_owner'] = false; + + $data['disabled1'] = 'disabled'; + $data['disabled2'] = 'disabled'; + + $data['disabled11'] = 'disabled'; + $data['disabled22'] = 'disabled'; + /* + $data['job_status'] = $jbD1->status; + $data['job_member_id'] = $jbD1->member_id; + $data['job_client_id'] = $jbD1->client_id; + */ + if ($data['job_member_id'] == $_SESSION['member_id']) { $data['this_is_client'] = false; - $data['this_is_project_owner'] = false; - - $data['disabled1'] = 'disabled'; - $data['disabled2'] = 'disabled'; - - $data['disabled11'] = 'disabled'; - $data['disabled22'] = 'disabled'; - /* - $data['job_status'] = $jbD1->status; - $data['job_member_id'] = $jbD1->member_id; - $data['job_client_id'] = $jbD1->client_id; - */ - if ($data['job_member_id'] == $_SESSION['member_id']) { - $data['this_is_client'] = false; - $data['this_is_project_owner'] = true; - if ($data["job_status"] == CONTRACT_NOTIFY_COMPLETE) { - $data['disabled11'] = ''; - $data['disabled22'] = ''; - } - } else { - $data['this_is_client'] = true; - $data['this_is_project_owner'] = false; - if ($data["job_status"] == 1 and $data['force_wait'] == false) { - - $data['disabled1'] = ''; - $data['disabled2'] = ''; - } + $data['this_is_project_owner'] = true; + if ($data["job_status"] == CONTRACT_NOTIFY_COMPLETE) { + $data['disabled11'] = ''; + $data['disabled22'] = ''; } + } else { + $data['this_is_client'] = true; + $data['this_is_project_owner'] = false; + if ($data["job_status"] == 1 and $data['force_wait'] == false) { - if ($ajax == 1) { - echo isset($res)? $res:''; - $this->RenderUserPage('jobs/view_thisjob', $data); + $data['disabled1'] = ''; + $data['disabled2'] = ''; + } + } + + if ($ajax == 1) { + ob_end_clean(); + echo isset($res)? $res:''; + // $this->RenderUserPage('jobs/view_thisjob', $data); + } else { + /* $this->load->view('users/view_header_user', $data); + $this->load->view('jobs/view_thisjob', $data); + $this->load->view('users/view_footer_user', $data); */ + ob_end_flush(); + if ($uploaded) { + redirect('/proj/thisjob?jobID='.$jobID.'&message='.$message); } else { - /* $this->load->view('users/view_header_user', $data); - $this->load->view('jobs/view_thisjob', $data); - $this->load->view('users/view_footer_user', $data); */ - if ($uploaded) { - redirect('/proj/thisjob?jobID='.$jobID.'&message='.$message); - } else { - $this->RenderUserPage('jobs/view_thisjob', $data); - } + $this->RenderUserPage('jobs/view_thisjob', $data); } } } @@ -656,12 +665,8 @@ class Proj extends Users_Controller { } } } - - - - + private function load_files($data, $jobID) { - $data['username'] = $_SESSION['username']; // = $this->input->post('username'); $data['name'] = $_SESSION['name']; // = $this->input->post('username'); $data['firstname'] = $_SESSION['firstname']; // = $ret->firstname; @@ -683,9 +688,13 @@ class Proj extends Users_Controller { $mysql = "SELECT 'Project ID :'||mc.contract||' - Name: '||m.firstname||'
Title:'||mc.title||'
'||'Description: '||mc.description||'
Timeline: '||mc.timeline_days||' day(s) Price: '||mc.price*0.01||'Naira'||' Expected Delivery: '||mc.delivery_date||' '||$detail_button AS this_job," . " mc.contract AS contract_id, mc.job_detail AS job_detail " . "FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id " - . " WHERE (mc.member_id = " . $_SESSION['member_id'] . " OR mc.client_id=" . $_SESSION['member_id'] . ") AND mc.id=" . $jobID; + . " WHERE (mc.member_id = '" . $_SESSION['member_id'] . "' OR mc.client_id='" . $_SESSION['member_id'] . "') AND mc.id=" . ((int)$jobID); $query = $this->db->query($mysql); - $jbD = $query->row(); + $result = $query->result_array(); + $jbD = array("this_job" => "", "contract_id" => "", "job_detail" => ""); + if (is_array($result) && count($result)>0) { + $jbD = $result[0]; + } //---------------------- $mysql = "SELECT m.id,mc.contract, m.firstname,mc.title,mc.description, @@ -694,16 +703,20 @@ class Proj extends Users_Controller { $detail_button As delivery_details FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id - WHERE (mc.member_id = " . $_SESSION['member_id'] . " OR mc.client_id=" . $_SESSION['member_id'] . ") - AND mc.id=" . $jobID; + WHERE (mc.member_id = '" . $_SESSION['member_id'] . "' OR mc.client_id='" . $_SESSION['member_id'] . "') + AND mc.id=" . ((int)$jobID); $query = $this->db->query($mysql); - $data["this_job_result"] = $query->result()[0]; + $result = $query->result(); + $r = new stdClass(); + $r->id = ""; $r->contract = ""; $r->firstname = ""; $r->title = ""; $r->description = ""; $r->timeline_days = ""; + $r->price = ""; $r->delivery_date = ""; $r->contract_id = ""; $r->job_detail = ""; $r->delivery_details = ""; + $data["this_job_result"] = is_array($result) ? $result[0] : $r; //---------------------- // $this->table->set_heading('Job', 'Client', 'Terms', 'Price', 'Manage', 'Status'); $data['job_table'] = $this->table->generate($query); - $data['this_job'] = $jbD->this_job; - $data['contract_id'] = $jbD->contract_id; - $data['job_detail'] = $jbD->job_detail; + $data['this_job'] = $jbD["this_job"]; + $data['contract_id'] = $jbD["contract_id"]; + $data['job_detail'] = $jbD["job_detail"]; /* $sqlMsg = "SELECT (CASE WHEN jc.msg_type='FILE' THEN ''||jc.message||'' ELSE '['||m.firstname||']->'||jc.created||'
'||jc.message END) AS msg " . "FROM jobs_contract_message jc " @@ -751,15 +764,19 @@ class Proj extends Users_Controller { // $data['message_result_show'] = $this->messageAccordion($data['message_result']); - $mysql3 = "SELECT *,(delivery_date::date- now()::date)::int AS remaining_days FROM members_jobs_contract WHERE id= " . $jobID; + $mysql3 = "SELECT *,(delivery_date::date- now()::date)::int AS remaining_days FROM members_jobs_contract WHERE id= " . ((int)$jobID); $query3 = $this->db->query($mysql3); - $jbD1 = $query3->row(); - $data['job_status'] = $jbD1->status; - $data['job_member_id'] = $jbD1->member_id; - $data['job_client_id'] = $jbD1->client_id; - $data['job_contract'] = $jbD1->contract; - $data['timeline_days'] = $jbD1->timeline_days; - $data['remaining_days'] = $jbD1->remaining_days; + $result3 = $query3->result_array(); + $jbD1 = array("status"=>"","member_id"=>"","client_id"=>"","contract"=>"","timeline_days"=>"","remaining_days"=>""); + if (is_array($result3) && count($result3)) { + $jbD1 = $result3[0]; + } + $data['job_status'] = $jbD1["status"]; + $data['job_member_id'] = $jbD1["member_id"]; + $data['job_client_id'] = $jbD1["client_id"]; + $data['job_contract'] = $jbD1["contract"]; + $data['timeline_days'] = $jbD1["timeline_days"]; + $data['remaining_days'] = $jbD1["remaining_days"]; $data['force_wait'] = false; if ($data['remaining_days'] > 0) { if ($data['timeline_days'] / 2 < $data['remaining_days']) { diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php index 7dfd84dc..30e2b617 100644 --- a/www/application/views/jobs/view_thisjob.php +++ b/www/application/views/jobs/view_thisjob.php @@ -322,6 +322,7 @@ $('#jobmessage').data("wysihtml5").editor.clear(); $('#sendmessagenote').html('
Message was sent!
'); } else { + alert(data); alert('
Failed to send message
'); } document.message.btn_cancel.disabled = false; From 159fd25d1642b69ef63d6d98bfc134d122100da7 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 9 Sep 2022 19:31:33 -0400 Subject: [PATCH 05/47] Visual editor & append to message accordion --- www/application/views/jobs/view_thisjob.php | 68 ++++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php index 30e2b617..ed387a6c 100644 --- a/www/application/views/jobs/view_thisjob.php +++ b/www/application/views/jobs/view_thisjob.php @@ -88,7 +88,7 @@
- +
@@ -269,7 +269,7 @@ From 8d84bafa22bc2cf51f49c830e4f00b50d71d7661 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 9 Sep 2022 20:59:06 -0400 Subject: [PATCH 06/47] fix --- .../email/JOB/job_offer_sendtome.mailfile | 341 ++++++++++-------- wrenchboard/src/shared_tool/email.cc | 2 +- 2 files changed, 184 insertions(+), 159 deletions(-) diff --git a/wrenchboard/email/JOB/job_offer_sendtome.mailfile b/wrenchboard/email/JOB/job_offer_sendtome.mailfile index 85418366..baac8ab9 100644 --- a/wrenchboard/email/JOB/job_offer_sendtome.mailfile +++ b/wrenchboard/email/JOB/job_offer_sendtome.mailfile @@ -1,212 +1,237 @@ -Subject: {{subject}} +Subject: {{subject}} - {{title}} - + - -{{site_name}} - {{subject}}. - +
- +
- - - - - + + + + + +
+ + + + + + + + + + + + + + + + + - - - - -
+ + + + + + + +
+ WrenchBoard +
+ {{site_trade_name}} +
+ +
+ + + + + + - - - - - - - - - - - - -
+ Hi, {{firstname}}, +
+ You have sent a job offer from a {{site_name}} user with details below to {{job_email}}. - - - - - -
- + - - - - - -
+ Offer Expire : {{expire2}} +
-{{site_name}} -
-{{site_trade_name}} -
-
- -
- - - - - -
-{{title}}, -
-
- -
- - - -
-Visit {{site_name}}! to learn more. -
- - - - - -
- +
+ + + + + - + + + + - - - - - + + +
Title -{{title}} +{{title}}
-Description + +Offer ID -{{description}} +{{offer_code}} +
+ Description + + {{description}}
-Duration + + Duration -{{timeline_days}} day(s) + {{timeline_days}} day(s)
-Price + + Price -{{price}} Naira + {{price}} Naira
+
+Detail +{{job_description}} +
-
- -
- -
-{{firstname}} {{lastname}} @ {{site_name}} +
+
+ + + + + +
+ + Apple + + + + Android + +
+
+ Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. +
+{{site_name}} Team
{{server_name}} -
- - - - - -
- - - - - -
- -Facebook - - - -Twitter - -
-
-
- -
+ + + + + + + +
+ ® {{site_name}} {{YYYY}}
+ You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. +
+ + + + + +
+ + Facebook + + + + Twitter + +
+
+
+ +
- \ No newline at end of file + diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index ec46d454..95e70453 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -553,7 +553,7 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_OFFER_SENDTOME_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,o.member_id,j.title,o.offer_code " + " j.description,j.timeline_days,j.price,o.member_id,j.title,o.offer_code,jo.email AS job_email,to_char(now(), 'yyyy') AS YYYY " " FROM members_jobs_offer o " " LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.offer_code = '%s'", in["offer_code"].c_str())) { vars2form(x, form); From 8bb79df01b0f5cc04f6502ea107a7395f889b9c4 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 9 Sep 2022 21:25:35 -0400 Subject: [PATCH 07/47] OneSignal (oameye) --- .../views/site3/internal/template/view_securehead.php | 11 +++++++++++ www/assets/js/OneSignalSDKWorker.js | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 www/assets/js/OneSignalSDKWorker.js diff --git a/www/application/views/site3/internal/template/view_securehead.php b/www/application/views/site3/internal/template/view_securehead.php index cf57d301..be901e51 100644 --- a/www/application/views/site3/internal/template/view_securehead.php +++ b/www/application/views/site3/internal/template/view_securehead.php @@ -51,6 +51,17 @@ $server_name = 'https://'. $_SERVER['HTTP_HOST']; + + + diff --git a/www/assets/js/OneSignalSDKWorker.js b/www/assets/js/OneSignalSDKWorker.js new file mode 100644 index 00000000..1707e5e2 --- /dev/null +++ b/www/assets/js/OneSignalSDKWorker.js @@ -0,0 +1,3 @@ +if( 'function' === typeof importScripts) { + importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); +} From bece9b4a7e730dccc179f3ad285e4946c984f84a Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 9 Sep 2022 21:30:45 -0400 Subject: [PATCH 08/47] OneSignal worker fix --- www/{assets/js => }/OneSignalSDKWorker.js | 0 .../views/site3/internal/template/view_securehead.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename www/{assets/js => }/OneSignalSDKWorker.js (100%) diff --git a/www/assets/js/OneSignalSDKWorker.js b/www/OneSignalSDKWorker.js similarity index 100% rename from www/assets/js/OneSignalSDKWorker.js rename to www/OneSignalSDKWorker.js diff --git a/www/application/views/site3/internal/template/view_securehead.php b/www/application/views/site3/internal/template/view_securehead.php index be901e51..4e8ef787 100644 --- a/www/application/views/site3/internal/template/view_securehead.php +++ b/www/application/views/site3/internal/template/view_securehead.php @@ -51,7 +51,7 @@ $server_name = 'https://'. $_SERVER['HTTP_HOST']; - + -

Available Jobs @@ -32,10 +31,9 @@

- - - + +
offer_code') foreach ($market_table_result as $row) { - ?> + ?>
@@ -77,7 +75,7 @@
- offer_code?> + offer_code?>
@@ -88,131 +86,119 @@
-
- - -
- - - + + +
+ + + + + + + + + + + + Flagged Interest + +
+ + - -
- - - - - - - - - - - - Flagged Interest - -
+ From 8f6f743bd46042fbc913afefd244ae5bf688ff80 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 18 Sep 2022 17:40:33 -0400 Subject: [PATCH 22/47] fix --- www/application/controllers/Member.php | 29 ++- www/application/views/users/view_message.php | 178 +++++++++++++++++-- 2 files changed, 186 insertions(+), 21 deletions(-) diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 401018e5..0451d4df 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -1014,11 +1014,25 @@ class Member extends Users_Controller { $data = $this->getSessionArray(); $this->load->library('table'); $this->table->set_template($this->template); - $mysql = "SELECT added::date AS msg_date,msg,id AS msg_id - FROM members_messages - WHERE member_id = " . $_SESSION['member_id'] . " AND reply IS NULL - ORDER BY id DESC LIMIT 20"; + $mysql88 = "SELECT mm.added::date AS msg_date,mm.msg,id AS msg_id ,ms.firstname AS senders_name + FROM members_messages mm + LEFT JOIN members ms ON mm.senders_id = ms.id + WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL + ORDER BY mm.id DESC LIMIT 20"; + + + $mysql = "SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,ms.firstname AS senders_name ,mm.senders_id, mm.memo + FROM members_messages mm + LEFT JOIN members ms ON mm.senders_id = ms.id + WHERE mm.member_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL + UNION + SELECT mm.added::date AS msg_date,mm.msg,mm.id AS msg_id ,'Me' AS senders_name ,mm.senders_id, mm.memo + FROM members_messages mm + WHERE mm.senders_id = " . $_SESSION['member_id'] . " AND mm.reply IS NULL + ORDER BY msg_date DESC LIMIT 30"; + $query = $this->db->query($mysql); + $data['my_message_rows'] = $query->result_array(); // new implementation $myTable = ""; @@ -1037,6 +1051,13 @@ class Member extends Users_Controller { . ""; } + public function setupReply(){ +//E&message_id=" + message_id +"&job_id="+job_id + $message_id = $this->input->get('message_id'); + $job_id = $this->input->get('job_id'); + + echo '.....'; + } public function messagedetail() { // echo 'Ameye'; diff --git a/www/application/views/users/view_message.php b/www/application/views/users/view_message.php index 16d8c9eb..0e02cf19 100644 --- a/www/application/views/users/view_message.php +++ b/www/application/views/users/view_message.php @@ -1,39 +1,169 @@ -
+
+
+
+
+
+ Recent Contacts +
+
+
+ +
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+
+
+ +
+ +
+ +
+ +
+ Just now + You +
+ + +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ +
+ Brian Cox + Just now +
+ +
+ + +
Right before vacation season we have the next Big Deal for you.
+ +
+ +
+ +
+ +
+ + + + +
+
+
+
+
+
+
+ Reply Message +
+
+
+ +
+
+
+ +
+ +
+
+
+ + + + +
-
-

Messages

-
- -
-
- +
- -
- -
-
- - - + @@ -42,6 +172,20 @@ var current_message_id = null; +function RelyBoxShow(message_id, job_id ){ + if (current_message_id!=null) { + $('#'+current_message_id).html(''); + current_message_id = null; + } + current_message_id = message_id; + $.ajax({ + url: "/member/setupReply?proc=NCOMPLETE&message_id=" + message_id +"&job_id="+job_id + }).done(function( data ) { + $('#reply_esction').html(data); + }); + return false; +} + function EDetail(message_id) { if (current_message_id!=null) { $('#'+current_message_id).html(''); From decb2a784ea80a6a783db64c8ab14f8a2273b270 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 18 Sep 2022 20:31:24 -0400 Subject: [PATCH 23/47] fix --- www/application/controllers/Member.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 0451d4df..58a83e76 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -1053,10 +1053,11 @@ class Member extends Users_Controller { public function setupReply(){ //E&message_id=" + message_id +"&job_id="+job_id - $message_id = $this->input->get('message_id'); - $job_id = $this->input->get('job_id'); - - echo '.....'; + $message_id = trim($this->input->get('message_id')); + $job_id = trim($this->input->get('job_id')); + if ($message_id > 0 && $job_id !=''){ + echo '.....'; + } } public function messagedetail() { From f04379495b27d71cedb52be51b9ed86dd25cca2a Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 18 Sep 2022 21:00:31 -0400 Subject: [PATCH 24/47] fix --- www/application/controllers/Member.php | 3 +- .../views/users/sections/mgs_reply.php | 96 +++++++++++++++++++ www/application/views/users/view_message.php | 6 +- 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 www/application/views/users/sections/mgs_reply.php diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 58a83e76..8dd4a05c 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -1056,7 +1056,8 @@ class Member extends Users_Controller { $message_id = trim($this->input->get('message_id')); $job_id = trim($this->input->get('job_id')); if ($message_id > 0 && $job_id !=''){ - echo '.....'; + $answer_string = $this->load->view('users/sections/mgs_reply', '', TRUE); + echo $answer_string; } } public function messagedetail() { diff --git a/www/application/views/users/sections/mgs_reply.php b/www/application/views/users/sections/mgs_reply.php new file mode 100644 index 00000000..2b2a6b9e --- /dev/null +++ b/www/application/views/users/sections/mgs_reply.php @@ -0,0 +1,96 @@ +
+ +
+ +
+ +
+ Brian Cox + +
+ + Active +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ +
+ Pic +
+ + +
+ Brian Cox + 2 mins +
+ +
+ + +
How likely are you to recommend our company to your friends and family ?
+ +
+ +
+ + +
+ +
+ +
+ +
+ 5 mins + You +
+ + +
+ Pic +
+ +
+ + +
Hey there, we’re just writing to let you know that you’ve been subscribed to a repository on GitHub.
+ +
+ +
+ +
+ +
+ + + +
\ No newline at end of file diff --git a/www/application/views/users/view_message.php b/www/application/views/users/view_message.php index 0e02cf19..0c379f00 100644 --- a/www/application/views/users/view_message.php +++ b/www/application/views/users/view_message.php @@ -118,6 +118,7 @@
+
@@ -133,18 +134,19 @@
+
+ + -
- -
- -

- Recent Contacts -

- - -
- - -
-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
DateTitle/Message
-
- - date_contract ?> - -
- 		- title ?> - title_message?> - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - From d16da0b2e458280851282c23f7d5cd803182ceef Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 19 Sep 2022 08:03:33 -0400 Subject: [PATCH 29/47] fix --- .../email/JOB/job_reply_message.mailfile | 86 +++++++------------ 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/wrenchboard/email/JOB/job_reply_message.mailfile b/wrenchboard/email/JOB/job_reply_message.mailfile index fd59a042..92e21e58 100644 --- a/wrenchboard/email/JOB/job_reply_message.mailfile +++ b/wrenchboard/email/JOB/job_reply_message.mailfile @@ -28,7 +28,7 @@ img {height: auto;} - + @@ -211,7 +211,7 @@ img {height: auto;} @@ -244,8 +244,5 @@ img {height: auto;}
@@ -40,36 +40,25 @@ img {height: auto;} @@ -82,8 +71,7 @@ Dear {{firstname}},
- - - +
- - - - - - + + + + + +
- {{site_name}} -
- {{site_trade_name}} -
+WrenchBoard +
+{{site_trade_name}} +
-
-You have received a reply message from {{site_name}} at {{added}} as shown below. - +You have received a reply message from {{site_name}} at {{added}} as shown below.
@@ -91,36 +79,14 @@ You have received a reply message from - - - - -
- -
- - +
@@ -143,7 +120,7 @@ You have received a reply message from - + @@ -164,7 +141,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questio @@ -173,12 +150,12 @@ You received this email because of your interest in a task @ {{site_name}}. If y @@ -197,8 +174,5 @@ You received this email because of your interest in a task @ {{site_name}}. If y
- - - - - - @@ -129,6 +95,17 @@ You have received a reply message from +{{prev_message}} + + +
-Message -
-{{prev_message}} -
-Reply +New Message
® {{site_name}} 2022
-You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us. +You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us.
- Facebook + Facebook - Twitter + Twitter
- - - From 27238f212bd68dacd5a602fb71a82918e065b4b4 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 22 Sep 2022 20:08:55 -0400 Subject: [PATCH 30/47] fix --- www/application/controllers/Member.php | 2 +- www/application/models/Account_model.php | 6 ++++++ .../views/users/sections/mgs_reply.php | 3 ++- www/application/views/users/view_balance.php | 15 ++++++++++++++- www/application/views/users/view_message.php | 8 ++++++-- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 7f9575e5..70ef4c0d 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -749,7 +749,7 @@ class Member extends Users_Controller { $data['card_coupon_data_result'] = $this->report_model->getRedeemCouponsList(6)['card_coupon_data_result']; $data['wallet'] = $this->account_model->getUserWallet( $_SESSION['member_id']); - + $data['escrow'] = $this->account_model->getUserEscrowWallet( $_SESSION['member_id']); if ($_POST) { $data['comment'] = $this->input->post('comment'); diff --git a/www/application/models/Account_model.php b/www/application/models/Account_model.php index 00233353..6e93e328 100644 --- a/www/application/models/Account_model.php +++ b/www/application/models/Account_model.php @@ -18,6 +18,12 @@ class Account_model extends CI_Model { return $query->result_array(); } + public function getUserEscrowWallet($member_id) { + $mysql = "SELECT sum(amount),currency FROM members_payments WHERE code ='OFDPS' AND member_id = $member_id AND confirmation IS NOT NULL GROUP BY currency"; + $query = $this->db->query($mysql); + return $query->result_array(); + } + public function verify_link($data) { $q = $this ->db diff --git a/www/application/views/users/sections/mgs_reply.php b/www/application/views/users/sections/mgs_reply.php index 044c6261..41444d3d 100644 --- a/www/application/views/users/sections/mgs_reply.php +++ b/www/application/views/users/sections/mgs_reply.php @@ -42,7 +42,8 @@
+ data-kt-element="message-text"> + diff --git a/www/application/views/users/view_balance.php b/www/application/views/users/view_balance.php index 656b82e2..dd8cc7a8 100644 --- a/www/application/views/users/view_balance.php +++ b/www/application/views/users/view_balance.php @@ -54,7 +54,20 @@ function getAddWithdrawButtons(){ 		- + $val) { + if ($val['currency'] === $wlt['code']) { + $escrow_amount = $val['sum']; + } + } + + echo money_format('%.2n', $escrow_amount * 0.01); + + ?>
+ onclick="RelyBoxShow(,'');"> + Replied : '.$row['reply'].'' : '' ?> + @@ -50,7 +52,9 @@
+ onclick="RelyBoxShow(,'');"> + Replied : '.$row['reply'].'' : '
Reply Now' ?> + Date: Thu, 22 Sep 2022 20:08:59 -0400 Subject: [PATCH 31/47] fix --- wrenchboard/src/shared_tool/payments.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wrenchboard/src/shared_tool/payments.cc b/wrenchboard/src/shared_tool/payments.cc index 6d741cbf..dc7cca91 100644 --- a/wrenchboard/src/shared_tool/payments.cc +++ b/wrenchboard/src/shared_tool/payments.cc @@ -604,6 +604,9 @@ Foreign-key constraints: x["what_offer"] = in["offer_id"]; x["what_offer"].set_valid( true ); x["flags"] = FLAG_INIT; x["flags"].set_valid( true ); // starting the pprocess + + x["currency"] = vw["currency"]; x["currency"].set_valid( true ); + payment_id = insert_db_record( DBS_VALID, "members_payments", "members_payments_id_seq", x ); out["payment_id"] = payment_id; out["payment_id"].set_valid( true ); From 75a5004fce8e2b6f2100cf07f7a55e94f9d7ac2e Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 22 Sep 2022 21:09:26 -0400 Subject: [PATCH 32/47] fix --- www/application/models/Account_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/application/models/Account_model.php b/www/application/models/Account_model.php index 6e93e328..249058e2 100644 --- a/www/application/models/Account_model.php +++ b/www/application/models/Account_model.php @@ -19,7 +19,7 @@ class Account_model extends CI_Model { } public function getUserEscrowWallet($member_id) { - $mysql = "SELECT sum(amount),currency FROM members_payments WHERE code ='OFDPS' AND member_id = $member_id AND confirmation IS NOT NULL GROUP BY currency"; + $mysql = "SELECT sum(amount),currency FROM members_payments WHERE code ='OFDPS' AND member_id = $member_id AND confirmation IS NOT NULL AND flags = 4 GROUP BY currency"; $query = $this->db->query($mysql); return $query->result_array(); } From 90be9fd8b996d8b34807e26a4a5b1e99d09fa2e4 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 22 Sep 2022 21:09:31 -0400 Subject: [PATCH 33/47] fix --- wrenchboard/email/JOB/job_offer_cancel.mailfile | 17 ++++++++--------- .../email/JOB/job_offer_rejected.mailfile | 17 +++++++---------- wrenchboard/src/shared_tool/email.cc | 2 +- wrenchboard/src/shared_tool/jobs.cc | 2 +- wrenchboard/src/shared_tool/payments.cc | 8 +++++--- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/wrenchboard/email/JOB/job_offer_cancel.mailfile b/wrenchboard/email/JOB/job_offer_cancel.mailfile index 7834068f..9062056f 100644 --- a/wrenchboard/email/JOB/job_offer_cancel.mailfile +++ b/wrenchboard/email/JOB/job_offer_cancel.mailfile @@ -89,7 +89,7 @@ img {height: auto;}
- +
@@ -101,7 +101,7 @@ img {height: auto;} @@ -123,7 +123,7 @@ img {height: auto;} Offer ID @@ -180,7 +180,7 @@ img {height: auto;} @@ -201,7 +201,7 @@ img {height: auto;} @@ -210,12 +210,12 @@ img {height: auto;} @@ -235,7 +235,6 @@ img {height: auto;}
-

The offer below from a {{site_name}} with details below is canceled.

+

The offer below from a {{site_name}} with details below is canceled.
- {{offer_code}} + {{offer_code}}
- +
® {{site_name}} 2022
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. + You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.
- Facebook + Facebook - Twitter + Twitter
- - + diff --git a/wrenchboard/email/JOB/job_offer_rejected.mailfile b/wrenchboard/email/JOB/job_offer_rejected.mailfile index 4d35ffba..bc7c3e2e 100644 --- a/wrenchboard/email/JOB/job_offer_rejected.mailfile +++ b/wrenchboard/email/JOB/job_offer_rejected.mailfile @@ -89,7 +89,7 @@ img {height: auto;}
- +
@@ -101,7 +101,7 @@ img {height: auto;} @@ -123,7 +123,7 @@ img {height: auto;} Offer ID @@ -187,7 +187,7 @@ img {height: auto;} @@ -208,7 +208,7 @@ img {height: auto;} @@ -217,12 +217,12 @@ img {height: auto;} @@ -241,8 +241,5 @@ img {height: auto;}
-

You have rejected the job offer from a {{site_name}} user with details below.

+

You have rejected the job offer from a {{site_name}} user with details below.
- {{offer_code}} + {{offer_code}}
- +
® {{site_name}} 2022
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. + You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.
- Facebook + Facebook - Twitter + Twitter
- - - diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index cb54690b..1a3edea2 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -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()); diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 677ffd21..08c626f3 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -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; diff --git a/wrenchboard/src/shared_tool/payments.cc b/wrenchboard/src/shared_tool/payments.cc index dc7cca91..e388bf3c 100644 --- a/wrenchboard/src/shared_tool/payments.cc +++ b/wrenchboard/src/shared_tool/payments.cc @@ -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 { From bbe90b327c24ca93a8ad62928e44307e0110676a Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 22 Sep 2022 21:47:51 -0400 Subject: [PATCH 34/47] fix --- wrenchboard/email/JOB/job_offer_accepted.mailfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wrenchboard/email/JOB/job_offer_accepted.mailfile b/wrenchboard/email/JOB/job_offer_accepted.mailfile index 702d8183..a20b1c5c 100644 --- a/wrenchboard/email/JOB/job_offer_accepted.mailfile +++ b/wrenchboard/email/JOB/job_offer_accepted.mailfile @@ -190,7 +190,7 @@ img {height: auto;}
- +
® {{site_name}} 2022
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. + You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.
- - - From b609dd8b7a31700b1e0af00aa221514ae85eb2b7 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Tue, 27 Sep 2022 07:46:33 -0400 Subject: [PATCH 35/47] fix --- .../views/jobs/view_viewmyjoboffer.php | 54 +++++++++++++++++-- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php index c012f678..7081832e 100644 --- a/www/application/views/jobs/view_viewmyjoboffer.php +++ b/www/application/views/jobs/view_viewmyjoboffer.php @@ -50,7 +50,7 @@
- +
@@ -80,7 +80,7 @@ -
+
@@ -104,14 +104,58 @@

- Other Offers + Actions

- + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ + +
+
+
+ +
+ + + + + + +
From 4f4d5f233991e48309896327a8acf0221c581154 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 1 Oct 2022 10:30:17 -0400 Subject: [PATCH 36/47] fix --- www/application/controllers/Jobs.php | 1 + www/application/models/Job_model.php | 4 +++- www/application/views/jobs/view_viewmyjoboffer.php | 14 +++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 00099751..9c0e2154 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -715,6 +715,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] ); $data["timeline_days"] = $out["timeline_days"]; $data["price"] = $out["price"]; $data["offer_code"] = $out["offer_code"]; + $data['is_public_view'] = $out['public_view']; $a_from = array('\t','\n','\r','\0','\v'); $a_to = array("\t","\n","\r","",""); $data["job_description"] = trim(trim(str_replace($a_from,$a_to,$out["job_description"])),'"'); // str_replace('"','\"',$out["job_description"]); // $out["job_description"]; diff --git a/www/application/models/Job_model.php b/www/application/models/Job_model.php index aa243328..0eb3da2f 100644 --- a/www/application/models/Job_model.php +++ b/www/application/models/Job_model.php @@ -176,7 +176,8 @@ class Job_model extends CI_Model { public function readMyloadJobOffer($member_id, $offer_code) { $out = array(); $out['result'] = 0; - $mysql = "SELECT jo.added::date AS added_date,j.title,j.description, j.timeline_days, j.price*0.01 AS price,jo.offer_code,jo.job_description,jo.expire,(CASE WHEN jo.public_view > 0 THEN 'Public View' ELSE jo.email END ) AS job_sent_to " + $mysql = "SELECT jo.added::date AS added_date,j.title,j.description, j.timeline_days, j.price*0.01 AS price,public_view," + ." jo.offer_code,jo.job_description,jo.expire,(CASE WHEN jo.public_view > 0 THEN 'Public View' ELSE jo.email END ) AS job_sent_to " . "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.member_id = " . $member_id . " AND jo.offer_code='" . $offer_code . "' "; @@ -192,6 +193,7 @@ class Job_model extends CI_Model { $out['offer_code'] = $q->row()->offer_code; $out['job_description'] = $q->row()->job_description; $out['expire'] = $q->row()->expire; + $out['public_view'] = $q->row()->public_view; $out['result'] = 1; } else { diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php index 7081832e..02795c4d 100644 --- a/www/application/views/jobs/view_viewmyjoboffer.php +++ b/www/application/views/jobs/view_viewmyjoboffer.php @@ -119,7 +119,19 @@ - + 0){ + ?> + Job sent to + + + + + From 1dbd9dd1094eb6fde408405073965e6eb278f482 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 6 Oct 2022 18:30:12 -0400 Subject: [PATCH 37/47] fix --- www/application/controllers/Proj.php | 7 ++++--- .../views/compo/offers_jobs/offers_jobs_table.php | 8 ++++---- www/application/views/jobs/view_viewmyjoboffer.php | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 0a43411d..4dc7b1fa 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -362,9 +362,10 @@ class Proj extends Users_Controller { if ($ajax == 1) { echo $res; } else { - $this->load->view('users/view_header_user', $data); - $this->load->view('jobs/view_latejob', $data); - $this->load->view('users/view_footer_user', $data); + // $this->load->view('users/view_header_user', $data); + // $this->load->view('jobs/view_latejob', $data); + // $this->load->view('users/view_footer_user', $data); + $this->RenderUserPage('jobs/view_latejob', $data); } } } diff --git a/www/application/views/compo/offers_jobs/offers_jobs_table.php b/www/application/views/compo/offers_jobs/offers_jobs_table.php index ee40af98..93c4411b 100644 --- a/www/application/views/compo/offers_jobs/offers_jobs_table.php +++ b/www/application/views/compo/offers_jobs/offers_jobs_table.php @@ -3,7 +3,7 @@ Added/Expire Title/Target - Status + @@ -22,11 +22,11 @@ title ?> - trec ?> + trec?> - + diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php index 02795c4d..56a9fb1f 100644 --- a/www/application/views/jobs/view_viewmyjoboffer.php +++ b/www/application/views/jobs/view_viewmyjoboffer.php @@ -175,7 +175,8 @@
-
+ + @@ -193,14 +194,14 @@
-
+
+
  • Actions -
    • +
    @@ -91,7 +91,7 @@
    - +
    @@ -216,7 +216,14 @@ } if ($this_is_project_owner == true) { - include('jobaction/job_owner.php'); + if ($this_job_result->current_job_status == 4){ + include('jobaction/job_owner.php'); + } + else{ + echo "Waiting for the completion message from the client before you can approve."; + } + + // } ?>
    From da661f15ebc1f3acc6bf4be3eda95adb58eafee9 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Wed, 12 Oct 2022 08:09:52 -0400 Subject: [PATCH 44/47] fix --- .../site3/internal/template/side_menu.php | 21 +++++++++++++++++++ .../internal/template/view_securehead.php | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/www/application/views/site3/internal/template/side_menu.php b/www/application/views/site3/internal/template/side_menu.php index 58131c38..e27567ee 100644 --- a/www/application/views/site3/internal/template/side_menu.php +++ b/www/application/views/site3/internal/template/side_menu.php @@ -89,6 +89,27 @@ + + +
    + + + + + + + + + + + + + + Refer a Friend + +
    +     + - - - - - +
    -
    -
    -
    - -
    @@ -396,13 +386,9 @@ $server_name = 'https://'. $_SERVER['HTTP_HOST']; - - Refer a Friend - - From 6c665e538f2edf5b333db6ff1f9ef5b205bf2c57 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 20 Oct 2022 18:36:21 -0400 Subject: [PATCH 45/47] fix --- .../email/ACCOUNT/member_welcome.mailfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/wrenchboard/email/ACCOUNT/member_welcome.mailfile b/wrenchboard/email/ACCOUNT/member_welcome.mailfile index 007dc23a..31e8721c 100644 --- a/wrenchboard/email/ACCOUNT/member_welcome.mailfile +++ b/wrenchboard/email/ACCOUNT/member_welcome.mailfile @@ -66,13 +66,7 @@ img {height: auto;} - - - - -
    - -
    + - +
    From 40a7015b25596175e9d696ae856c770bc4cd2eb4 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Thu, 20 Oct 2022 19:39:46 -0400 Subject: [PATCH 47/47] fix --- .../email/JOB/job_interest_client.mailfile | 93 +++++++------------ 1 file changed, 36 insertions(+), 57 deletions(-) diff --git a/wrenchboard/email/JOB/job_interest_client.mailfile b/wrenchboard/email/JOB/job_interest_client.mailfile index 455c7092..43ec2d14 100644 --- a/wrenchboard/email/JOB/job_interest_client.mailfile +++ b/wrenchboard/email/JOB/job_interest_client.mailfile @@ -10,34 +10,18 @@ Subject: {{subject}} - {{title}} body {margin: 0; padding: 0; min-width: 100%!important;} img {height: auto;} .content {width: 100%; max-width: 600px;} -.header {padding: 40px 30px 20px 30px;} -.innerpadding {padding: 30px 30px 30px 30px;} +.header {padding: 10px 10px 10px 10px;} +.innerpadding {padding: 10px 10px 10px 10px;} .borderbottom {border-bottom: 1px solid #f2eeed;} .subhead {font-size: 12px; color: #ffffff; font-family: sans-serif; letter-spacing: 3px;} .h1, .h2, .bodycopy {color: #153643; font-family: sans-serif;} .h1 {font-size: 33px; line-height: 38px; font-weight: bold;} -.h2 {padding: 0 0 15px 0; font-size: 24px; line-height: 28px; font-weight: bold;} .bodycopy {font-size: 14px; line-height: 20px;} .button {text-align: center; font-size: 16px; font-family: sans-serif; font-weight: bold; padding: 0 30px 0 30px;} .button a {color: #ffffff; text-decoration: none;} -.footer {padding: 20px 30px 15px 30px;} +.footer {padding: 20px 30px 15px 30px; bgcolor:#007bff; background-color:#007bff;} .footercopy {font-family: sans-serif; font-size: 14px; color: #ffffff;} .footercopy a {color: #ffffff; text-decoration: underline;} - -@media only screen and (max-width: 550px), screen and (max-device-width: 550px) { -body[yahoo] .hide {display: none!important;} -body[yahoo] .buttonwrapper {background-color: transparent!important;} -body[yahoo] .button {padding: 0px!important;} -body[yahoo] .button a {background-color: #e05443; padding: 15px 15px 13px!important;} -body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; background: #2f3942; border-radius: 5px; text-decoration: none!important; font-weight: bold;} -} - -/*@media only screen and (min-device-width: 601px) { -.content {width: 600px !important;} -.col425 {width: 425px!important;} -.col380 {width: 380px!important;} -}*/ - @@ -53,41 +37,41 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
    - {{site_name}} empowers you to find jobs or join jobs group. With {{site_name}} you can set up and post your jobs and find expert skills sets to get them done. + {{site_name}} empowers you to find jobs or join jobs group. With {{site_name}} you can set up and post your jobs and find expert skills sets to get them done.
    -With {{site_name}}, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge.
    +
    +With {{site_name}}, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge.
    - - - - -
    -WrenchBoard -
    + + + + +
    + WrenchBoard +
    - - -
    - +
    + + @@ -196,11 +180,6 @@ Note that this task was posted in the public domain and the owner can select any - - -
    + + + + - -
    + - - - - - - -
    -{{site_name}} -
    -{{site_trade_name}} -
    -
    -
    - -
    Please contact us at https://www.wrenchboard.com/contact if you have any question about this email.