Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #357 from abhishek-webkul/gli-778

Browse Source 
Remove module config links from Hotel Reservation System > Settings page
This commit is contained in:
Rohit Jain
2022-05-05 17:09:53 +05:30
committed by GitHub
parent 5a2a3b3071 feb3baf3a6
commit 6719a6a7fa
7 changed files with 11 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/xml/themes/default.xml
View File

@@ -150,13 +150,11 @@
<hook module="wkfooterpaymentinfoblockcontainer" hook="displayFooter" position="4"/>
<hook module="wkfooteraboutblock" hook="displayFooterMostLeftBlock" position="3"/>
<hook module="wkfooteraboutblock" hook="displayFooterPaymentInfo" position="1"/>
<hook module="wkfooterpaymentblock" hook="displayAddModuleSettingLink" position="6"/>
<hook module="wkfooterpaymentblock" hook="displayFooterPaymentInfo" position="2"/>
<hook module="wkfooternotificationblock" hook="displayFooter" position="5"/>
<hook module="blocknavigationmenu" hook="displayTop" position="2"/>
<hook module="blocknavigationmenu" hook="displayFooter" position="6"/>
<hook module="blocknavigationmenu" hook="actionObjectLanguageAddAfter" position="6"/>
<hook module="blocknavigationmenu" hook="displayAddModuleSettingLink" position="7"/>
<hook module="blocknavigationmenu" hook="displayDefaultNavigationHook" position="1"/>
<hook module="blocknavigationmenu" hook="displayNavigationHook" position="1"/>
<hook module="blocknewsletter" hook="Header" position="3"/>

15
modules/blocknavigationmenu/blocknavigationmenu.php
View File

@@ -41,6 +41,11 @@ class blocknavigationmenu extends Module
$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 @@ class blocknavigationmenu extends Module
}
}
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 @@ class blocknavigationmenu extends Module
return $this->registerHook(
array (
'footer',
'displayAddModuleSettingLink',
'actionObjectLanguageAddAfter',
'displayDefaultNavigationHook',
'displayNavigationHook',

28
modules/blocknavigationmenu/views/templates/hook/customNavigationLinkSetting.tpl
View File

@@ -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 <support@webkul.com>
* @copyright 2010-2019 Webkul IN
* @license https://store.webkul.com/license.html
*}
<div class="btn-group setting-link-div col-sm-3 col-xs-12">
<a type="button" href="{$custom_navigation_link_setting_url|escape:'htmlall':'UTF-8'}" class="setting-link btn btn-default col-sm-10 col-xs-10">
<span class="col-sm-2 col-xs-2"><i class="icon-chain"></i></span>
<span class="setting-title col-sm-10 col-xs-10">{l s='Custom Navigation Link' mod='blocknavigationmenu'}</span>
</a>
<a tabindex="0" class="btn btn-default col-sm-2 col-xs-2" role="button" data-toggle="popover" data-trigger="focus" title="{l s='Custom Links Setting' mod='blocknavigationmenu'}" data-content="{l s='Create custom links which will display at footer navigation block and navigation menu.' mod='blocknavigationmenu'}" data-placement="bottom">
<i class="icon-question-circle"></i>
</a>
</div>

7
modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php
View File

@@ -29,13 +29,6 @@ class AdminHotelConfigurationSettingController extends ModuleAdminController
'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();
}

12
modules/hotelreservationsystem/views/templates/admin/hotel_configuration_setting/helpers/view/view.tpl
View File

@@ -10,18 +10,6 @@
<i class="icon-question-circle"></i>
</a>
</div>
{* Reviews setting link if only productcomment module is enabled *}
{if isset($htl_reviews_conf_link) && $htl_reviews_conf_link}
<div class="btn-group setting-link-div col-sm-3 col-xs-12">
<a type="button" href="{$htl_reviews_conf_link}" class="setting-link btn btn-default col-sm-10 col-xs-10">
<span class="col-sm-2 col-xs-2"><i class="icon-star"></i></span>
<span class="setting-title col-sm-10 col-xs-10">{l s='Hotel Reviews' mod='hotelreservationsystem'}</span>
</a>
<a tabindex="0" class="btn btn-default col-sm-2 col-xs-2" role="button" data-toggle="popover" data-trigger="focus" title="{l s='Hotel Reviews Settings' mod='hotelreservationsystem'}" data-content="{l s='Configure Reviews setting using this link.' mod='hotelreservationsystem'}" data-placement="bottom">
<i class="icon-question-circle"></i>
</a>
</div>
{/if}
<div class="btn-group setting-link-div col-sm-3 col-xs-12">
<a type="button" href="{$order_restrict_setting_link}" class="setting-link btn btn-default col-sm-10 col-xs-10">
<span class="col-sm-2 col-xs-2"><i class="icon-list-alt"></i></span>

28
modules/wkfooterpaymentblock/views/templates/hook/footerPaymentSettingLink.tpl
View File

@@ -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 <support@webkul.com>
* @copyright 2010-2018 Webkul IN
* @license https://store.webkul.com/license.html
*}
<div class="btn-group setting-link-div col-sm-3 col-xs-12">
<a type="button" href="{$footerPaymentBlockLink}" class="setting-link btn btn-default col-sm-10 col-xs-10">
<span class="col-sm-2 col-xs-2"><i class="icon-money"></i></span>
<span class="setting-title col-sm-10 col-xs-10">{l s='Footer Payment Block' mod='wkfooterpaymentblock'}</span>
</a>
<a tabindex="0" class="btn btn-default col-sm-2 col-xs-2" role="button" data-toggle="popover" data-trigger="focus" title="{l s='Footer Payment Block Setting' mod='wkfooterpaymentblock'}" data-content="{l s='Using this setting, you can configure payment block view in the footer of page in front end.' mod='wkfooterpaymentblock'}" data-placement="bottom">
<i class="icon-question-circle"></i>
</a>
</div>

16
modules/wkfooterpaymentblock/wkfooterpaymentblock.php
View File

@@ -43,6 +43,11 @@ class WkFooterPaymentBlock extends Module
$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();
@@ -57,15 +62,7 @@ class WkFooterPaymentBlock extends Module
{
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...
@@ -102,7 +99,6 @@ class WkFooterPaymentBlock extends Module
if (!parent::install()
|| !$objFooterPaymentBlockDb->createTables()
||!$this->registerHook('displayFooterPaymentInfo')
||!$this->registerHook('displayAddModuleSettingLink')
|| !$this->callInstallTab()
|| !$this->insertDefaultModuleData()
) {