diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index bbe5538..e5f7ed4 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -327,6 +327,7 @@ class Admin_controller extends BaseController $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); $data['creditsData'] = $this->creditsModel->select('member_credits.* , member.name as member_name ') ->join('member', 'member_credits.member_id = member.id', 'left') + ->orderBy('member_credits.created_at' , 'desc') ->findAll(); echo view('layout/header',$userdata); echo view('transactions_list',$data); @@ -338,6 +339,7 @@ class Admin_controller extends BaseController $creditsData = $this->creditsModel->select('member_credits.* , member.name as member_name ') ->join('member', 'member_credits.member_id = member.id', 'left') ->where('md5(member_credits.member_id)', $member_id ) + ->orderBy('member_credits.created_at' , 'desc') ->findAll(); $output = '
'; foreach ($creditsData as $row) { diff --git a/app/Controllers/Cart_controller.php b/app/Controllers/Cart_controller.php index 57f8bca..e98a12c 100644 --- a/app/Controllers/Cart_controller.php +++ b/app/Controllers/Cart_controller.php @@ -78,6 +78,7 @@ class Cart_controller extends BaseController } else { + $this->session->set('user_token',$token); $data['token'] = $token; $data['primary_id'] = $this->request->getVar('id'); @@ -141,7 +142,10 @@ class Cart_controller extends BaseController } else { - $this->index(); + $val['token'] = ''; + $val['msg'] = 'Your cart is empty'; + echo view('cart.php',$val); + // $this->index(); } } else @@ -163,7 +167,10 @@ class Cart_controller extends BaseController } else { - $this->index(); + $val['token'] = $this->session->get('logged_user'); + $val['msg'] = 'Your cart is empty'; + echo view('cart.php',$val); + // $this->index(); } } } @@ -173,16 +180,30 @@ class Cart_controller extends BaseController if (!session()->has('logged_user')) { $tokendata = $this->Cart_token_model->where('md5(token)', $token )->find(); + if($tokendata) + { $data['token'] = $tokendata[0]['token']; $data['pack_data'] = $this->credits_pack(); echo view('membership.php',$data); + } + else + { + $this->index(); + } } else { $tokendata = $this->cartModel->where('md5(member_id)', $token )->findAll(); - $data['token'] = $tokendata[0]['member_id']; - $data['pack_data'] = $this->credits_pack(); - echo view('membership.php',$data); + if ($tokendata) + { + $data['token'] = $tokendata[0]['member_id']; + $data['pack_data'] = $this->credits_pack(); + echo view('membership.php',$data); + } + else + { + $this->index(); + } } } diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 6755413..a4256c6 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -94,7 +94,8 @@ class Member_controller extends BaseController } } - return view('member_login'); + //return view('member_login'); + return view('myaccount'); } public function logout() @@ -276,12 +277,12 @@ class Member_controller extends BaseController $this->session->setTempdata('email',$data[0]['email'],3); } $this->session->setTempdata('mail_success', "OTP verification sucessfully",3); - return view('set_password.php'); + return view('changepassword.php'); } else { $this->session->setTempdata('error', "You entered wrong OTP.Please retry",3); - return view('forgot_password.php'); + return view('forgot_password_otp.php'); } } } diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php index ffd5df9..f106d2a 100644 --- a/app/Controllers/PaymentController.php +++ b/app/Controllers/PaymentController.php @@ -269,11 +269,12 @@ class PaymentController extends BaseController if( $transaction_id != null) $memberCredits = $this->creditsModel->where('transaction_id', $transaction_id ) ->where('member_id', session()->get('logged_user')) - ->select('package_name','credit_points') + ->select('package_name') + ->selectSum('credit_points', 'credit_points') ->selectSum('cost', 'cost') ->selectCount('package_name', 'pack_count') ->groupBy('package_name')->findAll(); - + // print_r($memberCredits);die(); $sendmail_controller = new Sendmail_controller(); $sendmail_controller->index(session()->get('logged_user_email') , null , 5); $Subtotal = 0; diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php index 61c0896..c239a88 100644 --- a/app/Controllers/Sendmail_controller.php +++ b/app/Controllers/Sendmail_controller.php @@ -237,7 +237,7 @@ class Sendmail_controller extends BaseController $this->session->setTempdata('user',"member",3); if($this->request->getmethod() == 'get') { - return view('forgot_password.php'); + return view('forgot_password_otp.php'); } else if($this->request->getmethod() == 'post') { diff --git a/app/Views/cart.php b/app/Views/cart.php index 00677e2..7c16fd8 100644 --- a/app/Views/cart.php +++ b/app/Views/cart.php @@ -30,6 +30,7 @@ $value) { ?> @@ -55,8 +56,8 @@ echo $pack_id[$key]['count']; } ?>" title="Qty" size="4" min="1" max="" step="1" placeholder="" inputmode="numeric" autocomplete="off"/> - - +
@@ -65,10 +66,16 @@
Remove
- + + + '.$msg.''; }?> + + + + -
+
@@ -80,17 +87,29 @@
- +
-
-
Taxes
-
-
- - -
$
-
$
-
+
+
Taxes
+
+
+
+
PST(7%)
+
+
+ +
$
+
+
+
+
+
+
GST(5%)
+
+
+ +
$
+
@@ -103,7 +122,7 @@
$
- +
diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php new file mode 100644 index 0000000..cbf3db6 --- /dev/null +++ b/app/Views/changepassword.php @@ -0,0 +1,70 @@ + + + + Change Password - Golf Evolution + + + + assets/member_images/favicon.png" sizes="192x192" /> + + + assets/member_css/front-style.css"> + + + + + + + + + +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/app/Views/forgot_password_otp.php b/app/Views/forgot_password_otp.php new file mode 100644 index 0000000..71bf8bf --- /dev/null +++ b/app/Views/forgot_password_otp.php @@ -0,0 +1,107 @@ + + + + Forget Password - Golf Evolution + + + + assets/member_images/favicon.png" sizes="192x192" /> + + + assets/member_css/front-style.css"> + + + + + + + + + + +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php index de58c32..4be1ccc 100644 --- a/app/Views/member_layout/header.php +++ b/app/Views/member_layout/header.php @@ -23,8 +23,12 @@
diff --git a/app/Views/members_list.php b/app/Views/members_list.php index 068beb3..9cd9309 100644 --- a/app/Views/members_list.php +++ b/app/Views/members_list.php @@ -36,7 +36,7 @@
- + @@ -50,7 +50,7 @@ - + - + @@ -52,7 +52,7 @@ - +
DatePointsCostPack / Indidual
Name Mobile EmailAddress Status Action
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php new file mode 100644 index 0000000..f356cd1 --- /dev/null +++ b/app/Views/myaccount.php @@ -0,0 +1,132 @@ + + + + + My Account - Golf Evolution + + + + /assets/member_images/favicon.png" sizes="192x192" /> + + + /assets/member_css/front-style.css"> + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/users_list.php b/app/Views/users_list.php index f589b08..579c83f 100644 --- a/app/Views/users_list.php +++ b/app/Views/users_list.php @@ -37,7 +37,7 @@ Mobile Email RoleAddress Status Action