From 4d38fae6daaf7516b3f9eef008bd2faad06db01d Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 20 Jun 2023 16:05:26 +0530 Subject: [PATCH] merge:GWM --- .gitignore | 5 ++--- app/Controllers/Member_controller.php | 2 +- app/Views/checkout.php | 10 ++++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6c16610..7a6f313 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,11 @@ # Ignore vendor folder public/vendor/ - # Include assets folder and its files !public/assets/ !public/square-js/ !public/square-stylesheets/ - +# Ignore public/assets/css public/assets/data public/assets/fonts @@ -18,6 +17,6 @@ public/assets/images public/assets/js public/assets/libs public/assets/member_images - +# Include !public/assets/member_css !public/assets/member_js diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index f33860e..7500987 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -263,7 +263,7 @@ class Member_controller extends BaseController { session()->remove('logged_user'); - + session()->remove('token'); if(!session()->get('logged_admin_user')) { session()->destroy(); diff --git a/app/Views/checkout.php b/app/Views/checkout.php index 83986e1..738d61e 100644 --- a/app/Views/checkout.php +++ b/app/Views/checkout.php @@ -618,18 +618,16 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https -->