diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 8924d7a..8f9e918 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -569,9 +569,11 @@ class Member_controller extends BaseController public function member_dashboard() { - $creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('created_at' , 'DESC')->findAll(); + $creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll(); $data['credit_data'] = []; $data['avaiable_credit'] = 0; + // $data['no_of_credits']; + // $data['expiry_date']; $data['profile'] = $this->MemberModel->where('id',$this->session->get('logged_user'))->find(); foreach ($creditsData as $creditsDataindex => $creditsDataValue) { @@ -595,7 +597,8 @@ class Member_controller extends BaseController ->selectCount('package_name', 'pack_count') ->groupBy('package_name') ->where('order_id',$TransactionDatavalue['order_id']) - ->where('is_active',1)->findAll(); + ->where('is_active',1) + ->findAll(); $TransactionDatavalue['credit_data'] = $credit_data; array_push($data['TransactionData'] ,$TransactionDatavalue); } diff --git a/app/Views/cart.php b/app/Views/cart.php index 4f8a945..1210d18 100644 --- a/app/Views/cart.php +++ b/app/Views/cart.php @@ -128,7 +128,12 @@