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 @@
-
+ '; + } + else { + echo '
'; + } ?>
Continue Shopping diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php index 14365d1..07968e9 100644 --- a/app/Views/memberaccess.php +++ b/app/Views/memberaccess.php @@ -88,17 +88,24 @@ Credit Transactions Available Credits - $value) { ?> + = 0 ; $i--) { ?> - -

Credit Expiry

Expiry Date:

+ format('d-M-Y'); ?> + 0) - echo ' '; + if($credit_data[$i]['expiring_date'] < date('m-d-Y', time())) + echo '

Credit Expiry

'; else - echo ' '; + echo '

'.$credit_data[$i]['package_name'].'

'; ?> - +

Expiry Date:

+ 0) + echo ' '; + else + echo ' '; + ?> + @@ -107,12 +114,16 @@
Upcoming Credit Expiry:
-
-
No of Credit: 20
-
-
-
Expiry Date: 12-12-2026
-
+ $value) { + if($value['running_balance'] != 0) { ?> +
+
No of Credit:
+
+
+
Expiry Date:
+
+
@@ -316,6 +327,8 @@ $(document).ready(function(){ $("."+id+"").slideToggle(); }); }); + + \ No newline at end of file