From f6674417cb56bff8307348af7295a8bcffd7d6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 18 Mar 2013 11:05:06 +0100
Subject: [PATCH 1/6] [-] Core: Fix #PSCFV-8293 bad sql vars name on
 Order::getShipping() #PSCFV-8293

---
 .../default/template/controllers/orders/_shipping.tpl       | 2 +-
 classes/order/Order.php                                     | 6 ++++--
 themes/default/mobile/order-detail.tpl                      | 2 +-
 themes/default/order-detail.tpl                             | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
index 7dd842ac3..ca22c24c1 100644
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -45,7 +45,7 @@
 	<tr>
 		<td>{dateFormat date=$line.date_add full=true}</td>
 		<td>{$line.type}</td>
-		<td>{$line.state_name}</td>
+		<td>{$line.carrier_name}</td>
 		<td>{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</td>
 		<td>
 			{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 11cc76562..36c2b45af 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1510,11 +1510,12 @@ class OrderCore extends ObjectModel
 
 	/**
 	 * @return array return all shipping method for the current order
+	 * state_name sql var is now deprecated - use order_state_name for the state name and carrier_name for the carrier_name
 	 */
 	public function getShipping()
 	{
 		return Db::getInstance()->executeS('
-			SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`
+			SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `carrier_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`, osl.`name` as order_state_name, c.`name` as state_name
 			FROM `'._DB_PREFIX_.'orders` o
 			LEFT JOIN `'._DB_PREFIX_.'order_history` oh
 				ON (o.`id_order` = oh.`id_order`)
@@ -1524,7 +1525,8 @@ class OrderCore extends ObjectModel
 				ON (oc.`id_carrier` = c.`id_carrier`)
 			LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl
 				ON (oh.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)Context::getContext()->language->id.')
-			WHERE oc.`id_order` = '.(int)$this->id);
+			WHERE o.`id_order` = '.(int)$this->id.'
+			GROUP BY c.id_carrier');
 	}
 
 
diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl
index d2a513e03..c341b7461 100644
--- a/themes/default/mobile/order-detail.tpl
+++ b/themes/default/mobile/order-detail.tpl
@@ -203,7 +203,7 @@
 <ul data-role="listview" >
 	{foreach from=$order->getShipping() item=line}
 	<li>
-		<h3>{$line.state_name}</h3>
+		<h3>{$line.carrier_name}</h3>
 		<p><strong>{l s='Weight'}</strong> {$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</p>
 		<p><strong>{l s='Shipping cost'}</strong> {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if}</p>
 		<p><strong>{l s='Tracking number'}</strong> {if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}" data-ajax="false">{$line.tracking_number}</a>{elseif $line.tracking_number != ''}{$line.tracking_number}{else}----{/if}</p>
diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl
index c305611de..c36c33366 100644
--- a/themes/default/order-detail.tpl
+++ b/themes/default/order-detail.tpl
@@ -326,7 +326,7 @@
 			{foreach from=$order->getShipping() item=line}
 			<tr class="item">
 				<td>{$line.date_add}</td>
-				<td>{$line.state_name}</td>
+				<td>{$line.carrier_name}</td>
 				<td>{if $line.weight > 0}{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}{else}-{/if}</td>
 				<td>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if}</td>
 				<td>

From a0f97f5425febb2070a84c08a13ade622caaf5f0 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 18 Mar 2013 11:08:57 +0100
Subject: [PATCH 2/6] // Clean code

---
 classes/Feature.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/classes/Feature.php b/classes/Feature.php
index 83b49bb57..5a879fc27 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -312,16 +312,16 @@ class FeatureCore extends ObjectModel
 	 */
 	public static function cleanPositions()
 	{
-		$return = true;
-		$sql = '
-			UPDATE `'._DB_PREFIX_.'feature` f LEFT JOIN
-				(SELECT @i := @i +1 AS rank, id_feature, position 
-				FROM `'._DB_PREFIX_.'feature` JOIN (SELECT @i :=1) dummy
-				ORDER by position) AS f2
-				USING(id_feature)
-				SET f.position = f2.rank-1';
-		$return = Db::getInstance()->executeS($sql);
-		return $return;
+		return Db::getInstance()->execute('
+		UPDATE `'._DB_PREFIX_.'feature` f
+		LEFT JOIN (
+			SELECT @i := @i +1 AS rank, id_feature, position 
+			FROM `'._DB_PREFIX_.'feature`
+			JOIN (SELECT @i :=1) dummy
+			ORDER by position
+		) AS f2
+		USING id_feature
+		SET f.position = f2.rank - 1');
 	}
 
 	/**

From e549207b8d1cb9183349d964ce3eb3d0831c8ee9 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 18 Mar 2013 11:49:45 +0100
Subject: [PATCH 3/6] // Small fix

---
 classes/Feature.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Feature.php b/classes/Feature.php
index 5a879fc27..fbf6af072 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -320,7 +320,7 @@ class FeatureCore extends ObjectModel
 			JOIN (SELECT @i :=1) dummy
 			ORDER by position
 		) AS f2
-		USING id_feature
+		USING (id_feature)
 		SET f.position = f2.rank - 1');
 	}
 

From 734c5a7c8f1d183d5cf8eacb83d69759e7aa7d3f Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 18 Mar 2013 14:54:04 +0100
Subject: [PATCH 4/6] [-] BO : fixed bug #PSCFV-8285 - module tab listing
 permission

---
 classes/controller/AdminController.php       | 14 ++++++++++++-
 controllers/admin/AdminModulesController.php | 22 ++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 13e0aa09a..f797cb5c8 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1514,6 +1514,7 @@ class AdminControllerCore extends Controller
 	
 	public function renderModulesList()
 	{
+		
 		if ($this->getModulesList($this->filter_modules_list))
 		{
 			$helper = new Helper();
@@ -2214,7 +2215,18 @@ class AdminControllerCore extends Controller
 		$this->modules_list = array();
 		foreach($all_modules as $module)
 		{
-			if (in_array($module->name, $filter_modules_list))
+			$perm = true;
+			if ($module->id)
+				$perm &= Module::getPermissionStatic($module->id, 'configure');
+			else
+			{
+				$id_admin_module = Tab::getIdFromClassName('AdminModules');
+				$access = Profile::getProfileAccess($this->context->employee->id_profile, $id_admin_module);
+				if (!$access['edit'])
+					$perm &= false; 
+			}
+			
+			if (in_array($module->name, $filter_modules_list) && $perm)
 			{
 				$this->fillModuleData($module, 'select');
 				$this->modules_list[] = $module;
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index ec5e2c42f..dcb8e6cb3 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -250,11 +250,25 @@ class AdminModulesControllerCore extends AdminController
 			{
 				if (in_array($module->name, $tab_modules_list))
 				{
-					$this->fillModuleData($module, 'select', $back);
+					$perm = true;
 					if ($module->id)
-						$modules_list['installed'][] = $module;
+						$perm &= Module::getPermissionStatic($module->id, 'configure');
 					else
-						$modules_list['not_installed'][] = $module;
+					{
+						$id_admin_module = Tab::getIdFromClassName('AdminModules');
+						$access = Profile::getProfileAccess($this->context->employee->id_profile, $id_admin_module);
+						if (!$access['edit'])
+							$perm &= false; 
+					}
+					if ($perm)
+					{
+						$this->fillModuleData($module, 'select', $back);
+						if ($module->id)
+							$modules_list['installed'][] = $module;
+						else
+							$modules_list['not_installed'][] = $module;
+
+					}
 				}		
 			}
 		}
@@ -781,7 +795,7 @@ class AdminModulesControllerCore extends AdminController
 		// Call appropriate module callback
 		if (!isset($ppmReturn))
 			$this->postProcessCallback();
-		
+
 		if ($back = Tools::getValue('back'))
 			Tools::redirectAdmin($back);	
 	}

From e9c618e55b0f7dfa08b5adb3061c615fd0978df7 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 18 Mar 2013 15:27:56 +0100
Subject: [PATCH 5/6] //small fix when click on install button on tab module
 list

---
 .../default/template/controllers/modules/tab_module_line.tpl   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
index 4bbace5b9..73147573b 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -72,7 +72,8 @@
 							{$module->optionsHtml}
 							<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">Valider</a>
 						{else}
-							<a href="{$module->options.install_url}" class="button action_tab_module">{l s='Install'}</a>
+							
+							<a href="{$module->options.install_url}" class="button">{l s='Install'}</a>
 						{/if}
 					</div>
 				</td>

From ce4148b89a82415bf1422258aec21cbfef5724fa Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 18 Mar 2013 17:48:17 +0100
Subject: [PATCH 6/6] [-] BO : added important check of the default language
 for ObjectModel multilang properties

---
 classes/ObjectModel.php                     | 2 ++
 controllers/admin/AdminImportController.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 444d1dfdb..27b09c547 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -859,6 +859,8 @@ abstract class ObjectModelCore
 			$values = $this->$field;
 			if (!is_array($values))
 				$values = array($this->id_lang => $values);
+			if (!isset($values[Configuration::get('PS_LANG_DEFAULT')]))
+				$values[Configuration::get('PS_LANG_DEFAULT')] = '';
 
 			foreach ($values as $id_lang => $value)
 			{
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index f8eb332fc..9add527b1 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -645,7 +645,7 @@ class AdminImportControllerCore extends AdminController
 		do $uniqid_path = _PS_UPLOAD_DIR_.uniqid(); while (file_exists($uniqid_path));
 		file_put_contents($uniqid_path, $field);
 		$tab = '';
-		if(!empty($uniqid_path))
+		if (!empty($uniqid_path))
 		{
 			$fd = fopen($uniqid_path, 'r');
 			$tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);