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

Merge pull request #601 from PrestaEdit/carrier_wizard2

Browse Source 
[-] Carrier Wizard: fix
This commit is contained in:
Vincent Augagneur
2013-07-30 02:22:45 -07:00
parent 3814a8c735 c1b0d32d32
commit 5929727be1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+3 -4
View File
@@ -533,7 +533,7 @@ class AdminCarrierWizardControllerCore extends AdminController
$template->assign('fields_value', $fields_value);
$template->assign('input', array('type' => 'zone', 'name' => 'zones' ));
die ($template->fetch());
die($template->fetch());
}
public function ajaxProcessValidateStep()
@@ -545,7 +545,6 @@ class AdminCarrierWizardControllerCore extends AdminController
$this->errors[] = Tools::displayError('You do not have permission to use this wizard.');
else
{
if (Shop::isFeatureActive() && $step_number == 2)
{
if (!Tools::getValue('checkBoxShopAsso_carrier'))
@@ -658,8 +657,7 @@ class AdminCarrierWizardControllerCore extends AdminController
$return['errors'][] = Tools::displayError('You do not have permission to use this wizard.')
);
else
{
{
if ($id_carrier = Tools::getValue('id_carrier'))
{
$current_carrier = new Carrier((int)$id_carrier);
@@ -687,6 +685,7 @@ class AdminCarrierWizardControllerCore extends AdminController
$return['errors'][] = $this->l('An error occurred while saving this carrier.');
}
}
if (Validate::isLoadedObject($carrier))
{
if (!$this->changeGroups((int)$carrier->id))