From 2b5554335f04b498c1503ddd5080c8b651bcfe9d Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Thu, 20 Jul 2023 13:09:12 +0530
Subject: [PATCH] desimal issue:GWM

---
 app/Controllers/Admin_controller.php | 8 +++++---
 app/Views/transactions_list.php      | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index aed1f8e..bbf5a8d 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -694,7 +694,7 @@ class Admin_controller extends BaseController
 													   ->join('member', 'transactions.member_id = member.id', 'left')
 													   ->orderBy('transactions.created_at' , 'desc')
 													   ->findAll();
-		  // echo '<pre>';   echo print_r($data['creditsData']); '</pre>';
+		  // echo '<pre>';   echo print_r($data['creditsData']); '</pre>'; die;
 			echo view('layout/header',$userdata);
 			echo view('transactions_list',$data);
 			echo view('layout/footer');
@@ -714,7 +714,8 @@ class Admin_controller extends BaseController
 			$date = new DateTime($row['created_at']);   
 			 if($row['status'] == 'Success'){
 				$style = 'style="color:green;"';
-				$cost =  json_decode($row['transaction'] , true)['payment']['amount_money']['amount'];
+				$cost =  json_decode($row['transaction'] , true)['payment']['amount_money']['amount'] / 100;
+				$cost = number_format($cost, 2, '.', '');
 			  }else{$cost=''; $style = 'style="color:red;"';}
              $output .='<tr><td>'.$row['order_id'].'</td><td>'.$date->format('M d , Y').'</td><td>'.$row['transaction_id'].'</td><td>'.$cost.'</td></td><td>'.$row['member_name'].'</td></td><td '.$style.'>'.$row['status'].'</td></tr>';
 			}  
@@ -739,8 +740,9 @@ class Admin_controller extends BaseController
 			$output = '<div class="table-responsive"><table class="table mb-0"><thead class="thead-light"><tr> <th>Order Id</th><th>Package Name</th><th>Cost</th><th>Total Amount</th><th>Credits</th><th>Payment Status</th></tr></thead><tbody>';
 			foreach ($creditsData as $row) { 
 			if($row['is_active'] == 1 ){ $status = 'Success';}else{ $status = 'Failed';}
+			$cost = number_format($row['cost'], 2, '.', '');
 			$cost_with_tax = number_format($row['cost_with_tax'], 2, '.', '');
-             $output .='<tr><td>'.$row['order_id'].'</td><td>'.$row['package_name'].'</td><td>'.$row['cost'].'</td></td><td>'.$cost_with_tax.'</td></td><td>'.$row['credit_points'].'</td><td>'.$status.'</td></tr>';
+             $output .='<tr><td>'.$row['order_id'].'</td><td>'.$row['package_name'].'</td><td>'.$cost.'</td></td><td>'.$cost_with_tax.'</td></td><td>'.$row['credit_points'].'</td><td>'.$status.'</td></tr>';
 			}  
 		    echo  $output .= '</tbody></table></div> ';
 	
diff --git a/app/Views/transactions_list.php b/app/Views/transactions_list.php
index b197167..2b3c623 100644
--- a/app/Views/transactions_list.php
+++ b/app/Views/transactions_list.php
@@ -46,6 +46,7 @@
                                         <table id="datatable-buttons"  class="table table-striped dt-responsive nowrap w-100">
                                             <thead>
                                                 <tr>
+                                                   
                                                     <th>Order Id</th>
                                                     <th>Order Date</th>
                                                     <th>Transaction Id</th>
@@ -62,6 +63,7 @@
                                             <?php foreach ($creditsData as $row)
                                                 { ?>
                                                 <tr class="order_details" id="<?php echo $row['member_id'];?>">
+                                                       
                                                         <td><?php echo $row['order_id'];?></td>
                                                         <td><?php $date = new DateTime($row['created_at']);    echo $date->format('M d , Y');  ?></td>
                                                         <td><?php echo $row['transaction_id'];?></td>
@@ -149,12 +151,13 @@ $(document).on('click','.order_details',function(){
 <script>
   $(document).ready(function() {
     $('#datatable-buttons').DataTable({
-      "order": [[1, 'desc']], // Set initial sorting to descending on the first column
+      "order": [[2, 'desc']], // Set initial sorting to descending on the first column
       "dom": 'Bfrtip', // Show export buttons
       // "buttons": ['copy', 'csv', 'excel', 'pdf'], // Enable export options
       "language": {
         "search": "Search: " // Customize search label
-      }
+      },
+      "ordering": false
     });
   });
 </script>
\ No newline at end of file