From 00e3c5a442ef9df4b7f402d263e79468cf9ac9ab Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 20 Jun 2023 09:58:56 +0530 Subject: [PATCH] checkout:GWM --- app/Config/Routes.php | 2 +- app/Controllers/Admin_controller.php | 57 +++++----------------------- app/Views/checkout.php | 6 +-- app/Views/members_list.php | 28 +++++++------- 4 files changed, 28 insertions(+), 65 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index c958ddb..17d18f5 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -99,7 +99,7 @@ $routes->match(['get','post'],'/booked_slot','Admin_controller::booked_slot'); $routes->match(['get','post'],'/manage_availability','Admin_controller::manage_availability'); $routes->match(['get','post'],'/add_to_cart_package','Admin_controller::add_to_cart_package'); $routes->match(['post'],'/order_details','Admin_controller::order_details'); -$routes->match(['get'],'/view_member_details/(:any)','Admin_controller::view_member_details/$1'); +$routes->match(['get'],'/view_credit_details/(:any)','Admin_controller::view_credit_details/$1'); $routes->match(['get'],'/admin_home','Dashboard::admin_home'); diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 1bd49c9..0608e4c 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -1084,28 +1084,14 @@ class Admin_controller extends BaseController } - public function view_member_details($member_id) + public function view_credit_details($member_id) { - $creditsData = $this->creditsModel->where('member_id',$member_id)->where('is_active',1)->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',$member_id)->where('is_active',1)->first(); - 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'] = ''; - } - - + $creditsData = $this->creditsModel->where('md5(member_id)',$member_id)->where('is_active',1)->orderBy('id' , 'ASC')->findAll(); $data['credit_data'] = []; $data['avaiable_credit'] = 0; - $data['profile'] = $this->MemberModel->select('member.* , zipcode.code as zipcode') - ->join('zipcode', 'member.pincode = zipcode.id', 'left') - ->where('member.id', $member_id) - ->find(); $data['country'] = $this->CountryModel->findAll(); foreach ($creditsData as $creditsDataindex => $creditsDataValue) { @@ -1115,37 +1101,14 @@ class Admin_controller extends BaseController array_push($data['credit_data'] , $creditsDataValue); } - - $TransactionData = $this->TransactionModel->where('member_id', $member_id)->where('status', 'success')->findAll(); - $data['TransactionData'] = []; - foreach ($TransactionData as $TransactionDatakey => $TransactionDatavalue) { - $credit_data = $this->creditsModel->where('member_id', $member_id) - ->select('package_name') - ->select('cost') - ->select('credit_points') - ->select('expiring_date') - ->selectSum('credit_points', 'creditPointsSum') - ->selectSum('cost', 'costSum') - ->selectCount('package_name', 'pack_count') - ->groupBy('package_name') - ->where('order_id',$TransactionDatavalue['order_id']) - ->where('is_active',1) - ->findAll(); - $TransactionDatavalue['credit_data'] = $credit_data; - array_push($data['TransactionData'] ,$TransactionDatavalue); - } - $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; - $zip = $this->ZipcodeModel->findAll(); - $output = ''; - foreach($zip as $row) - { - $output .= ''; - } - $data['zipcode'] = $output; - - echo view('view_member_details',$data); //dashboard - + $output = '
'; + for( $i = count($data['credit_data']) - 1; $i >= 0 ; $i--) { + $date = new DateTime($data['credit_data'][$i]['created_at']); + $expirydate = new DateTime($data['credit_data'][$i]['expiring_date']); + $output .=''; + } + echo $output .= '
Order IdOrder DateExpiry DateCredit TransactionsCredit Balance
'.$data['credit_data'][$i]['order_id'].''.$date->format('M-d-Y').''.$expirydate->format('M-d-Y').''.$data['credit_data'][$i]['running_balance'].''.$data['credit_data'][$i]['avaiable_credit'].'
'; + } // public function add_to_cart_package() diff --git a/app/Views/checkout.php b/app/Views/checkout.php index 072ecfc..2482cb3 100644 --- a/app/Views/checkout.php +++ b/app/Views/checkout.php @@ -372,8 +372,8 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https - - +
+ @@ -516,7 +516,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
-

By placing your order, you agree to our company privacy policy and condition of use.

+ diff --git a/app/Views/members_list.php b/app/Views/members_list.php index a1c57f9..aca95a3 100644 --- a/app/Views/members_list.php +++ b/app/Views/members_list.php @@ -63,7 +63,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -93,7 +93,7 @@
- +
@@ -110,18 +110,18 @@ - +