From a84e91f9732d9c73c7ba601c453d6675198b4d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 5 Feb 2013 11:02:05 +0100 Subject: [PATCH 1/4] // Fix merge bug --- classes/stock/StockManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php index f74e343f2..1ad67d77b 100644 --- a/classes/stock/StockManager.php +++ b/classes/stock/StockManager.php @@ -473,7 +473,7 @@ class StockManagerCore implements StockManagerInterface $query->where('od.product_id = '.(int)$id_product); if (0 != $id_product_attribute) $query->where('od.product_attribute_id = '.(int)$id_product_attribute); - $query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.date_add = o.date_upd'); + $query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.id_order_state = o.current_state'); $query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state'); $query->where('os.shipped != 1'); $query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').' @@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface return $stocks; } -} \ No newline at end of file +} From 9c317100929cd9eaeea8ddc99d4a568fd26d4b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 5 Feb 2013 11:27:17 +0100 Subject: [PATCH 2/4] [-] BO: Fix #PSCFV-6497 display of list when deleting customers --- .../controllers/customers/helpers/list/list_header.tpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl index 27743f08e..39fec4f95 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl @@ -62,5 +62,10 @@
 
+ {/if} {/block} From 6721387e7b18dd406d27e89b62f287a649c5a61b Mon Sep 17 00:00:00 2001 From: gRoussac Date: Tue, 5 Feb 2013 11:53:44 +0100 Subject: [PATCH 3/4] [-] CORE : Set default customer group to old default group when upgrading from 1.4.X --- .../php/update_customer_default_group.php | 50 +++++++++++++++++++ install-dev/upgrade/sql/1.5.4.0.sql | 2 + 2 files changed, 52 insertions(+) create mode 100644 install-dev/upgrade/php/update_customer_default_group.php diff --git a/install-dev/upgrade/php/update_customer_default_group.php b/install-dev/upgrade/php/update_customer_default_group.php new file mode 100644 index 000000000..75aeaf6a2 --- /dev/null +++ b/install-dev/upgrade/php/update_customer_default_group.php @@ -0,0 +1,50 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +public function update_customer_default_group() +{ + $filename = _PS_ROOT_DIR_.'/config/defines.inc.php'; + $filename_old = str_replace('.inc.', '.old.', $filename); + copy($filename, $filename_old); + @chmod($filename_old, 0664); + $content = file_get_contents($filename); + $pattern = "/define\('_PS_DEFAULT_CUSTOMER_GROUP_', (\d)\);/"; + preg_match($pattern, $content, $matches); + if (!defined('_PS_DEFAULT_CUSTOMER_GROUP_')) + define('_PS_DEFAULT_CUSTOMER_GROUP_', ((isset($matches[1]) AND is_numeric($matches[1]))? (int)$matches[1] : 3)); + $ps_customer_group = $this->db->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE name LIKE "PS_CUSTOMER_GROUP"', false); + $str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');'; + $str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');'; + $content = str_replace($str_old, $str_new, $content); + $result = (bool)file_put_contents($filename, $content); + if($result === true && file_exists($filename) && file_exists($filename_old)) + { + @unlink($filename_old); + @chmod($filename, 0664); + return true; + } + return false; +} \ No newline at end of file diff --git a/install-dev/upgrade/sql/1.5.4.0.sql b/install-dev/upgrade/sql/1.5.4.0.sql index a5bdbe096..481f951d2 100644 --- a/install-dev/upgrade/sql/1.5.4.0.sql +++ b/install-dev/upgrade/sql/1.5.4.0.sql @@ -1,5 +1,7 @@ SET NAMES 'utf8'; +/* PHP:update_customer_default_group(); */; + UPDATE `PREFIX_meta` SET `page` = 'supplier' WHERE `page` = 'supply'; ALTER TABLE `PREFIX_image_type` CHANGE `name` `name` VARCHAR( 64 ) NOT NULL; From 0836efb02fc41ee9e9051da983d858b7f805673b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 5 Feb 2013 12:20:46 +0100 Subject: [PATCH 4/4] [-] BO: Not allow to give an existing email when editing an employee --- controllers/admin/AdminEmployeesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 667ce6213..4ed6e5490 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -343,7 +343,7 @@ class AdminEmployeesControllerCore extends AdminController $email = $this->getFieldValue($obj, 'email'); if (!Validate::isEmail($email)) $this->errors[] = Tools::displayError('Invalid e-mail'); - else if (Employee::employeeExists($email) && !Tools::getValue('id_employee')) + elseif (Employee::employeeExists($email) && (!Tools::getValue('id_employee') || ($employee = new Employee((int)Tools::getValue('id_employee'))) && $employee->email != $email)) $this->errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$email; }