diff --git a/admin-dev/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin-dev/themes/default/template/controllers/orders/_current_cart_details_data.tpl index a9bd80c22..deaeda564 100644 --- a/admin-dev/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -121,7 +121,7 @@ - {hook h='displayAdminOrderCartRoomCellAfterOccupancy' data=$data} + {hook h='displayAdminOrderCartRoomOccupancyAfter' data=$data} {/if} @@ -154,7 +154,7 @@ - {hook h='displayAfterAdminCartDetailsDeleteAction' data=$data} + {hook h='displayAdminCartDetailsDeleteActionAfter' data=$data}
 {l s='Services'} diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index 25d61c43c..18c66d79d 100644 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -2316,7 +2316,7 @@ - {hook h="displayAdminBeforeOrderMessage"} + {hook h="displayAdminOrderMessageBefore"}
@@ -2442,14 +2442,14 @@

{l s='Select or type the payment method using which payment for booking will be made.'}

- {hook h="displayOrderPaymentSelectionAfter"} + {hook h="displayAdminOrderPaymentSelectionAfter"}
- {hook h="displayAdminAddOrderFormFieldsAfter"} + {hook h="displayAdminOrderFormFieldsAfter"}
- {hook h='displayAddExtraProductInformation' item=$product} + {hook h='displayAdminProductInformationAfter' item=$product} diff --git a/admin-dev/themes/default/template/helpers/kpi/row.tpl b/admin-dev/themes/default/template/helpers/kpi/row.tpl index 53fe846b5..3a4635eb9 100644 --- a/admin-dev/themes/default/template/helpers/kpi/row.tpl +++ b/admin-dev/themes/default/template/helpers/kpi/row.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -{hook h='displayBeforeKpi'} +{hook h='displayAdminKpiBefore'}
{foreach from=$kpis item=kpi} diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl index 807444c4b..a1e846e6b 100644 --- a/admin-dev/themes/default/template/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl @@ -158,7 +158,7 @@ {if $has_actions} {assign var='compiled_actions' value=array()} - {capture assign='row_actions_before_delete'}{hook h='displayAdminListRowActionsBeforeDelete' table=$table identifier=$identifier id=$tr.$identifier token=$token}{/capture} + {capture assign='row_actions_before_delete'}{hook h='displayAdminListRowActionsDeleteBefore' table=$table identifier=$identifier id=$tr.$identifier token=$token}{/capture} {assign var='row_actions_before_delete_added' value=false} {foreach $actions AS $key => $action} {if isset($tr.$action)} diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index f3e0616b2..5680dd633 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -245,7 +245,7 @@ class AdminNormalProductsControllerCore extends AdminController // Code For Standard product working $this->_where .= ' AND a.`selling_preference_type` = '.(int)Product::SELLING_PREFERENCE_WITH_ROOM_TYPE; - Hook::exec('actionFilterAdminProducts', array('join' => &$this->_join, 'where' => &$this->_where)); + Hook::exec('actionAdminProductsQueryModifier', array('join' => &$this->_join, 'where' => &$this->_where)); $this->_group = 'GROUP BY a.`id_product`'; diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 04b7ca4a0..a28dafaee 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -9001,7 +9001,7 @@ class AdminOrdersControllerCore extends AdminController { $idHotelBookingDetail = (int) Tools::getValue('id_hotel_booking_detail'); if (Validate::isLoadedObject($objHotelBookingDetail = new HotelBookingDetail($idHotelBookingDetail))) { - Hook::exec('actionAdminOnChangeRoomStatus', array( + Hook::exec('actionAdminRoomStatusChangeAfter', array( 'post_data' => Tools::getAllValues(), 'errors' => &$this->errors )); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 13a0e50e3..28c922b64 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -152,7 +152,7 @@ class AdminProductsControllerCore extends AdminController } // Allow modules to override the labels of the product tabs - $tabNameOverrides = Hook::exec('displayUpdateProductTabName', array('id_product' => (int) Tools::getValue('id_product')), null, true); + $tabNameOverrides = Hook::exec('actionAdminProductTabNameModifier', array('id_product' => (int) Tools::getValue('id_product')), null, true); if (is_array($tabNameOverrides)) { foreach ($tabNameOverrides as $moduleOverrides) { if (is_array($moduleOverrides)) { diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php index 88c79e5e9..cefbf1b93 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php +++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php @@ -505,7 +505,7 @@ class HotelBranchInformation extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbl ON (hbl.`id` = hbi.`id` AND hbl.`id_lang` = '.(int)$idLang.')'; - Hook::exec('actionFilterSellerHotel', array('query' => &$sql)); + Hook::exec('actionSellerHotelQueryModifier', array('query' => &$sql)); return Db::getInstance()->executeS($sql); } diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 0e2057290..e3418e839 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -3343,7 +3343,7 @@ class HotelHelper INNER JOIN `'._DB_PREFIX_.'category` AS c ON (hbi.`id_category` = c.`id_category`) WHERE 1'; - Hook::exec('actionFilterSellerHotel', array('treeQuery' => &$sql)); + Hook::exec('actionSellerHotelQueryModifier', array('treeQuery' => &$sql)); if ($cities) { $sql .= ' AND c.`id_parent` IN ('.implode(', ', $cities).')'; diff --git a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl index d25ecde7c..ea6d4facd 100644 --- a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl +++ b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl @@ -90,7 +90,7 @@
{l s='Guests'}
{$rm_v.adults|string_format:'%02d'} {if $rm_v.adults > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v.children}, {$rm_v.children|string_format:'%02d'} {if $rm_v.children > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} - {hook h='displayOrderDetailAfterOccupancy' data=$data_v room=$rm_v id_order=$order->id} + {hook h='displayOrderDetailOccupancyAfter' data=$data_v room=$rm_v id_order=$order->id}
diff --git a/themes/hotel-reservation-theme/_partials/room_type_list.tpl b/themes/hotel-reservation-theme/_partials/room_type_list.tpl index 25af0288b..0e547755d 100644 --- a/themes/hotel-reservation-theme/_partials/room_type_list.tpl +++ b/themes/hotel-reservation-theme/_partials/room_type_list.tpl @@ -178,7 +178,7 @@
{l s='No room available for this property!'}
- {hook h='displayAfterNoRoomAvailableBlock'} + {hook h='displayNoRoomAvailableBlockAfter'} {/if} {block name='displayRoomTypeListAfter'} diff --git a/themes/hotel-reservation-theme/cms.tpl b/themes/hotel-reservation-theme/cms.tpl index c5961ef3b..12c497556 100644 --- a/themes/hotel-reservation-theme/cms.tpl +++ b/themes/hotel-reservation-theme/cms.tpl @@ -41,7 +41,7 @@
{$cms->content}
- {hook h='displayCMSPage' page=$cms} + {hook h='displayCMSPageContentAfter' page=$cms} {elseif isset($cms_category)}

{$cms_category->name|escape:'html':'UTF-8'}

diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl index d5a9b05e6..ae6e29ace 100644 --- a/themes/hotel-reservation-theme/contact-form.tpl +++ b/themes/hotel-reservation-theme/contact-form.tpl @@ -191,7 +191,7 @@
- {hook h='displayAfterContactUsSubmitButton'} + {hook h='displayContactFormSubmitButtonAfter'} {/block}
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl index 677ff93b1..9e68ecd77 100644 --- a/themes/hotel-reservation-theme/order-confirmation.tpl +++ b/themes/hotel-reservation-theme/order-confirmation.tpl @@ -127,7 +127,7 @@
{l s='Guests'}
{$rm_v.adults|string_format:'%02d'} {if $rm_v.adults > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v.children}, {$rm_v.children|string_format:'%02d'} {if $rm_v.children > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} - {hook h='displayOrderConfirmationAfterOccupancy' data=$data_v room=$rm_v} + {hook h='displayOrderConfirmationOccupancyAfter' data=$data_v room=$rm_v}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl index ed9f9b6a7..30ee05ec7 100644 --- a/themes/hotel-reservation-theme/order-opc-new-account.tpl +++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl @@ -419,7 +419,7 @@
- {hook h='displayAddAccountFormBottom'} + {hook h='displayCustomerAccountFormBottom'} {/block} diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl index 210193f58..5cbb76425 100644 --- a/themes/hotel-reservation-theme/order-opc.tpl +++ b/themes/hotel-reservation-theme/order-opc.tpl @@ -177,7 +177,7 @@ {/if} {/block} - {block name='displayCheckoutGuestDetailsAfter'}{hook h='displayCheckoutGuestDetailsAfter'}{/block} + {hook h='displayCheckoutGuestDetailsAfter'} {* proceed only if no order restrict errors are there *} {if !$orderRestrictErr}