From c70779a7ad4c6162ae72f0fad7ce5ae457416b37 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:04:51 +0530 Subject: [PATCH] dashboard :suseendhiran --- app/Config/Routes.php | 1 + app/Controllers/Member_controller.php | 40 +++++- app/Views/cart.php | 2 +- app/Views/memberaccess.php | 195 +++++++++++++------------- 4 files changed, 139 insertions(+), 99 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 92a445d..14851ea 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -39,6 +39,7 @@ $routes->match(['get','post'],'/member_add','Member_controller::member_add'); $routes->match(['get','post'],'/member_address_form','Member_controller::member_address_form'); $routes->match(['get','post'],'/member_address_edit_or_add','Member_controller::member_address_edit_or_add'); $routes->match(['get','post'],'/member_home','Member_controller::member_dashboard'); +$routes->match(['get','post'],'/check_old_password','Member_controller::check_old_password'); $routes->match(['post'],'/buy_pack','Member_controller::buy_pack'); $routes->match(['post'],'/use_points','Member_controller::use_points'); diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 96dc5cc..8924d7a 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -13,6 +13,8 @@ use Config\Services; use App\Libraries\SquareService; use App\Models\Cart_token_model; use App\Models\Member_address_model; +use App\Models\transaction_model; +use App\Models\Rule_model; class Member_controller extends BaseController { @@ -31,6 +33,8 @@ class Member_controller extends BaseController $this->CreditsUsageTrackingModel = new Credits_usage_tracking_model(); $this->Cart_token_model = new Cart_token_model(); $this->MemberAddressModel = new Member_address_model(); + $this->TransactionModel = new transaction_model(); + $this->RuleModel = new Rule_model(); helper('form'); } public function index() @@ -543,13 +547,24 @@ class Member_controller extends BaseController $array = $this->request->getVar(); $id = $this->request->getVar('id'); - $update =$this->MemberAddressModel->where('id', $id )->where('member_id',session()->get('logged_user'))->set($array)->update(); + $update =$this->MemberModel->where('id', $id )->set($array)->update(); if($update) { echo true; } + } + + public function check_old_password() + { + $id = $this->request->getVar('id'); + $old_password = $this->request->getVar('old_password'); + $data =$this->MemberModel->where('id', $id )->find(); + if(password_verify($old_password , $data[0]['password'])) + echo 1; + else + echo 0; } public function member_dashboard() @@ -566,8 +581,31 @@ class Member_controller extends BaseController array_push($data['credit_data'] , $creditsDataValue); } + + $TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->where('status', 'success')->findAll(); + $data['TransactionData'] = []; + foreach ($TransactionData as $TransactionDatakey => $TransactionDatavalue) { + $credit_data = $this->creditsModel->where('member_id', session()->get('logged_user')) + ->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; + echo view('memberaccess',$data); //dashboard } + + // ----------------------------------------------- } diff --git a/app/Views/cart.php b/app/Views/cart.php index 6d632c4..4f8a945 100644 --- a/app/Views/cart.php +++ b/app/Views/cart.php @@ -52,7 +52,7 @@
-
$500x
+
$x
+ @@ -121,91 +122,85 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + $value) { ?> + + + + + + + + "> + + + + + + + "> + + + + + + + $credit_data_value) { ?> + table-bottom"> + + + + + + + + + + table-bottom"> + + + + + + + table-bottom"> + + + + + + + "> + + + + + + + table-bottom"> + + + + + + + +
Order IDOrder DateCostCredit UsageDetails
#EG4525272023-05-11 14:20:15$1000.00
#EG4525262023-05-11 14:15:21$1550.00assets/member_images/table-order-icon-white.png" alt=""> 4
ItemsDescriptionNosCostCredit Usage
Evo Pack 1

Pack Credits:24 Nos

Pack Expiry:12-12-2023

x1$550.00
Evo Pack 2

Pack Credits:24 Nos

Pack Expiry:12-12-2023

x1$550.00
Subtotal$595.80
TaxesPST(7%)$41.70
GST(5%)$29.79
Total$66.29
assets/member_images/table-order-icon-white.png" alt=""> 4
#EGF4525272023-05-11 14:20:15$1000.00
assets/member_images/table-order-icon-grey.png" alt=""> 4
Order IDOrder DateCostCredit UsageDetails
#$">
$assets/member_images/table-order-icon-white.png" alt=""> -
ItemsDescriptionNosCostCredit Usage

Pack Cost:$

Pack Credits: Nos

Pack Expiry:

x$
Subtotal$
TaxesPST (%)$
GST (%)$
Total$
assets/member_images/table-order-icon-white.png" alt=""> -