[-] BO : fixed #PSCFV-3005 - problems to create a shop for contact with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16229 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -286,6 +286,15 @@ class AdminStoresControllerCore extends AdminController
|
|||||||
'class' => 'button'
|
'class' => 'button'
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (Shop::isFeatureActive())
|
||||||
|
{
|
||||||
|
$this->fields_form['input'][] = array(
|
||||||
|
'type' => 'shop',
|
||||||
|
'label' => $this->l('Shop association:'),
|
||||||
|
'name' => 'checkBoxShopAsso',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (!($obj = $this->loadObject(true)))
|
if (!($obj = $this->loadObject(true)))
|
||||||
return;
|
return;
|
||||||
@@ -324,7 +333,8 @@ class AdminStoresControllerCore extends AdminController
|
|||||||
{
|
{
|
||||||
/* Cleaning fields */
|
/* Cleaning fields */
|
||||||
foreach ($_POST as $kp => $vp)
|
foreach ($_POST as $kp => $vp)
|
||||||
$_POST[$kp] = trim($vp);
|
if ($kp != 'checkBoxShopAsso_store')
|
||||||
|
$_POST[$kp] = trim($vp);
|
||||||
|
|
||||||
/* If the selected country does not contain states */
|
/* If the selected country does not contain states */
|
||||||
$id_state = (int)Tools::getValue('id_state');
|
$id_state = (int)Tools::getValue('id_state');
|
||||||
@@ -387,8 +397,8 @@ class AdminStoresControllerCore extends AdminController
|
|||||||
|
|
||||||
if (!count($this->errors))
|
if (!count($this->errors))
|
||||||
parent::postProcess();
|
parent::postProcess();
|
||||||
else
|
else
|
||||||
$this->display = 'add';
|
$this->display = 'add';
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function postImage($id)
|
protected function postImage($id)
|
||||||
|
|||||||
Reference in New Issue
Block a user