gwm
This commit is contained in:
suseendhiran17
parent
bf0b620c89
commit
196cf251a3
@ -596,8 +596,14 @@ class Member_controller extends BaseController
|
||||
}
|
||||
$creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll();
|
||||
$recent_expiry = $this->creditsModel->select('expiring_date')->selectSum('running_balance', 'no_of_credits')->groupBy('expiring_date')->orderBy('expiring_date', 'asc')->where('member_id',$this->session->get('logged_user'))->where('is_active',1)->first();
|
||||
$data['no_of_credits'] = $recent_expiry['no_of_credits'];
|
||||
$data['expiring_date'] = $recent_expiry['expiring_date'];
|
||||
if($recent_expiry){
|
||||
$data['no_of_credits'] = $recent_expiry['no_of_credits'];
|
||||
$data['expiring_date'] = $recent_expiry['expiring_date'];
|
||||
}else{
|
||||
$data['no_of_credits'] = '';
|
||||
$data['expiring_date'] = '';
|
||||
}
|
||||
|
||||
|
||||
$data['credit_data'] = [];
|
||||
$data['avaiable_credit'] = 0;
|
||||
|
||||
@ -146,8 +146,10 @@ class PaymentController extends BaseController
|
||||
$data['gst'] = $gst;
|
||||
$data['pst'] = $pst;
|
||||
$data['packageArray'] = $packageArray;
|
||||
$data['userdata'] = $this->MemberModel->where('id',session()->get('logged_user'))->find();
|
||||
|
||||
$data['userdata'] = $this->MemberModel->select('member.* , zipcode.code as zipcode')
|
||||
->join('zipcode', 'member.pincode = zipcode.id', 'left')
|
||||
->where('member.id', session()->get('logged_user'))
|
||||
->find();
|
||||
$if_trans_exist = $this->TransactionModel->where('member_id', session()->get('logged_user'))
|
||||
->where('order_id', $orderId )->find();
|
||||
if($if_trans_exist){
|
||||
|
||||
@ -95,9 +95,9 @@
|
||||
<div class="col-lg-6">
|
||||
<div class="subtotal-label">Taxes</div>
|
||||
</div>
|
||||
<div class="col-lg-3"></div>
|
||||
<div class="col-lg-1 text-end">
|
||||
<div class="taxes pst-label">PST(7%)</div>
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes pst-label">PST (7%)</div>
|
||||
</div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<input id="pst" value="<?= $pst[0]['value'] ?>" type="hidden">
|
||||
@ -105,9 +105,9 @@
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
</div>
|
||||
<div class="col-lg-3"></div>
|
||||
<div class="col-lg-1 text-end">
|
||||
<div class="taxes gst-label">GST(5%)</div>
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes gst-label">GST (5%)</div>
|
||||
</div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<input id="gst" value="<?= $gst[0]['value'] ?>" type="hidden">
|
||||
|
||||
@ -148,6 +148,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
<div class="col-lg-4 mb-3">
|
||||
<label for="zipcode">Zip Code</label>
|
||||
<select name="pincode" id="pincode">
|
||||
<option value="<?= $userdata[0]['pincode']; ?>"><?= $userdata[0]['zipcode']; ?></option>
|
||||
<?= $zipcode ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -191,7 +192,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
|
||||
<input type="hidden" value="" name="address_id" id="address_id">
|
||||
<div id="card-container"></div>
|
||||
<span id="payment-flow-message"></span>
|
||||
<button id="card-button" type="button">Proceed to Pay</button>
|
||||
<div class="text-end" style="margin-top:-45px;"> <button id="card-button" type="button">Proceed to Pay</button></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -146,13 +146,13 @@
|
||||
<td></td>
|
||||
<td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<!-- <tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td><?= $value['order_id'] ?></td>
|
||||
<td><?php $date = new DateTime($value['created_at']); echo $date->format('M-d-Y'); ?></td>
|
||||
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
|
||||
<td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tr> -->
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td>Items</td>
|
||||
<td>Description</td>
|
||||
|
||||
@ -94,18 +94,18 @@
|
||||
<div class="col-lg-6">
|
||||
<div class="taxes label">Taxes</div>
|
||||
</div>
|
||||
<div class="col-lg-3"></div>
|
||||
<div class="col-lg-1 text-end">
|
||||
<div class="taxes pst label">PST(<?= $pst; ?>%)</div>
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes pst label">PST (<?= $pst; ?>%)</div>
|
||||
</div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100 , 2); ?></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
</div>
|
||||
<div class="col-lg-3"></div>
|
||||
<div class="col-lg-1 text-end">
|
||||
<div class="taxes gst label">GST(<?= $gst; ?>%)</div>
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes gst label">GST (<?= $gst; ?>%)</div>
|
||||
</div>
|
||||
<div class="col-lg-2 text-end">
|
||||
<div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100 , 2); ?></div>
|
||||
@ -125,7 +125,7 @@
|
||||
<div class="row dashboard">
|
||||
<div class="col-lg-4"></div>
|
||||
<div class="col-lg-4">
|
||||
<a href="<?= base_url('member_home'); ?>">Return to Dashboard</a>
|
||||
<a href="<?= base_url('member_home'); ?>" class="custom-btn">Return to Dashboard</a>
|
||||
</div>
|
||||
<div class="col-lg-4"></div>
|
||||
</div>
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
<div class="col-lg-2"></div>
|
||||
<div class="col-lg-8">
|
||||
<div class="payment-box">
|
||||
<div class="row payment-head">
|
||||
<div class="row payment-head alert">
|
||||
<div class="col-lg-12">
|
||||
<div>
|
||||
<img src="<?= base_url()."/public"; ?>/assets/member_images/Group_122.png" alt="" width="60" height="60"/>
|
||||
<h1 style="color: red">Payment Failed!</h1>
|
||||
<!-- <p>The order confirmation has been sent to your registered mail id</p> -->
|
||||
<a href="<?= base_url('payment'); ?>">Retry with other payment options</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -58,12 +58,12 @@
|
||||
|
||||
|
||||
|
||||
<div class="row dashboard">
|
||||
<div class="col-lg-4"></div>
|
||||
<div class="row dashboard mt-2">
|
||||
<div class="col-lg-8"> <a href="<?= base_url('payment'); ?>" class="custom-btn">Retry payment</a></div>
|
||||
<div class="col-lg-4">
|
||||
<a href="<?= base_url('member_home'); ?>">Return to Dashboard</a>
|
||||
<a href="<?= base_url('member_home'); ?>" class="custom-btn secondary-btn">Return to Dashboard</a>
|
||||
</div>
|
||||
<div class="col-lg-4"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user