diff --git a/www/application/config/constants.php b/www/application/config/constants.php index 3e6fcf84..8b0bc0dc 100644 --- a/www/application/config/constants.php +++ b/www/application/config/constants.php @@ -179,6 +179,8 @@ define('WRENCHBOARD_USER_USESAVEDCC', 11056); define('WRENCHBOARD_USER_SETTINGS', 11058); define('WRENCHBOARD_ACCOUNT_PREPARE_TOPUP', 11062); +define('WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP', 11063); + define('WRENCHBOARD_USER_DELETEACC', 11990); define('WRENCHBOARD_ACCOUNT_END', 11999); diff --git a/www/application/controllers/Fltw.php b/www/application/controllers/Fltw.php new file mode 100644 index 00000000..87eb97ec --- /dev/null +++ b/www/application/controllers/Fltw.php @@ -0,0 +1,46 @@ +load->helper('url'); + + //Load session library + $this->load->library('session'); + } + + //Displays social login links + public function index() { + + } + + public function complete() { +$in= []; +// //https://oameye.work.wrenchboard.com/dash?status=successful&tx_ref=wrench-1161918567&transaction_id=3631794 + + $in['tx_ref'] = $this->input->get('tx_ref'); + $in['transaction_id'] = $this->input->get('transaction_id'); + $in['status'] = $this->input->get('status'); + + if ( $in['tx_ref'] !='' && $in['transaction_id'] !='' && $in['status']!='' ){ + + $in['action'] = WRENCHBOARD_ACCOUNT_COMPLETE_TOPUP; + $this->load->model('backend_model'); + $out = array(); + $res = $this->backend_model->wrenchboard_api($in, $out); + if ($res > 0) { + + + } + } + + redirect('/dash', 'refresh'); + } + +} diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index f45eddbf..92e410ee 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -653,24 +653,34 @@ class Member extends Users_Controller { $this->load->model('backend_model'); $out = array(); $res = $this->backend_model->wrenchboard_api($in, $out); - if ($res == PHP_CREATED_OK) { + if ($res > 0) { // prepare the fullter parameters - - + /* + * + * 12:16:52.238 INFO [237499]: RET: consumer_id=1 +- 12:16:52.238 INFO [237499]: RET: consumer_mac=3119b744-42ad-4834-bb83-b737588754ca +- 12:16:52.238 INFO [237499]: RET: currency=NGN +- 12:16:52.238 INFO [237499]: RET: phone= +- 12:16:52.238 INFO [237499]: RET: result=YES I GET TO BACK END +- 12:16:52.238 INFO [237499]: RET: status=OK +- 12:16:52.238 INFO [237499]: RET: tx_ref=c30b3a20-b7f2-4324-b733-a9afa29dc7d1 + * * + */ + $data['tx_ref'] = $out['tx_ref']; + $data['currency'] =$out['currency']; + $data['customer_email'] = $_SESSION['username']; + $data['customer_phone_number'] = $out['phone']; + $data['customer_name'] = $_SESSION['firstname'].' '.$_SESSION['lastname']; + $data['consumer_id'] =$out['consumer_id']; + $data['consumer_mac'] =$out['consumer_mac']; + $data['redirect_url'] = base_url() . "fltw/complete"; //"https://oameye.work.wrenchboard.com/dash"; + $data['public_key'] = "FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X"; } else { // very bad here } - $data['tx_ref'] = 'wrench-'.rand(1000000000,9999999999); - $data['currency'] = "NGN"; - $data['customer_email'] = $_SESSION['username']; - $data['customer_phone_number'] = ''; - $data['customer_name'] = $_SESSION['firstname'].' '.$_SESSION['lastname']; - $data['consumer_id'] = $_SESSION['member_id']; - $data['consumer_mac'] = $_SESSION['member_id']."-912ba-1192a"; - $data['redirect_url'] = base_url() . "dash"; //"https://oameye.work.wrenchboard.com/dash"; - $data['public_key'] = "FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X"; + //*************GET MOST OF THESE DATA FROM BACKEND */ $this->load->library('table'); diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php index 73024b56..98acbca2 100644 --- a/www/application/controllers/Proj.php +++ b/www/application/controllers/Proj.php @@ -187,7 +187,7 @@ class Proj extends Users_Controller { . " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id WHERE mc.member_id = " . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) OR mc.client_id =" . $_SESSION['member_id'] . " AND mc.status IN (1,2,4) LIMIT " . $config["per_page"] . " OFFSET " . $page; $mysql = "SELECT 'ID:'||mc.contract||'
Timeline:'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," - . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id," + . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,mc.delivery_date::date," . " (CASE WHEN mc.status=4 THEN '' " . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " . " WHEN mc.status = 1 AND mc.delivery_date PastDue' " diff --git a/www/application/libraries/Users_Controller.php b/www/application/libraries/Users_Controller.php index 83473958..bf52f98b 100644 --- a/www/application/libraries/Users_Controller.php +++ b/www/application/libraries/Users_Controller.php @@ -55,7 +55,7 @@ class Users_Controller extends WRB_Controller { $jbx = "''/proj/thisjob''"; $mysql = "SELECT ''||mc.contract||'
'||mc.timeline_days||' day(s)
Price:'||mc.price*0.01 AS Project," - . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id," + . " 'Title: '||mc.title||'
Description: '||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,mc.delivery_date::date," . " (CASE WHEN mc.status=4 THEN '' " . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '' " . " WHEN mc.status = 1 AND mc.delivery_date PastDue' " diff --git a/www/application/views/compo/active_jobs/active_jobs_table.php b/www/application/views/compo/active_jobs/active_jobs_table.php index d1158633..0dfaf147 100644 --- a/www/application/views/compo/active_jobs/active_jobs_table.php +++ b/www/application/views/compo/active_jobs/active_jobs_table.php @@ -1,47 +1,38 @@ - - - + + - - - - - -
Job Title/DescriptionStatusDue
project ?> description ?> - + delivery_date?> - - - - - - - - + + + + + +
\ No newline at end of file diff --git a/www/application/views/compo/comp_active_jobs.php b/www/application/views/compo/comp_active_jobs.php index ec0a4b6d..b08d561c 100644 --- a/www/application/views/compo/comp_active_jobs.php +++ b/www/application/views/compo/comp_active_jobs.php @@ -6,7 +6,7 @@

- Active Projects + Active Projects

@@ -14,9 +14,7 @@
-
-
0 ){ @@ -26,16 +24,10 @@ include 'active_jobs/active_jobs_nojob.php'; } ?> - -
-
- -
-