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

// code review of AdminGroupShop - norms

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12764 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2012-01-27 16:00:15 +00:00
parent f1dece04f2
commit c23f882426
4 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminGroupShopController.php
+4 -2
View File
@@ -122,7 +122,8 @@ class AdminGroupShopControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and available quantities)')
'desc' =>
$this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and available quantities)')
),
array(
'type' => 'radio',
@@ -226,10 +227,11 @@ class AdminGroupShopControllerCore extends AdminController
'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
);
$default_group_shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
$this->tpl_form_vars = array(
'disabled' => $disabled,
'checked' => (Tools::getValue('addgroup_shop') !== false) ? true : false,
'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID(),
'defaultGroup' => $default_group_shop->getGroupID(),
);
if (isset($this->fields_import_form))
$this->tpl_form_vars = array_merge($this->tpl_form_vars, array('form_import' => $this->fields_import_form));