From f62840a4503166ec663dd12ffb5575653dd29dfc Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 20 Mar 2022 20:11:29 -0400 Subject: [PATCH] fix --- www/TEST/test_createuser.php | 2 +- www/application/controllers/Jobs.php | 41 +++--- www/application/controllers/Proj.php | 7 +- www/application/libraries/Bko_Controller.php | 5 +- www/application/views/jobs/view_jobagree.php | 88 +++++++++--- www/application/views/jobs/view_manage.php | 127 +++++++++++----- .../views/jobs/view_pastduejob.php | 135 ++++++++++++++++++ .../views/jobs/view_pendingoffer.php | 20 +-- .../views/site3/external/view_vemail.php | 4 +- 9 files changed, 338 insertions(+), 91 deletions(-) create mode 100644 www/application/views/jobs/view_pastduejob.php diff --git a/www/TEST/test_createuser.php b/www/TEST/test_createuser.php index 490a6adf..e7bd8ab9 100644 --- a/www/TEST/test_createuser.php +++ b/www/TEST/test_createuser.php @@ -6,7 +6,7 @@ $url = $local_url . "/createuser"; $username = urlencode("jubaworker+" . rand(1000, 9999) . "@gmail.com"); $username = "jubaworker+" . rand(1000, 9999) . "@gmail.com"; -//$username = "ameye+" . rand(1000, 9999) . "@chiefsoft.com"; +$username = "ameye+auto" . rand(1000, 9999) . "@chiefsoft.com"; //$username = "ses66181+" . rand(1000, 9999) . "@gmail.com"; $phone = (rand(1, 2) > 1) ? "770222" . rand(2222, 9999) : ''; diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 4d7d9bc0..f3c460b6 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -138,9 +138,12 @@ class Jobs extends Users_Controller { - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_pendinginterest', $data); - $this->load->view('users/view_footer_user', $data); + $this->load->view('users/view_footer_user', $data); */ + + $this->renderSecurePage('jobs/view_pendinginterest', $data); + } public function jobinterest() { @@ -214,9 +217,12 @@ class Jobs extends Users_Controller { - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_manageinterest', $data); - $this->load->view('users/view_footer_user', $data); + $this->load->view('users/view_footer_user', $data);*/ + + $this->renderSecurePage('jobs/view_manageinterest', $data); + } private function getMarketInterestMessage($offer_code, $client_id) { @@ -724,9 +730,13 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) $_SESSION['secure_data'] = $data; // all data needed for secure page $data['page_title'] = "my Market Job(s)"; - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_pendingoffer', $data); $this->load->view('users/view_footer_user', $data); +*/ + + $this->renderSecurePage('jobs/view_pendingoffer', $data); + } public function jobgrp() { @@ -910,11 +920,11 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) public function jobagree() { $data = $this->getSessionArray(); -//echo 'Ameye-- '. rand(100,999); -//print_r($this->input->post()); + + if ($_POST) { - + //echo rand(1000,9999); $in = array(); $in['action'] = WRENCHBOARD_ACCOUNT_TERMS; $in['action_item'] = ACCOUNT_AGREE_JOBS; @@ -923,7 +933,6 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) $out = array(); $res = $this->backend_model->wrenchboard_api($in, $out); - if ($res == PHP_API_OK) { redirect('/jobs/create'); } @@ -931,13 +940,7 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) $data['page_key'] = 'WRB_POST_JOB_TERM'; $data['txt_detail'] = $this->readFixedText($data['page_key']); - - - - - $this->load->view('users/view_header_user', $data); - $this->load->view('jobs/view_jobagree', $data); - $this->load->view('users/view_footer_user', $data); + $this->renderSecurePage('jobs/view_jobagree', $data); } private function processingJob($jobID) { @@ -1248,9 +1251,11 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) $data['page_title'] = "Manage Job(s)"; $data['job_table'] = $this->table->generate($query); - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_manage', $data); - $this->load->view('users/view_footer_user', $data); + $this->load->view('users/view_footer_user', $data); */ + $this->renderSecurePage('jobs/view_manage', $data); + } } diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 695e16e4..7a59336d 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -125,9 +125,12 @@ class Proj extends Users_Controller { $data['current_balance'] = $out['current_balance']; $data['new_message'] = $out['new_message']; - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_activejob', $data); - $this->load->view('users/view_footer_user', $data); + $this->load->view('users/view_footer_user', $data);*/ + //view_pastduejob.php + $data['page_title'] ="Past Due"; + $this->renderSecurePage('jobs/view_activejob', $data); } } diff --git a/www/application/libraries/Bko_Controller.php b/www/application/libraries/Bko_Controller.php index 33a635cd..02951990 100644 --- a/www/application/libraries/Bko_Controller.php +++ b/www/application/libraries/Bko_Controller.php @@ -43,14 +43,15 @@ class Bko_Controller extends WRB_Controller { $data = array(); $this->load->library('table'); $this->table->set_template($this->template); - $mysql = "SELECT 'ADDED:'||added::date||'
EXPIRE:'||expire::date||'
'||username||'
Name:'||firstname||' '||lastname AS signup," + $mysql = "SELECT 'ADDED:'||added::date||'
EXPIRE:'||expire::date||'
'||username||'
Name:'||firstname||' '||lastname AS signup, country," . " (CASE WHEN status=1 THEN '
' ELSE ' ' END) AS action ," . " (CASE WHEN status=1 THEN '
' ELSE ' ' END) AS Del " . " FROM members_pending WHERE expire> now() AND status = 1" . " ORDER BY id desc limit 5"; $query = $this->db->query($mysql); // $this->table->set_heading('Dates', 'Username', 'Name', 'Action'); - $this->table->set_heading(array('data' => 'Date/Email/Name', 'style' => 'width:180px'), array('data' => 'RES', 'style' => 'width:20px; cellpadding:0px;'), array('data' => 'Del', 'style' => 'width:20px; cellpadding:0px;')); + $this->table->set_heading(array('data' => 'Date/Email/Name', 'style' => 'width:180px'),array('data' => 'Country', 'style' => 'width:20px; cellpadding:0px;'), + array('data' => 'RES', 'style' => 'width:20px; cellpadding:0px;'), array('data' => 'Del', 'style' => 'width:20px; cellpadding:0px;')); $data['pending_dash_table'] = $this->table->generate($query); diff --git a/www/application/views/jobs/view_jobagree.php b/www/application/views/jobs/view_jobagree.php index 768fc7eb..9de60c85 100644 --- a/www/application/views/jobs/view_jobagree.php +++ b/www/application/views/jobs/view_jobagree.php @@ -1,28 +1,78 @@ - -
- + + +
+
+ +
+ +
+ +

+ Additional Terms for Jobs Posting. +

+ + +
+ + +
+
+ +
+ +

All terms of sale must follow WrenchBoard policies for buying and selling. Setting and meeting expectations in a listing's terms of sale ensure a smooth transaction and buyer satisfaction while helping WrenchBoard remain a reputable marketplace.

+
+

What is the policy?

+ +

Task or Job owners should provide clear and accurate delivery terms and conditions required to meet the expectations they have set in their listings. These should include:

+ +
    +
  • Delivery mode, timelines, and reviews
    • +
  • The forms of payment available for the task
    • +
  • A returns policy: +
      +
    • Clearly stated criteria under which cancellation will be accepted.
      • +
    • Clearly stated the time period in which the buyer must notify the seller about the delivery delay.
      • +
    • How refunds/returns/cancellations will be issued
      • +
    + +
    • +
+ +
+
+ + + + +
+

Activity that doesn't follow WrenchBoard policy could result in a range of actions, including for example: administratively ending or canceling listings, hiding or demoting all listings from search results, lowering rating, buying or selling restrictions, and account suspension. +
+ All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account.

+
+

Why does WrencBoard have this policy?

+

Buyers and sellers enter a contract when they complete transactions, so it's necessary to have precise details on what the transaction entails to guarantee satisfaction. This policy also helps sellers meet our performance standards.

+ - -
-
-
- -
-
- -
-
- -
-
+ + +
+ +
+ + +
- +
+
+
-
- + + + diff --git a/www/application/views/jobs/view_manage.php b/www/application/views/jobs/view_manage.php index 72396484..f4f14a9c 100644 --- a/www/application/views/jobs/view_manage.php +++ b/www/application/views/jobs/view_manage.php @@ -21,50 +21,111 @@ } // --> -
- - - + - -
-
- + +
+ +
+ +
+ +
+

+ Manage Jobs +

+
- -
-
-

My Job(s)

- -
-

Create Job

-
-
-

Completed Jobs(s)

-
- -
-

Past Due

-
-
-
- -
+ + + + +
+

+
+
+ My Job(s) +
+ +
+ Create Job +
+
+ +
+
+

+
+ Completed    + Past Due + +
+
+ + + + +
+
+ +
+ + + +
+
+
+
- + + +
+ +
+ +
+

+ . +

+
+ +
+
+ + +
+
+ +
+ +
+ + + .. +
+ +
+ + +
+
+ +
+ +
+
- + + + + + + + + + + +
+
+ +
+ +
+ +

+ Past Due +

+ + +
+ + +
+
+ +
+ +
+ + +
+ + +
+ + +
+ + +
+ +
+ +
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/www/application/views/jobs/view_pendingoffer.php b/www/application/views/jobs/view_pendingoffer.php index 4bdeddd2..99e93ebb 100644 --- a/www/application/views/jobs/view_pendingoffer.php +++ b/www/application/views/jobs/view_pendingoffer.php @@ -11,11 +11,14 @@ return false; } // --> - + + + +
- +
@@ -25,7 +28,7 @@
-
+
@@ -33,18 +36,7 @@
-
-
-
- Active Projects -
-
-
My Active Projects
- View active project. manage list and communication with deliverables. -
-
-
diff --git a/www/application/views/site3/external/view_vemail.php b/www/application/views/site3/external/view_vemail.php index 9b94988b..df66eee1 100644 --- a/www/application/views/site3/external/view_vemail.php +++ b/www/application/views/site3/external/view_vemail.php @@ -36,8 +36,8 @@ Create an Account
- - + +