From 28ab2693f8d7a645f67c91639e6db30e4b61394c Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Sat, 24 Jun 2023 18:28:54 +0530 Subject: [PATCH 001/212] Resolved:Issues in Availability & Rates search API response while partial available rooms are present in the response data. --- .../WebserviceSpecificManagementHotelAri.php | 71 ++++++++++++++++--- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php index a81daf4c6..bfdbfdce8 100644 --- a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php +++ b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php @@ -500,20 +500,45 @@ class WebserviceSpecificManagementHotelAri extends ObjectModel implements Webser } elseif ($key == 'partially_available') { $nodeRoomAvailability = 'partial_available'; } + $this->output .= $this->objOutput->getObjectRender()->renderNodeHeader($nodeRoomAvailability, array()); - if ($roomsInfo) { - foreach ($roomsInfo as $roomInfo) { - $this->output .= $this->objOutput->getObjectRender()->renderNodeHeader('room', array(), array('id' => $roomInfo['id_room'])); + if ($key == 'partially_available') { + foreach ($roomsInfo as $dateIndex => $partialRoomsInfo) { + if (isset($partialRoomsInfo['rooms']) && $partialRoomsInfo['rooms']) { + $this->output .= $this->objOutput->getObjectRender()->renderNodeHeader('rooms', array(), array('date_from' => $partialRoomsInfo['date_from'], 'date_to' => $partialRoomsInfo['date_to'])); - $field = array('sqlId' => 'id_room', 'value' => $roomInfo['id_room']); - $this->output .= $this->objOutput->getObjectRender()->renderField($field); + foreach ($partialRoomsInfo['rooms'] as $roomInfo) { + $roomDetail = array(); + $this->output .= $this->objOutput->getObjectRender()->renderNodeHeader('room', array(), array('id' => $roomInfo['id_room'])); - $field = array('sqlId' => 'room_number', 'value' => $roomInfo['room_num']); - $this->output .= $this->objOutput->getObjectRender()->renderField($field); + $field = array('sqlId' => 'id_room', 'value' => $roomInfo['id_room']); + $this->output .= $this->objOutput->getObjectRender()->renderField($field); - $this->output .= $this->objOutput->getObjectRender()->renderNodeFooter('room', array()); + $field = array('sqlId' => 'room_number', 'value' => $roomInfo['room_num']); + $this->output .= $this->objOutput->getObjectRender()->renderField($field); + + $this->output .= $this->objOutput->getObjectRender()->renderNodeFooter('room', array()); + } + + $this->output .= $this->objOutput->getObjectRender()->renderNodeFooter('rooms', array()); + } + } + } else { + if ($roomsInfo) { + foreach ($roomsInfo as $roomInfo) { + $this->output .= $this->objOutput->getObjectRender()->renderNodeHeader('room', array(), array('id' => $roomInfo['id_room'])); + + $field = array('sqlId' => 'id_room', 'value' => $roomInfo['id_room']); + $this->output .= $this->objOutput->getObjectRender()->renderField($field); + + $field = array('sqlId' => 'room_number', 'value' => $roomInfo['room_num']); + $this->output .= $this->objOutput->getObjectRender()->renderField($field); + + $this->output .= $this->objOutput->getObjectRender()->renderNodeFooter('room', array()); + } } } + $this->output .= $this->objOutput->getObjectRender()->renderNodeFooter($nodeRoomAvailability, array()); } @@ -604,6 +629,10 @@ class WebserviceSpecificManagementHotelAri extends ObjectModel implements Webser 'value' => $objRoomType->name[$idLang] ); } + // if only one lang than do not set name as array and set only value of the room + if (count($ariFormatted['hotel_ari']['room_types'][$roomTypeIndex]['name']) == 1) { + $ariFormatted['hotel_ari']['room_types'][$roomTypeIndex]['name'] = $ariFormatted['hotel_ari']['room_types'][$roomTypeIndex]['name'][0]['value']; + } // rooms info of the room type if (isset($roomTypeInfo['data']) && $roomTypeInfo['data']) { @@ -620,12 +649,32 @@ class WebserviceSpecificManagementHotelAri extends ObjectModel implements Webser } elseif ($key == 'partially_available') { $keyRoomAvailability = 'partially_available'; } + if ($roomsInfo) { - foreach ($roomsInfo as $roomIndex => $roomInfo) { - $roomsAriInfo[$roomIndex]['id_room'] = $roomInfo['id_room']; - $roomsAriInfo[$roomIndex]['room_number'] = $roomInfo['room_num']; + if ($key == 'partially_available') { + foreach ($roomsInfo as $dateIndex => $partialRoomsInfo) { + if (isset($partialRoomsInfo['rooms']) && $partialRoomsInfo['rooms']) { + $roomsAriInfo[$dateIndex]['date_from'] = $partialRoomsInfo['date_from']; + $roomsAriInfo[$dateIndex]['date_to'] = $partialRoomsInfo['date_to']; + + $roomsAriInfo[$dateIndex]['rooms'] = array(); + foreach ($partialRoomsInfo['rooms'] as $roomInfo) { + $roomDetail = array(); + $roomDetail['id_room'] = $roomInfo['id_room']; + $roomDetail['room_number'] = $roomInfo['room_num']; + + $roomsAriInfo[$dateIndex]['rooms'][] = $roomDetail; + } + } + } + } else { + foreach ($roomsInfo as $roomIndex => $roomInfo) { + $roomsAriInfo[$roomIndex]['id_room'] = $roomInfo['id_room']; + $roomsAriInfo[$roomIndex]['room_number'] = $roomInfo['room_num']; + } } } + $ariFormatted['hotel_ari']['room_types'][$roomTypeIndex]['rooms'][$keyRoomAvailability] = array_values($roomsAriInfo); } } From 13e16c37920e1789fc1d9d5b37f49a855da67088 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Thu, 20 Jul 2023 19:14:01 +0530 Subject: [PATCH 002/212] Resolved: Fatal error when set Awaiting Payment order status as logable and creating partial payment with bankwire --- classes/PaymentModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 3e89319f2..55cc2178d 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -1006,7 +1006,7 @@ abstract class PaymentModuleCore extends Module $new_history = new OrderHistory(); $new_history->id_order = (int)$order->id; if ($order_status->logable && $order->is_advance_payment && $order->advance_paid_amount < $order->total_paid_tax_incl) { - $new_history->changeIdOrderState((int)Configuration::get('PS_OS_PARTIAL_PAYMENT'), $order, true); + $new_history->changeIdOrderState((int)Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'), $order, true); } else { $new_history->changeIdOrderState((int)$id_order_state, $order, true); } From 4592b8c4c5d6f9df53dea68bc9c7bf4040f906cf Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Fri, 21 Jul 2023 12:45:38 +0530 Subject: [PATCH 003/212] Order payment status submitted even after clicking Cancel button with Bulk actions in order list --- controllers/admin/AdminOrdersController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 63a271ecd..20d2c67fa 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -464,6 +464,11 @@ class AdminOrdersControllerCore extends AdminController public function processBulkUpdateOrderStatus() { + // if process to cancelled the redirect to the original order page + if (Tools::getIsset('cancel')) { + Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token); + } + if (Tools::isSubmit('submitUpdateOrderStatus') && ($id_order_state = (int)Tools::getValue('id_order_state'))) { if ($this->tabAccess['edit'] !== '1') { From e2aa82a78ad774ae25656b3f705866b820c25b50 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 24 Jul 2023 16:58:15 +0530 Subject: [PATCH 004/212] Remove unwanted files and folders from themes/hotel-reservation-theme/ --- .../css/modules/carriercompare/index.php | 35 --- .../css/modules/carriercompare/style.css | 56 ---- .../favoriteproducts/favoriteproducts.css | 36 --- .../css/modules/favoriteproducts/index.php | 35 --- .../css/modules/mailalerts/index.php | 35 --- .../css/modules/mailalerts/mailalerts.css | 12 - .../modules/productcomments/img/accept.png | Bin 744 -> 0 bytes .../css/modules/productcomments/img/bg_bt.gif | Bin 314 -> 0 bytes .../css/modules/productcomments/img/bg_li.png | Bin 90 -> 0 bytes .../modules/productcomments/img/comment.png | Bin 376 -> 0 bytes .../productcomments/img/comments_delete.png | Bin 633 -> 0 bytes .../modules/productcomments/img/delete.gif | Bin 752 -> 0 bytes .../modules/productcomments/img/delete.png | Bin 678 -> 0 bytes .../css/modules/productcomments/img/index.php | 35 --- .../css/modules/productcomments/img/note.png | Bin 463 -> 0 bytes .../modules/productcomments/img/note_go.png | Bin 624 -> 0 bytes .../css/modules/productcomments/img/star.gif | Bin 1380 -> 0 bytes .../css/modules/productcomments/img/star.png | Bin 322 -> 0 bytes .../css/modules/productcomments/img/star1.gif | Bin 398 -> 0 bytes .../css/modules/productcomments/index.php | 35 --- .../productcomments/productcomments.css | 216 -------------- .../js/modules/loyalty/index.php | 35 --- .../js/modules/loyalty/js/index.php | 35 --- .../js/modules/loyalty/js/loyalty.js | 65 ----- .../js/modules/mailalerts/index.php | 35 --- .../js/modules/mailalerts/mailalerts.js | 139 --------- .../js/modules/productcomments/index.php | 35 --- .../js/modules/productcomments/js/index.php | 35 --- .../productcomments/js/productcomments.js | 155 ---------- .../productcomments/js/products-comparison.js | 68 ----- .../js/modules/referralprogram/index.php | 35 --- .../js/modules/referralprogram/js/index.php | 35 --- .../referralprogram/js/referralprogram.js | 30 -- .../modules/carriercompare/index.php | 35 --- .../template/carriercompare.tpl | 92 ------ .../carriercompare/template/configuration.tpl | 29 -- .../modules/carriercompare/template/index.php | 35 --- .../modules/cashondelivery/index.php | 35 --- .../modules/cashondelivery/views/index.php | 35 --- .../views/templates/front/index.php | 35 --- .../views/templates/front/validation.tpl | 54 ---- .../views/templates/hook/confirmation.tpl | 32 --- .../views/templates/hook/index.php | 35 --- .../views/templates/hook/payment.tpl | 34 --- .../cashondelivery/views/templates/index.php | 35 --- .../modules/favoriteproducts/index.php | 35 --- .../modules/favoriteproducts/views/index.php | 35 --- .../front/favoriteproducts-account.tpl | 77 ----- .../views/templates/front/index.php | 35 --- .../templates/hook/favoriteproducts-extra.tpl | 42 --- .../hook/favoriteproducts-header.tpl | 31 -- .../views/templates/hook/index.php | 35 --- .../views/templates/hook/my-account.tpl | 37 --- .../views/templates/index.php | 35 --- .../modules/loyalty/index.php | 35 --- .../modules/loyalty/views/index.php | 35 --- .../loyalty/views/templates/front/index.php | 35 --- .../loyalty/views/templates/front/loyalty.tpl | 248 ---------------- .../loyalty/views/templates/hook/index.php | 35 --- .../views/templates/hook/my-account.tpl | 30 -- .../loyalty/views/templates/hook/product.tpl | 52 ---- .../views/templates/hook/shopping-cart.tpl | 38 --- .../modules/loyalty/views/templates/index.php | 35 --- .../modules/mailalerts/index.php | 35 --- .../modules/mailalerts/views/index.php | 35 --- .../views/templates/front/index.php | 35 --- .../templates/front/mailalerts-account.tpl | 49 ---- .../mailalerts/views/templates/hook/index.php | 35 --- .../views/templates/hook/my-account.tpl | 31 -- .../views/templates/hook/product.tpl | 44 --- .../mailalerts/views/templates/index.php | 35 --- .../modules/productcomments/index.php | 35 --- .../productcomments/productcomments-extra.tpl | 64 ----- .../productcomments/productcomments.tpl | 266 ------------------ .../productcomments_reviews.tpl | 42 --- .../productcomments/productcomments_top.tpl | 0 .../productcomments/products-comparison.tpl | 103 ------- .../modules/productcomments/tab.tpl | 28 -- .../modules/referralprogram/index.php | 35 --- .../modules/referralprogram/views/index.php | 35 --- .../views/templates/front/email.tpl | 26 -- .../views/templates/front/index.php | 35 --- .../views/templates/front/program.tpl | 223 --------------- .../views/templates/front/rules.tpl | 32 --- .../views/templates/hook/authentication.tpl | 34 --- .../views/templates/hook/index.php | 35 --- .../views/templates/hook/my-account.tpl | 30 -- .../templates/hook/order-confirmation.tpl | 29 -- .../views/templates/hook/shopping-cart.tpl | 34 --- .../referralprogram/views/templates/index.php | 35 --- 90 files changed, 4008 deletions(-) delete mode 100644 themes/hotel-reservation-theme/css/modules/carriercompare/index.php delete mode 100644 themes/hotel-reservation-theme/css/modules/carriercompare/style.css delete mode 100644 themes/hotel-reservation-theme/css/modules/favoriteproducts/favoriteproducts.css delete mode 100644 themes/hotel-reservation-theme/css/modules/favoriteproducts/index.php delete mode 100644 themes/hotel-reservation-theme/css/modules/mailalerts/index.php delete mode 100644 themes/hotel-reservation-theme/css/modules/mailalerts/mailalerts.css delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/accept.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/bg_bt.gif delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/bg_li.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/comment.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/comments_delete.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/delete.gif delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/delete.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/index.php delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/note.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/note_go.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/star.gif delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/star.png delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/img/star1.gif delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/index.php delete mode 100644 themes/hotel-reservation-theme/css/modules/productcomments/productcomments.css delete mode 100644 themes/hotel-reservation-theme/js/modules/loyalty/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/loyalty/js/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/loyalty/js/loyalty.js delete mode 100644 themes/hotel-reservation-theme/js/modules/mailalerts/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/mailalerts/mailalerts.js delete mode 100644 themes/hotel-reservation-theme/js/modules/productcomments/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/productcomments/js/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/productcomments/js/productcomments.js delete mode 100644 themes/hotel-reservation-theme/js/modules/productcomments/js/products-comparison.js delete mode 100644 themes/hotel-reservation-theme/js/modules/referralprogram/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/referralprogram/js/index.php delete mode 100644 themes/hotel-reservation-theme/js/modules/referralprogram/js/referralprogram.js delete mode 100644 themes/hotel-reservation-theme/modules/carriercompare/index.php delete mode 100644 themes/hotel-reservation-theme/modules/carriercompare/template/carriercompare.tpl delete mode 100644 themes/hotel-reservation-theme/modules/carriercompare/template/configuration.tpl delete mode 100644 themes/hotel-reservation-theme/modules/carriercompare/template/index.php delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/index.php delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/index.php delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/index.php delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/validation.tpl delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/confirmation.tpl delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/index.php delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/payment.tpl delete mode 100644 themes/hotel-reservation-theme/modules/cashondelivery/views/templates/index.php delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/index.php delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/index.php delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/index.php delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/index.php delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/my-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/index.php delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/index.php delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/index.php delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/front/index.php delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/front/loyalty.tpl delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/index.php delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/my-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/product.tpl delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/shopping-cart.tpl delete mode 100644 themes/hotel-reservation-theme/modules/loyalty/views/templates/index.php delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/index.php delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/index.php delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/index.php delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/mailalerts-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/index.php delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/my-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/product.tpl delete mode 100644 themes/hotel-reservation-theme/modules/mailalerts/views/templates/index.php delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/index.php delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/productcomments-extra.tpl delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/productcomments.tpl delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/productcomments_reviews.tpl delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/productcomments_top.tpl delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/products-comparison.tpl delete mode 100644 themes/hotel-reservation-theme/modules/productcomments/tab.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/index.php delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/index.php delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/email.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/index.php delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/program.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/rules.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/authentication.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/index.php delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/my-account.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/order-confirmation.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/shopping-cart.tpl delete mode 100644 themes/hotel-reservation-theme/modules/referralprogram/views/templates/index.php diff --git a/themes/hotel-reservation-theme/css/modules/carriercompare/index.php b/themes/hotel-reservation-theme/css/modules/carriercompare/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/css/modules/carriercompare/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/css/modules/carriercompare/style.css b/themes/hotel-reservation-theme/css/modules/carriercompare/style.css deleted file mode 100644 index c1bb1e5ee..000000000 --- a/themes/hotel-reservation-theme/css/modules/carriercompare/style.css +++ /dev/null @@ -1,56 +0,0 @@ -#compare_shipping .form-group { - line-height: normal; - margin-bottom: 10px; } - #compare_shipping .form-group label { - margin-bottom: 6px; } - #compare_shipping .form-group .form-control { - width: 263px; } - #compare_shipping .form-group.last { - margin-bottom: 20px; } - #compare_shipping .form-group.last input { - margin-bottom: 3px; } -#compare_shipping .table { - background: #fff; } - #compare_shipping .table thead tr th { - background: #fff; - padding: 4px 10px 3px 10px; } - #compare_shipping .table tbody td { - margin: 0; } - #compare_shipping .table tbody td.carrier_action { - width: 54px; - padding-left: 0; - padding-right: 0; - text-align: center; } - #compare_shipping .table tbody td.carrier_action input { - margin: 0; } - -#availableCarriers .table { - margin-bottom: 20px; } - -#compare_shipping ul#carriercompare_errors_list { - color: red; } - -#compare_shipping_form { - padding-bottom: 20px; } - -#compare_shipping ul#carriercompare_errors_list li { - margin-left: 30px; - text-decoration: none; - list-style: none; } - -#SE_AjaxDisplay { - text-align: center; - display: none; } - -#SE_AjaxDisplay img { - width: 15px; } - -.SE_SubmitRefreshCard button { - float: left; } - .SE_SubmitRefreshCard button#carriercompare_submit { - margin-right: 10px; } - -#carriercompare_errors { - display: none; } - -/*# sourceMappingURL=style.css.map */ diff --git a/themes/hotel-reservation-theme/css/modules/favoriteproducts/favoriteproducts.css b/themes/hotel-reservation-theme/css/modules/favoriteproducts/favoriteproducts.css deleted file mode 100644 index 484295f68..000000000 --- a/themes/hotel-reservation-theme/css/modules/favoriteproducts/favoriteproducts.css +++ /dev/null @@ -1,36 +0,0 @@ -#favoriteproducts_block_account .favoriteproduct { - position: relative; - margin-bottom: 14px; - padding: 12px 8px; - border: 1px solid #d6d4d4; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; } - #favoriteproducts_block_account .favoriteproduct a.product_img_link { - border: 1px solid #d6d4d4; - display: block; - float: left; - margin-right: 14px; - overflow: hidden; - position: relative; } - #favoriteproducts_block_account .favoriteproduct p.product_desc { - line-height: 16px; - overflow: hidden; - padding: 0; } - #favoriteproducts_block_account .favoriteproduct .remove { - position: absolute; - top: 10px; - right: 10px; } - #favoriteproducts_block_account .favoriteproduct .remove .icon { - cursor: pointer; } - -/* lnk fiche produit */ -#usefull_link_block li#favoriteproducts_block_extra_add, #usefull_link_block li#favoriteproducts_block_extra_remove, #usefull_link_block li#favoriteproducts_block_extra_added, #usefull_link_block li#favoriteproducts_block_extra_removed { - padding-left: 30px; - cursor: pointer; } -#usefull_link_block li#favoriteproducts_block_extra_added { - display: none; } -#usefull_link_block li#favoriteproducts_block_extra_removed { - display: none; } - -/*# sourceMappingURL=favoriteproducts.css.map */ diff --git a/themes/hotel-reservation-theme/css/modules/favoriteproducts/index.php b/themes/hotel-reservation-theme/css/modules/favoriteproducts/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/css/modules/favoriteproducts/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/css/modules/mailalerts/index.php b/themes/hotel-reservation-theme/css/modules/mailalerts/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/css/modules/mailalerts/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/css/modules/mailalerts/mailalerts.css b/themes/hotel-reservation-theme/css/modules/mailalerts/mailalerts.css deleted file mode 100644 index 5eb7a8e6e..000000000 --- a/themes/hotel-reservation-theme/css/modules/mailalerts/mailalerts.css +++ /dev/null @@ -1,12 +0,0 @@ -#mailalerts_block_account li.last_item { - border-bottom: none; - margin-bottom: 0; } -#mailalerts_block_account li .products-block-image { - float: left; - margin-right: 19px; } -#mailalerts_block_account li .remove { - float: right; } - #mailalerts_block_account li .remove i { - cursor: pointer; } - -/*# sourceMappingURL=mailalerts.css.map */ diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/accept.png b/themes/hotel-reservation-theme/css/modules/productcomments/img/accept.png deleted file mode 100644 index 995fe516f3f39ff9646422492a9b7398497641b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVP)q}E%9LN1TcFuNe0|{hAA%cWZdle)SJDLr}yev!8-M!K_ zW7tfKGICzVNGUC|)M|51ZR*tK)|4`F*-=8wz3D==VRW%?=j_Ey5+i!x3l9&^=kt56 zaRB1}Cw~kS_zsD3rw{70Jt<7aYNeI)qdDsUV~|_G8(S$SnWgOOcf5; z_>p8ApWY_O@uUbd-AU^l%uTEbl%c|30?o`B=-8CAsrH?P{q;RuoT`A>LavLilfsxl z=1wxG#)qxWKhgWDRZ48)2JkM0`ET!~{p}2^$YqZlgA!f!15Zu4Dj< zALgN&D8$&>P!#^L`5kS~F2OKSjJ{we1V&;bCXn2xHu{&lVf3p|>(}Db*N;)?{g<~f z*fLuWwJRHX_i6M8J0Pg}UC=`@H|CqrzHk}3Njc2EYDB($j>4NiH(_~t0cFlCXjnl@ zpbqU`GpH(JYYVBj1P1v)8tf}~Q9U7t+I8(m z5}QamzJZ9C++}dElGcD3`q3hs8_=&!%= aU-JuR(5&Toy3}I;0000re(l%! zb3XXjA=BSSEdN{#|9iLO*8%-MR}+7qbp3tY@z3?Nzc;ggpZ5HH*6+{dn6Eo!{=Mk? zb3y&r36&oQ6@H&q{dG#^&qa-2`?P+aQ~SDI`sY!lABPpcY?Jz diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/comment.png b/themes/hotel-reservation-theme/css/modules/productcomments/img/comment.png deleted file mode 100644 index 2973119143a1ccfbff4e1c90315c6c5c53be1713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)QPk|Kq{CfLH~a0UK8yy!HS0 zpTGa{fh{NRgABP1#B6W_fE*qm{`2?WzyBY;{rms&)4%`EKK}dvWL{eR~b#PI3`$3cdeAsZlv9^6{hh!5Z4l&5`l_)XKuR!()b043rR}KKn+Sjd=H3I=$97;%m4uQ Wiw`2c;%W;30000U3t1fLtd_l7i+$px| z#_FO4t%V9*wJvnygEpcfO=_5q|j7e@lg(*rNfGeq93E0L5 zU@l-TpmtmgJOg7v6`a>pd9`A3>ei$wV$Kha2Id0h0_FnV(mLl@V(`tHgNuFSu_W%F z4avNwbQQ5?i|J1`e(|A&EXa&IzdiG3u?T)XlrRwG`e!0128%WE1__f) zkX907E-0Fn-{MaXhA?w>H>M7`FnwYtf}=OY;7iS5Gr3OO_P&46`yO)(aWE4sJsHM_ z?)@mdxQ*&(AMy_`;O+Un7(RK_>-g8dwM~u@T{lYbcer6tj63Z>&nBSHjrh$2@E>+A zG&HbHzA_g~9dw~O>qY&Oy0(SqE!Ae?jdBB0m^iXNmb=>pP*m)8AW4?aIpJ?}hMO5| zBVMxSb?4UJH=b5A(&L79#f9&lbx`dstG+hp)utoV6X@K2nH?A9+I;^Iv7G+`QKRz^ T9YJsg00000NkvXXu0mjfmoOgv diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/delete.gif b/themes/hotel-reservation-theme/css/modules/productcomments/img/delete.gif deleted file mode 100644 index 43c6ca8763d79bde87bcf437e497af00c8be562d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 zcmZ?wbhEHb6kt$bc*el6GthYN-n}zt&b)vB{*)i+-#|NQy$ zABXln&Q1FL`t{#CH*SY|{oJwc*Qz;h;)0))7aYq9ewP~fc2e)_P3vAY)$9wl{IzJp zy{ydlr;a^HiGHwZ{*SH8FZkJhE{gei`OM?;ir*_{?@ji478&@mD*tSH_`A&5@6Vqe z@G<&xeCOwiq-WvY-eS5f?;vgCP8#IHGBw=+^cY}xvy zx8c*8mDl2ff1W;kCeZrNm9vlQYJg5Caki?(^G9DBs4DA0KlA4-ZT3fl8 z8F_gb*}2-1v>0WWwY1oIg_&Emc-aM+Wn|bpRc1GF^$N-etzA1qr9X*XNNWw_j-BjG zGEKc(x)1gUF{(82E@ad^eMXp9hUxg0Q)f<}lVRDncBb&%dq*yAR+(|l-D@bZwvw%g)cL7VG z)An_f*+XqOetkIP*eg{wS7K(+qJ{-x0ue3?v&y~1d1To>MqD_2keNGNE=Pc|!BJ7b fV_(F^#N=Z_Jo9)pKRPly^YODPxtB+f3oIcR<9S%P!;C)R2eg+CAmqhhI>bBSc9qD5>k8&{dg3ERvELjvga@67 zyctDgWC;A-4$K-#@v4wupR2`0Qo%AjT~6@}w>z*j^%l{-JBYU15p6z)A2*w@INS%1 z$$(L1HvdeXNvsmg=yZY@?B=ewV~KGgdhrZ=b_@KrYJ@LX5NV(hww^%v-VMwhB{6(x zpZl?Fk02q4!SsBs8H=v5_>Un64ewbaf_1u8;ZBkWcU{5DybKITGw6ii19gN6bX`TX zvl%{XCB7C(lV+ik1aGT>$5MrdL^_iYFy-1{*Ei-MufR)p&f2%aiiS1@0yg1@N|{o*Yvf{79p9Nf!}N_OE(wGrNi^YMJDI)+C%TbE(> zcR1-X4N7+l2gK=SC$W=xkiVVl7j5QxbJLif>{N4i<_6(kxA9-|6CKjdxk+*x{r~^~ M07*qoM6N<$f}O@VUH||9 diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/index.php b/themes/hotel-reservation-theme/css/modules/productcomments/img/index.php deleted file mode 100644 index a318ca6dc..000000000 --- a/themes/hotel-reservation-theme/css/modules/productcomments/img/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/note.png b/themes/hotel-reservation-theme/css/modules/productcomments/img/note.png deleted file mode 100644 index 4d7030f04dd1ed58a5c1bd35cc82674dc78b715d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmV;=0WkiFP)<34t{ z%lR9dfaAkgrXQZ6+JkyjQ*$7rjtGu}6eP-zj~u+-ruI8f3$8K(Hy5rt=b#(E_k~*z zDU&@WZywLU=@=|eNExUtO#hC6CBjO_xtm+WPcNCid%?=3>#SY5jU!M63~*$bk@FUl zy{C8NB_m6yL@a&>I=T>$B^Wa9sYTl=S05?N5&XB`_#3&mI$Wz0+v5NL002ovPDHLk FV1gLE$_)Sj diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/note_go.png b/themes/hotel-reservation-theme/css/modules/productcomments/img/note_go.png deleted file mode 100644 index 4d7ffdfdedfe365b95f7be42b995b879d17c58fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)}|w#Zm@lU_^)(A(3I!A`K`h1kK?MJb1tVf9AaxsVe_- z(g6D9rAqDxsumT8dWVWdB|&`x&fvwM5`#0;c0P@E1H4e)a_t<{3%UCJ>bm?9*G5En#byA%+-!OXlvl270*sNl^e`%fGx zC1z-i>hlotsLx}>QlDw!er0*7gGd#( zJV|z7n40#xL{UV~_c>Ua#RkEOaO}`2n(ErfnQc1y>zol=G4yav(>wh>*w)3`KsW0{ zkEy+K4+)m*&0Tm6_}~dBiyQNtslUXQjnm_EZ|&LMR7Dy9F+^o4s#@<5PrV>F`Wzz` zuYs?tGq@l~a5(SSOmdt%ewi(oPmg^bHpMwGWMB28Vo(=j;}4kHD#Qy%YZ{Q?@f!HH zF~{NRIws~v7?~aZXoc43Z_CvAq|qB|vB6@*ax&ALy4cvk`?*mDr(aK6;lg5{Cegoc zV@q#p<$S}{%$w=KaT{n~>{DB8z`p?+yQ38!$}(~A<;#64JNchU$$I%CY#&Gf0000< KMNUMnLSTYj_Z-gv diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/img/star.gif b/themes/hotel-reservation-theme/css/modules/productcomments/img/star.gif deleted file mode 100644 index f7f80c2bf1947305bd757d93067136845af5eeac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1380 zcmZ?wbhEHbaTleK78=t z=aXw+k1qYRtmN~$hKUm=Zr!rw$DLCR_4VJc?3*=n=Hf+*zMb8;ckkZw=g%KIcI@TL zm*r(;@7tY!|NhMY28#c=BYXoCToOwXfwYZ%ML}Y6c4~=2Qfhi;o~_dR-TRdkGE;1o z!cBb*d<&dYGcrA@ic*8C{6dnevXd=SlxV% zQmue&kg&dz0$52&wylyQNJ0T*r*nQ$s)DJWfo`&anSp|tp`M|!iMhGCj)IYap@F`E zk-njkuA#Y=v5}R5fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5m+O@q>*W`v>l<2H zT7t|lGSUUA&@HaaD@m--%_~-hnc$LIoLrPyP?DLSrvNfBF)6>a#8wIDQivCF3*g4) z73+b$qnDhYt6z~=pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsWvLIDID784hv?w_h zs9YIjRe_arQEFmIeo;t%ehw@Y12XbU@{2R_3lyA#O%=j3^HTE5i@~aWeXTt6ic1pn zl2bihY?Xle^)fS4tc;x8ObpzNO^wYBTnr6ejV+xm4cr{fEiKI)&0L(_%wc+6@{>z* zQ}aq-dQ%X3&2Z`kC4}4ppv^9+MVV!(DQ-pixe8zpTV>*Qi!n~~pn6kqyTt^jUVWfr z^g+>z6wNRpVA=sO;fWT=fhYUaJYZTc0w!w4|Ns8}`TgtXkMG~Ue);_Ag9{)&z?Sc{OI9>`}gkNxqa*AjqBI0Ub%ef;)V0)&Yn4a>g0*z$BrI3eCXhT{rmRr z*}ZG$j_upFZrQwPBVyU^MUX)=&*C+u1kER(%XO#u0dFo8#Q3_o0q!3^w&GW4LK!#o@`gl+mW>!i^IN zN6UC-zszX1d;4a|uru*7&R*EZB)eeI;;BoQGp&?mSuU(DxSUgck__{#F69Nx8@YLRsEdhd z2yQiQ>F(IwG;@OP_9@e5ET21n`RpajRXJMa({o}&^0Blzd!!{bmjMh+20OY{Q2|e=k@xZmka;A-0}UW`_G?0 zzwOcb`t|F}moM+!x%1;(((eazew<6bbm`Kcx5w_^zyJMI$occM*88giysR$UhpM9R2DyU)k!wRjVI4X zG|-ttj-yk7O^&UPMUKTyid$~h?AhE3Oq_FOb22$GvM*w1bYob=;Lf~=*_~fbkU>z6 z-;GgDz*#_UwUh8tH>UONeG1*Zof9T?PMPLBW6_*>3$Dv8S+-)%sx|92Y}&GI$F4p5 P4jghm>V87Ok--`OzEzlo diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/index.php b/themes/hotel-reservation-theme/css/modules/productcomments/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/css/modules/productcomments/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/css/modules/productcomments/productcomments.css b/themes/hotel-reservation-theme/css/modules/productcomments/productcomments.css deleted file mode 100644 index dba2824d0..000000000 --- a/themes/hotel-reservation-theme/css/modules/productcomments/productcomments.css +++ /dev/null @@ -1,216 +0,0 @@ -#product_comments_block_extra { - padding: 8px 10px 10px; - font-weight: bold; - line-height: 18px; - border: 1px solid #d6d4d4; - background: #fbfbfb; - margin: 39px 0 22px; } - #product_comments_block_extra .comments_note { - margin-bottom: 5px; } - #product_comments_block_extra .comments_note span{ - float: left; - color: #333; } - .raty_star i[class^="icon-"] { - font-size: 22px; - color: #e9ce18; - } .raty_star i.icon-star-o { - color: #777777; - } - #product_comments_block_extra .comments_advices { - clear: both; } - -.comments_advices { - padding-top: 2px; } - .comments_advices li { - display: inline-block; - line-height: 30px; } - @media (min-width: 768px) and (max-width: 991px) { - .comments_advices li { - display: block; - line-height: 20px; } } - .comments_advices a { - text-decoration: none; - color: #777; - position: relative; - margin-right: 8px; - line-height: 30px; - padding: 0; - display: inline-block; } - @media (min-width: 768px) and (max-width: 1199px) { - .comments_advices a { - float: none; - line-height: 20px; } } - .comments_advices a:before { - background: #929292; - -moz-border-radius: 50px; - -webkit-border-radius: 50px; - border-radius: 50px; - color: white; - display: inline-block; - font-family: "FontAwesome"; - font-size: 15px; - font-weight: normal; - height: 30px; - line-height: 30px; - margin-right: 6px; - text-align: center; - width: 30px; - /*max 1199px*/ } - @media (max-width: 1199px) { - .comments_advices a:before { - display: none; } } - .comments_advices a.reviews:before { - content: "\f0e5"; } - .comments_advices a.open-comment-form:before { - content: "\f040"; } - .comments_advices a:hover { - color: #333; } - .comments_advices a.reviews { - border-right: 1px solid #d6d4d4; - padding-right: 30px; - margin-right: 9px; } - @media (min-width: 768px) and (max-width: 991px) { - .comments_advices a.reviews { - margin-right: 0; - padding: 0; - border: none; } } - -/* pop-in add grade/advice ********************************************************************* */ -#fancybox-wrap { - width: 585px; } - -#fancybox-content { - width: 585px; - border-width: 0; } - -#new_comment_form { - overflow: hidden; - color: #333; - text-align: left; } - #new_comment_form h2 { - margin-bottom: 10px; } - #new_comment_form .title { - padding: 10px; - font-size: 13px; - color: #fff; - text-transform: uppercase; - background: #333; } - #new_comment_form ul.grade_content { - list-style-type: none; - margin: 0 0 20px 0; } - #new_comment_form ul.grade_content li { - width: 50%; } - #new_comment_form ul.grade_content span { - display: inline-block; - padding: 0 10px; - width: 150px; - font-weight: bold; } - #new_comment_form ul.grade_content .cancel { - margin-right: 5px; } - #new_comment_form .product { - padding: 15px; } - #new_comment_form .product img { - border: 1px solid #d6d4d4; } - #new_comment_form .product .product_desc { - line-height: 18px; - color: #666; } - #new_comment_form .product .product_desc .product_name { - padding: 10px 0 5px; - font-size: 13px; - color: #000; } - #new_comment_form .new_comment_form_content { - padding: 15px 25px 15px 15px;} - @media (max-width: 767px) { - #new_comment_form .new_comment_form_content { - padding-left: 25px; } } - #new_comment_form .new_comment_form_content .intro_form { - padding-bottom: 10px; - font-weight: bold; - font-size: 12px; } - #new_comment_form label { - display: block;} - #new_comment_form input { - width: 100%;} - #new_comment_form textarea { - width: 100%; - height: 200px; } - #new_comment_form #criterions_list { - padding-top: 15px; - list-style-type: none; } - #new_comment_form #criterions_list li { - margin-bottom: 10px; } - #new_comment_form #criterions_list label { - margin: 0 10px 0 0; } - #new_comment_form #criterions_list .star_content { - float: left; } - #new_comment_form #new_comment_form_footer { - margin-top: 20px; - font-size: 12px; } - -/* TAB COMMENTS ******************************************************************************** */ -#product_comments_block_tab div.comment { - margin: 0 0 14px; - padding-top: 14px; - border-top: 1px solid #d6d4d4; } - #product_comments_block_tab div.comment:first-child { - padding: 0; - border: none; } - #product_comments_block_tab div.comment .comment_author { - padding: 0 20px; - line-height: 18px; } - #product_comments_block_tab div.comment .comment_author span { - font-weight: bold; - float: left; } - #product_comments_block_tab div.comment .comment_author .star_content { - display: inline-block; - vertical-align: middle; - margin: 0 0 0 5px; } - #product_comments_block_tab div.comment .comment_details { - overflow: hidden; - border-left: 1px solid #d6d4d4; } - @media (max-width: 991px) { - #product_comments_block_tab div.comment .comment_details { - border-left: none; } - #product_comments_block_tab div.comment .comment_details ul { - list-style-type: none; - margin: 0; } - #product_comments_block_tab div.comment .comment_details ul li { - padding: 2px 0 2px; } - #product_comments_block_tab div.comment .comment_details ul li:before { - font-family: "FontAwesome"; - content: "\f0da"; - color: #333; - margin-right: 8px; } } - #product_comments_block_tab div.star:after { - content: "\f006"; - font-family: "FontAwesome"; - display: inline-block; - color: #777676; } - #product_comments_block_tab div.star_on:after { - content: "\f005"; - font-family: "FontAwesome"; - display: inline-block; - color: #e9ce18; } - #product_comments_block_tab .comment_author_infos { - clear: both; - padding-top: 9px; } - #product_comments_block_tab .comment_author_infos strong { - display: block; - color: #333; } - #product_comments_block_tab .comment_author_infos em { - color: #adadad; } - #product_comments_block_tab a { - text-decoration: none; - font-weight: bold; } - #product_comments_block_tab span.report_btn { - cursor: pointer; } - #product_comments_block_tab span.report_btn:hover { - text-decoration: underline; } - -.fl { - float: left; } - -.fr { - float: right; } - -/*# sourceMappingURL=productcomments.css.map */ diff --git a/themes/hotel-reservation-theme/js/modules/loyalty/index.php b/themes/hotel-reservation-theme/js/modules/loyalty/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/loyalty/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/loyalty/js/index.php b/themes/hotel-reservation-theme/js/modules/loyalty/js/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/loyalty/js/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/loyalty/js/loyalty.js b/themes/hotel-reservation-theme/js/modules/loyalty/js/loyalty.js deleted file mode 100644 index eab351f0a..000000000 --- a/themes/hotel-reservation-theme/js/modules/loyalty/js/loyalty.js +++ /dev/null @@ -1,65 +0,0 @@ -/* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -$(document).ready(function() { - $(document).on('change', '#our_price_display', function(e){ - updateLoyaltyView(parseInt($('#our_price_display').text())); - }) - updateLoyaltyView(parseInt($('#our_price_display').text())); -}); - -function updateLoyaltyView(new_price) { - if (typeof(new_price) == 'undefined' || typeof(productPriceWithoutReduction) == 'undefined') - return; - - var points = Math.floor(new_price / point_rate); - var total_points = points_in_cart + points; - var voucher = total_points * point_value; - - if (!none_award && productPriceWithoutReduction != new_price) { - $('#loyalty').html(loyalty_already); - } - else if (!points) { - $('#loyalty').html(loyalty_nopoints); - } - else - { - var content = loyalty_willcollect + " "+points+' '; - if (points > 1) - content += loyalty_points + ". "; - else - content += loyalty_point + ". "; - - content += loyalty_total + " "+total_points+' '; - if (total_points > 1) - content += loyalty_points; - else - content += loyalty_point; - - content += ' ' + loyalty_converted + ' '; - content += ''+formatCurrency(voucher, currencyFormat, currencySign, currencyBlank)+'.'; - $('#loyalty').html(content); - } -} diff --git a/themes/hotel-reservation-theme/js/modules/mailalerts/index.php b/themes/hotel-reservation-theme/js/modules/mailalerts/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/mailalerts/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/mailalerts/mailalerts.js b/themes/hotel-reservation-theme/js/modules/mailalerts/mailalerts.js deleted file mode 100644 index d6513a023..000000000 --- a/themes/hotel-reservation-theme/js/modules/mailalerts/mailalerts.js +++ /dev/null @@ -1,139 +0,0 @@ -/* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -$(document).ready(function() { - oosHookJsCodeMailAlert(); - $(document).on('keypress', '#oos_customer_email', function(e){ - if(e.keyCode == 13) - { - e.preventDefault(); - addNotification(); - } - }); - - $(document).on('click', '#oos_customer_email', function(e){ - clearText(); - }); - - $(document).on('click', '#mailalert_link', function(e){ - e.preventDefault(); - addNotification(); - }); - - $(document).on('click', 'i[rel^=ajax_id_mailalert_]', function(e) - { - var ids = $(this).attr('rel').replace('ajax_id_mailalert_', ''); - ids = ids.split('_'); - var id_product_mail_alert = parseInt(ids[0]); - var id_product_attribute_mail_alert = parseInt(ids[1]); - var parent = $(this).parents('li'); - - if (typeof mailalerts_url_remove == 'undefined') - return; - - $.ajax({ - url: mailalerts_url_remove, - type: "POST", - data: { - 'id_product': id_product_mail_alert, - 'id_product_attribute': id_product_attribute_mail_alert - }, - success: function(result) - { - if (result == '0') - { - parent.fadeOut("normal", function() - { - if (parent.siblings().length == 0) - $("#mailalerts_block_account_warning").removeClass('hidden'); - parent.remove(); - }); - } - } - }); - }); - -}); - -function clearText() -{ - if ($('#oos_customer_email').val() == mailalerts_placeholder) - $('#oos_customer_email').val(''); -} - -function oosHookJsCodeMailAlert() -{ - if (typeof mailalerts_url_check == 'undefined') - return; - - $.ajax({ - type: 'POST', - url: mailalerts_url_check, - data: 'id_product=' + id_product + '&id_product_attribute=' + $('#idCombination').val(), - success: function (msg) { - if (msg == '0') - { - $('#mailalert_link').show(); - $('#oos_customer_email').show(); - } - else - { - $('#mailalert_link').hide(); - $('#oos_customer_email').hide(); - } - } - }); -} - -function addNotification() -{ - if ($('#oos_customer_email').val() == mailalerts_placeholder || (typeof mailalerts_url_add == 'undefined')) - return; - - $.ajax({ - type: 'POST', - url: mailalerts_url_add, - data: 'id_product=' + id_product + '&id_product_attribute='+$('#idCombination').val()+'&customer_email='+$('#oos_customer_email').val()+'', - success: function (msg) { - if (msg == '1') - { - $('#mailalert_link').hide(); - $('#oos_customer_email').hide(); - $('#oos_customer_email_result').html(mailalerts_registered); - $('#oos_customer_email_result').css('color', 'green').show(); - } - else if (msg == '2' ) - { - $('#oos_customer_email_result').html(mailalerts_already); - $('#oos_customer_email_result').css('color', 'red').show(); - } - else - { - $('#oos_customer_email_result').html(mailalerts_invalid); - $('#oos_customer_email_result').css('color', 'red').show(); - } - } - }); -} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/js/modules/productcomments/index.php b/themes/hotel-reservation-theme/js/modules/productcomments/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/productcomments/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/productcomments/js/index.php b/themes/hotel-reservation-theme/js/modules/productcomments/js/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/productcomments/js/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/productcomments/js/productcomments.js b/themes/hotel-reservation-theme/js/modules/productcomments/js/productcomments.js deleted file mode 100644 index bf1712ce9..000000000 --- a/themes/hotel-reservation-theme/js/modules/productcomments/js/productcomments.js +++ /dev/null @@ -1,155 +0,0 @@ -/* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ -$(document).ready(function(){ - $('.raty_star').raty({ - starType : 'i', - starOff: 'icon-star-o', - starOn: 'icon-star', - halfShow: false, - score: 3, - hints: null, - readOnly: function() { - return $(this).hasClass('readonly'); - } - }); - $('#new_comment_tab_btn').on('click', function(e){ - e.preventDefault(); - $('.new_comment_form_outer').show(); - $('.open-comment-block').hide(); - }); - - $('#cancelreview').on('click', function(e){ - e.preventDefault(); - $('.new_comment_form_outer').hide(); - $('.open-comment-block').show(); - }); - - /*if (!!$.prototype.fancybox) - $('.open-comment-form').fancybox({ - 'autoSize' : false, - 'width' : 600, - 'height' : 'auto', - 'hideOnContentClick': false - });*/ - - $(document).on('click', '#id_new_comment_form .closefb', function(e){ - e.preventDefault(); - $.fancybox.close(); - }); - - $(document).on('click', 'a[href=#idTab5]', function(e){ - $('*[id^="idTab"]').addClass('block_hidden_only_for_screen'); - $('div#idTab5').removeClass('block_hidden_only_for_screen'); - - $('ul#more_info_tabs a[href^="#idTab"]').removeClass('selected'); - $('a[href="#idTab5"]').addClass('selected'); - }); - - $(document).on('click', 'button.usefulness_btn', function(e){ - var id_product_comment = $(this).data('id-product-comment'); - var is_usefull = $(this).data('is-usefull'); - var parent = $(this).parent(); - - $.ajax({ - url: productcomments_controller_url + '?rand=' + new Date().getTime(), - data: { - id_product_comment: id_product_comment, - action: 'comment_is_usefull', - value: is_usefull - }, - type: 'POST', - headers: { "cache-control": "no-cache" }, - success: function(result){ - parent.fadeOut('slow', function() { - parent.remove(); - }); - } - }); - }); - - $(document).on('click', 'span.report_btn', function(e){ - if (confirm(confirm_report_message)) - { - var idProductComment = $(this).data('id-product-comment'); - var parent = $(this).parent(); - - $.ajax({ - url: productcomments_controller_url + '?rand=' + new Date().getTime(), - data: { - id_product_comment: idProductComment, - action: 'report_abuse' - }, - type: 'POST', - headers: { "cache-control": "no-cache" }, - success: function(result){ - parent.fadeOut('slow', function() { - parent.remove(); - }); - } - }); - } - }); - - $(document).on('click', '#submitNewMessage', function(e){ - // Kill default behaviour - e.preventDefault(); - - // Form element - - url_options = '?'; - if (!productcomments_url_rewrite) - url_options = '&'; - - $.ajax({ - url: productcomments_controller_url + url_options + 'action=add_comment&secure_key=' + secure_key + '&rand=' + new Date().getTime(), - data: $('#id_new_comment_form').serialize(), - type: 'POST', - headers: { "cache-control": "no-cache" }, - dataType: "json", - success: function(data){ - if (data.result) - { - $.fancybox.close(); - var buttons = {}; - buttons[productcomment_ok] = "productcommentRefreshPage"; - fancyChooseBox(moderation_active ? productcomment_added_moderation : productcomment_added, productcomment_title, buttons); - } - else - { - $('#new_comment_form_error ul').html(''); - $.each(data.errors, function(index, value) { - $('#new_comment_form_error ul').append('
  • '+value+'
    • '); - }); - $('#new_comment_form_error').slideDown('slow'); - } - } - }); - }); -}); - -function productcommentRefreshPage() -{ - window.location.reload(); -} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/js/modules/productcomments/js/products-comparison.js b/themes/hotel-reservation-theme/js/modules/productcomments/js/products-comparison.js deleted file mode 100644 index 3af911d0b..000000000 --- a/themes/hotel-reservation-theme/js/modules/productcomments/js/products-comparison.js +++ /dev/null @@ -1,68 +0,0 @@ -/* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ -$(document).ready(function() -{ - $('input.star').rating(); - $('.auto-submit-star').rating(); - $('a.cluetip').cluetip({ - local:true, - cursor: 'pointer', - cluetipClass: 'comparison_comments', - dropShadow: false, - dropShadowSteps: 0, - showTitle: false, - tracking: true, - sticky: false, - mouseOutClose: true, - width: 450, - fx: { - open: 'fadeIn', - openSpeed: 'fast' - } - }).css('opacity', 0.8); - - $('.comparison_infos a').each(function(){ - var id_product_comment = parseInt($(this).data('id-product-comment')); - if (id_product_comment) - { - $(this).click(function(e){ - e.preventDefault(); - }); - var htmlContent = $('#comments_' + id_product_comment).html(); - $(this).popover({ - placement : 'bottom', //placement of the popover. also can use top, bottom, left or right - title : false, //this is the top title bar of the popover. add some basic css - html: 'true', //needed to show html of course - content : htmlContent //this is the content of the html box. add the image here or anything you want really. - }); - } - }); -}); - -function closeCommentForm() -{ - $('#sendComment').slideUp('fast'); - $('input#addCommentButton').fadeIn('slow'); -} diff --git a/themes/hotel-reservation-theme/js/modules/referralprogram/index.php b/themes/hotel-reservation-theme/js/modules/referralprogram/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/referralprogram/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/referralprogram/js/index.php b/themes/hotel-reservation-theme/js/modules/referralprogram/js/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/js/modules/referralprogram/js/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/js/modules/referralprogram/js/referralprogram.js b/themes/hotel-reservation-theme/js/modules/referralprogram/js/referralprogram.js deleted file mode 100644 index 1d18f4156..000000000 --- a/themes/hotel-reservation-theme/js/modules/referralprogram/js/referralprogram.js +++ /dev/null @@ -1,30 +0,0 @@ -/* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ -$(document).ready(function() { - $('#idTabs a').on('click', function(e) { - e.preventDefault(); - $(this).tab('show'); - }); -}); \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/carriercompare/index.php b/themes/hotel-reservation-theme/modules/carriercompare/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/carriercompare/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/carriercompare/template/carriercompare.tpl b/themes/hotel-reservation-theme/modules/carriercompare/template/carriercompare.tpl deleted file mode 100644 index 70dfc382b..000000000 --- a/themes/hotel-reservation-theme/modules/carriercompare/template/carriercompare.tpl +++ /dev/null @@ -1,92 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{if !$opc} -
    -
    -

    {l s='Estimate the cost of shipping & taxes.' mod='carriercompare'}

    -
    - - -
    - -
    - - ({l s='Needed for certain carriers.' mod='carriercompare'}) -
    - -
    - Loading data
    -

    -
    - - -

    - - -

    -
    -
    -{addJsDef taxEnabled=$use_taxes} -{addJsDef displayPrice=$priceDisplay} -{addJsDef id_carrier=$id_carrier|intval} -{addJsDef id_state=$id_state|intval} -{addJsDef SE_RefreshMethod=$refresh_method|intval} - -{addJsDefL name=SE_RedirectTS}{l s='Refreshing the page and updating your cart...' mod='carriercompare' js=1}{/addJsDefL} -{addJsDefL name=SE_RefreshStateTS}{l s='Checking available states...' mod='carriercompare' js=1}{/addJsDefL} -{addJsDefL name=SE_RetrievingInfoTS}{l s='Retrieving information...' mod='carriercompare' js=1}{/addJsDefL} -{addJsDefL name=txtFree}{l s='Free!' mod='carriercompare' js=1}{/addJsDefL} -{/if} diff --git a/themes/hotel-reservation-theme/modules/carriercompare/template/configuration.tpl b/themes/hotel-reservation-theme/modules/carriercompare/template/configuration.tpl deleted file mode 100644 index 8672ab2c1..000000000 --- a/themes/hotel-reservation-theme/modules/carriercompare/template/configuration.tpl +++ /dev/null @@ -1,29 +0,0 @@ -{if isset($display_error)} - {if $display_error} -
    {l s='An error occurred during form validation.' mod='carriercompare'}
    - {else} -
    {l s='Configuration updated' mod='carriercompare'}
    - {/if} -{/if} - -
    -
    -
    - {l s='This module is only available during the standard five-step checkout process. The carrier list has already been defined for one-page checkout.' mod='carriercompare'} -
    - {l s='Global Configuration' mod='carriercompare'} - - -
    - -

    {l s='How would you like to refresh information for a customer?' mod='carriercompare'}

    -
    - -
    - -
    -
    -
    diff --git a/themes/hotel-reservation-theme/modules/carriercompare/template/index.php b/themes/hotel-reservation-theme/modules/carriercompare/template/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/carriercompare/template/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/index.php b/themes/hotel-reservation-theme/modules/cashondelivery/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/index.php b/themes/hotel-reservation-theme/modules/cashondelivery/views/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/index.php b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/validation.tpl b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/validation.tpl deleted file mode 100644 index 03ff6f30c..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/front/validation.tpl +++ /dev/null @@ -1,54 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{capture name=path}{l s='Shipping' mod='cashondelivery'}{/capture} - -

    {l s='Order summary' mod='cashondelivery'}

    - -{assign var='current_step' value='payment'} -{include file="$tpl_dir./order-steps.tpl"} - -
    -
    - -

    {l s='Cash on delivery (COD) payment' mod='cashondelivery'}

    -

    - - {l s='You have chosen the Cash on Delivery method.' mod='cashondelivery'} -
    - - {l s='The total amount of your order is' mod='cashondelivery'} - {convertPrice price=$total} - {if $use_taxes == 1} - {l s='(tax incl.)' mod='cashondelivery'} - {/if} -

    -

    - {l s='Please confirm your order by clicking \'I confirm my order\'.' mod='cashondelivery'}. -

    -
    -

    - {l s='Other payment methods' mod='cashondelivery'} - -

    -
    diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/confirmation.tpl b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/confirmation.tpl deleted file mode 100644 index 1909af47a..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/confirmation.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -
    -

    {l s='Your order on' mod='cashondelivery'} {$shop_name} {l s='is complete.' mod='cashondelivery'} -
    - {l s='You have chosen the cash on delivery method.' mod='cashondelivery'} -
    {l s='Your order will be sent very soon.' mod='cashondelivery'} -
    {l s='For any questions or for further information, please contact our' mod='cashondelivery'} {l s='customer support' mod='cashondelivery'}. -

    -
    \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/index.php b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/payment.tpl b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/payment.tpl deleted file mode 100644 index d2c601d19..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/hook/payment.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -
    -
    -

    - - {l s='Pay with cash on delivery (COD)' mod='cashondelivery'} - ({l s='You pay for the merchandise upon delivery' mod='cashondelivery'}) - -

    -
    -
    diff --git a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/index.php b/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/cashondelivery/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/index.php b/themes/hotel-reservation-theme/modules/favoriteproducts/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/index.php b/themes/hotel-reservation-theme/modules/favoriteproducts/views/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl deleted file mode 100644 index 0e9fa54ad..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl +++ /dev/null @@ -1,77 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{capture name=path} - - {l s='My account' mod='favoriteproducts'} - - {$navigationPipe} - {l s='My favorite products' mod='favoriteproducts'} -{/capture} - -
    -

    {l s='My favorite products' mod='favoriteproducts'}

    - {if $favoriteProducts} - - {else} -

    {l s='No favorite products have been determined just yet. ' mod='favoriteproducts'}

    - {/if} - - -
    diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/index.php b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/front/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl deleted file mode 100644 index 9c303eb0b..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-extra.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{if !$isCustomerFavoriteProduct AND $is_logged} -
  • - {l s='Add this product to my list of favorites.' mod='favoriteproducts'} -
    • -{/if} -{if $isCustomerFavoriteProduct AND $is_logged} -
  • - {l s='Remove this product from my favorite\'s list. ' mod='favoriteproducts'} -
    • -{/if} - -
  • - {l s='Remove this product from my favorite\'s list. ' mod='favoriteproducts'} -
    • -
  • - {l s='Add this product to my list of favorites.' mod='favoriteproducts'} -
    • \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl deleted file mode 100644 index 16dff0abd..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/favoriteproducts-header.tpl +++ /dev/null @@ -1,31 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{strip} -{addJsDef favorite_products_url_add=$link->getModuleLink('favoriteproducts', 'actions', ['process' => 'add'], Tools::usingSecureMode())|escape:'quotes':'UTF-8'} -{addJsDef favorite_products_url_remove=$link->getModuleLink('favoriteproducts', 'actions', ['process' => 'remove'], Tools::usingSecureMode())|escape:'quotes':'UTF-8'} -{if isset($smarty.get.id_product)} - {addJsDef favorite_products_id_product=$smarty.get.id_product|intval} -{/if} -{/strip} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/index.php b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/my-account.tpl b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/my-account.tpl deleted file mode 100644 index 0e3289348..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/hook/my-account.tpl +++ /dev/null @@ -1,37 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -
  • - - {if !$in_footer} - - {l s='My favorite products' mod='favoriteproducts'} - {else} - {l s='My favorite products' mod='favoriteproducts'} - {/if} - -
    • diff --git a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/index.php b/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/favoriteproducts/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/loyalty/index.php b/themes/hotel-reservation-theme/modules/loyalty/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/index.php b/themes/hotel-reservation-theme/modules/loyalty/views/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/index.php b/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/loyalty.tpl b/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/loyalty.tpl deleted file mode 100644 index 0fa112b9a..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/front/loyalty.tpl +++ /dev/null @@ -1,248 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{capture name=path}{l s='My account' mod='loyalty'}{$navigationPipe}{l s='My loyalty points' mod='loyalty'}{/capture} - -

    {l s='My loyalty points' mod='loyalty'}

    - -{if $orders} -
    - {if $orders && count($orders)} - - - - - - - - - - - - - - - - - - {foreach from=$displayorders item='order'} - - - - - - - {/foreach} - -
    {l s='Order' mod='loyalty'}{l s='Date' mod='loyalty'}{l s='Points' mod='loyalty'}{l s='Points Status' mod='loyalty'}
    {l s='Total points available:' mod='loyalty'}{$totalPoints|intval} 
    {l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}{dateFormat date=$order.date full=1}{$order.points|intval}{$order.state|escape:'html':'UTF-8'}
    -
     
    - {else} -

    {l s='You have not placed any orders.' mod='loyalty'}

    - {/if} -
    -
    - -
    - {if ($nbpagination*$page) < $orders|@count } - {assign var='itemShowing' value=$nbpagination*$page} - {else} - {assign var='itemShowing' value=($nbpagination*$page-$orders|@count-$nbpagination*$page)*-1} - {/if} - {if $page==1} - {assign var='itemShowingStart' value=1} - {else} - {assign var='itemShowingStart' value=$nbpagination*$page-$nbpagination+1} - {/if} - {if $orders|@count > 1} - {l s='Showing %1$d - %2$d of %3$d items' sprintf=[$itemShowingStart, $itemShowing, $orders|@count] mod='loyalty'} - {else} - {l s='Showing %1$d - %2$d of 1 item' sprintf=[$itemShowingStart, $itemShowing] mod='loyalty'} - {/if} -
    -
    - -

    {l s='Vouchers generated here are usable in the following categories : ' mod='loyalty'} -{if $categories}{$categories}{else}{l s='All' mod='loyalty'}{/if}

    - -{if $transformation_allowed} -

    - {l s='Transform my points into a voucher of' mod='loyalty'} {convertPrice price=$voucher}. -

    -{/if} - -

    {l s='My vouchers from loyalty points' mod='loyalty'}

    - -{if $nbDiscounts} -
    - - - - - - - - - - - - - - {foreach from=$discounts item=discount name=myLoop} - - - - - - - - - - {/foreach} - -
    {l s='Created' mod='loyalty'}{l s='Value' mod='loyalty'}{l s='Code' mod='loyalty'}{l s='Valid from' mod='loyalty'}{l s='Valid until' mod='loyalty'}{l s='Status' mod='loyalty'}{l s='Details' mod='loyalty'}
    {dateFormat date=$discount->date_add}{if $discount->reduction_percent > 0} - {$discount->reduction_percent}% - {elseif $discount->reduction_amount} - {displayPrice price=$discount->reduction_amount currency=$discount->reduction_currency} - {else} - {l s='Free shipping' mod='loyalty'} - {/if}{$discount->code}{dateFormat date=$discount->date_from}{dateFormat date=$discount->date_to}{if $discount->quantity > 0}{l s='To use' mod='loyalty'}{else}{l s='Used' mod='loyalty'}{/if} - {l s='more...' mod='loyalty'} - -
    -
     
    -
    - -{if $minimalLoyalty > 0}

    {l s='The minimum order amount in order to use these vouchers is:' mod='loyalty'} {convertPrice price=$minimalLoyalty}

    {/if} - -{else} -

    {l s='No vouchers yet.' mod='loyalty'}

    -{/if} -{else} -

    {l s='No reward points yet.' mod='loyalty'}

    -{/if} - - diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/index.php b/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/my-account.tpl b/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/my-account.tpl deleted file mode 100644 index c18bc3a62..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/my-account.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -
  • - {l s='My loyalty points' mod='loyalty'} -
    • - \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/product.tpl b/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/product.tpl deleted file mode 100644 index 4373b83ec..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/product.tpl +++ /dev/null @@ -1,52 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -

    - {if $points} - {l s='By buying this product you can collect up to' mod='loyalty'} {$points} - {if $points > 1}{l s='loyalty points' mod='loyalty'}{else}{l s='loyalty point' mod='loyalty'}{/if}. - {l s='Your cart will total' mod='loyalty'} {$total_points} - {if $total_points > 1}{l s='loyalty points' mod='loyalty'}{else}{l s='loyalty point' mod='loyalty'}{/if} {l s='that can be converted into a voucher of' mod='loyalty'} - {convertPrice price=$voucher}. - {else} - {if isset($no_pts_discounted) && $no_pts_discounted == 1} - {l s='No reward points for this product because there\'s already a discount.' mod='loyalty'} - {else} - {l s='No reward points for this product.' mod='loyalty'} - {/if} - {/if} -

    -
    -{addJsDef point_rate=$point_rate} -{addJsDef point_value=$point_value} -{addJsDef points_in_cart=$points_in_cart} -{addJsDef none_award=$none_award} - -{addJsDefL name=loyalty_willcollect}{l s='By buying this product you can collect up to' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_already}{l s='No reward points for this product because there\'s already a discount.' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_nopoints}{l s='No reward points for this product.' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_points}{l s='loyalty points' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_point}{l s='loyalty point' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_total}{l s='Your cart will total' mod='loyalty' js=1}{/addJsDefL} -{addJsDefL name=loyalty_converted}{l s='that can be converted into a voucher of' mod='loyalty' js=1}{/addJsDefL} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/shopping-cart.tpl b/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/shopping-cart.tpl deleted file mode 100644 index dea995c2f..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/hook/shopping-cart.tpl +++ /dev/null @@ -1,38 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -

    - - {if $points > 0} - {l s='By checking out this shopping cart you can collect up to' mod='loyalty'} - {if $points > 1}{l s='%d loyalty points' sprintf=$points mod='loyalty'}{else}{l s='%d loyalty point' sprintf=$points mod='loyalty'}{/if} - {l s='that can be converted into a voucher of' mod='loyalty'} {convertPrice price=$voucher}{if isset($guest_checkout) && $guest_checkout}*{/if}.
    - {if isset($guest_checkout) && $guest_checkout}* {l s='Not available for Instant checkout order' mod='loyalty'}{/if} - {else} - {l s='Add some products to your shopping cart to collect some loyalty points.' mod='loyalty'} - {/if} -

    - \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/loyalty/views/templates/index.php b/themes/hotel-reservation-theme/modules/loyalty/views/templates/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/loyalty/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/mailalerts/index.php b/themes/hotel-reservation-theme/modules/mailalerts/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/index.php b/themes/hotel-reservation-theme/modules/mailalerts/views/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/index.php b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/mailalerts-account.tpl b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/mailalerts-account.tpl deleted file mode 100644 index 47fe5199d..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/front/mailalerts-account.tpl +++ /dev/null @@ -1,49 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{capture name=path}{l s='My account' mod='mailalerts'}{$navigationPipe}{l s='My alerts' mod='mailalerts'}{/capture} -
    -

    {l s='My alerts' mod='mailalerts'}

    - {if $mailAlerts} - - {/if} -

    {l s='No mail alerts yet.' mod='mailalerts'}

    - -
    -{addJsDef mailalerts_url_remove=$link->getModuleLink('mailalerts', 'actions', ['process' => 'remove'])|escape:'quotes':'UTF-8'} \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/index.php b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/my-account.tpl b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/my-account.tpl deleted file mode 100644 index 3e4ad1c24..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/my-account.tpl +++ /dev/null @@ -1,31 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -
  • - - - {l s='My alerts' mod='mailalerts'} - -
    • diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/product.tpl b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/product.tpl deleted file mode 100644 index df64e2422..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/hook/product.tpl +++ /dev/null @@ -1,44 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - {if isset($email) AND $email} -

    - -

    - {/if} - {l s='Notify me when available' mod='mailalerts'} - -{strip} -{addJsDef oosHookJsCodeFunctions=array('oosHookJsCodeMailAlert')} -{addJsDef mailalerts_url_check=$link->getModuleLink('mailalerts', 'actions', ['process' => 'check'])} -{addJsDef mailalerts_url_add=$link->getModuleLink('mailalerts', 'actions', ['process' => 'add'])} - -{addJsDefL name='mailalerts_placeholder'}{l s='your@email.com' mod='mailalerts' js=1}{/addJsDefL} -{addJsDefL name='mailalerts_registered'}{l s='Request notification registered' mod='mailalerts' js=1}{/addJsDefL} -{addJsDefL name='mailalerts_already'}{l s='You already have an alert for this product' mod='mailalerts' js=1}{/addJsDefL} -{addJsDefL name='mailalerts_invalid'}{l s='Your e-mail address is invalid' mod='mailalerts' js=1}{/addJsDefL} -{/strip} - diff --git a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/index.php b/themes/hotel-reservation-theme/modules/mailalerts/views/templates/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/mailalerts/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/productcomments/index.php b/themes/hotel-reservation-theme/modules/productcomments/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/productcomments/productcomments-extra.tpl b/themes/hotel-reservation-theme/modules/productcomments/productcomments-extra.tpl deleted file mode 100644 index 11cbb1e8c..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/productcomments-extra.tpl +++ /dev/null @@ -1,64 +0,0 @@ - {* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{if (!$content_only && (($nbComments == 0 && $too_early == false && ($is_logged || $allow_guests)) || ($nbComments != 0)))} -
    - {if $nbComments != 0} -
    - {l s='Rating' mod='productcomments'}  -
    - {section name="i" start=0 loop=5 step=1} - {if $averageTotal le $smarty.section.i.index} -
    - {else} -
    - {/if} - {/section} - - - -
    -
    - {/if} - - -
    -{/if} - diff --git a/themes/hotel-reservation-theme/modules/productcomments/productcomments.tpl b/themes/hotel-reservation-theme/modules/productcomments/productcomments.tpl deleted file mode 100644 index e9a73e1f7..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/productcomments.tpl +++ /dev/null @@ -1,266 +0,0 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newersend_friend_form_content -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -
    -
    - {if (!$too_early AND ($is_logged OR $allow_guests))} -

    - - - {if $comments} - {l s='Make a review' mod='productcomments'} - {else} - {l s='Be the first to write your review' mod='productcomments'} - {/if} - - -

    - -
    - {/if} - {if $comments} - {foreach from=$comments item=comment} - {if $comment.content} -
    -
    - {$comment.customer_name|escape:'html':'UTF-8'} - {dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0} -
    -
    -
    -

    {$comment.title}

    -
    -
    -
    - - - -
    -
    -

    {$comment.content|escape:'html':'UTF-8'|nl2br}

    -
      - {if $comment.total_advice > 0} -
    • - {l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful,$comment.total_advice] mod='productcomments'} -
      • - {/if} - {if $is_logged} - {if !$comment.customer_advice} -
    • - {l s='Was this comment useful to you?' mod='productcomments'} - - -
      • - {/if} - {if !$comment.customer_report} -
    • - - {l s='Report abuse' mod='productcomments'} - -
      • - {/if} - {/if} -
    -

    -
    -
    -
    - {/if} - {/foreach} - {else} -

    {l s='No customer reviews for the moment.' mod='productcomments'}

    - {/if} -
    -
    -{strip} -{addJsDef productcomments_controller_url=$productcomments_controller_url|@addcslashes:'\''} -{addJsDef moderation_active=$moderation_active|boolval} -{addJsDef productcomments_url_rewrite=$productcomments_url_rewriting_activated|boolval} -{addJsDef secure_key=$secure_key} - -{addJsDefL name=confirm_report_message}{l s='Are you sure that you want to report this review?' mod='productcomments' js=1}{/addJsDefL} -{addJsDefL name=productcomment_added}{l s='Your review has been added!' mod='productcomments' js=1}{/addJsDefL} -{addJsDefL name=productcomment_added_moderation}{l s='Your review has been added and will be available once approved by a moderator.' mod='productcomments' js=1}{/addJsDefL} -{addJsDefL name=productcomment_title}{l s='New Review' mod='productcomments' js=1}{/addJsDefL} -{addJsDefL name=productcomment_ok}{l s='OK' mod='productcomments' js=1}{/addJsDefL} -{/strip} - diff --git a/themes/hotel-reservation-theme/modules/productcomments/productcomments_reviews.tpl b/themes/hotel-reservation-theme/modules/productcomments/productcomments_reviews.tpl deleted file mode 100644 index 2ab650171..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/productcomments_reviews.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{if isset($nbComments) && $nbComments > 0} -
    -
    - {section name="i" start=0 loop=5 step=1} - {if $averageTotal le $smarty.section.i.index} -
    - {else} -
    - {/if} - {/section} - - - -
    - {$nbComments} {l s='Review(s)' mod='productcomments'} -
    -{/if} diff --git a/themes/hotel-reservation-theme/modules/productcomments/productcomments_top.tpl b/themes/hotel-reservation-theme/modules/productcomments/productcomments_top.tpl deleted file mode 100644 index e69de29bb..000000000 diff --git a/themes/hotel-reservation-theme/modules/productcomments/products-comparison.tpl b/themes/hotel-reservation-theme/modules/productcomments/products-comparison.tpl deleted file mode 100644 index 89f915c4b..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/products-comparison.tpl +++ /dev/null @@ -1,103 +0,0 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - - {l s='Comments' mod='productcomments'} - - {foreach from=$list_ids_product item=id_product} - - {/foreach} - - -{foreach from=$grades item=grade key=grade_id} - - {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} - - {$grade} - - {foreach from=$list_ids_product item=id_product} - {assign var='tab_grade' value=$product_grades[$grade_id]} - - {if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]} -
    - {section loop=6 step=1 start=1 name=average} - - {/section} -
    - {else} - - - {/if} - - {/foreach} - -{/foreach} - -{cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} - - - {l s='Average' mod='productcomments'} - - {foreach from=$list_ids_product item=id_product} - - {if isset($list_product_average[$id_product]) AND $list_product_average[$id_product]} -
    - {section loop=6 step=1 start=1 name=average} - - {/section} -
    - {else} - - - {/if} - - {/foreach} - - - -  - {foreach from=$list_ids_product item=id_product} - - {if isset($product_comments[$id_product]) AND $product_comments[$id_product]} - - - {l s='View comments' mod='productcomments'} - - - - {else} - - - {/if} - - {/foreach} - diff --git a/themes/hotel-reservation-theme/modules/productcomments/tab.tpl b/themes/hotel-reservation-theme/modules/productcomments/tab.tpl deleted file mode 100644 index 26839bb90..000000000 --- a/themes/hotel-reservation-theme/modules/productcomments/tab.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -
  • {l s='Reviews' mod='productcomments'}
    • diff --git a/themes/hotel-reservation-theme/modules/referralprogram/index.php b/themes/hotel-reservation-theme/modules/referralprogram/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/index.php b/themes/hotel-reservation-theme/modules/referralprogram/views/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/email.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/email.tpl deleted file mode 100644 index 3d4030e33..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/email.tpl +++ /dev/null @@ -1,26 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -{$content} diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/index.php b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/program.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/program.tpl deleted file mode 100644 index 022c09ba2..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/program.tpl +++ /dev/null @@ -1,223 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} -{capture name=path}{l s='My account' mod='referralprogram'}{$navigationPipe}{l s='Referral Program' mod='referralprogram'}{/capture} - -

    {l s='Referral program' mod='referralprogram'}

    - -{if $error} -

    - {if $error == 'conditions not valided'} - {l s='You need to agree to the conditions of the referral program!' mod='referralprogram'} - {elseif $error == 'email invalid'} - {l s='At least one e-mail address is invalid!' mod='referralprogram'} - {elseif $error == 'name invalid'} - {l s='At least one first name or last name is invalid!' mod='referralprogram'} - {elseif $error == 'email exists'} - {l s='Someone with this e-mail address has already been sponsored!' mod='referralprogram'}: {foreach from=$mails_exists item=mail}{$mail} {/foreach} - {elseif $error == 'no revive checked'} - {l s='Please mark at least one checkbox' mod='referralprogram'} - {elseif $error == 'cannot add friends'} - {l s='Cannot add friends to database' mod='referralprogram'} - {/if} -

    -{/if} - -{if $invitation_sent} -

    - {if $nbInvitation > 1} - {l s='E-mails have been sent to your friends!' mod='referralprogram'} - {else} - {l s='An e-mail has been sent to your friend!' mod='referralprogram'} - {/if} -

    -{/if} - -{if $revive_sent} -

    - {if $nbRevive > 1} - {l s='Reminder e-mails have been sent to your friends!' mod='referralprogram'} - {else} - {l s='A reminder e-mail has been sent to your friend!' mod='referralprogram'} - {/if} -

    -{/if} - -
    - -
    -

    - {l s='Get a discount of %1$s for you and your friends by recommending this Website.' sprintf=[$discount] mod='referralprogram'} -

    - {if $canSendInvitations} -

    - {l s='It\'s quick and it\'s easy. Just fill in the first name, last name, and e-mail address(es) of your friend(s) in the fields below.' mod='referralprogram'} - {if $orderQuantity > 1} - {l s='When one of them makes at least %d orders, ' sprintf=$orderQuantity mod='referralprogram'} - {else} - {l s='When one of them makes at least %d order, ' sprintf=$orderQuantity mod='referralprogram'} - {/if}, - {l s='he or she will receive a %1$s voucher and you will receive your own voucher worth %1$s.' sprintf=[$discount] mod='referralprogram'} -

    -
    - - - - - - - - - - - {section name=friends start=0 loop=$nbFriends step=1} - - - - - - - {/section} - -
     {l s='Last name' mod='referralprogram'}{l s='First name' mod='referralprogram'}{l s='E-mail' mod='referralprogram'}
    {$smarty.section.friends.iteration}
    -

    - {l s='Important: Your friends\' e-mail addresses will only be used in the referral program. They will never be used for other purposes.' mod='referralprogram'} -

    -

    - - - {l s='Read conditions.' mod='referralprogram'} -

    -

    - {l s='Preview' mod='referralprogram'} - {assign var="file" value="{$lang_iso}/referralprogram-invitation.html"} - {l s='the default e-mail' mod='referralprogram'} {l s='that will be sent to your friend(s).' mod='referralprogram'} -

    -

    - -

    -
    - {else} -

    - {l s='To become a sponsor, you need to have completed at least' mod='referralprogram'} {$orderQuantity} {if $orderQuantity > 1}{l s='orders' mod='referralprogram'}{else}{l s='order' mod='referralprogram'}{/if}. -

    - {/if} -
    - -
    - {if $pendingFriends AND $pendingFriends|@count > 0} -

    - {l s='These friends have not yet placed an order on this Website since you sponsored them, but you can try again! To do so, mark the checkboxes of the friend(s) you want to remind, then click on the button "Remind my friend(s)"' mod='referralprogram'} -

    -
    - - - - - - - - - - - - {foreach from=$pendingFriends item=pendingFriend name=myLoop} - - - - - - - - {/foreach} - -
     {l s='Last name' mod='referralprogram'}{l s='First name' mod='referralprogram'}{l s='E-mail' mod='referralprogram'}{l s='Last invitation' mod='referralprogram'}
    - - - - {$pendingFriend.firstname|substr:0:22}{$pendingFriend.email}{dateFormat date=$pendingFriend.date_upd full=1}
    -

    - -

    -
    - {else} -

    - {if $subscribeFriends AND $subscribeFriends|@count > 0} - {l s='You have no pending invitations.' mod='referralprogram'} - {else} - {l s='You have not sponsored any friends yet.' mod='referralprogram'} - {/if} -

    - {/if} -
    - -
    - {if $subscribeFriends AND $subscribeFriends|@count > 0} -

    - {l s='Here are sponsored friends who have accepted your invitation:' mod='referralprogram'} -

    - - - - - - - - - - - - {foreach from=$subscribeFriends item=subscribeFriend name=myLoop} - - - - - - - - {/foreach} - -
     {l s='Last name' mod='referralprogram'}{l s='First name' mod='referralprogram'}{l s='E-mail' mod='referralprogram'}{l s='Inscription date' mod='referralprogram'}
    {$smarty.foreach.myLoop.iteration}.{$subscribeFriend.lastname|substr:0:22}{$subscribeFriend.firstname|substr:0:22}{$subscribeFriend.email}{dateFormat date=$subscribeFriend.date_upd full=1}
    - {else} -

    - {l s='No sponsored friends have accepted your invitation yet.' mod='referralprogram'} -

    - {/if} -
    -
    - - -{addJsDefL name=ThickboxI18nClose}{l s='Close' mod='referralprogram' js=1}{/addJsDefL} -{addJsDefL name=ThickboxI18nOrEscKey}{l s='or Esc key' mod='referralprogram' js=1}{/addJsDefL} -{addJsDef tb_pathToImage=$img_ps_dir|cat:'loadingAnimation.gif'} diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/rules.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/rules.tpl deleted file mode 100644 index ff32ce07d..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/front/rules.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -

    {l s='Referral program rules' mod='referralprogram'}

    - -{if isset($xml)} -
    - {if isset($xml->body->$paragraph)}
    {$xml->body->$paragraph|replace:"\'":"'"|replace:'\"':'"'}
    {/if} -
    -{/if} diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/authentication.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/authentication.tpl deleted file mode 100644 index d721126df..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/authentication.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - - \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/index.php b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/my-account.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/my-account.tpl deleted file mode 100644 index f5eaaee8e..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/my-account.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -
  • - {l s='Referral program' mod='referralprogram'} -
    • - \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/order-confirmation.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/order-confirmation.tpl deleted file mode 100644 index 450ea29c8..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/order-confirmation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -

    - {l s='Thanks to your order, your sponsor %1$s %2$s will earn a voucher worth %3$d off when this order is confirmed.' sprintf=[$sponsor_firstname,$sponsor_lastname,$discount] mod='referralprogram'} -

    -
    \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/shopping-cart.tpl b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/shopping-cart.tpl deleted file mode 100644 index 4ebd5c929..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/hook/shopping-cart.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{* -* 2007-2017 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -

    - - {l s='You have earned a voucher worth %s thanks to your sponsor!' sprintf=$discount_display mod='referralprogram'} - {l s='Enter voucher name %s to receive the reduction on this order.' sprintf=$discount->name mod='referralprogram'} - {l s='View your referral program.' mod='referralprogram'} -

    -
    - \ No newline at end of file diff --git a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/index.php b/themes/hotel-reservation-theme/modules/referralprogram/views/templates/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/referralprogram/views/templates/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; From dfc9aab4dc15d13c649aa3fb54f041e5e03ee085 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 7 Aug 2023 14:46:44 +0530 Subject: [PATCH 005/212] Revert PR #471 --- .../admin/AdminPPreferencesController.php | 23 ---- install/data/theme.sql | 2 - install/data/xml/configuration.xml | 6 - .../wkhotelfilterblock/wkhotelfilterblock.php | 119 +++++++++++++++++- 4 files changed, 118 insertions(+), 32 deletions(-) diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 1ea8b3f50..9d9e77aee 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -391,29 +391,6 @@ class AdminPPreferencesControllerCore extends AdminController // 'bottom' => '', // 'submit' => array('title' => $this->l('Save')) // ), - 'fo_search_filters' => array( - 'title' => $this->l('Search Results Page Filters'), - 'icon' => 'icon-search', - 'fields' => array( - 'SHOW_AMENITIES_FILTER' => array( - 'title' => $this->l('Show Amenities filter'), - 'hint' => $this->l('Enable to display Amenities filter.'), - 'validation' => 'isBool', - 'cast' => 'intval', - 'required' => false, - 'type' => 'bool', - ), - 'SHOW_PRICE_FILTER' => array( - 'title' => $this->l('Show Price filter'), - 'hint' => $this->l('Enable to display Price filter.'), - 'validation' => 'isBool', - 'cast' => 'intval', - 'required' => false, - 'type' => 'bool', - ), - ), - 'submit' => array('title' => $this->l('Save')) - ), ); } diff --git a/install/data/theme.sql b/install/data/theme.sql index ec71efd71..9ce4b813b 100644 --- a/install/data/theme.sql +++ b/install/data/theme.sql @@ -3,8 +3,6 @@ SET NAMES 'utf8'; UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_CONDITIONS'; UPDATE `PREFIX_configuration` SET value = '12' WHERE name = 'PS_PRODUCTS_PER_PAGE'; UPDATE `PREFIX_configuration` SET value = '9' WHERE name = 'PS_HOTEL_IMAGES_PER_PAGE'; -UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SHOW_AMENITIES_FILTER'; -UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'SHOW_PRICE_FILTER'; UPDATE `PREFIX_configuration` SET value = '0' WHERE name = 'PS_PRODUCTS_ORDER_WAY'; UPDATE `PREFIX_configuration` SET value = '4' WHERE name = 'PS_PRODUCTS_ORDER_BY'; UPDATE `PREFIX_configuration` SET value = '1' WHERE name = 'PS_DISPLAY_QTIES'; diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 935de20ba..34b3c3d2e 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -62,12 +62,6 @@ 9 - - 1 - - - 1 - 0 diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php index e2fa40f38..bbb2e4b84 100644 --- a/modules/wkhotelfilterblock/wkhotelfilterblock.php +++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php @@ -42,12 +42,117 @@ class wkhotelfilterblock extends Module $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } + public function getContent() + { + $this->html = ''; + if (Tools::isSubmit('btnConfigSubmit')) { + $this->postProcess(); + } else { + $this->html .= '
    '; + } + + $this->html .= $this->renderForm(); + + return $this->html; + } + + public function renderForm() + { + $fields_form = array(); + $fields_form['form'] = array( + 'legend' => array( + 'icon' => 'icon-cog', + 'title' => $this->l('Search Results Filter Configuration'), + ), + 'input' => array( + array( + 'type' => 'switch', + 'label' => $this->l('Show Amenities filter'), + 'name' => 'SHOW_AMENITIES_FILTER', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + ), + array( + 'id' => 'active_off', + 'value' => 0, + ), + ), + 'hint' => $this->l('Enable to display Amenities filter.'), + ), + array( + 'type' => 'switch', + 'label' => $this->l('Show Price filter'), + 'name' => 'SHOW_PRICE_FILTER', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + ), + array( + 'id' => 'active_off', + 'value' => 0, + ), + ), + 'hint' => $this->l('Enable to display Price filter.'), + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + 'name' => 'submit_conf_filter', + ), + ); + + $helper = new HelperForm(); + $helper->show_toolbar = false; + $helper->table = $this->table; + $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT')); + $helper->default_form_language = $lang->id; + $this->fields_form = array(); + $helper->identifier = $this->identifier; + $helper->submit_action = 'btnConfigSubmit'; + $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false). + '&configure='.$this->name.'&module_name='.$this->name; + $helper->token = Tools::getAdminTokenLite('AdminModules'); + + $helper->tpl_vars = array( + 'fields_value' => $this->getConfigFieldsValues(), + 'languages' => $this->context->controller->getLanguages(), + 'id_language' => $this->context->language->id, + ); + + return $helper->generateForm(array($fields_form)); + } + + public function postProcess() + { + if (Tools::isSubmit('btnConfigSubmit')) { + Configuration::updateValue( + 'SHOW_AMENITIES_FILTER', + Tools::getValue('SHOW_AMENITIES_FILTER') + ); + Configuration::updateValue('SHOW_PRICE_FILTER', Tools::getValue('SHOW_PRICE_FILTER')); + + // redirect after saving the configuration + Tools::redirectAdmin( + $this->context->link->getAdminLink('AdminModules').'&configure='.$this->name.'&tab_module='.$this->tab. + '&module_name='.$this->name.'&conf=4' + ); + } + } + public function install() { if (!parent::install() || !$this->registerHook('header') || !$this->registerHook('addOtherModuleSetting') - || !$this->registerHook('displayLeftColumn')) { + || !$this->registerHook('displayLeftColumn') + || !Configuration::updateValue('SHOW_AMENITIES_FILTER', 1) + || !Configuration::updateValue('SHOW_PRICE_FILTER', 1) + ) { return false; } @@ -155,4 +260,16 @@ class wkhotelfilterblock extends Module 'SHOW_PRICE_FILTER' => Configuration::get('SHOW_PRICE_FILTER'), ); } + + public function uninstall() + { + if (!parent::uninstall() + || !Configuration::deleteByName('SHOW_AMENITIES_FILTER') + || !Configuration::deleteByName('SHOW_PRICE_FILTER') + ) { + return false; + } + + return true; + } } From a49650efbea20ca35eaebbb45e2213ad84614414 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 7 Aug 2023 16:15:10 +0530 Subject: [PATCH 006/212] Do not allow voucher code duplications for same customer --- classes/CartRule.php | 5 +++-- classes/PaymentModule.php | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index 9086135ad..c965e3f36 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -421,7 +421,7 @@ class CartRuleCore extends ObjectModel * @param $name * @return bool */ - public static function cartRuleExists($name) + public static function cartRuleExists($code, $id_customer = 0) { if (!CartRule::isFeatureActive()) { return false; @@ -430,7 +430,8 @@ class CartRuleCore extends ObjectModel return (bool)Db::getInstance()->getValue(' SELECT `id_cart_rule` FROM `'._DB_PREFIX_.'cart_rule` - WHERE `code` = \''.pSQL($name).'\''); + WHERE `code` = \''.pSQL($code).'\''. + ($id_customer ? 'AND `id_customer` = '.(int) $id_customer : '')); } /** diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 3e89319f2..0e3ccbfdd 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -669,6 +669,13 @@ abstract class PaymentModuleCore extends Module $voucher->code = preg_replace('/'.$matches[0].'$/', '-'.(intval($matches[1]) + 1), $voucher->code); } + // If ABCDEFGH-2 already exists for customer use ABCDEFGH-3 + while (CartRule::cartRuleExists($voucher->code, $order->id_customer)) { + if (preg_match('/\-([0-9]{1,2})$/', $voucher->code, $matches)) { + $voucher->code = preg_replace('/'.$matches[1].'$/', (intval($matches[1]) + 1), $voucher->code); + } + } + // Set the new voucher value $voucher->reduction_amount = $remaining_amount; if ($voucher->reduction_tax) { @@ -1782,4 +1789,4 @@ abstract class PaymentModuleCore extends Module } return $result; } -} +} \ No newline at end of file From 37c62b626e3e70024d2501673cd344a635860691 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 9 Aug 2023 12:59:55 +0530 Subject: [PATCH 007/212] Allow group input field name to be changed --- admin/themes/default/template/helpers/form/form_group.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/themes/default/template/helpers/form/form_group.tpl b/admin/themes/default/template/helpers/form/form_group.tpl index d04103cac..66bb72fa0 100644 --- a/admin/themes/default/template/helpers/form/form_group.tpl +++ b/admin/themes/default/template/helpers/form/form_group.tpl @@ -31,13 +31,13 @@ - + {l s='ID'} - {l s='Group name'} + {if isset($input['groups_title']) && $input['groups_title']}{$input['groups_title']}{else}{l s='Group name'}{/if} @@ -46,8 +46,8 @@ {foreach $groups as $key => $group} - {assign var=id_checkbox value=groupBox|cat:'_'|cat:$group['id_group']} - + {assign var=id_checkbox value=$input['name']|cat:'_'|cat:$group['id_group']} + {$group['id_group']} From 281452b0314550298f0dbf7351757c384bb7bd02 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 11 Aug 2023 11:41:55 +0530 Subject: [PATCH 008/212] Fix invalid zip file issue during module upload --- controllers/admin/AdminModulesController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 0eae6b275..b54542f0c 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1700,6 +1700,9 @@ class AdminModulesControllerCore extends AdminController 'author' => $module->author, 'image' => $module->image ? $module->image : '' ); + } else { + $this->errors[] = $this->l('The uploaded file does not contain a valid module or zip file name is incorrect.'); + $response['errors'] = $this->errors; } } else { $response['errors'] = $this->errors; From 28b90136addc9914365d49f6219128ed514df583 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 18 Aug 2023 17:42:03 +0530 Subject: [PATCH 009/212] Fix issue when displaying order at guest history page --- controllers/front/GuestTrackingController.php | 623 +++++++++--------- .../guest-tracking.tpl | 12 + 2 files changed, 323 insertions(+), 312 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index 806e2dfa5..3cc86d316 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -207,224 +207,258 @@ class GuestTrackingControllerCore extends FrontController $nonRequestedRooms = 0; $anyBackOrder = 0; - $processedProducts = array(); - $cartHotelData = array(); - } - foreach ($order_list as &$order) { - $idOrder = $order->id; - /** @var Order $order */ - $order->id_order_state = (int)$order->getCurrentState(); - $order->invoice = (OrderState::invoiceAvailable((int)$order->id_order_state) && $order->invoice_number); - $order->order_history = $order->getHistory((int)$this->context->language->id, false, true); - $order->carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang); - $order->address_invoice = new Address((int)$order->id_address_invoice); - $order->address_delivery = new Address((int)$order->id_address_delivery); - $order->inv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_invoice->id_country); - $order->dlv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_delivery->id_country); - $order->invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_invoice, $order->inv_adr_fields); - $order->deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_delivery, $order->dlv_adr_fields); - $order->currency = new Currency($order->id_currency); - $order->discounts = $order->getCartRules(); - $order->invoiceState = (Validate::isLoadedObject($order->address_invoice) && $order->address_invoice->id_state) ? new State((int)$order->address_invoice->id_state) : false; - $order->deliveryState = (Validate::isLoadedObject($order->address_delivery) && $order->address_delivery->id_state) ? new State((int)$order->address_delivery->id_state) : false; - $order->products = $order->getProducts(); - $order->customizedDatas = Product::getAllCustomizedDatas((int)$order->id_cart); - Product::addCustomizationPrice($order->products, $order->customizedDatas); - $order->total_old = $order->total_discounts > 0 ? (float)$order->total_paid - (float)$order->total_discounts : false; + foreach ($order_list as &$order) { + $idOrder = $order->id; - if ($order->carrier->url && $order->shipping_number) { - $order->followup = str_replace('@', $order->shipping_number, $order->carrier->url); - } - $order->hook_orderdetaildisplayed = Hook::exec('displayOrderDetail', array('order' => $order)); + $processedProducts = array(); + $cartHotelData = array(); - // enter the details of the booking the order - if ($hotelresInstalled) { - if ($orderProducts = $order->getProducts()) { - $total_demands_price_te = 0; - $total_demands_price_ti = 0; - $total_convenience_fee_te = 0; - $total_convenience_fee_ti = 0; - foreach ($orderProducts as $type_key => $type_value) { - if (in_array($type_value['product_id'], $processedProducts)) { - continue; - } - if ($type_value['is_booking_product']) { - $processedProducts[] = $type_value['product_id']; + $order->id_order_state = (int)$order->getCurrentState(); + $order->invoice = (OrderState::invoiceAvailable((int)$order->id_order_state) && $order->invoice_number); + $order->order_history = $order->getHistory((int)$this->context->language->id, false, true); + $order->carrier = new Carrier((int)$order->id_carrier, (int)$order->id_lang); + $order->address_invoice = new Address((int)$order->id_address_invoice); + $order->address_delivery = new Address((int)$order->id_address_delivery); + $order->inv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_invoice->id_country); + $order->dlv_adr_fields = AddressFormat::getOrderedAddressFields($order->address_delivery->id_country); + $order->invoiceAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_invoice, $order->inv_adr_fields); + $order->deliveryAddressFormatedValues = AddressFormat::getFormattedAddressFieldsValues($order->address_delivery, $order->dlv_adr_fields); + $order->currency = new Currency($order->id_currency); + $order->discounts = $order->getCartRules(); + $order->invoiceState = (Validate::isLoadedObject($order->address_invoice) && $order->address_invoice->id_state) ? new State((int)$order->address_invoice->id_state) : false; + $order->deliveryState = (Validate::isLoadedObject($order->address_delivery) && $order->address_delivery->id_state) ? new State((int)$order->address_delivery->id_state) : false; + $order->products = $order->getProducts(); + $order->customizedDatas = Product::getAllCustomizedDatas((int)$order->id_cart); + Product::addCustomizationPrice($order->products, $order->customizedDatas); + $order->total_old = $order->total_discounts > 0 ? (float)$order->total_paid - (float)$order->total_discounts : false; - $product = new Product($type_value['product_id'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['product_id']); + if ($order->carrier->url && $order->shipping_number) { + $order->followup = str_replace('@', $order->shipping_number, $order->carrier->url); + } + $order->hook_orderdetaildisplayed = Hook::exec('displayOrderDetail', array('order' => $order)); - if (!empty($cover_image_arr)) { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); - } else { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + // enter the details of the booking the order + if ($hotelresInstalled) { + if ($orderProducts = $order->getProducts()) { + $total_demands_price_te = 0; + $total_demands_price_ti = 0; + $total_convenience_fee_te = 0; + $total_convenience_fee_ti = 0; + foreach ($orderProducts as $type_key => $type_value) { + if (in_array($type_value['product_id'], $processedProducts)) { + continue; } + if ($type_value['is_booking_product']) { + $processedProducts[] = $type_value['product_id']; - if (isset($customer->id)) { - $obj_cart = new Cart($order->id_cart); - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); - } else { - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); - } - $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; - $cartHotelData[$type_key]['cover_img'] = $cover_img; + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); - - $objBookingDemand = new HotelBookingDemands(); - foreach ($order_bk_data as $data_k => $data_v) { - $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); - - $cartHotelData[$type_key]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['children'] = $data_v['children']; - /*Product price when order was created*/ - $order_details_obj = new OrderDetail($data_v['id_order_detail']); - $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; - $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; - $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; - - if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; - - $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; - $var_quant = (int) $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; - } - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; - } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; - } + if (!empty($cover_image_arr)) { + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); } else { - $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; - $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + } - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; + if (isset($customer->id)) { + $obj_cart = new Cart($order->id_cart); + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); + } else { + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); + } + $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; + $cartHotelData[$type_key]['cover_img'] = $cover_img; + + + $objBookingDemand = new HotelBookingDemands(); + foreach ($order_bk_data as $data_k => $data_v) { + $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); + + $cartHotelData[$type_key]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['children'] = $data_v['children']; + /*Product price when order was created*/ + $order_details_obj = new OrderDetail($data_v['id_order_detail']); + $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; + $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; + $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; + + if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; + + $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; + $var_quant = (int) $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } + if ($data_v['is_refunded']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; + } + if ($data_v['is_cancelled']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; + } + } else { + $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; + $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0; + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0; + if ($data_v['is_refunded']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; + } + if ($data_v['is_cancelled']) { + $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; + } } - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] = 0; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] = 0; - if ($data_v['is_refunded']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] += 1; + + $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + $type_value['product_id'], + 0, + $data_v['date_from'], + $data_v['date_to'] + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; } - if ($data_v['is_cancelled']) { - $cartHotelData[$type_key]['date_diff'][$date_join]['count_cancelled'] += 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['count_refunded'] -= 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; } + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 0 + ); + $total_demands_price_ti += $extraDemandPriceTI; + $total_demands_price_te += $extraDemandPriceTE; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; + + $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); + $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; + + $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; + // add additional services products in hotel detail. + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'] + ); + + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $additionalServicesPriceTI = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $additionalServicesPriceTE = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0 + ); + // get auto added price to be displayed with room price + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); } - - $cartHotelData[$type_key]['date_diff'][$date_join]['is_refunded'] = $data_v['is_refunded']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $type_value['product_id'], - 0, - $data_v['date_from'], - $data_v['date_to'] - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $type_value['product_id'], - $data_v['id_room'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 1 - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $type_value['product_id'], - $data_v['id_room'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 0 - ); - $total_demands_price_ti += $extraDemandPriceTI; - $total_demands_price_te += $extraDemandPriceTE; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; - - $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); - $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; - - $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; - // add additional services products in hotel detail. - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'] - ); - - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $additionalServicesPriceTI = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 1 - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $additionalServicesPriceTE = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 0 - ); // get auto added price to be displayed with room price if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; @@ -458,121 +492,86 @@ class GuestTrackingControllerCore extends FrontController 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM ); - } - // get auto added price to be displayed with room price - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 1, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - 0, - 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], - 1, - 0, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - // calculate averages now - foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { - $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); - $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); + // calculate averages now + foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { + $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); + $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); - $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); - $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); - } - } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { - if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) { - $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - $type_value['product_id'], - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1 - ); - $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $idOrder, - $type_value['product_id'], - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1 - ); - } - } else { - // get all products that are independent. - if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) { - $product = new Product($type_value['product_id'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['product_id']); - - if (!empty($cover_image_arr)) { - $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); - } else { - $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); + $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); + } + } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { + if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) { + $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1 + ); + $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1 + ); + } + } else { + // get all products that are independent. + if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) { + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); + + if (!empty($cover_image_arr)) { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); + } else { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + } + $cartServiceProducts[] = $type_value; } - $cartServiceProducts[] = $type_value; } } } } + // end booking details entries + $redirectTermsLink = $this->context->link->getCMSLink( + new CMS(3, $this->context->language->id), + null, $this->context->language->id + ); + + $customerGuestDetail = false; + if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) { + $customerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail); + } + + // set order specific values + $order->total_convenience_fee_ti = $total_convenience_fee_ti; + $order->total_convenience_fee_te = $total_convenience_fee_te; + $order->total_demands_price_ti = $total_demands_price_ti; + $order->total_demands_price_te = $total_demands_price_te; + $order->any_back_order = $anyBackOrder; + $order->shw_bo_msg = Configuration::get('WK_SHOW_MSG_ON_BO'); + $order->back_ord_msg = Configuration::get('WK_BO_MESSAGE'); + $order->order_has_invoice = $order->hasInvoice(); + $order->cart_htl_data = $cartHotelData; + $order->non_requested_rooms = $nonRequestedRooms; + $order->customerGuestDetail = $customerGuestDetail; + //end + + Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order)); + } - // end booking details entries - $redirectTermsLink = $this->context->link->getCMSLink( - new CMS(3, $this->context->language->id), - null, $this->context->language->id - ); - - $customerGuestDetail = false; - if ($id_customer_guest_detail = OrderCustomerGuestDetail::isCustomerGuestBooking($order->id)) { - $customerGuestDetail = new OrderCustomerGuestDetail($id_customer_guest_detail); - } - - $this->context->smarty->assign( - array( - 'total_convenience_fee_ti' => $total_convenience_fee_ti, - 'total_convenience_fee_te' => $total_convenience_fee_te, - 'total_demands_price_ti' => $total_demands_price_ti, - 'total_demands_price_te' => $total_demands_price_te, - 'any_back_order' => $anyBackOrder, - 'shw_bo_msg' => Configuration::get('WK_SHOW_MSG_ON_BO'), - 'back_ord_msg' => Configuration::get('WK_BO_MESSAGE'), - 'order_has_invoice' => $order->hasInvoice(), - 'cart_htl_data' => $cartHotelData, - 'non_requested_rooms' => $nonRequestedRooms, - 'customerGuestDetail' => $customerGuestDetail, - ) - ); - //end - - Hook::exec('actionOrderDetail', array('carrier' => $order->carrier, 'order' => $order)); } $this->context->smarty->assign(array( diff --git a/themes/hotel-reservation-theme/guest-tracking.tpl b/themes/hotel-reservation-theme/guest-tracking.tpl index 4ed9b1b57..34ef93ab7 100644 --- a/themes/hotel-reservation-theme/guest-tracking.tpl +++ b/themes/hotel-reservation-theme/guest-tracking.tpl @@ -46,6 +46,18 @@ {assign var=products value=$order->products} {assign var=customizedDatas value=$order->customizedDatas} {assign var=HOOK_ORDERDETAILDISPLAYED value=$order->hook_orderdetaildisplayed} + {assign var=total_convenience_fee_ti value=$order->total_convenience_fee_ti} + {assign var=total_convenience_fee_te value=$order->total_convenience_fee_te} + {assign var=total_demands_price_ti value=$order->total_demands_price_ti} + {assign var=total_demands_price_te value=$order->total_demands_price_te} + {assign var=any_back_order value=$order->any_back_order} + {assign var=shw_bo_msg value=$order->shw_bo_msg} + {assign var=back_ord_msg value=$order->back_ord_msg} + {assign var=order_has_invoice value=$order->order_has_invoice} + {assign var=cart_htl_data value=$order->cart_htl_data} + {assign var=non_requested_rooms value=$order->non_requested_rooms} + {assign var=customerGuestDetail value=$order->customerGuestDetail} + {if isset($order->total_old)} {assign var=total_old value=$order->total_old} {/if} From 27a8ae8338542a5c2f30a437f4459bf2ca3755ac Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Fri, 25 Aug 2023 11:58:33 +0530 Subject: [PATCH 010/212] Fixed: Getting PS exception when admin sends
    - - - + *} {/if} -{/block} +{/block} \ No newline at end of file diff --git a/classes/Product.php b/classes/Product.php index 84fc215a2..c88c77e00 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -1414,6 +1414,22 @@ class ProductCore extends ObjectModel return $result; } + public static function getAllServiceProducts($activeOnly = true, $idLang = null) + { + if (!$idLang) { + $idLang = Context::getContext()->language->id; + } + + $sql = 'SELECT p.*, pl.* + FROM `'._DB_PREFIX_.'product` p + LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON + (pl.`id_product` = p.`id_product` AND pl.`id_lang` = '.(int) $idLang.') + WHERE p.`booking_product` = 0'.($activeOnly ? ' AND p.`active` = 1' : '').' + ORDER BY p.`id_product`'; + + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); + } + public function getAvailableServiceProductsCategories($id_lang, $front = false, $active = true, Context $context = null) { if (!$context) { diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index ea3a469f7..8f5e90583 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -875,7 +875,7 @@ class AdminControllerCore extends Controller if ($field = $this->filterToField($key, $filter)) { $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false)); - if (($type == 'date' || $type == 'datetime' || $type == 'range') && is_string($value)) { + if ((in_array($type, array('date', 'datetime', 'range', 'select_multiple_and', 'select_multiple_or'))) && is_string($value)) { $value = json_decode($value, true); } $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`'; @@ -895,7 +895,12 @@ class AdminControllerCore extends Controller } /* Only for date filtering (from, to) */ if (is_array($value)) { - if ($type == 'range') { + if ($type == 'select_multiple_and') { + $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')'; + $this->_filterHaving .= ' AND COUNT(DISTINCT '.pSQL($key).') = '.(int) count($value); + } elseif ($type == 'select_multiple_or') { + $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')'; + } elseif ($type == 'range') { if (isset($value[0]) && !empty($value[0])) { if (!Validate::isUnsignedInt($value[0])) { $this->errors[] = Tools::displayError('The \'From\' value is invalid'); diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index e807008dc..c1f944ff3 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -681,6 +681,11 @@ class HelperListCore extends Helper } break; + case 'select_multiple_and': + case 'select_multiple_or': + $value = json_decode($value, true); + break; + case 'text': if (!Validate::isCleanHtml($value)) { $value = ''; diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 542c4bdb6..65ee35b56 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -194,12 +194,17 @@ class AdminProductsControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (image_shop.`id_product` = a.`id_product` AND image_shop.`cover` = 1 AND image_shop.id_shop = '.$id_shop.') LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_image` = image_shop.`id_image`) LEFT JOIN `'._DB_PREFIX_.'product_download` pd ON (pd.`id_product` = a.`id_product` AND pd.`active` = 1) - LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`)'; + LEFT JOIN `'._DB_PREFIX_.'address` aa ON (aa.`id_hotel` = hb.`id`) + LEFT JOIN `'._DB_PREFIX_.'htl_advance_payment` hap ON (hap.`id_product` = a.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'feature_product` fp ON (fp.`id_product` = a.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_demand` hrtd ON (hrtd.`id_product` = a.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product` hrtsp ON ((hrtsp.`element_type` = '.(int) RoomTypeServiceProduct::WK_ELEMENT_TYPE_HOTEL.' AND hrtsp.`id_element` = hrt.`id_hotel`) OR (hrtsp.`element_type` = '.(int) RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE.' AND hrtsp.`id_element` = a.`id_product`))'; $this->_select .= ' (SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri WHERE hri.`id_product` = a.`id_product`) as num_rooms, '; - $this->_select .= 'hrt.`adults`, hrt.`children`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, '; + $this->_select .= 'hrt.`adults`, hrt.`children`, hrt.`max_guests`, hb.`id` as id_hotel, aa.`city`, hbl.`hotel_name`, '; $this->_select .= 'shop.`name` AS `shopname`, a.`id_shop_default`, '; $this->_select .= $alias_image.'.`id_image` AS `id_image`, cl.`name` AS `name_category`, '.$alias.'.`price`, 0 AS `price_final`, a.`is_virtual`, pd.`nb_downloadable`, sav.`quantity` AS `sav_quantity`, '.$alias.'.`active`, IF(sav.`quantity`<=0, 1, 0) AS `badge_danger`'; + $this->_select .= ', hap.`active` AS advance_payment'; if ($join_category) { $this->_join .= ' INNER JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product` AND cp.`id_category` = '.(int)$this->_category->id.') '; @@ -210,7 +215,8 @@ class AdminProductsControllerCore extends AdminController $this->_where .= ' AND a.`booking_product` = 1'; $this->_use_found_rows = false; - $this->_group = ''; + $this->_group = ' GROUP BY a.`id_product`'; + $this->_orderBy = 'a.id_product'; $this->fields_list = array(); $this->fields_list['id_product'] = array( @@ -246,22 +252,25 @@ class AdminProductsControllerCore extends AdminController $this->fields_list['adults'] = array( 'title' => $this->l('Adults'), 'filter_key' => 'hrt!adults', + 'type' => 'range', 'align' => 'center', ); $this->fields_list['child'] = array( 'title' => $this->l('Children'), 'filter_key' => 'hrt!children', + 'type' => 'range', 'align' => 'center', ); // use it for total rooms $this->fields_list['num_rooms'] = array( 'title' => $this->l('Total Rooms'), 'align' => 'center', + 'type' => 'range', 'havingFilter' => true, ); $this->fields_list['price'] = array( - 'title' => $this->l('Base price'), - 'type' => 'price', + 'title' => $this->l('Base Price'), + 'type' => 'range', 'align' => 'text-left', 'filter_key' => 'a!price' ); @@ -279,11 +288,87 @@ class AdminProductsControllerCore extends AdminController 'active' => 'status', 'filter_key' => $alias.'!active', 'align' => 'text-center', - 'type' => 'bool', - 'class' => 'fixed-width-sm', + 'type' => 'select', + 'list' => array(1 => $this->l('Yes'), 0 => $this->l('No')), + 'optional' => true, + 'visible_default' => true, 'orderby' => false ); + $this->fields_list['max_guests'] = array( + 'title' => $this->l('Maximum Occupancy'), + 'filter_key' => 'hrt!max_guests', + 'type' => 'range', + 'align' => 'center', + 'optional' => true, + ); + + $this->fields_list['advance_payment'] = array( + 'title' => $this->l('Advance Payment'), + 'active' => 'advance_payment', + 'filter_key' => 'hap!active', + 'align' => 'text-center', + 'type' => 'select', + 'list' => array(1 => $this->l('Yes'), 0 => $this->l('No')), + 'optional' => true, + 'visible_default' => true, + 'orderby' => false + ); + + $taxRulesGroups = array(); + foreach (TaxRulesGroup::getTaxRulesGroups(true) as $taxRulesGroup) { + $taxRulesGroups[$taxRulesGroup['id_tax_rules_group']] = $taxRulesGroup['name']; + } + $this->fields_list['id_tax_rules_group'] = array( + 'title' => $this->l('Tax Rules'), + 'align' => 'text-center', + 'type' => 'select_multiple_or', + 'filter_key' => 'a!id_tax_rules_group', + 'list' => $taxRulesGroups, + 'displayed' => false, + ); + + $features = array(); + foreach (Feature::getFeatures($this->context->language->id) as $feature) { + $features[$feature['id_feature']] = $feature['name']; + } + $this->fields_list['id_feature'] = array( + 'title' => $this->l('Features'), + 'align' => 'text-center', + 'type' => 'select_multiple_and', + 'filter_key' => 'fp!id_feature', + 'list' => $features, + 'displayed' => false, + ); + + $serviceProducts = array(); + foreach (Product::getAllServiceProducts() as $serviceProduct) { + $serviceProducts[$serviceProduct['id_product']] = $serviceProduct['name']; + } + $this->fields_list['id_service_product'] = array( + 'title' => $this->l('Service Products'), + 'align' => 'text-center', + 'type' => 'select_multiple_and', + 'filter_key' => 'hrtsp!id_product', + 'list' => $serviceProducts, + 'displayed' => false, + ); + + $additionalFacilities = array(); + $objHotelRoomTypeGlobalDemand = new HotelRoomTypeGlobalDemand(); + $demands = $objHotelRoomTypeGlobalDemand->getAllDemands(); + foreach ($demands as $demand) { + $additionalFacilities[$demand['id_global_demand']] = $demand['name']; + } + $this->fields_list['id_global_demand'] = array( + 'title' => $this->l('Additional Facilities'), + 'align' => 'text-center', + 'type' => 'select_multiple_and', + 'filter_key' => 'hrtd!id_global_demand', + 'list' => $additionalFacilities, + 'displayed' => false, + ); + if ($join_category && (int)$this->id_current_category) { $this->fields_list['position'] = array( 'title' => $this->l('Position'), @@ -2264,36 +2349,6 @@ class AdminProductsControllerCore extends AdminController } $this->tpl_form_vars['product_tabs'] = $product_tabs; } - } else { - if ($id_category = (int)$this->id_current_category) { - self::$currentIndex .= '&id_category='.(int)$this->id_current_category; - } - - // If products from all categories are displayed, we don't want to use sorting by position - if (!$id_category) { - $this->_defaultOrderBy = $this->identifier; - if ($this->context->cookie->{$this->table.'Orderby'} == 'position') { - unset($this->context->cookie->{$this->table.'Orderby'}); - unset($this->context->cookie->{$this->table.'Orderway'}); - } - } - if (!$id_category) { - $id_category = Configuration::get('PS_ROOT_CATEGORY'); - } - $this->tpl_list_vars['is_category_filter'] = (bool)$this->id_current_category; - - // Generate category selection tree - $catFilter = $this->l('Filter by Places'); - $tree = new HelperTreeCategories('categories-tree', $catFilter); - $tree->setAttribute('is_category_filter', (bool)$this->id_current_category) - ->setAttribute('base_url', preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token) - ->setInputName('id-category') - ->setRootCategory((int)Configuration::get('PS_LOCATIONS_CATEGORY')) - ->setSelectedCategories(array((int)$id_category)); - $this->tpl_list_vars['category_tree'] = $tree->render(); - - // used to build the new url when changing category - $this->tpl_list_vars['base_url'] = preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token; } parent::initContent(); From 8644d030869cac0522a0473f21f68c84c829052b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 15 Sep 2023 17:02:17 +0530 Subject: [PATCH 032/212] Update disable_search_threshold to 5 --- .../template/controllers/products/helpers/list/list_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl index 6f2143969..143f73771 100644 --- a/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/products/helpers/list/list_header.tpl @@ -327,7 +327,7 @@ setTimeout(function () { // chosen prevents redraws if already drawn $('#list_filters_panel select[multiple]').chosen({ - disable_search_threshold: 6, + disable_search_threshold: 5, search_contains: true }); }, 1); From 2de9b872339d01e74f9c24b81d4e1957dc90a487 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 18 Sep 2023 16:32:14 +0530 Subject: [PATCH 033/212] Fixed: Vouchers values not updated on changing the currency of the order --- controllers/admin/AdminOrdersController.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index db89c73f5..72b8d1b70 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1061,6 +1061,21 @@ class AdminOrdersControllerCore extends AdminController $order_carrier->update(); } + // update Order Cart rules + if ($orderVouchers = $order->getCartRules()) { + $fields = array( + 'value', + 'value_tax_excl', + ); + foreach($orderVouchers as $orderVoucher) { + $objOrderCartRule = new OrderCartRuleCore($orderVoucher['id_order_cart_rule']); + foreach ($fields as $field) { + $objOrderCartRule->{$field} = Tools::convertPriceFull($objOrderCartRule->{$field}, $old_currency, $currency); + } + $objOrderCartRule->update(); + } + } + // Update order && order_invoice amount $fields = array( 'total_discounts', From 84b0a59a2c2d6b684ae001d9ec61b7bbfd9b7822 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 20 Sep 2023 11:00:16 +0530 Subject: [PATCH 034/212] Add an option to allow some room types to be booked only from back office --- .../controllers/products/informations.tpl | 21 ++++++++++++++++ classes/Cart.php | 2 +- controllers/front/OrderOpcController.php | 3 +++ controllers/front/ProductController.php | 2 +- .../classes/HotelHelper.php | 1 + .../classes/HotelRoomType.php | 25 +++++++++++++++++-- themes/hotel-reservation-theme/product.tpl | 2 +- 7 files changed, 51 insertions(+), 5 deletions(-) diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl index 89ff4ac8c..e2d0e1307 100644 --- a/admin/themes/default/template/controllers/products/informations.tpl +++ b/admin/themes/default/template/controllers/products/informations.tpl @@ -273,6 +273,27 @@ +
    + +
    + + show_at_front || !$product->isAssociatedToShop()}checked="checked"{/if}/> + + show_at_front && $product->isAssociatedToShop()}checked="checked"{/if}/> + + + +
    +
    +