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

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-03-12 15:09:14 -05:00
parent 41fe987f5d
commit db39cea49b
3 changed files with 197 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Member.php
+19
View File
@@ -607,6 +607,25 @@ class Member extends Users_Controller {
public function addfund() {
$data = $this->getSessionArray();
$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_key'] = 'WRB_FUND_ACCOUNT';
$data['txt_detail'] = $this->readFixedText($data['page_key']);
$data['txt_detail'] = str_replace("[how-it-worked-image-1]", "<img src='/assets/images/howitworks/howitworks-1.jpg' alt=''>", $data['txt_detail']);
www/application/views/users/view_addfund.php
+109 -133
View File
@@ -1,145 +1,121 @@
<!-- Main content -->
<div class="content-wrapper">
<?php include('common/userstrip.php'); ?>
<!-- Marketing campaigns -->
<div class="panel panel-flat">
<div class="panel-heading">
<h5 class="panel-title">Add Credit to your Account</h5>
</div>
</div>
<!-- Main charts -->
<div class="row">
<div class="col-lg-12">
</div>
</div>
<!-- /main charts -->
<div class="row">
<div class="col-lg-9 col-sm-6">
<?php include('common/userstrip.php'); ?>
<!--begin::Row-->
<div class="row g-5 g-xl-8">
<!--begin::Col-->
<div class="col-xl-6">
<!--begin::Tables Widget 3-->
<div class="thumbnail">
<?php echo $txt_detail; ?>
<!-- div class="thumb">
<img src="/assets/images/comingsoon.jpg" alt="Refer A Friend">
</div -->
<!--begin::Order details-->
<div class="card card-flush py-4 flex-row-fluid">
<!--begin::Card header-->
<div class="card-header">
<div class="card-title">
<h2>Add Credit to your Account </h2>
</div>
</div>
<!--end::Card header-->
<!--begin::Card body-->
<div class="card-body pt-0">
<div class="table-responsive">
<!--begin::Table-->
<?php echo $txt_detail; ?>
<!--end::Table-->
</div>
</div>
<!--end::Card body-->
</div>
<!--end::Order details-->
<!--end::Tables Widget 3-->
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-6">
<!--begin::Table Widget 8-->
<div class="card card-xl-stretch mb-5 mb-xl-8">
<!--begin::Header-->
<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">Recent Activities</span>
<span class="text-muted mt-1 fw-bold fs-7">Activity Report</span>
</h3>
<div class="card-toolbar">
<div class="panel panel-flat">
<div class="panel-heading">
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_8_tab_1">
<!--begin::Table container-->
<div class="table-responsive">
<!--begin::Table-->
<table class="table align-middle gs-0 gy-3">
<!--begin::Table head-->
<thead>
<div class="row">
<div class="col-lg-6">
Credit Your Account With PayPal<SUP>TM</SUP>
<form name="pp" action="/member/paypal" method="POST">
<div class="form-group">
<label for="sel1">Amount:</label>
<select class="form-control" id="sel1" name="D1" onchange="checkAmountPaypal(this.value);">
<option>Select Amount..</option>
<tr>
<th class="p-0 w-90px">Date</th>
<th class="p-0 min-w-160px">Recipient</th>
<th class="p-0 w-100px">Amount/Fee</th>
<th class="p-0 w-100px">Conf/Status</th>
</tr>
</thead>
<!--end::Table head-->
<!--begin::Table body-->
<tbody>
<?php
//var_dump($sendmoney_table_result);
foreach( $sendmoney_table_result as $row){
?>
<tr>
<td>
<?=$row->date?>
</td>
<td>
<a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6"><?=$row->recitient?></a>
<span class="text-muted fw-bold d-block fs-7"></span>
</td>
<td>
<?=$row->amount?><br><?=$row->fee?>
</td>
<td class="text-end">
<span class="text-dark fw-bolder d-block fs-7"><?=$row->confirmation?></span>
<span class="text-muted fw-bold d-block fs-8"><?=$row->status?></span>
</td>
<td class="text-end">
<a href="#" class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
<i class="bi bi-three-dots fs-5"></i>
</a>
</td>
</tr>
<?php
for ($i=2; $i<5; $i++)
{
$nairaval = $i*2000;
$dollarval = ($nairaval/370)*(1.015);
echo "<option value='".$dollarval."' selected>".$nairaval." Naira for $". sprintf ("%.2f",$dollarval)."</option>";
}
?>
</select>
<span class="input-group-btn">
<input name="B1" type="submit" class="btn btn-primary" value="Continue"/>
</span>
</div>
</form>
}
?>
</tbody>
<!--end::Table body-->
</table>
</div>
<div class="col-lg-6">
<div class="alert alert-info no-border"> You will be transferred to the Paypal website to complete this transaction.
<p>
You will require an existing Paypal account to complete this transaction.</div>
<p><div class="alert alert-danger no-border">PLEASE DO NOT CLOSE THE PAYPAL PAGE AFTER PAYMENT IS COMPLETED, you will be automatically re-directed back to your WrenchBoard account once payment is approved. If you close the page before this, your payment may not be properly credited.</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-3 col-sm-6">
<div class="thumbnail">
<div class="thumb">
<img src="/assets/images/howitworks_dash.png" alt="Your Page">
</div>
<div class="caption">
<h6 class="no-margin-top text-semibold"><a href="#" class="text-default">How it Works</a> <a href="#" class="text-muted"></a></h6>
See how to create projects, offer and manage project on WrenchBoard
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
</div>
</div>
<!--end::Table-->
</div>
<!-- /main content -->
<!--end::Tap pane-->
</div>
</div>
<!--end::Body-->
</div>
<!--end::Tables Widget 8-->
</div>
<!--end::Col-->
</div>
<!--end::Row-->
www/application/views/users/view_startpaymus.php
+69
View File
@@ -282,3 +282,72 @@
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row g-5 g-xl-8">
<!--begin::Col-->
<div class="col-xl-6">
<!--begin::Tables Widget 3-->
<div class="card card-xl-stretch mb-xl-8">
<!--begin::Header-->
<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">Payment Methods</span>
</h3>
<div class="card-toolbar">
PayPal
</div>
</div>
<!--end::Header-->
<!--begin::Body-->
<div class="card-body py-3">
<!--begin::Table container-->
<form name="pp" action="/member/paypal" method="POST">
<div class="form-group">
<label for="sel1">Amount:</label>
<select class="form-control" id="sel1" name="D1" onchange="checkAmountPaypal(this.value);">
<option>Select Amount..</option>
<?php
for ($i=2; $i<5; $i++)
{
$nairaval = $i*2000;
$dollarval = ($nairaval/370)*(1.015);
echo "<option value='".$dollarval."' selected>".$nairaval." Naira for $". sprintf ("%.2f",$dollarval)."</option>";
}
?>
</select>
<span class="input-group-btn">
<input name="B1" type="submit" class="btn btn-primary" value="Continue"/>
</span>
</div>
</form>
<div class="alert alert-info no-border"> You will be transferred to the Paypal website to complete this transaction.
<p>
You will require an existing Paypal account to complete this transaction.</div>
<p><div class="alert alert-danger no-border">PLEASE DO NOT CLOSE THE PAYPAL PAGE AFTER PAYMENT IS COMPLETED, you will be automatically re-directed back to your WrenchBoard account once payment is approved. If you close the page before this, your payment may not be properly credited.</div>
<!--end::Table container-->
</div>
<!--begin::Body-->
</div>
<!--end::Tables Widget 3-->
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-6">
<!--begin::Tables Widget 4-->
<div class="card card-xl-stretch mb-5 mb-xl-8">
</div>
<!--end::Tables Widget 4-->
</div>
<!--end::Col-->
</div>
<!--end::Row-->