From 4da84bfbd42a46aa70df0eb7692aa3e742930436 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 6 Dec 2022 12:20:46 +0530 Subject: [PATCH] Remove usage of $_COOKIE when creating a booking at back office --- classes/PaymentModule.php | 8 -------- controllers/admin/AdminOrdersController.php | 7 +++++++ .../classes/HotelBookingDetail.php | 5 +++-- .../admin/AdminHotelRoomsBookingController.php | 18 +++++++----------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index d40602bde..56d60a748 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -849,14 +849,6 @@ abstract class PaymentModuleCore extends Module // delete cart feature prices after booking creation success HotelRoomTypeFeaturePricing::deleteByIdCart($id_cart); - if (isset($_COOKIE['wk_id_cart'])) { - setcookie('wk_id_cart', ' ', time() - 86400, $this->context->shop->physical_uri); - setcookie('wk_id_guest', ' ', time() - 86400, $this->context->shop->physical_uri); - - unset($_COOKIE['wk_id_cart']); - unset($_COOKIE['wk_id_guest']); - } - if (self::DEBUG_MODE) { PrestaShopLogger::addLog('PaymentModule::validateOrder - Hook validateOrder is about to be called', 1, null, 'Cart', (int)$id_cart, true); } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 1fc055c12..bf5d787c0 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -865,6 +865,13 @@ class AdminOrdersControllerCore extends AdminController $cart->secure_key ); + if (isset($this->context->cookie->wk_id_cart)) { + unset($this->context->cookie->wk_id_cart); + } + if (isset($this->context->cookie->wk_id_guest)) { + unset($this->context->cookie->wk_id_guest); + } + if ($payment_module->currentOrder) { Tools::redirectAdmin(self::$currentIndex.'&id_order='.$payment_module->currentOrder.'&vieworder'.'&token='.$this->token.'&conf=3'); } diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 3f020f1ff..6e8f3c505 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -979,8 +979,9 @@ class HotelBookingDetail extends ObjectModel */ public function getAvailableRoomsForReallocation($date_from, $date_to, $room_type, $hotel_id) { - if (isset($_COOKIE['wk_id_cart'])) { - $current_admin_cart_id = $_COOKIE['wk_id_cart']; + $context = Context::getContext(); + if (isset($context->cookie->wk_id_cart)) { + $current_admin_cart_id = $context->cookie->wk_id_cart; } $exclude_ids = 'SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `date_from` < \''.pSQL($date_to).'\' AND `date_to` > \''.pSQL($date_from).'\' diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 61800e722..9a3a79eca 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -30,26 +30,22 @@ class AdminHotelRoomsBookingController extends ModuleAdminController parent::__construct(); - //unset($_COOKIE['wk_id_guest']); - //unset($_COOKIE['wk_id_cart']); $this->setPhpCookieData(); } public function setPhpCookieData() { - if (!isset($_COOKIE['wk_id_guest']) || !$_COOKIE['wk_id_guest']) { + if (!isset($this->context->cookie->wk_id_guest) || !$this->context->cookie->wk_id_guest) { if (!isset($this->context->cookie->id_guest)) { Guest::setNewGuest($this->context->cookie); } - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, $this->context->shop->physical_uri); + $this->context->cookie->wk_id_guest = $this->context->cookie->id_guest; } else { - $this->context->cookie->id_guest = $_COOKIE['wk_id_guest']; - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, $this->context->shop->physical_uri); + $this->context->cookie->id_guest = $this->context->cookie->wk_id_guest; } - $guest = new Guest($this->context->cookie->id_guest); - if (!isset($_COOKIE['wk_id_cart']) && !isset($this->context->cart->id)) { + if (!isset($this->context->cookie->wk_id_cart) && !isset($this->context->cart->id)) { $cart = new Cart(); $cart->recyclable = 0; @@ -67,13 +63,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->context->cart = $cart; $this->context->cookie->id_cart = $cart->id; - setcookie('wk_id_cart', $cart->id, time() + 86400, $this->context->shop->physical_uri); + $this->context->cookie->wk_id_cart = $cart->id; } else { - $cart = new Cart((int)$_COOKIE['wk_id_cart']); + $cart = new Cart((int) $this->context->cookie->wk_id_cart); $this->context->cart = $cart; $this->context->cookie->id_cart = $cart->id; - setcookie('wk_id_cart', $cart->id, time() + 86400, $this->context->shop->physical_uri); + $this->context->cookie->wk_id_cart = $cart->id; } $customer = new Customer();