From e850619dffe0e0ea3163857d07c6d37ddcf6b84b Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 23 Nov 2011 17:00:20 +0000 Subject: [PATCH] // Some fix on multishop + stock --- admin-dev/themes/template/header.tpl | 10 +++++----- classes/Category.php | 5 +---- classes/Supplier.php | 7 +++---- controllers/admin/AdminShopController.php | 1 + controllers/admin/AdminShopUrlController.php | 8 ++++---- controllers/front/AuthController.php | 4 ++-- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl index c04ef9170..fa773bb5f 100644 --- a/admin-dev/themes/template/header.tpl +++ b/admin-dev/themes/template/header.tpl @@ -35,7 +35,7 @@ var iso_user = '{$iso_user}'; var country_iso_code = '{$country_iso_code}'; var _PS_VERSION_ = '{$smarty.const._PS_VERSION_}'; - + var helpboxes = {$help_box}; var roundMode = {$round_mode}; {if isset($shop_context)} @@ -77,7 +77,7 @@ {/foreach} {/if} - + {if $display_header} {$HOOK_HEADER} @@ -216,13 +216,13 @@ {l s='For security reasons, you must also:'} {l s='delete the /install folder'} {/if} - + {if $display_header && $is_multishop && $shop_context != 'all'}
{if $shop_context == 'group'} - {l s='You are configuring your store for group shop'} {$group_shop->name} + {l s='You are configuring your store for group shop '} {$group_shop->name} {elseif $shop_context == 'shop'} - {l s='You are configuring your store for shop'} {$shop->name} + {l s='You are configuring your store for shop '} {$shop->name} {/if}
{/if} diff --git a/classes/Category.php b/classes/Category.php index ad1e319d5..1dbdf544f 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -596,7 +596,7 @@ class CategoryCore extends ObjectModel return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql); } - $sql = 'SELECT p.*, sa.out_of_stock, stock.quantity, pa.`id_product_attribute`, pl.`description`, pl.`description_short`, pl.`available_now`, + $sql = 'SELECT p.*, stock.out_of_stock, stock.quantity, pa.`id_product_attribute`, pl.`description`, pl.`description_short`, pl.`available_now`, pl.`available_later`, pl.`link_rewrite`, pl.`meta_description`, pl.`meta_keywords`, pl.`meta_title`, pl.`name`, i.`id_image`, il.`legend`, m.`name` AS manufacturer_name, tl.`name` AS tax_name, t.`rate`, cl.`name` AS category_default, DATEDIFF(p.`date_add`, DATE_SUB(NOW(), @@ -634,9 +634,6 @@ class CategoryCore extends ObjectModel AND tl.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON m.`id_manufacturer` = p.`id_manufacturer` - LEFT JOIN `'._DB_PREFIX_.'stock_available` sa - ON sa.`id_product` = p.`id_product` - AND sa.id_product_attribute = 0 WHERE cp.`id_category` = '.(int)$this->id .($active ? ' AND p.`active` = 1' : '') .($id_supplier ? ' AND p.id_supplier = '.(int)$id_supplier : ''). diff --git a/classes/Supplier.php b/classes/Supplier.php index 98d7e20d3..edb6fb6f9 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.php @@ -230,7 +230,7 @@ class SupplierCore extends ObjectModel $nb_days_new_product = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20; - $sql = 'SELECT p.*, sa.out_of_stock, + $sql = 'SELECT p.*, stock.out_of_stock, pl.`description`, pl.`description_short`, pl.`link_rewrite`, @@ -248,7 +248,7 @@ class SupplierCore extends ObjectModel m.`name` AS manufacturer_name FROM `'._DB_PREFIX_.'product` p JOIN `'._DB_PREFIX_.'product_supplier` ps ON (ps.id_product = p.id_product - AND ps_id_product_attribute = 0) + AND ps.id_product_attribute = 0) LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Context::getContext()->shop->addSqlRestrictionOnLang('pl').') LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = p.`id_product` @@ -264,8 +264,7 @@ class SupplierCore extends ObjectModel AND tl.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'supplier` s ON s.`id_supplier` = p.`id_supplier` LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON m.`id_manufacturer` = p.`id_manufacturer` - LEFT JOIN `'._DB_PREFIX_.'stock_available` sa ON (sa.`id_product` = p.`id_product` - AND sa.id_product_attribute = 0) + '.Product::sqlStock('p').' WHERE ps.`id_supplier` = '.(int)$id_supplier. ($active ? ' AND p.`active` = 1' : '').' AND p.`id_product` IN ( diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index a37d6a5ea..a9b7c0065 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -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) diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 721ac3667..c3b276b99 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -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', diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 9a905d249..ded9219e8 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -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()));