diff --git a/admin-dev/themes/default/template/controllers/categories/form.tpl b/admin-dev/themes/default/template/controllers/categories/form.tpl index d99981d2f..2474082b4 100644 --- a/admin-dev/themes/default/template/controllers/categories/form.tpl +++ b/admin-dev/themes/default/template/controllers/categories/form.tpl @@ -34,4 +34,7 @@ {$input.customer}

{/if} -{/block} + {if ($input.name == 'module')} + {hook h="displayAdminCategoriesForm"} + {/if} +{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl index 0caba4f5a..aa0c7fb66 100644 --- a/admin-dev/themes/default/template/controllers/home/content.tpl +++ b/admin-dev/themes/default/template/controllers/home/content.tpl @@ -106,6 +106,7 @@ $(document).ready(function() { {/foreach} + {hook h="displayAdminHomeQuickLinks"}

{l s='Your Required'}

@@ -115,7 +116,7 @@ $(document).ready(function() { {$tips_optimization}

{l s='Loading...'}

- + {hook h="displayAdminHomeInfos"}
@@ -126,8 +127,9 @@ $(document).ready(function() { {$customers_service} {$stats_sales} {$last_orders} + {hook h="displayAdminHomeStatistics"} - {hook h="displayBackOfficeHome"} +
 
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 6e41f33da..44172eec9 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -405,6 +405,10 @@ class AdminCategoriesControllerCore extends AdminController 'guest' => $guest_group_information, 'customer' => $default_group_information, 'desc' => $this->l('Mark all groups you want to give access to this category') + ), + array( + 'type' => 'module', + 'name' => 'module' ) ), 'submit' => array( diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 3e5f06354..3fb982f0f 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -218,6 +218,7 @@ class AdminOrdersControllerCore extends AdminController @Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit', (int)$order->id_lang), $templateVars, $customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, null, _PS_MAIL_DIR_, true); + Hook::exec('actionAdminOrdersTrackingNumberUpdate', array('order' => $order)); Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token); } else diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index a1ce6ac3b..f8b299b9b 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3798,7 +3798,7 @@ class AdminProductsControllerCore extends AdminController public function initFormModules($obj) { $id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->tab_display_module).'\''); - $this->tpl_form_vars['custom_form'] = hook::exec('displayAdminProductsExtra', array(), (int)$id_module); + $this->tpl_form_vars['custom_form'] = Hook::exec('displayAdminProductsExtra', array(), (int)$id_module); } diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index 0ffdc2539..90757fb8f 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -81,6 +81,7 @@ class PasswordControllerCore extends FrontController $customer->last_passwd_gen = date('Y-m-d H:i:s', time()); if ($customer->update()) { + Hook::exec('actionPasswordRenew', array('customer' => $customer, 'password' => $password)); if (Mail::Send($this->context->language->id, 'password', Mail::l('Your password'), array( '{email}' => $customer->email, diff --git a/modules/mailalerts/MailAlert.php b/modules/mailalerts/MailAlert.php index 437b3ad41..ed52e47e4 100644 --- a/modules/mailalerts/MailAlert.php +++ b/modules/mailalerts/MailAlert.php @@ -177,6 +177,8 @@ class MailAlert extends ObjectModel if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.txt') && file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.html')) Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'customer_qty', Mail::l('Product available', $id_lang), $templateVars, strval($customer_email), NULL, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/'); + + Hook::exec('actionModuleMailAlertSendCustomer', array('product' => (is_array($product->name) ? $product->name[$id_lang] : $product->name), 'link' => $link->getProductLink($product))); self::deleteAlert((int)$customer_id, strval($customer_email), (int)$id_product, (int)$id_product_attribute); }