diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index bf1fdf304..96567894c 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -150,13 +150,11 @@ - - diff --git a/modules/blocknavigationmenu/blocknavigationmenu.php b/modules/blocknavigationmenu/blocknavigationmenu.php index 4df99a5e6..5b615c4bf 100644 --- a/modules/blocknavigationmenu/blocknavigationmenu.php +++ b/modules/blocknavigationmenu/blocknavigationmenu.php @@ -41,6 +41,11 @@ public function __construct() $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } + public function getContent() + { + Tools::redirectAdmin($this->context->link->getAdminLink('AdminCustomNavigationLinkSetting')); + } + public function hookTop($params) { return $this->hookDisplayTopSubSecondaryBlock($params); @@ -98,15 +103,6 @@ public function hookActionObjectLanguageAddAfter($params) } } - public function hookDisplayAddModuleSettingLink() - { - $this->context->smarty->assign( - 'custom_navigation_link_setting_url', - $this->context->link->getAdminLink('AdminCustomNavigationLinkSetting') - ); - return $this->display(__FILE__, 'customNavigationLinkSetting.tpl'); - } - public function install() { $objModuleDb = new WkBlockNavigationMenuDb(); @@ -128,7 +124,6 @@ public function registerModuleHooks() return $this->registerHook( array ( 'footer', - 'displayAddModuleSettingLink', 'actionObjectLanguageAddAfter', 'displayDefaultNavigationHook', 'displayNavigationHook', diff --git a/modules/blocknavigationmenu/views/templates/hook/customNavigationLinkSetting.tpl b/modules/blocknavigationmenu/views/templates/hook/customNavigationLinkSetting.tpl deleted file mode 100644 index 1ce9562e6..000000000 --- a/modules/blocknavigationmenu/views/templates/hook/customNavigationLinkSetting.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{* -* 2010-2019 Webkul. -* -* NOTICE OF LICENSE -* -* All right is reserved, -* Please go through this link for complete license : https://store.webkul.com/license.html -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade this module to newer -* versions in the future. If you wish to customize this module for your -* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. -* -* @author Webkul IN -* @copyright 2010-2019 Webkul IN -* @license https://store.webkul.com/license.html -*} - -
- - - {l s='Custom Navigation Link' mod='blocknavigationmenu'} - - - - -
\ No newline at end of file diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php index 5033928ed..aa756be79 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php @@ -29,13 +29,6 @@ public function renderView() 'order_restrict_setting_link' => $this->context->link->getAdminLink('AdminOrderRestrictSettings'), 'additional_demand_setting_link' => $this->context->link->getAdminLink('AdminRoomTypeGlobalDemand'), ); - // Reviews setting link if only productcomment module is enabled - if (Module::isEnabled('productcomments')) { - $review_module_instance = Module::getInstanceByName('productcomments'); - $this->tpl_view_vars['htl_reviews_conf_link'] = $this->context->link->getAdminLink('AdminModules', true). - '&configure='.urlencode($review_module_instance->name).'&tab_module='.$review_module_instance->tab. - '&module_name='.urlencode($review_module_instance->name); - } return parent::renderView(); } diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl index de4b0fef6..efa042a9f 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl @@ -10,18 +10,6 @@ - {* Reviews setting link if only productcomment module is enabled *} - {if isset($htl_reviews_conf_link) && $htl_reviews_conf_link} -
- - - {l s='Hotel Reviews' mod='hotelreservationsystem'} - - - - -
- {/if}
diff --git a/modules/wkfooterpaymentblock/views/templates/hook/footerPaymentSettingLink.tpl b/modules/wkfooterpaymentblock/views/templates/hook/footerPaymentSettingLink.tpl deleted file mode 100644 index 161e1599b..000000000 --- a/modules/wkfooterpaymentblock/views/templates/hook/footerPaymentSettingLink.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{* -* 2010-2018 Webkul. -* -* NOTICE OF LICENSE -* -* All right is reserved, -* Please go through this link for complete license : https://store.webkul.com/license.html -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade this module to newer -* versions in the future. If you wish to customize this module for your -* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. -* -* @author Webkul IN -* @copyright 2010-2018 Webkul IN -* @license https://store.webkul.com/license.html -*} - -
- - - {l s='Footer Payment Block' mod='wkfooterpaymentblock'} - - - - -
\ No newline at end of file diff --git a/modules/wkfooterpaymentblock/wkfooterpaymentblock.php b/modules/wkfooterpaymentblock/wkfooterpaymentblock.php index 1ea861932..7686d0bef 100644 --- a/modules/wkfooterpaymentblock/wkfooterpaymentblock.php +++ b/modules/wkfooterpaymentblock/wkfooterpaymentblock.php @@ -44,6 +44,11 @@ public function __construct() $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } + public function getContent() + { + Tools::redirectAdmin($this->context->link->getAdminLink('AdminFooterPaymentBlockSetting')); + } + public function hookFooter($params) { $objPaymentBlockInfo = new WkFooterPaymentBlockInfo(); @@ -58,15 +63,7 @@ public function hookdisplayFooterPaymentInfo($params) { return $this->hookFooter($params); } - - public function hookDisplayAddModuleSettingLink() - { - $footerPaymentBlockLink = $this->context->link->getAdminLink('AdminFooterPaymentBlockSetting'); - $this->context->smarty->assign('footerPaymentBlockLink', $footerPaymentBlockLink); - - return $this->display(__FILE__, 'footerPaymentSettingLink.tpl'); - } - + public function callInstallTab() { //Controllers which are to be used in this modules but we have not to create tab for those controllers... @@ -117,7 +114,6 @@ public function install() } if (!parent::install() ||!$this->registerHook('displayFooterPaymentInfo') - ||!$this->registerHook('displayAddModuleSettingLink') || !$this->callInstallTab() || !$this->insertDefaultModuleData() ) {