Merge branch 'ticket-12562-trustedShopsES' into develop

This commit is contained in:
Marion Muszynski 2017-02-17 10:56:03 +01:00
commit abed9fd454

View File

@ -62,9 +62,9 @@ class TrustedShopsBbb extends Module
if (!Configuration::deleteByName('TRUSTED_SHOP_FR_ID')) {
return FALSE;
}
// if (!Configuration::deleteByName('TRUSTED_SHOP_ES_ID')) {
// return FALSE;
// }
if (!Configuration::deleteByName('TRUSTED_SHOP_ES_ID')) {
return FALSE;
}
if (!Configuration::deleteByName('TRUSTED_SHOP_STATUS_WATCHED')) {
return FALSE;
}
@ -83,7 +83,7 @@ class TrustedShopsBbb extends Module
{
global $cookie;
$output = '<h2>Trusted Shop Configuration</h2>';
if (Tools::isSubmit('submitTrustedShop') AND ($tsfrid = Tools::getValue('trusted_shop_fr_id')) AND ($tsdays = Tools::getValue('trusted_shop_days')) AND ($tssw = Tools::getValue('status_watched_id')) AND ($tspassword = Tools::getValue('trusted_shop_password')) AND ($tsuser = Tools::getValue('trusted_shop_user'))) {
if (Tools::isSubmit('submitTrustedShop') AND ($tsfrid = Tools::getValue('trusted_shop_fr_id')) AND ($tsesid = Tools::getValue('trusted_shop_es_id')) AND ($tsdays = Tools::getValue('trusted_shop_days')) AND ($tssw = Tools::getValue('status_watched_id')) AND ($tspassword = Tools::getValue('trusted_shop_password')) AND ($tsuser = Tools::getValue('trusted_shop_user'))) {
Configuration::updateValue('TRUSTED_SHOP_FR_ID', trim($tsfrid));
Configuration::updateValue('TRUSTED_SHOP_ES_ID', trim($tsesid));
Configuration::updateValue('TRUSTED_SHOP_STATUS_WATCHED', $tssw);