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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-08-07 13:34:04 -04:00
parent 3f081bb310
commit ad29f634fa
7 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/config/constants.php
+2
View File
@@ -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);
www/application/controllers/Fltw.php
+46
View File
@@ -0,0 +1,46 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Fltw extends WRB_Controller {
function __construct()
{
parent::__construct();
//Load URL helper
$this->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');
}
}
www/application/controllers/Member.php
+22 -12
View File
@@ -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');
www/application/controllers/Proj.php
+1 -1
View File
@@ -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 '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,mc.delivery_date::date,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
. " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
www/application/libraries/Users_Controller.php
+1 -1
View File
@@ -55,7 +55,7 @@ class Users_Controller extends WRB_Controller {
$jbx = "''/proj/thisjob''";
$mysql = "SELECT '<a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01 AS Project,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
. " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,mc.delivery_date::date,"
. " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
. " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\" name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
. " WHEN mc.status = 1 AND mc.delivery_date <now() THEN '<span class=\"label label-flat border-danger text-danger-600\">PastDue</span>' "
www/application/views/compo/active_jobs/active_jobs_table.php
+9 -18
View File
@@ -1,47 +1,38 @@
<table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
<!--begin::Table head-->
<thead>
<tr class="border-0">
<th class="p-0 min-w-180px">Job</th>
<th class="p-0 min-w-180px">Title/Description</th>
<th class="p-0 min-w-90px">Status</th>
<th class="p-0 min-w-50px"></th>
<th class="p-0 min-w-80px">Due</th>
<th class="p-0 min-w-40px"></th>
</tr>
</thead>
<!--end::Table head-->
<!--begin::Table body-->
<tbody>
<?php
foreach ($job_table_result as $row)
{
?>
<tr>
<td>
<a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"> <?= $row->project ?></a>
</td>
<td><?= $row->description ?></td>
<td class="text-end">
<span class="badge badge-light-success"></span>
<span class="badge badge-light-success"><?=$row->delivery_date?></span>
</td>
<td class="text-end">
<a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_id?>')" class="btn btn-sm btn-icon btn-bg-primary btn-active-color-primary">
<!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
<span class="svg-icon svg-icon-2">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
<path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
<span class="svg-icon svg-icon-2">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
<path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
</svg>
</span>
</a>
</td>
</tr>
<?php
}
?>
</tbody>
<!--end::Table body-->
</table>
www/application/views/compo/comp_active_jobs.php
+1 -9
View File
@@ -6,7 +6,7 @@
<div class="card card-xl-stretch mb-5 mb-xl-8">
<div class="card-header border-0 pt-5">
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Active Projects</span>
<span class="card-label fw-bolder fs-3 mb-1"><a href="/proj/active">Active Projects</a></span>
</h3>
<div class="card-toolbar">
@@ -14,9 +14,7 @@
</div>
<div class="card-body py-3">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<!--begin::Table container-->
<div class="table-responsive">
<?
if (count($job_table_result) > 0 ){
@@ -26,16 +24,10 @@
include 'active_jobs/active_jobs_nojob.php';
}
?>
<!--begin::Table-->
</div>
<!--end::Table-->
</div>
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>