// Merge -> revision 8097

admin-dev/ajax.php

@@ -625,7 +625,7 @@ if (Tools::isSubmit('getAdminHomeElement'))
 {
 	$result = array();
 	
-	$protocol = (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http';
+	$protocol = Tools::usingSecureMode() ? 'https' : 'http';
 	$isoUser = Context::getContext()->language->iso_code;
 	$isoCountry = Context::getContext()->country->iso_code;
 	$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));

admin-dev/tabs/AdminDiscounts.php

@@ -340,7 +340,11 @@ class AdminDiscounts extends AdminTab
 				</div>
 				<label>'.$this->l('Minimum amount').'</label>
 				<div class="margin-form">
-					<input type="text" size="15" name="minimal" value="'.($this->getFieldValue($obj, 'minimal') ? (float)($this->getFieldValue($obj, 'minimal')) : '0').'" onkeyup="javascript:this.value = this.value.replace(/,/g, \'.\'); " /> <sup>*</sup>
+					<input type="text" size="15" name="minimal" value="'.($this->getFieldValue($obj, 'minimal') ? (float)($this->getFieldValue($obj, 'minimal')) : '0').'" onkeyup="javascript:this.value = this.value.replace(/,/g, \'.\'); " /> <sup>*</sup>&nbsp;
+					<select name="include_tax" id="include_tax" style="vertical-align: middle;">
+						<option value="0">'.$this->l('tax excl.').'</option>
+						<option value="1">'.$this->l('tax incl.').'</option>
+					</select>
 					<p class="clear">'.$this->l('0 if not applicable').'</p>
 				</div>
 				<div class="margin-form">
@@ -540,6 +544,4 @@ class AdminDiscounts extends AdminTab
 				if ($key != 'infos')
 					self::recurseCategoryForInclude($id_obj, $indexedCategories, $categories, $categories[$id_category][$key], $key, $id_category_default, $has_suite);
 	}
-}
-
-
+}

admin-dev/tabs/AdminHome.php

@@ -154,7 +154,7 @@ class AdminHome extends AdminTab
 		$this->warnDomainName();
 
 		$tab = get_class();
-		$protocol = (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off')?'https':'http';
+		$protocol = Tools::usingSecureMode()?'https':'http';
 		$isoUser = $this->context->language->iso_code;
 		$currency = $this->context->currency;
 		echo '<div>

admin-dev/tabs/AdminImport.php

@@ -751,11 +751,17 @@ class AdminImport extends AdminTab
 				// check quantity
 				if ($product->quantity == NULL)
 					$product->quantity = 0;
-					
-				// If id product AND id product already in base, trying to update
-				if ($product->id AND Product::existsInDatabase((int)($product->id), 'product'))
-				{
 
+				// If match ref is specified AND ref product AND ref product already in base, trying to update
+				if (Tools::getValue('match_ref') == 1 AND $product->reference AND Product::existsRefInDatabase($product->reference))
+				{
+					$datas = Db::getInstance()->getRow('SELECT `date_add`, `id_product` FROM `'._DB_PREFIX_.'product` WHERE `reference` = "'.$product->reference.'"');
+					$product->id = pSQL($datas['id_product']);
+					$product->date_add = pSQL($datas['date_add']);
+					$res = $product->update();
+				} // Else If id product AND id product already in base, trying to update
+				else if ($product->id AND Product::existsInDatabase((int)($product->id), 'product'))
+				{
 					$datas = Db::getInstance()->getRow('SELECT `date_add` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)($product->id));
 					$product->date_add = pSQL($datas['date_add']);
 					$res = $product->update();
@@ -767,7 +773,7 @@ class AdminImport extends AdminTab
 						$res = $product->add(false);
 					else
 					$res = $product->add();
-			}
+				}
 			}
 			// If both failed, mysql error
 			if (!$res)
@@ -1396,14 +1402,21 @@ class AdminImport extends AdminTab
 							</div>
 							<label for="truncate" class="clear">'.$this->l('Delete all').' <span id="entitie">'.$this->l('categories').'</span> '.$this->l('before import ?').' </label>
 							<div class="margin-form">
-								<input name="truncate" id="truncate" type="checkbox" style="margin-top: 6px;"/>
+							<input name="truncate" id="truncate" type="checkbox"/>
 							</div>
+						<label for="match_ref" class="clear" style="display: none">'.$this->l('Use product reference as key ?').'</label>
+						<div class="margin-form">
+							<input name="match_ref" id="match_ref" type="checkbox" style="margin-top: 6px; display:none"/>
+						</div>
 							<div class="space margin-form">
 								<input type="submit" name="submitImportFile" value="'.$this->l('Next step').'" class="button"/>
 							</div>
 							<div>
-								'.$this->l('Note that the category import does not support categories of the same name').'
+							'.$this->l('Note that the category import does not support categories of the same name').'.
 							</div>
+						<div>
+							'.$this->l('Note that references are not specified as UNIQUE in the database').'.
+						</div>
 						';
 				}
 				else
@@ -1427,6 +1440,14 @@ class AdminImport extends AdminTab
 				<div class="clear">&nbsp;</div>
 				<script type="text/javascript">
 					$("select#entity").change( function() {
+					if ($("#entity > option:selected").val() != 1)
+					{
+						$("label[for=match_ref],#match_ref").hide();
+					}
+					if ($("#entity > option:selected").val() == 1)
+					{
+						$("label[for=match_ref],#match_ref").show();
+					}
 						$("#entitie").html($("#entity > option:selected").text().toLowerCase());
 						$.getJSON("'.dirname(self::$currentIndex).'/ajax.php", 
 							{
@@ -1577,13 +1598,15 @@ class AdminImport extends AdminTab
 
 		echo '
 		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post" id="import_form" name="import_form">
-			'.$this->l('Skip').' <input type="text" size="2" name="skip" value="0" /> '.$this->l('lines').'.
+			'.$this->l('Skip').' <input type="text" size="2" name="skip" value="0" /> '.$this->l('lines').'
 			<input type="hidden" name="csv" value="'.Tools::getValue('csv').'" />
 			<input type="hidden" name="convert" value="'.Tools::getValue('convert').'" />
 			<input type="hidden" name="entity" value="'.(int)(Tools::getValue('entity')).'" />
 			<input type="hidden" name="iso_lang" value="'.Tools::getValue('iso_lang').'" />';
 		if (Tools::getValue('truncate'))
 			echo '<input type="hidden" name="truncate" value="1" />';
+		if (Tools::getValue('match_ref'))
+			echo '<input type="hidden" name="match_ref" value="1" />';
 		echo '
 			<input type="hidden" name="separator" value="'.strval(trim(Tools::getValue('separator'))).'">
 			<input type="hidden" name="multiple_value_separator" value="'.strval(trim(Tools::getValue('multiple_value_separator'))).'">

admin-dev/tabs/AdminPreferences.php

@@ -106,7 +106,7 @@ class AdminPreferences extends AdminTab
 				$fields['PS_TIMEZONE'] = array('title' => $this->l('Time Zone:'), 'validation' => 'isAnything', 'type' => 'select', 'list' => $timezones, 'identifier' => 'name', 'visibility' => Shop::CONTEXT_ALL);
 			
 			// No HTTPS activation if you haven't already.
-			if (empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off')
+			if (!Tools::usingSecureMode())
 			{
 				$fields['PS_SSL_ENABLED']['type'] = 'disabled';
 				$fields['PS_SSL_ENABLED']['disabled'] = '<a href="https://'.Tools::getShopDomainSsl().$_SERVER['REQUEST_URI'].'">'.$this->l('Please click here to use HTTPS protocol before enabling SSL.').'</a>';

classes/Discount.php

@@ -71,6 +71,9 @@ class DiscountCore extends ObjectModel
 	/** @var integer Minimum cart total amount required to use the discount */
 	public 		$minimal;
 
+	/** @var boolean include_tax selected for the choice of the calcul method in the cart*/
+	public 		$include_tax;
+
 	/** @var integer display the discount in the summary */
 	public 		$cart_display;
 
@@ -115,6 +118,7 @@ class DiscountCore extends ObjectModel
 			'date_from' => array('sqlId' => 'date_from'),
 			'date_to' => array('sqlId' => 'date_to'),
 			'minimal' => array('sqlId' => 'minimal'),
+			'include_tax' => array('sqlId' => 'include_tax'),
 			'active' => array('sqlId' => 'active'),
 			'cart_display' => array('sqlId' => 'cart_display'),
 			'date_add' => array('sqlId' => 'date_add'),
@@ -141,6 +145,7 @@ class DiscountCore extends ObjectModel
 		$fields['date_from'] = pSQL($this->date_from);
 		$fields['date_to'] = pSQL($this->date_to);
 		$fields['minimal'] = (float)($this->minimal);
+		$fields['include_tax'] = (int)($this->include_tax);
 		$fields['behavior_not_exhausted'] = (int)$this->behavior_not_exhausted;
 		$fields['active'] = (int)($this->active);
 		$fields['cart_display'] = (int)($this->cart_display);
@@ -297,11 +302,9 @@ class DiscountCore extends ObjectModel
 
 		foreach ($products AS $product)
 			if (count($categories) AND Product::idIsOnCategoryId($product['id_product'], $categories))
-				$totalAmount += $useTax ? $product['price_wt'] * $product['quantity']: $product['price'] * $product['quantity'];
-
+				$totalAmount += $this->include_tax ? $product['total_wt'] : $product['total'];
 		if ($this->minimal > 0 AND $totalAmount < $this->minimal)
 			return 0;
-
 		switch ($this->id_discount_type)
 		{
 			/* Relative value (% of the order total) */
@@ -311,7 +314,7 @@ class DiscountCore extends ObjectModel
 				foreach ($products AS $product)
 						if (Product::idIsOnCategoryId($product['id_product'], $categories))
 							if ($this->cumulable_reduction OR (!$product['reduction_applies'] AND !$product['on_sale']))
-								$amount += ($useTax ? $product['total_wt'] : $product['total']) * $percentage;
+								$amount += ($this->include_tax ? $product['total_wt'] : $product['total']) * $percentage;
 				return $amount;
 
 			/* Absolute value */
@@ -322,7 +325,7 @@ class DiscountCore extends ObjectModel
 					return 0;
 
 				$taxDiscount = Cart::getTaxesAverageUsed((int)($cart->id));
-				if (!$useTax AND isset($taxDiscount) AND $taxDiscount != 1)
+				if (!$this->include_tax AND isset($taxDiscount) AND $taxDiscount != 1)
 					$this->value = abs($this->value / (1 + $taxDiscount * 0.01));
 
 				// Main return
@@ -483,4 +486,4 @@ class DiscountCore extends ObjectModel
 	{
 		return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'discount` WHERE `id_discount` = '.(int)$id_discount);
 	}
-}
+}

classes/FrontController.php

@@ -87,7 +87,7 @@ class FrontControllerCore
 		 * Use the Context to access objects instead.
 		 * Example: $this->context->cart
 		 */
-		global $cookie, $smarty, $cart, $iso, $defaultCountry, $protocol_link, $protocol_content, $link, $css_files, $js_files, $currency;
+		global $useSSL, $cookie, $smarty, $cart, $iso, $defaultCountry, $protocol_link, $protocol_content, $link, $css_files, $js_files, $currency;
 
 		if (self::$initialized)
 			return;
@@ -97,7 +97,7 @@ class FrontControllerCore
 		
 		$this->id_current_shop = Context::getContext()->shop->getID();
 		$this->id_current_group_shop = Context::getContext()->shop->getGroupID();
-		
+
 		$this->css_files = array();
 		$this->js_files = array();
 		
@@ -105,7 +105,7 @@ class FrontControllerCore
 		$css_files = $this->css_files;
 		$js_files = $this->js_files;
 		
-		if ($this->ssl AND (empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off') AND Configuration::get('PS_SSL_ENABLED'))
+		if ($this->ssl AND !Tools::usingSecureMode() AND Configuration::get('PS_SSL_ENABLED'))
 		{
 			header('HTTP/1.1 301 Moved Permanently');
 			header('Location: '.Tools::getShopDomainSsl(true).$_SERVER['REQUEST_URI']);
@@ -127,8 +127,9 @@ class FrontControllerCore
 
 		$this->context->smarty->ps_language = $this->context->language;
 		
-		$protocol_link = (Configuration::get('PS_SSL_ENABLED') OR (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
-		$protocol_content = ((isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) OR (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
+		$protocol_link = (Configuration::get('PS_SSL_ENABLED') OR Tools::usingSecureMode()) ? 'https://' : 'http://';
+		$useSSL = (isset($this->ssl) AND $this->ssl AND Configuration::get('PS_SSL_ENABLED')) OR Tools::usingSecureMode()?true:false;
+		$protocol_content = ($useSSL) ? 'https://' : 'http://';
 		$link = new Link($protocol_link, $protocol_content);
 		$this->context->link = $link;
 
@@ -267,7 +268,7 @@ class FrontControllerCore
 			'page_name' => $page_name,
 			'base_dir' => _PS_BASE_URL_.__PS_BASE_URI__,
 			'base_dir_ssl' => $protocol_link.Tools::getShopDomainSsl().__PS_BASE_URI__,
-			'content_dir' => $protocol_content.Tools::getShopDomain().__PS_BASE_URI__,
+			'content_dir' => $protocol_content.(($useSSL)?Tools::getShopDomainSsl():Tools::getShopDomain()).__PS_BASE_URI__,
 			'tpl_dir' => _PS_THEME_DIR_,
 			'modules_dir' => _MODULE_DIR_,
 			'mail_dir' => _MAIL_DIR_,

classes/Meta.php

@@ -130,9 +130,10 @@ class MetaCore extends ObjectModel
 			return false;			
 									
 		return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
-									(int)(Configuration::get('PS_REWRITING_SETTINGS')),		
-									(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')), 
-									''
+									(int)Configuration::get('PS_REWRITING_SETTINGS'),
+									(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
+									'',
+									(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
 									);
 	}
 
@@ -141,9 +142,10 @@ class MetaCore extends ObjectModel
 		if (!parent::add($autodate, $nullValues));
 		
 		return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
-									(int)(Configuration::get('PS_REWRITING_SETTINGS')),		
-									(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')), 
-									''
+									(int)Configuration::get('PS_REWRITING_SETTINGS'),
+									(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
+									'',
+									(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
 									);
 	}
 	
@@ -153,9 +155,10 @@ class MetaCore extends ObjectModel
 			return false;
 		
 		return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
-								(int)(Configuration::get('PS_REWRITING_SETTINGS')),		
-								(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')), 
-								''
+								(int)Configuration::get('PS_REWRITING_SETTINGS'),
+								(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'),
+								'',
+								(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
 								);
 	}
 	
@@ -171,9 +174,10 @@ class MetaCore extends ObjectModel
 		}
 		
 		return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
-									(int)(Configuration::get('PS_REWRITING_SETTINGS')),		
-									(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')), 
-									''
+									(int)Configuration::get('PS_REWRITING_SETTINGS'),		
+									(int)Configuration::get('PS_HTACCESS_CACHE_CONTROL'), 
+									'',
+									(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
 									);
 	}
 

classes/Product.php

@@ -3420,4 +3420,18 @@ class ProductCore extends ObjectModel
 				return false;
 		return true;
 	}
-}
+        
+	/**
+	 * Checks if reference exists
+	 * @return boolean
+	 */
+	public function existsRefInDatabase($reference)
+	{
+		$row = Db::getInstance()->getRow('
+		SELECT `reference`
+		FROM `'._DB_PREFIX_.'product` p
+		WHERE p.reference = "'.$reference.'"');
+	                
+		return isset($row['reference']);
+	}
+}

classes/Tools.php

@@ -224,6 +224,10 @@ class ToolsCore
 	*/
 	public static function usingSecureMode()
 	{
+		if (empty($_SERVER['HTTPS'])) {
+			if(!empty($_SERVER['SSL']))
+				$_SERVER['HTTPS'] = $_SERVER['SSL'];
+		}
 		return !(empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off');
 	}
 	

install-dev/sql/db.sql

@@ -115,7 +115,7 @@ CREATE TABLE `PREFIX_attribute_lang` (
   `id_attribute` int(10) unsigned NOT NULL,
   `id_lang` int(10) unsigned NOT NULL,
   `name` varchar(128) NOT NULL,
-  PRIMARY KEY `attribute_lang` (`id_attribute`,`id_lang`),
+  PRIMARY KEY (`id_attribute`,`id_lang`),
   KEY `id_lang` (`id_lang`,`name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
@@ -567,6 +567,7 @@ CREATE TABLE `PREFIX_discount` (
   `date_from` datetime NOT NULL,
   `date_to` datetime NOT NULL,
   `minimal` decimal(17,2) default NULL,
+  `include_tax` tinyint(1) NOT NULL default '0',
   `active` tinyint(1) unsigned NOT NULL default '0',
   `cart_display` tinyint(1) unsigned NOT NULL default '0',
 	`date_add` datetime NOT NULL,

install-dev/sql/upgrade/1.2.0.1.sql

@@ -169,7 +169,7 @@ ALTER TABLE PREFIX_product_lang DROP INDEX `id_product`;
 CREATE TABLE `PREFIX_customer_group` (
 	`id_customer` int(10) unsigned NOT NULL,
 	`id_group` int(10) unsigned NOT NULL,
-	PRIMARY KEY `customer_group_index` (`id_customer`,`id_group`),
+	PRIMARY KEY (`id_customer`,`id_group`),
 	INDEX customer_login(id_group)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 

install-dev/sql/upgrade/1.4.5.0.sql

@@ -11,4 +11,6 @@ AND `id_lang` = (
 	FROM `PREFIX_lang`
 	WHERE `iso_code` = 'en'
 	LIMIT 1
-);
+);
+
+ALTER TABLE `PREFIX_discount` ADD `include_tax` TINYINT(1) NOT NULL DEFAULT '0';

modules/authorizeaim/authorizeaim.php

@@ -140,7 +140,7 @@ class authorizeAIM extends PaymentModule
 
 	public function hookPayment($params)
 	{
-		if (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off' AND Configuration::get('PS_SSL_ENABLED'))
+		if (Tools::usingSecureMode() AND Configuration::get('PS_SSL_ENABLED'))
 		{
 			$invoiceAddress = new Address((int)$params['cart']->id_address_invoice);
 			

modules/blocksearch/blocksearch.php

@@ -80,9 +80,8 @@ class BlockSearch extends Module
 	 */
 	private function _hookCommon($params)
 	{
-
 		$this->context->smarty->assign('ENT_QUOTES', ENT_QUOTES);
-		$this->context->smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
+		$this->context->smarty->assign('search_ssl', Tools::usingSecureMode());
 		
 		$ajaxSearch=(int)(Configuration::get('PS_SEARCH_AJAX'));
 		$this->context->smarty->assign('ajaxsearch', $ajaxSearch);

modules/blockwishlist/mywishlist.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 <div id="mywishlist">
 	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

modules/loyalty/loyalty.php

@@ -525,6 +525,8 @@ class Loyalty extends Module
 				 'voucher' => LoyaltyModule::getVoucherValue((int)$points),
 				 'guest_checkout' => (int)Configuration::get('PS_GUEST_CHECKOUT_ENABLED')
 			));
+		} else {
+			$smarty->assign(array('points' => 0));
 		}
 		
 		return $this->display(__FILE__, 'shopping-cart.tpl');

modules/loyalty/loyalty.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

modules/mailalerts/myalerts.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 <div id="myalerts">
 	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

modules/mondialrelay/mondialrelay.php

@@ -368,8 +368,7 @@ class MondialRelay extends Module
 		self::$modulePath =	_PS_MODULE_DIR_. 'mondialrelay/';
 		self::$MRToken = sha1('mr'._COOKIE_KEY_.'mrAgain');
 	
-		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) 
-			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
+		$protocol = (Configuration::get('PS_SSL_ENABLED') || Tools::usingSecureMode()) ? 'https://' : 'http://';
 		
 		$endURL = __PS_BASE_URI__.'/modules/mondialrelay/';
 	

modules/paypal/paypal.php

@@ -1033,7 +1033,7 @@ class PayPal extends PaymentModule
 		// Amount for refund
 		$amt = 0.00;
 		foreach ($products AS $product)
-			$amt += (float)($product['total_price']) * ($product['product_quantity'] - $product['product_quantity_refunded']);
+			$amt += (float)($product['product_price_wt']) * ($product['product_quantity'] - $product['product_quantity_refunded']);
 		$amt += (float)($order->total_shipping) + (float)($order->total_wrapping) - (float)($order->total_discounts);
 
 		// check if total or partial

modules/referralprogram/referralprogram-program.tpl

@@ -26,12 +26,6 @@
 
 <script type="text/javascript">
 //<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
-<script type="text/javascript">
-// <![CDATA[
 	ThickboxI18nClose = "{l s='Close' mod='referralprogram'}";
 	ThickboxI18nOrEscKey = "{l s='or Esc key' mod='referralprogram'}";
 	tb_pathToImage = "{$img_ps_dir}loadingAnimation.gif";

modules/treepodia/treepodia.php

@@ -86,7 +86,7 @@ class Treepodia extends Module
 		if (!($domain = Configuration::get('PS_SHOP_DOMAIN')))
 			$domain = $_SERVER['HTTP_HOST'];
 
-		$host = ((Configuration::get('PS_SSL_ENABLED') OR (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
+		$host = ((Configuration::get('PS_SSL_ENABLED') OR Tools::usingSecureMode()) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
 
 		return $host;
 	}

modules/uspscarrier/config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <module>
 	<name>uspscarrier</name>
-	<displayName><![CDATA[USPS Carrier]]></displayName>
+	<displayName><![CDATA[U.S.P.S Rate Calulator]]></displayName>
 	<version><![CDATA[1.1]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with USPS]]></description>
 	<author><![CDATA[PrestaShop]]></author>

themes/live_edit.tpl

@@ -37,7 +37,6 @@
 	var unableToUnregisterHook = '{l s='Unable to unregister hook'}';
 	var unableToSaveModulePosition = '{l s='Unable to save module position'}';
 	var loadFail = '{l s='Failed to load module list'}';
-	var baseDir = '{$base_dir}';
 </script>
 
 <div style="width:100%;height:30px;padding-top:10px;background-color:#D0D3D8;border:solid 1px gray;position:fixed;bottom:0;left:0;opacity:0.7" onmouseover="$(this).css('opacity', 1);" onmouseout="$(this).css('opacity', 0.7);">

themes/prestashop/address.tpl

@@ -52,12 +52,6 @@
 	{/if}
 {/if}
 
-<script type="text/javascript">
-// <![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 <script type="text/javascript">
 // <![CDATA[
 idSelectedCountry = {if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{else}false{/if}{/if};

themes/prestashop/addresses.tpl

@@ -78,7 +78,6 @@
 
 <script type="text/javascript">
 //<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
 	{literal}
 	$(document).ready(function()
 	{

themes/prestashop/discount.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My Vouchers'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/history.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Order history'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 {include file="$tpl_dir./errors.tpl"}

themes/prestashop/identity.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Your personal information'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/my-account.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}{l s='My account'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/order-address.tpl

@@ -61,7 +61,6 @@
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
-	var baseDir = '{$base_dir_ssl}';
 	var orderProcess = 'order';
 	var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
 	var currencyRate = '{$currencyRate|floatval}';

themes/prestashop/order-carrier.tpl

@@ -27,7 +27,6 @@
 {if !$opc}
 	<script type="text/javascript">
 	//<![CDATA[
-		var baseDir = '{$base_dir_ssl}';
 		var orderProcess = 'order';
 		var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
 		var currencyRate = '{$currencyRate|floatval}';

themes/prestashop/order-confirmation.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}{l s='Order confirmation'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/order-detail.tpl

@@ -24,11 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-// <![CDATA[
-	var baseDir = '{$base_dir_ssl}';		
-//]]>
-</script>
 {if !isset($smarty.get.ajax)}
 <div class="block-center" id="block-history">
 	<div id="block-order-detail">

themes/prestashop/order-follow.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Return Merchandise Authorization (RMA)'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/order-opc.tpl

@@ -32,7 +32,6 @@
 {else}
 <script type="text/javascript">
 	// <![CDATA[
-	var baseDir = '{$base_dir_ssl}';
 	var imgDir = '{$img_dir}';
 	var authenticationUrl = '{$link->getPageLink("authentication", true)}';
 	var orderOpcUrl = '{$link->getPageLink("order-opc", true)}';

themes/prestashop/order-payment.tpl

@@ -27,7 +27,6 @@
 {if !$opc}
 	<script type="text/javascript">
 	// <![CDATA[
-	var baseDir = '{$base_dir_ssl}';
 	var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';

themes/prestashop/order-slip.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Credit slips'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

themes/prestashop/shopping-cart.tpl

@@ -40,7 +40,6 @@
 {else}
 	<script type="text/javascript">
 	// <![CDATA[
-	var baseDir = '{$base_dir_ssl}';
 	var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
 	var currencyRate = '{$currencyRate|floatval}';
 	var currencyFormat = '{$currencyFormat|intval}';

translations/fr/admin.php

@@ -1241,8 +1241,10 @@ $_LANGADM['AdminImportbf8a4a7e7e5c9cff1528294e1b1dd3f0'] = 'Séparateur champs
 $_LANGADM['AdminImport0450d266974d92724ff4bacc3a51952e'] = 'Supprimer les';
 $_LANGADM['AdminImportb0b5ccb4a195a07fd3eed14affb8695f'] = 'catégories';
 $_LANGADM['AdminImport74b997703c3e7fc1db960f1366ba03ab'] = 'avant l\'import ?';
+$_LANGADM['AdminImport34219bb13b784f30df289c19f5dc0e31'] = 'Utiliser la référence comme clé ?';
 $_LANGADM['AdminImportc290a5941ad6eb0d5fe8752c15c5fd78'] = 'Etape suivante';
 $_LANGADM['AdminImport651463c8be1ff45540a213cfcae30cfc'] = 'Notez que l\'import de catégories ne gère pas les catégories de même nom';
+$_LANGADM['AdminImportfbb6344e653db9f1e291725cd254bd9c'] = 'Notez que les références ne sont pas UNIQUE dans la base de donnée';
 $_LANGADM['AdminImport6fa9eb1f1c5bd853188d93953b6e92b2'] = 'Il n\'y a pas de fichier CSV de disponible, veuillez en charger un.';
 $_LANGADM['AdminImport6a84219217279f2f1ad80deda1c512d8'] = 'Vous pouvez obtenir de nombreuses informations sur l\'importation CSV à l\'adresse suivante:';
 $_LANGADM['AdminImport950770fc8c228bda83a28836b467df5d'] = 'Pour en savoir plus sur le format CSV rendez-vous à l\'adresse suivante:';