From 28cd1cf832187240d47b5472feca2d454720029e Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Mon, 5 Jun 2023 14:40:01 +0530
Subject: [PATCH] payment_function:GWM

---
 app/Controllers/PaymentController.php | 27 +++++++++++++++++++--------
 app/Views/payment.php                 |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php
index 13eba6a..a83ca48 100644
--- a/app/Controllers/PaymentController.php
+++ b/app/Controllers/PaymentController.php
@@ -118,9 +118,10 @@ class PaymentController extends BaseController
                     $credits_data['order_id'] = $orderId;
                     $credits_data['cost_with_tax'] =  round( ( $packageData[0]['cost'] + (($packageData[0]['cost'] * ($gst + $pst) ) / 100) ) , 2 );
                     
-                    $single_pack_no_of_count = $CartData[$i]['count'];
-                    if($CartData[0]['order_id'] == null)
-                    {
+                    $creditsModel_pack_count = $this->creditsModel->selectCount('id')->where('package_name',$packageData[0]['package_name'])->where('order_id',$orderId)->get()->getRow()->id;
+                    $single_pack_no_of_count = $CartData[$i]['count'] - $creditsModel_pack_count;
+                    // if($CartData[0]['order_id'] == null)
+                    // {
                       for($j=0;$j<$single_pack_no_of_count;$j++)   
                       {
                           $insert_data = $this->creditsModel->save($credits_data);
@@ -129,7 +130,7 @@ class PaymentController extends BaseController
                       $this->cartModel->where('id', $CartData[$i]['id'] )
                              ->where('member_id', session()->get('logged_user'))
                              ->set(array( 'order_id' => $orderId   ))->update();
-                    }
+                    // }
                     
                    
                     $amount = $amount + $cost;
@@ -261,12 +262,22 @@ class PaymentController extends BaseController
 
     public function payment_success( $transaction_id  = null)
     { 
+
+
+       
+      
         if( $transaction_id != null)
-        $data['memberCredits'] = $this->creditsModel->where('transaction_id', $transaction_id )->where('member_id', session()->get('logged_user'))->findAll();
+        $memberCredits = $this->creditsModel->where('transaction_id', $transaction_id )
+                                            ->where('member_id', session()->get('logged_user'))
+                                            ->select('package_name','credit_points')
+                                            ->selectSum('cost', 'cost')
+                                            ->selectCount('package_name', 'pack_count')
+                                            ->groupBy('package_name')->findAll();
         $Subtotal = 0;
-        foreach ($data['memberCredits'] as $ele) {
+        foreach ($memberCredits as $key => $ele) {
             $Subtotal = $Subtotal + $ele['cost'];
         }
+        $data['memberCredits'] =$memberCredits;
         $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']);
@@ -277,10 +288,10 @@ class PaymentController extends BaseController
         $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);
+        // print_r(  $data['memberCredits']);
         // echo '</pre>';
 
-
+      
       
 
 
diff --git a/app/Views/payment.php b/app/Views/payment.php
index fda679a..899fcc0 100644
--- a/app/Views/payment.php
+++ b/app/Views/payment.php
@@ -64,7 +64,7 @@
                                     <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"><?php echo $val['package_name']; ?></div>
+                                    <div class="product-name"><?php echo $val['package_name']." (".$val['pack_count'].")"; ?></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> -->