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

// fix multishop

Browse Source
This commit is contained in:
Rémi Gaillard
2013-07-17 10:49:17 +02:00
parent de4cb8a096
commit f6f2552f38
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+2 -6
View File
@@ -439,6 +439,7 @@ class AdminCarrierWizardControllerCore extends AdminController
{ {
$helper = new HelperForm(); $helper = new HelperForm();
$helper->show_toolbar = false; $helper->show_toolbar = false;
$helper->table = $this->table;
$helper->default_form_language = $this->context->language->id; $helper->default_form_language = $this->context->language->id;
$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
$this->fields_form = array(); $this->fields_form = array();
@@ -503,16 +504,11 @@ class AdminCarrierWizardControllerCore extends AdminController
if (Shop::isFeatureActive() && $step_number == 2) if (Shop::isFeatureActive() && $step_number == 2)
{ {
if (!Tools::getValue('checkBoxShopAsso_')) if (!Tools::getValue('checkBoxShopAsso_carrier'))
{ {
$return['has_error'] = true; $return['has_error'] = true;
$return['errors'][] = $this->l('You must choose at least one shop or group shop.'); $return['errors'][] = $this->l('You must choose at least one shop or group shop.');
} }
}
else if ((!Shop::isFeatureActive() && $step_number == 2) || (Shop::isFeatureActive() && $step_number == 3))
{
} }
else else
$this->validateRules('AdminCarrierWizardControllerCore'); $this->validateRules('AdminCarrierWizardControllerCore');