// Some fix on multishop + stock

This commit is contained in:
rMalie
2011-11-23 17:00:20 +00:00
parent d3db9d0808
commit 1dc3341748
6 changed files with 16 additions and 19 deletions
@@ -286,6 +286,7 @@ class AdminShopControllerCore extends AdminController
'scene' => $this->l('Scenes'),
'stock' => $this->l('Stock'),
'store' => $this->l('Stores'),
'warehouse' => $this->l('Warehouse'),
);
if (!$this->object->id)
+4 -4
View File
@@ -45,6 +45,10 @@ class AdminShopUrlControllerCore extends AdminController
'align' => 'center',
'width' => 25
),
'shop_name' => array(
'title' => $this->l('Shop name'),
'width' => 70
),
'domain' => array(
'title' => $this->l('Domain'),
'width' => 'auto',
@@ -60,10 +64,6 @@ class AdminShopUrlControllerCore extends AdminController
'width' => 200,
'filter_key' => 'uri'
),
'shop_name' => array(
'title' => $this->l('Shop name'),
'width' => 70
),
'main' => array(
'title' => $this->l('Main URL'),
'align' => 'center',
+2 -2
View File
@@ -323,8 +323,8 @@ class AuthControllerCore extends FrontController
// Preparing customer
$customer = new Customer();
$_POST['lastname'] = $_POST['customer_lastname'];
$_POST['firstname'] = $_POST['customer_firstname'];
$_POST['lastname'] = Tools::getValue('customer_lastname');
$_POST['firstname'] = Tools::getValue('customer_firstname');
if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile') && Configuration::get('PS_REGISTRATION_PROCESS_TYPE'))
$this->errors[] = Tools::displayError('You must register at least one phone number');
$this->errors = array_unique(array_merge($this->errors, $customer->validateController()));