Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend

This commit is contained in:
suseendhiran17 2023-06-05 14:36:52 +05:30
commit 2db6211cc3
2 changed files with 44 additions and 25 deletions

View File

@ -17,6 +17,7 @@ use App\Models\Cart_model;
use App\Models\Credits_usage_tracking_model;
use App\Models\Rule_model;
use App\Models\Cart_token_model;
class PaymentController extends BaseController
{
@ -214,10 +215,6 @@ class PaymentController extends BaseController
$data = json_encode($response->getResult());
$result = json_decode( $data ,true);
$TrancactionId = $result['payment']['id'];
$payment_order_id = $result['payment']['order_id'];
$TrancactionData['member_id'] = session()->get('logged_user');
@ -262,13 +259,32 @@ class PaymentController extends BaseController
public function payment_success( $order_id = null)
public function payment_success( $transaction_id = null)
{
if( $order_id != null)
$memberCredits = $this->creditsModel->where('order_id', $order_id )->where('member_id', session()->get('logged_user'))->findAll();
echo '<pre>';
print_r($memberCredits);
echo '</pre>';
if( $transaction_id != null)
$data['memberCredits'] = $this->creditsModel->where('transaction_id', $transaction_id )->where('member_id', session()->get('logged_user'))->findAll();
$Subtotal = 0;
foreach ($data['memberCredits'] as $ele) {
$Subtotal = $Subtotal + $ele['cost'];
}
$data['TransactionData'] = $this->TransactionModel->where('transaction_id', $transaction_id )->where('member_id', session()->get('logged_user'))->findAll();
$data['transaction_id'] = $transaction_id;
$timestamp = strtotime($data['TransactionData'][0]['created_at']);
$data['formattedDate'] = date('l, F j, Y', $timestamp);
$data['Subtotal'] = $Subtotal;
$data['gst'] = $this->RuleModel->select('value')->where('rule_key', 3 )->get()->getRow()->value;
$data['pst'] = $this->RuleModel->select('value')->where('rule_key', 4 )->get()->getRow()->value;
$data['card_brand'] = json_decode($data['TransactionData'][0]['transaction'] , true)['payment']['card_details']['card']['card_brand'];
$data['last_4'] = json_decode($data['TransactionData'][0]['transaction'] , true)['payment']['card_details']['card']['last_4'];
// echo '<pre>';
// print_r($data);
// echo '</pre>';
echo view('payment',$data);
}

View File

@ -40,15 +40,15 @@
<div class="col-lg-12">
<div class="aside-content">
<div class="trans-id label">Transactions ID</div>
<div class="trans-id">V2SwTL5GN1Ha61R7OHSCiBOv1YUZY</div>
<div class="trans-id"><?= $transaction_id; ?></div>
</div>
<div class="aside-content">
<div class="trans-date label">Transactions Date</div>
<div class="trans-date">Friday, September 8, 2023</div>
<div class="trans-date"><?= $formattedDate; ?></div>
</div>
<div class="aside-content aside-content-last">
<div class="trans-method label">Payment Method</div>
<div class="trans-method">Visa card ending with 7413</div>
<div class="trans-method"><?= $card_brand; ?> card ending with <?= $last_4; ?></div>
</div>
</div>
</div>
@ -56,24 +56,27 @@
<div class="row order">
<div class="col-lg-12">
<div class="order-heading">Your Order</div>
</div>
</div>
<?php foreach ($memberCredits as $val) { ?>
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4">
<img src="<?= base_url()."/public"; ?>/assets/member_images/cart-icon.png" alt="" width="70" height="70">
</div>
<div class="col-lg-5">
<div class="product-name">Evo Pack 1</div>
<div class="credits-number">24 Credits</div>
<div class="credit-point">20+4 Credits Extra*</div>
<div class="credit-price">1 Credit at $22.90</div>
<div class="product-name"><?php echo $val['package_name']; ?></div>
<div class="credits-number"><?php echo $val['credit_points']; ?> Credits</div>
<!-- <div class="credit-point">20+4 Credits Extra*</div>
<div class="credit-price">1 Credit at $22.90</div> -->
</div>
<div class="col-lg-3"></div>
</div>
</div>
<div class="col-lg-6 d-flex justify-content-end align-items-start">
<div class="order-total"><span class="price-symbol">$</span>1100.00</div>
<div class="order-total"><span class="price-symbol">$</span><?php echo $val['cost']; ?></div>
</div>
<?php } ?>
</div>
<div class="total">
@ -83,7 +86,7 @@
<div class="subtotal label">Subtotal</div>
</div>
<div class="col-lg-6 text-end">
<div class="subtotal"><span class="price-symbol">$</span>1100.00</div>
<div class="subtotal"><span class="price-symbol">$</span><?= $Subtotal; ?></div>
</div>
</div>
@ -93,19 +96,19 @@
</div>
<div class="col-lg-3"></div>
<div class="col-lg-1 text-end">
<div class="taxes pst label">PST(7%)</div>
<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>77.00</div>
<div class="taxes pst"><span class="price-symbol">$</span><?= round($Subtotal * $pst / 100); ?></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(5%)</div>
<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>55.00</div>
<div class="taxes gst"><span class="price-symbol">$</span><?= round($Subtotal * $gst / 100); ?></div>
</div>
</div>
@ -114,7 +117,7 @@
<div class="order-total label">Total</div>
</div>
<div class="col-lg-6 text-end">
<div class="order-total"><span class="price-symbol">$</span>1232.00</div>
<div class="order-total"><span class="price-symbol">$</span><?= round( ( $Subtotal + (($Subtotal * ($gst + $pst) ) / 100) ) , 2 ); ?></div>
</div>
</div>
</div>