diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 39b850a28..d40602bde 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -850,8 +850,8 @@ abstract class PaymentModuleCore extends Module HotelRoomTypeFeaturePricing::deleteByIdCart($id_cart); if (isset($_COOKIE['wk_id_cart'])) { - setcookie('wk_id_cart', ' ', time() - 86400, '/'); - setcookie('wk_id_guest', ' ', time() - 86400, '/'); + 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']); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index a7e150ecc..1fc055c12 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -864,13 +864,7 @@ class AdminOrdersControllerCore extends AdminController false, $cart->secure_key ); - /* - setcookie('wk_id_cart', ' ', time() - 86400, '/'); - setcookie('wk_id_guest', ' ', time() - 86400, '/'); - unset($_COOKIE['wk_id_cart']); - unset($_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/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 2c8e81273..61800e722 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -42,10 +42,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController Guest::setNewGuest($this->context->cookie); } - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, "/"); + setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, $this->context->shop->physical_uri); } else { $this->context->cookie->id_guest = $_COOKIE['wk_id_guest']; - setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, "/"); + setcookie('wk_id_guest', $this->context->cookie->id_guest, time() + 86400, $this->context->shop->physical_uri); } $guest = new Guest($this->context->cookie->id_guest); @@ -67,13 +67,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $this->context->cart = $cart; $this->context->cookie->id_cart = $cart->id; - setcookie('wk_id_cart', $cart->id, time() + 86400, "/"); + setcookie('wk_id_cart', $cart->id, time() + 86400, $this->context->shop->physical_uri); } else { $cart = new Cart((int)$_COOKIE['wk_id_cart']); $this->context->cart = $cart; $this->context->cookie->id_cart = $cart->id; - setcookie('wk_id_cart', $cart->id, time() + 86400, "/"); + setcookie('wk_id_cart', $cart->id, time() + 86400, $this->context->shop->physical_uri); } $customer = new Customer(); @@ -409,7 +409,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'rms_in_cart' => $rms_in_cart, 'total_amount' => Tools::displayPrice($total_amount), 'booking_stats' => $booking_stats, - 'id_cart_book_data' => $obj_cart_book_data->id); + 'id_cart_book_data' => $obj_cart_book_data->id ); if ($obj_cart_book_data->id) {