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

www

Browse Source
This commit is contained in:
Olusesan Ameye
2022-02-19 00:09:18 -05:00
parent 44e2295bb7
commit 961b003078
3 changed files with 120 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Member.php
+71 -2
View File
@@ -682,10 +682,79 @@ class Member extends Users_Controller {
$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);
$data['page_title'] ="Wallet";
$this->RenderUserPage('users/view_balance', $data);
}
public function smoney() {
$data = $this->getSessionArray();
$data['add_error'] = '';
$data['amount'] = 0;
$this->load->model('combo_model');
$data['recipient_account'] = $this->input->post('recipient_account');
$data['recipient_account_combo'] = $this->combo_model->getUserRecipientCombo('recipient_account', $_SESSION['member_id'], $data['recipient_account']);
$data['fee'] = $data['total'] =0;
$data['comment'] = '';
// $data['fee'] = 0;
//$data['escrow_balance'] = 0;
if ($_POST) {
$data['comment'] = $this->input->post('comment');
$data['amount'] = $this->input->post('amount') + 0; // must be number [still in full will be cents to go to backend latter]
if ($data['amount'] == 0 || $data['amount'] < 0 || $data['amount'] == '' || $data['recipient_account'] == '') {
$out['error'] = 'Amount & Recipient Account Required';
$data['add_error'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" . $out['error'] . "</div></div>";
if ($data['amount'] > 0) {
$outx = $this->transactionFee($data['amount'], $_SESSION['member_id']);
$data['total'] = $outx['total_amount'];
$data['fee'] = $outx['processing_fee'];
}
} else {
$outx = $this->transactionFee($data['amount'], $_SESSION['member_id']);
$data['total'] = $outx['total_amount'];
$data['fee'] = $outx['processing_fee'];
$TotalAmount = $data['total'];
// now let us do initial check if you have enough money
if ($_SESSION['current_balance'] < $TotalAmount) {
$out['error'] = 'You do not have enough balance for this transfer';
$data['add_error'] = "<div class=\"text-left\"><div class=\"alert alert-danger no-border\">" . $out['error'] . "</div></div>";
} else {
$this->session->set_flashdata('pending_sendmoney', $data);
redirect('member/confirmwithdraw');
}
}
}
$this->load->library('table');
$this->table->set_template($this->template);
$mysql = "SELECT m.added::date AS date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, "
. "r.firstname||' '||r.lastname||'<br><b>Acc:</b>'||r.account_no||'-'||b.name AS Recitient,mp.confirmation,"
. "CASE WHEN m.status=1 THEN 'Pending' WHEN m.status=3 THEN 'Cancelled' WHEN m.status=5 THEN 'Completed' ELSE '' END AS Status "
. "FROM money_transfer m "
. "LEFT JOIN sendmoney_recipient r ON r.id = m.recipientid "
. "LEFT JOIN bank_entity_codes b ON b.code = r.bank_code "
. "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id "
. "WHERE m.member_id =" . $_SESSION['member_id'] . " AND mp.confirmation IS NOT NULL ORDER BY m.id DESC LIMIT 4";
$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_smoney', $data);
}
public function fee() {
$amount = $this->input->get('amount') + 0;
$res = $this->transactionFee($amount, $_SESSION['member_id']);
www/application/views/site3/internal/template/view_securehead.php
+26 -18
View File
@@ -1,5 +1,9 @@
<!DOCTYPE html>
<?php
//var_dump($_SERVER);
$server_name = 'https://'. $_SERVER['HTTP_HOST'];
//exit;
?>
<html lang="en">
<!--begin::Head-->
<head>
@@ -13,22 +17,26 @@
<meta property="og:locale" content="en_US" />
<meta property="og:type" content="article" />
<meta property="og:title" content="WrenchBoard: Find a Freelancer | Sell Professional Services" />
<meta property="og:url" content="https://www.wrenchboard.com" />
<meta property="og:url" content="<?=$server_name?>" />
<meta property="og:site_name" content="WrenchBoard" />
<link rel="canonical" href="https://dashboard.wrenchboard.com" />
<link rel="canonical" href="<?=$server_name?>" />
<link rel="shortcut icon" href="/assets/ext/images/favicon.png">
<!--begin::Fonts-->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700" />
<!--end::Fonts-->
<!--begin::Global Stylesheets Bundle(used by all pages)-->
<link href="/site3/assets/plugins/global/plugins.bundle.css" rel="stylesheet" type="text/css" />
<link href="/site3/assets/css/style.bundle.css" rel="stylesheet" type="text/css" />
<link href="<?=$server_name?>/site3/assets/plugins/global/plugins.bundle.css" rel="stylesheet" type="text/css" />
<link href="<?=$server_name?>/site3/assets/css/style.bundle.css" rel="stylesheet" type="text/css" />
<!--end::Global Stylesheets Bundle-->
<style>
.h-lg-45px {
height: 45px!important;
}
.header-brand{
background-color: #1e1ffd;
}
</style>
</head>
<!--end::Head-->
@@ -90,7 +98,7 @@
<div class="menu-content d-flex align-items-center px-3">
<!--begin::Avatar-->
<div class="symbol symbol-50px me-5">
<img alt="Logo" src="/assets/ext/images/wrenchboard.png" />
<img alt="Logo" src="<?=$server_name?>/assets/ext/images/wrenchboard.png" />
</div>
<!--end::Avatar-->
<!--begin::Username-->
@@ -166,7 +174,7 @@
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5">
<a href="../../demo8/dist/account/statements.html" class="menu-link px-5">My Statements</a>
<a href="" class="menu-link px-5">My Statements</a>
</div>
<!--end::Menu item-->
<!--begin::Menu separator-->
@@ -177,47 +185,47 @@
<a href="#" class="menu-link px-5">
<span class="menu-title position-relative">Language
<span class="fs-8 rounded bg-light px-3 py-2 position-absolute translate-middle-y top-50 end-0">English
<img class="w-15px h-15px rounded-1 ms-2" src="/site3/assets/media/flags/united-states.svg" alt="" /></span></span>
<img class="w-15px h-15px rounded-1 ms-2" src="<?=$server_name?>/site3/assets/media/flags/united-states.svg" alt="" /></span></span>
</a>
<!--begin::Menu sub-->
<div class="menu-sub menu-sub-dropdown w-175px py-4">
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="../../demo8/dist/account/settings.html" class="menu-link d-flex px-5 active">
<a href="" class="menu-link d-flex px-5 active">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="/site3/assets/media/flags/united-states.svg" alt="" />
<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/united-states.svg" alt="" />
</span>English</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="../../demo8/dist/account/settings.html" class="menu-link d-flex px-5">
<a href="" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="/site3/assets/media/flags/spain.svg" alt="" />
<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/spain.svg" alt="" />
</span>Spanish</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="../../demo8/dist/account/settings.html" class="menu-link d-flex px-5">
<a href="" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="/site3/assets/media/flags/germany.svg" alt="" />
<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/germany.svg" alt="" />
</span>German</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="../../demo8/dist/account/settings.html" class="menu-link d-flex px-5">
<a href="" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="/site3/assets/media/flags/japan.svg" alt="" />
<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/japan.svg" alt="" />
</span>Japanese</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="../../demo8/dist/account/settings.html" class="menu-link d-flex px-5">
<a href="" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="/site3/assets/media/flags/france.svg" alt="" />
<img class="rounded-1" src="<?=$server_name?>/site3/assets/media/flags/france.svg" alt="" />
</span>French</a>
</div>
<!--end::Menu item-->
www/application/views/users/view_balance.php
+23 -113
View File
@@ -55,9 +55,29 @@
<span class="badge badge-light-danger fs-7 fw-bolder"><? echo money_format('%.2n', $escrow_balance * 0.01); ?></span>
</td>
<td class="text-end">
<form class="form-horizontal" action="/member/addfund" method='POST'>
<button type="submit" onclick="addfund();" class="btn btn-primary btn-sm btn-block">Add Fund</button>
</form>
<div class="d-flex justify-content-end flex-shrink-0">
<a href="/member/smoney" class="btn btn-icon btn-bg-light btn-active-color-primary btn-sm me-1">
<!--begin::Svg Icon | path: icons/duotune/general/gen019.svg-->
<span class="svg-icon svg-icon-3">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path d="M17.5 11H6.5C4 11 2 9 2 6.5C2 4 4 2 6.5 2H17.5C20 2 22 4 22 6.5C22 9 20 11 17.5 11ZM15 6.5C15 7.9 16.1 9 17.5 9C18.9 9 20 7.9 20 6.5C20 5.1 18.9 4 17.5 4C16.1 4 15 5.1 15 6.5Z" fill="black" />
<path opacity="0.3" d="M17.5 22H6.5C4 22 2 20 2 17.5C2 15 4 13 6.5 13H17.5C20 13 22 15 22 17.5C22 20 20 22 17.5 22ZM4 17.5C4 18.9 5.1 20 6.5 20C7.9 20 9 18.9 9 17.5C9 16.1 7.9 15 6.5 15C5.1 15 4 16.1 4 17.5Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</a>
<a href="/member/addfund" class="btn btn-icon btn-bg-light btn-active-color-primary btn-sm me-1">
<!--begin::Svg Icon | path: icons/duotune/art/art005.svg-->
<span class="svg-icon svg-icon-3">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<path opacity="0.3" d="M21.4 8.35303L19.241 10.511L13.485 4.755L15.643 2.59595C16.0248 2.21423 16.5426 1.99988 17.0825 1.99988C17.6224 1.99988 18.1402 2.21423 18.522 2.59595L21.4 5.474C21.7817 5.85581 21.9962 6.37355 21.9962 6.91345C21.9962 7.45335 21.7817 7.97122 21.4 8.35303ZM3.68699 21.932L9.88699 19.865L4.13099 14.109L2.06399 20.309C1.98815 20.5354 1.97703 20.7787 2.03189 21.0111C2.08674 21.2436 2.2054 21.4561 2.37449 21.6248C2.54359 21.7934 2.75641 21.9115 2.989 21.9658C3.22158 22.0201 3.4647 22.0084 3.69099 21.932H3.68699Z" fill="black" />
<path d="M5.574 21.3L3.692 21.928C3.46591 22.0032 3.22334 22.0141 2.99144 21.9594C2.75954 21.9046 2.54744 21.7864 2.3789 21.6179C2.21036 21.4495 2.09202 21.2375 2.03711 21.0056C1.9822 20.7737 1.99289 20.5312 2.06799 20.3051L2.696 18.422L5.574 21.3ZM4.13499 14.105L9.891 19.861L19.245 10.507L13.489 4.75098L4.13499 14.105Z" fill="black" />
</svg>
</span>
<!--end::Svg Icon-->
</a>
</div>
</td>
</tr>
<tr>
@@ -435,114 +455,4 @@
<div class="row g-5 g-xl-8">
<div class="col-xl-12">
<div class="card card-xl-stretch mb-5 mb-xl-8">
<!--begin::Header-->
<div class="card-header border-0 pt-5">
<!--begin::Title-->
<h3 class="card-title align-items-start flex-column">
<span class="card-label fw-bolder fs-3 mb-1">Withdraw from Balance [<? echo money_format('%.2n', $current_balance * 0.01); ?>]</span>
</h3>
<!--end::Title-->
</div>
<!--end::Header-->
<div class="card-body">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<!--begin::Table container-->
<form class="form-horizontal" action="/member/balance" method='POST'>
<div class="row">
<div class="col-md-10 col-md-offset-1">
</div>
</div>
<script type="text/javascript">
<!--
function getFee(val) {
$.ajax({
url: "/member/fee?amount=" + val
}).done(function (data) {
var fee = 0;
if (parseFloat(data) > 0) {
fee = parseFloat(data);
}
var total = fee + parseFloat(val);
$('#fee').val(fee.toFixed(2));
$('#total').val(total.toFixed(2));
});
}
// -->
</script>
<div class="panel-body">
<div class="row">
</div>
<div class="col-md-10 col-md-offset-1">
<div class="form-group">
<label class="col-lg-3 control-label"> Amount:</label>
<div class="col-lg-9">
<input name ="amount" type="text" class="form-control" placeholder="Amount to withdraw" value="<?php echo $amount; ?>" onKeyUp="this.value = this.value.replace(/[^0-9]/g, '');getFee(this.value);" maxlength='6' onChange="getFee(this.value)">
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Recipient Acc:[<a href ='/member/recipient' class="label label-info">Add New</a>]</label>
<div class="col-lg-9">
<?php echo $recipient_account_combo; ?>
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Processing Fee:</label>
<div class="col-lg-9">
<input name ="fee" id="fee" type="text" class="form-control" placeholder="Processing fee" value="<?php echo $fee * 0.01; ?>" readonly >
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label"> Total :</label>
<div class="col-lg-9">
<input name ="total" id="total" type="text" class="form-control" placeholder="Total" value="<?php echo $total * 0.01; ?>" readonly >
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label"> Comment/Note :</label>
<div class="col-lg-9">
<input name="comment" type="text" class="form-control" placeholder="Comment" value="<?php echo $comment; ?>">
</div>
</div>
<div class="text-right">
<?php echo $add_error; ?>
<button type="submit" class="btn btn-primary btn-xs">Continue <i class="icon-arrow-right14 position-right"></i></button>
</div>
</div>
</div>
</form>
<!--end::Table-->
</div>
<!--end::Tap pane-->
</div>
</div>
</div>
</div>
</div>