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 deaeda564..c2d410eae 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 @@ -26,7 +26,7 @@
{l s='Cart Details'} - {hook h='displayAdminCartDetailsHeader'} + {hook h='displayAdminCartDetailsPanelTitleAfter'}
diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl index cc01b5317..17cf1903f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl @@ -62,7 +62,7 @@
{/if} - {hook h='displayAdminOrderOccupancyColumn' data=$data} + {hook h='displayAdminOrderProductLineOccupancyAfter' data=$data}

diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 73dee7830..dd43b560e 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -518,7 +518,7 @@ {if $customer->phone}

 {$customer->phone}
{/if} - {hook h='displayAdminOrderPhoneAfter'} + {hook h='displayAdminOrderCustomerPhoneAfter'}
diff --git a/admin-dev/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl b/admin-dev/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl index faed6f935..3e78a0787 100644 --- a/admin-dev/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl +++ b/admin-dev/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl @@ -29,7 +29,7 @@
  • {l s='Services'}
  • - {hook h='displayAdminOrderEditRoomTabNav' data=$data} + {hook h='displayAdminOrderEditRoomTab' data=$data}
    diff --git a/admin-dev/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl b/admin-dev/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl index c0d84da76..2196ec084 100644 --- a/admin-dev/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl +++ b/admin-dev/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl @@ -46,7 +46,7 @@ {l s='Total Price (tax excl.)'} {l s='Total Price (tax incl.)'} {l s='Action'} - {hook h="displayAdminOrderExtraServicesTabContentHeading"} + {hook h="displayAdminOrderSelectedServicesHeading"} @@ -106,7 +106,7 @@ {displayPrice price=$service['total_price_tax_excl']|escape:'html':'UTF-8' currency=$orderCurrency} {displayPrice price=$service['total_price_tax_incl']|escape:'html':'UTF-8' currency=$orderCurrency} - {hook h="displayAdminOrderExtraServicesTabContentData" id_service_product=$service['id_product'] id_htl_booking_detail=$id_booking_detail id_service_product_order_detail=$service['id_service_product_order_detail'] room_type_id_product=$additionalServices['room_type_id_product']} + {hook h="displayAdminOrderSelectedServicesData" id_service_product=$service['id_product'] id_htl_booking_detail=$id_booking_detail id_service_product_order_detail=$service['id_service_product_order_detail'] room_type_id_product=$additionalServices['room_type_id_product']} {/foreach} {else} @@ -137,7 +137,7 @@ {l s='Quantity'} {l s='Unit Price (tax excl.)'} - {hook h="displayAdminOrderExtraServicesTabContentHeading"} + {hook h="displayAdminOrderAvailableServicesHeading"} @@ -186,7 +186,7 @@
    - {hook h="displayAdminOrderExtraServicesTabContentData" id_service_product=$product['id_product'] id_htl_booking_detail=$id_booking_detail} + {hook h="displayAdminOrderAvailableServicesData" id_service_product=$product['id_product'] id_htl_booking_detail=$id_booking_detail} {/foreach} @@ -317,7 +317,7 @@ {l s='Unit Price (tax excl.)'} {l s='Total Price (tax excl.)'} {l s='Total Price (tax incl.)'} - {hook h="displayAdminOrderExtraServicesTabContentHeading"} + {hook h="displayAdminOrderViewServicesHeading"} @@ -366,6 +366,7 @@ {displayPrice price=$service['total_price_tax_incl'] currency=$orderCurrency} + {hook h="displayAdminOrderViewServicesData" id_service_product=$service['id_product'] id_htl_booking_detail=$id_booking_detail id_service_product_order_detail=$service['id_service_product_order_detail'] room_type_id_product=$additionalServices['room_type_id_product']} {/foreach} diff --git a/classes/Mail.php b/classes/Mail.php index 28e2e9799..badf1153e 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -424,7 +424,7 @@ class MailCore extends ObjectModel Hook::exec('actionMailAlterMessageBeforeSend', array( 'template' => &$template, 'message' => &$email, - 'template_vars' => $template_vars, + 'template_vars' => &$template_vars, )); $mailer->send($email); diff --git a/classes/Product.php b/classes/Product.php index 56ab769d1..27f9704bd 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3404,14 +3404,6 @@ class ProductCore extends ObjectModel } } - Hook::exec( - 'actionProductPriceModifier', - array( - 'price' => &$price, - 'type' => 'pre_tax' - ) - ); - // Tax $address->id_country = $id_country; $address->id_state = $id_state; @@ -3423,10 +3415,16 @@ class ProductCore extends ObjectModel $id_tax_rule_group = Product::getIdTaxRulesGroupByIdProduct((int)$id_product, $context); } - Hook::exec('actionProductTaxRuleGroupModifier', array( - 'id_product' => $id_product, - 'id_tax_rule_group' => &$id_tax_rule_group - )); + Hook::exec( + 'actionProductPriceModifier', + array( + 'price' => &$price, + 'type' => 'pre_tax', + 'id_product' => $id_product, + 'id_tax_rule_group' => &$id_tax_rule_group + + ) + ); $tax_manager = TaxManagerFactory::getManager($address, $id_tax_rule_group); $product_tax_calculator = $tax_manager->getTaxCalculator(); diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 5680dd633..dbd347614 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -245,8 +245,6 @@ 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('actionAdminProductsQueryModifier', array('join' => &$this->_join, 'where' => &$this->_where)); - $this->_group = 'GROUP BY a.`id_product`'; $this->fields_list = array(); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index a28dafaee..bbed3db59 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -633,11 +633,6 @@ class AdminOrdersControllerCore extends AdminController unset($this->toolbar_btn['new']); } - Hook::exec('actionOrderDetailToolbarModifier', array( - 'toolbar_btn' => &$this->toolbar_btn, - 'id_order' => (int) Tools::getValue('id_order') - )); - return $res; } diff --git a/pdf/invoice.additinal-services-tab.tpl b/pdf/invoice.additinal-services-tab.tpl index abe4b2d43..e7a848bb2 100644 --- a/pdf/invoice.additinal-services-tab.tpl +++ b/pdf/invoice.additinal-services-tab.tpl @@ -52,7 +52,7 @@ {/if} {$service['name']} - {hook h='displayServiceProductDatesInvoiceAndEmail' id_service_product_order_detail=$service['id_service_product_order_detail']} + {hook h='displayInvoiceServiceProductNameAfter' id_service_product_order_detail=$service['id_service_product_order_detail']} {if isset($service['product_tax_label']) && $service['product_tax_label']}{$service['product_tax_label']}{else}{l s='No tax' pdf='true'}{/if} diff --git a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl index 9396d461b..8d4bfe473 100644 --- a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl +++ b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl @@ -68,7 +68,7 @@ {/capture} {include file='_partials/ui-tooltip.tpl' tooltip_content=$smarty.capture.htl_pcm_tooltip allow_html=true} - {hook h='displayOrderedServiceProduct' product_order_detail=$additionalService} + {hook h='displayOrderDetailServiceProductNameBlockAfter' product_order_detail=$additionalService}