From 1b025a15631ffb225f6cbac80803dab1e4686d45 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Fri, 18 Feb 2022 18:30:32 -0500 Subject: [PATCH] fix --- www/application/controllers/Jobs.php | 6 +- www/application/controllers/Member.php | 1 + www/application/views/jobs/view_market.php | 2 +- .../views/jobs/view_viewmyjoboffer.php | 129 +++-- www/application/views/users/view_balance.php | 477 +++++++++++++++--- 5 files changed, 508 insertions(+), 107 deletions(-) diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index 96f93949..4d7d9bc0 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -671,9 +671,11 @@ echo $this->getMarketInterestMessage( $data['offer_code'], $out['client_id'] ) $data['job_link'] = 'https://'.$_SERVER['HTTP_HOST']."/plb/viewjob/".$out['offer_code']; - $this->load->view('users/view_header_user', $data); + /* $this->load->view('users/view_header_user', $data); $this->load->view('jobs/view_viewmyjoboffer', $data); - $this->load->view('users/view_footer_user', $data); + $this->load->view('users/view_footer_user', $data);*/ + + $this->RenderUserPage('jobs/view_viewmyjoboffer', $data); } else { redirect('dash'); // go back to dash if not valid } diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index c077505b..d0154fd4 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -681,6 +681,7 @@ class Member extends Users_Controller { $query = $this->db->query($mysql); $this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status'); $data['sendmoney_table'] = $this->table->generate($query); + $data['sendmoney_table_result'] = $query->result(); $data['page_title'] ="Wallet"; $this->RenderUserPage('users/view_balance', $data); } diff --git a/www/application/views/jobs/view_market.php b/www/application/views/jobs/view_market.php index eee753d3..ee922392 100644 --- a/www/application/views/jobs/view_market.php +++ b/www/application/views/jobs/view_market.php @@ -69,7 +69,7 @@
-
Nprice*0.01?>
+
N price * 0.01); ?>
Budget
diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php index 33d61ed8..94eabd51 100644 --- a/www/application/views/jobs/view_viewmyjoboffer.php +++ b/www/application/views/jobs/view_viewmyjoboffer.php @@ -1,9 +1,94 @@
+ + + +
+
+ +
+ +
+ +

+ Recent Task Message +

+ + +
+ + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
You have sent this job to
+
Date
Description
Offer Expire
Price Naira
Duration day(s)
Detail
Public Link
+ +
+ +
+ + +
+ + +
+ +
+ +
+
+ + + +
- +
@@ -15,47 +100,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
You have sent this job to
-
Date
Description
Offer Expire
Price Naira
Duration day(s)
Detail
Public Link
+
diff --git a/www/application/views/users/view_balance.php b/www/application/views/users/view_balance.php index 19ebd9a1..c6ca09b6 100644 --- a/www/application/views/users/view_balance.php +++ b/www/application/views/users/view_balance.php @@ -1,48 +1,440 @@ + +
-
- -
- + +
+ +
+ +
+

+ Wallet + More than 100 new orders +

+
+
    + Add New Wallet +
+
+
+ -
+
-
+
-
-
-
Account Balance :
-
-
-
Escrow Balance :
-
+ + + + + + + + + + + + + + + -
-
- - -
- + + + + + + + + + + + + + + +
CurrencyBalanceEscrow
+ Naira + # + + + + + +
+ +
+
+ US Dollars + $ + + + + + + +
-
- -
- +
+ + +
+ +
+ +
+

+ Recent Activities + Activity Report +

+
+ +
+
+ + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateRecipientAmount/FeeConf/Status
+ date?> + + recitient?> + + + amount?>
fee?> + 		+ confirmation?> + status?> + + + + +
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+ 		+ Who Knows Geography + By Zoey Dylan + + 3:22PM, 07 Sep + Date + + + + +
+
+ + + + + + + + + + + + +
+ 		+ Maths Championship + By Tom Gere + + 10:05PM, 25 Oct + Date + + + + +
+
+ + + + + + + + + + + +
+ 		+ School Music Festival + by Rose Liam + + 4:20PM, 03 Sep + Date + + + + +
+
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+ 		+ Maths Championship + By Tom Gere + + 10:05PM, 25 Oct + Date + + + + +
+
+ + + + + + + + + + +
+ 		+ Who Knows Geography + By Zoey Dylan + + 3:22PM, 07 Sep + Date + + + + +
+
+ + + + + + + + + + +
+ 		+ Napoleon Days + By Luke Owen + + 1:20PM, 02 Dec + Date + + + + +
+
+ + + + + + + + + + + +
+ 		+ School Music Festival + by Rose Liam + + 4:20PM, 03 Sep + Date + + + + +
+
+ +
+ +
+
+ +
+ +
+
+ +
@@ -150,45 +542,6 @@
- -
-
- -
- -
- -

- Recent Activities -

- - -
- - -
-
- -
- -
- - -
- -
- - -
- - -
- -
- -
-
-