From c74e80f2fe9408237d7e0fbf31500c609027915e Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Thu, 15 Jun 2023 14:26:58 +0530 Subject: [PATCH 1/2] susee --- app/Controllers/Member_controller.php | 9 ++++----- app/Controllers/PaymentController.php | 10 +++++----- app/Views/members_list.php | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 508c9c1..4a67c05 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -127,9 +127,9 @@ class Member_controller extends BaseController if (password_verify($password, $memberdata['password'])) { - + $token = $this->session->get("token"); - + $this->session->set('logged_user',$memberdata['id']); $this->session->set('logged_user_name',$memberdata['name']); @@ -139,17 +139,16 @@ class Member_controller extends BaseController if ($token) { - $tokendata = $this->Cart_token_model->where('md5(token)', $token )->findAll(); foreach ($tokendata as $value) { - $data = $this->cartModel->where('pack_id', $value['primary_id'] )->find(); + $data = $this->cartModel->where('pack_id', $value['primary_id'] )->where('member_id', $this->session->get('logged_user') )->find(); if($data) { - $successdata = $this->cartModel->where('pack_id', $value['primary_id'] )->set(array( 'count' => $data[0]['count'] + 1 ))->update(); + $successdata = $this->cartModel->where('pack_id', $value['primary_id'] )->where('member_id', $this->session->get('logged_user') )->set(array( 'count' => $data[0]['count'] + 1 ))->update(); if ($successdata) { $deletedata = $this->Cart_token_model->where('id', $value['id'] )->delete(); diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php index 5814e06..16211a5 100644 --- a/app/Controllers/PaymentController.php +++ b/app/Controllers/PaymentController.php @@ -130,7 +130,7 @@ class PaymentController extends BaseController } else { - + // echo $this->session->get('logged_user');die(); $this->payment_form(); } @@ -151,13 +151,13 @@ class PaymentController extends BaseController { - if(!session()->has('logged_user')) + // if(!session()->has('logged_user')) - { + // { - return redirect()->to(base_url()); + // return redirect()->to(base_url()); - } + // } $CartData = $this->cartModel->where('member_id',session()->get('logged_user'))->findAll(); diff --git a/app/Views/members_list.php b/app/Views/members_list.php index 1bc81bb..005c62b 100644 --- a/app/Views/members_list.php +++ b/app/Views/members_list.php @@ -116,7 +116,7 @@ $(document).on('click','.credit_usage',function(){ $(document).ready(function(){ var table = $('#datatable-buttons').DataTable(); -table.destroy(); + table.destroy(); $('#datatable-buttons').DataTable({ "order": [[ 0, "desc" ]] From 9e8fbb67e713389dfa940227bb55d886d900c181 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Thu, 15 Jun 2023 15:26:10 +0530 Subject: [PATCH 2/2] susee --- app/Controllers/Sendmail_controller.php | 10 +++++++++- app/Controllers/credentials.json | 1 - app/Controllers/token.json | 6 ------ app/Views/credits_pack_list.php | 2 +- app/Views/member_layout/header.php | 8 +++++--- app/Views/memberaccess.php | 12 ++++++------ 6 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 app/Controllers/credentials.json delete mode 100644 app/Controllers/token.json diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php index 45abe92..245437a 100644 --- a/app/Controllers/Sendmail_controller.php +++ b/app/Controllers/Sendmail_controller.php @@ -514,7 +514,15 @@ class Sendmail_controller extends BaseController // echo 'Email already verified.'; - return redirect()->to(base_url()."set_password/".md5($user_data[0]['id'])); + if($user_data[0]['password'] == '') + { + return redirect()->to(base_url()."set_password/".md5($user_data[0]['id'])); + } + else + { + return redirect()->to(base_url()); + } + } diff --git a/app/Controllers/credentials.json b/app/Controllers/credentials.json deleted file mode 100644 index 2ee146a..0000000 --- a/app/Controllers/credentials.json +++ /dev/null @@ -1 +0,0 @@ -{"web":{"client_id":"1091575547896-uksojot6eohd8i2mg7dcga9t0rn430ie.apps.googleusercontent.com","project_id":"titanium-genre-389806","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"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","redirect_uris":["http://localhost/golf_backend/test2"],"javascript_origins":["http://localhost"]}} \ No newline at end of file diff --git a/app/Controllers/token.json b/app/Controllers/token.json deleted file mode 100644 index 4e4e763..0000000 --- a/app/Controllers/token.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "access_token": "your-access-token", - "refresh_token": "your-refresh-token", - "expires_in": 3600, - "created": 1678934567 - } \ No newline at end of file diff --git a/app/Views/credits_pack_list.php b/app/Views/credits_pack_list.php index 5603ee3..247e80b 100644 --- a/app/Views/credits_pack_list.php +++ b/app/Views/credits_pack_list.php @@ -30,7 +30,7 @@

--> - +
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php index 78f4b6e..5dbda31 100644 --- a/app/Views/member_layout/header.php +++ b/app/Views/member_layout/header.php @@ -50,16 +50,18 @@
- /assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"> + /assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89">
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php index e264030..b6f5793 100644 --- a/app/Views/memberaccess.php +++ b/app/Views/memberaccess.php @@ -105,7 +105,7 @@ = 0 ; $i--) { ?> - + 0) @@ -135,7 +135,7 @@
Credits:
-
Expiry Date: format('M-d-Y'); }?>
+
Expiry Date: format('M d , Y'); }?>
@@ -158,14 +158,14 @@ $value) { ?> "> - +
Pack Name
format('M-d-Y'); ?>format('M d , Y'); ?> '.$credit_data[$i]['package_name'].'

'; ?> -

Expiry Date : format('M-d-Y'); ?>

+

Expiry Date : format('M d , Y'); ?>

Order Id :

#format('M-d-Y'); ?>format('M d , Y'); ?> $ ">
" class="fa fa-caret-down" aria-hidden="true">