dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] MO : Fix hook name on differents modules - #PSCFV-2784

Browse Source
This commit is contained in:
fSerny
2012-07-02 08:51:05 +00:00
parent 4e5c1b327a
commit 67c696a1ed
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/module_reinstall_blockmyaccount.php
+1 -1
View File
@@ -33,7 +33,7 @@ function module_reinstall_blockmyaccount()
{ {
$res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook` $res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook`
(`name`, `title`, `description`, `position`) VALUES (`name`, `title`, `description`, `position`) VALUES
("myAccountBlock", "My account block", "Display extra informations inside the \"my account\" block", 1)'); ("displayMyAccountBlock", "My account block", "Display extra informations inside the \"my account\" block", 1)');
// register left column, and header, and addmyaccountblockhook // register left column, and header, and addmyaccountblockhook
$hooks = array('leftColumn', 'header'); $hooks = array('leftColumn', 'header');
foreach($hooks as $hook_name) foreach($hooks as $hook_name)
install-dev/upgrade/php/module_reinstall_blocksearch.php
+1 -1
View File
@@ -33,7 +33,7 @@ function module_reinstall_blocksearch()
{ {
$res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook` $res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook`
(`name`, `title`, `description`, `position`) VALUES (`name`, `title`, `description`, `position`) VALUES
("myAccountBlock", "My account block", "Display extra informations inside the \"my account\" block", 1)'); ("displayMyAccountBlock", "My account block", "Display extra informations inside the \"my account\" block", 1)');
// register left column, and header, and addmyaccountblockhook // register left column, and header, and addmyaccountblockhook
$hooks = array('top', 'header'); $hooks = array('top', 'header');
foreach($hooks as $hook_name) foreach($hooks as $hook_name)
modules/blockmyaccount/blockmyaccount.php
+2 -2
View File
@@ -84,12 +84,12 @@ class BlockMyAccount extends Module
private function addMyAccountBlockHook() private function addMyAccountBlockHook()
{ {
return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlock\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'displayMyAccountBlock\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)');
} }
private function removeMyAccountBlockHook() private function removeMyAccountBlockHook()
{ {
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlock\''); return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayMyAccountBlock\'');
} }
public function hookDisplayHeader($params) public function hookDisplayHeader($params)
modules/blockmyaccountfooter/blockmyaccountfooter.php
+4 -4
View File
@@ -65,7 +65,7 @@ class Blockmyaccountfooter extends Module
$smarty->assign(array( $smarty->assign(array(
'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')), 'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')),
'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')), 'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')),
'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('myAccountBlock') 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlock')
)); ));
return $this->display(__FILE__, $this->name.'.tpl'); return $this->display(__FILE__, $this->name.'.tpl');
} }
@@ -77,12 +77,12 @@ class Blockmyaccountfooter extends Module
private function addMyAccountBlockHook() private function addMyAccountBlockHook()
{ {
return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'displayMyAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)');
} }
private function removeMyAccountBlockHook() private function removeMyAccountBlockHook()
{ {
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlockfooter\''); return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayMyAccountBlockfooter\'');
} }
public function hookHeader($params) public function hookHeader($params)
@@ -97,7 +97,7 @@ class Blockmyaccountfooter extends Module
$smarty->assign(array( $smarty->assign(array(
'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')), 'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')),
'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')), 'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')),
'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('myAccountBlock') 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlock')
)); ));
return $this->display(__FILE__, $this->name.'.tpl'); return $this->display(__FILE__, $this->name.'.tpl');
} }
modules/blockwishlist/blockwishlist.php
+2 -2
View File
@@ -72,7 +72,7 @@ class BlockWishList extends Module
) )
return false; return false;
/* This hook is optional */ /* This hook is optional */
$this->registerHook('myAccountBlock'); $this->registerHook('displayMyAccountBlock');
return true; return true;
} }
@@ -225,7 +225,7 @@ class BlockWishList extends Module
return $this->display(__FILE__, 'my-account.tpl'); return $this->display(__FILE__, 'my-account.tpl');
} }
public function hookMyAccountBlock($params) public function hookDisplayMyAccountBlock($params)
{ {
return $this->hookCustomerAccount($params); return $this->hookCustomerAccount($params);
} }
modules/loyalty/loyalty.php
+2 -2
View File
@@ -90,7 +90,7 @@ class Loyalty extends Module
Configuration::updateValue('PS_LOYALTY_VOUCHER_CATEGORY', $category_config); Configuration::updateValue('PS_LOYALTY_VOUCHER_CATEGORY', $category_config);
/* This hook is optional */ /* This hook is optional */
$this->registerHook('myAccountBlock'); $this->registerHook('displayMyAccountBlock');
if (!LoyaltyStateModule::insertDefaultData()) if (!LoyaltyStateModule::insertDefaultData())
return false; return false;
return true; return true;
@@ -475,7 +475,7 @@ class Loyalty extends Module
return $this->display(__FILE__, 'my-account.tpl'); return $this->display(__FILE__, 'my-account.tpl');
} }
public function hookMyAccountBlock($params) public function hookDisplayMyAccountBlock($params)
{ {
return $this->hookCustomerAccount($params); return $this->hookCustomerAccount($params);
} }
modules/referralprogram/referralprogram.php
+2 -2
View File
@@ -77,7 +77,7 @@ class ReferralProgram extends Module
Configuration::updateValue('REFERRAL_PERCENTAGE', 5); Configuration::updateValue('REFERRAL_PERCENTAGE', 5);
/* This hook is optional */ /* This hook is optional */
$this->registerHook('myAccountBlock'); $this->registerHook('displayMyAccountBlock');
return true; return true;
} }
@@ -387,7 +387,7 @@ class ReferralProgram extends Module
return $this->display(__FILE__, 'my-account.tpl'); return $this->display(__FILE__, 'my-account.tpl');
} }
public function hookMyAccountBlock($params) public function hookDisplayMyAccountBlock($params)
{ {
return $this->hookCustomerAccount($params); return $this->hookCustomerAccount($params);
} }