use tax in gifts sentences and update translations in french

modules/giveagift/giveagift.php

@@ -603,6 +603,7 @@ class GiveAGift extends Module
 
 			$this->context->smarty->assign(array(
 				'ranges' => $ranges,
+				'use_tax' => $use_tax,
 				'gift_min_amount' => $gift_min_amount ? Tools::convertPriceFull($gift_min_amount, $gift_currency, $this->context->currency) : false,
 				'gift_available' => $gift_available,
 				'ranges_available' => $ranges_available,

themes/roykin/modules/giveagift/shoppingCart.tpl

@@ -20,16 +20,36 @@
 						<div class="gift_range" id="range_{$index|escape:'html':'UTF-8':'intval'}" data-range="{$index|escape:'html':'UTF-8':'intval'}">
 							<h3 class="page-subheading">
 							{if $range.minimum_amount > 0 && $range.maximum_amount <= 0}{* from x to infinity *}
-								{l s='Your gift from %s of purchases' sprintf=Tools::displayPrice($range.minimum_amount, $currency) mod='giveagift'}{if !empty($range.manufacturer_name)} {l s='for the manufacturer:' mod='giveagift'} {$range.manufacturer_name|escape:'html':'UTF-8'}{/if}
+								{if $use_tax}
+									{l s='Your gift from %s with taxes of purchases' sprintf=Tools::displayPrice($range.minimum_amount, $currency)  mod='giveagift'}
+								{else}
+									{l s='Your gift from %s without taxes of purchases' sprintf=Tools::displayPrice($range.minimum_amount, $currency)  mod='giveagift'}
+								{/if}
+								{if !empty($range.manufacturer_name)} {l s='for the manufacturer:' mod='giveagift'} {$range.manufacturer_name|escape:'html':'UTF-8'}{/if}
 							{elseif $range.minimum_amount > 0 && $range.maximum_amount > 0}{* from x to y *}
-								{l s='Your gift from %s to %s of purchases' sprintf=[Tools::displayPrice($range.minimum_amount, $currency),Tools::displayPrice($range.maximum_amount, $currency)] mod='giveagift'}{if !empty($range.manufacturer_name)} {l s='for the manufacturer:' mod='giveagift'} {$range.manufacturer_name|escape:'html':'UTF-8'}{/if}
+								{if $use_tax}
+									{l s='Your gift from %s to %s with taxes of purchases' sprintf=[Tools::displayPrice($range.minimum_amount, $currency),Tools::displayPrice($range.maximum_amount, $currency)] mod='giveagift'}
+								{else}
+									{l s='Your gift from %s to %s without taxes of purchases' sprintf=[Tools::displayPrice($range.minimum_amount, $currency),Tools::displayPrice($range.maximum_amount, $currency)] mod='giveagift'}
+								{/if}
+								{if !empty($range.manufacturer_name)} {l s='for the manufacturer:' mod='giveagift'} {$range.manufacturer_name|escape:'html':'UTF-8'}{/if}
 							{elseif $range.minimum_amount <= 0 && $range.maximum_amount > 0}{* from 0 to x *}
-								{l s='Your gift up to %s of purchases' sprintf=Tools::displayPrice($range.maximum_amount, $currency) mod='giveagift'}
+								{if $use_tax}
+									{l s='Your gift up to %s with taxes of purchases' sprintf=Tools::displayPrice($range.maximum_amount, $currency) mod='giveagift'}
+								{else}
+									{l s='Your gift up to %s without taxes of purchases' sprintf=Tools::displayPrice($range.maximum_amount, $currency) mod='giveagift'}
+								{/if}
 							{else}
 								{l s='Choose your gift' mod='giveagift'}{* from 0 to infinity *}
 							{/if}
 							</h3>
-							{if $range.amount_left}<p class="subtitle">{l s='Only %s left to get the gifts !'  sprintf=Tools::displayPrice($range.amount_left, $currency) mod='giveagift'}</p>{/if}
+							{if $range.amount_left}<p class="subtitle">
+								{if $use_tax}
+									{l s='Only %s with taxes left to get the gifts !'  sprintf=Tools::displayPrice($range.amount_left, $currency) mod='giveagift'}
+								{else}
+									{l s='Only %s without taxes left to get the gifts !'  sprintf=Tools::displayPrice($range.amount_left, $currency) mod='giveagift'}
+								{/if}
+							</p>{/if}
 							<div class="gift-scroll">
 							{foreach from=$range.gifts item=gift}
 								<div class="gift-content text-center {if !$gift['available']} disable{elseif $gift.selected} selected{elseif !empty($range.selected)} giftselect{/if}">

themes/roykin/modules/giveagift/translations/fr.php

@@ -103,12 +103,16 @@ $_MODULE['<{giveagift}prestashop>list_1.5_62902641c38f3a4a8eb3212454360e24'] = '
 $_MODULE['<{giveagift}prestashop>list_1.5_1e1cc9bdeb2f29f5480106aec7e9bc48'] = 'Actuel';
 $_MODULE['<{giveagift}prestashop>list_1.5_f92965e2c8a7afb3c1b9a5c09a263636'] = 'Fermer';
 $_MODULE['<{giveagift}prestashop>shoppingcart_8077f3a81f31744656c4ff0dff8efe25'] = 'Votre cadeau';
-$_MODULE['<{giveagift}prestashop>shoppingcart_673ff6cd3596180e64968c29eaad3b31'] = 'Votre cadeau à partir de %s d\'achats';
+$_MODULE['<{giveagift}prestashop>shoppingcart_3a8f9f085e5e833c16b19cf546ed8c16'] = 'Votre cadeau à partir de %s TTC d\'achats (hors livraison)';
+$_MODULE['<{giveagift}prestashop>shoppingcart_944f1016cdb8a06cef258ff13bb67cc3'] = 'Votre cadeau à partir de %s HT d\'achats (hors livraison)';
 $_MODULE['<{giveagift}prestashop>shoppingcart_1a6ee6352de42b8264c2d994a1dd3ee4'] = 'sur la marque';
-$_MODULE['<{giveagift}prestashop>shoppingcart_2ea9cd1220e4cf2963a6076eda21ba82'] = 'Votre cadeau entre %s et %s d\'achats';
+$_MODULE['<{giveagift}prestashop>shoppingcart_96311f9f1b419272ec092336f72c8d17'] = 'Votre cadeau entre %s TTC et %s TTC d\'achats (hors livraison)';
-$_MODULE['<{giveagift}prestashop>shoppingcart_a99d49000900174747ef98678994b8a8'] = 'Votre cadeau jusqu\'à %s d\'achats';
+$_MODULE['<{giveagift}prestashop>shoppingcart_2fbc25fc38c85e8fdf69169c2c5f62fc'] = 'Votre cadeau entre %s HT et %s HT d\'achats (hors livraison)';
+$_MODULE['<{giveagift}prestashop>shoppingcart_c2f3cf03be48010e802b565515e830b3'] = 'Votre cadeau jusqu\'à %s TTC d\'achats (hors livraison)';
+$_MODULE['<{giveagift}prestashop>shoppingcart_051cf781e7aaa98b80c631a3120ec6ca'] = 'Votre cadeau jusqu\'à %s HT d\'achats (hors livraison)';
 $_MODULE['<{giveagift}prestashop>shoppingcart_46eb2ebca102bd82d41f9d0a59ac11d6'] = 'Choisissez votre cadeau';
-$_MODULE['<{giveagift}prestashop>shoppingcart_011bafc11873eb60171f3fe6425581bb'] = 'Ajoutez seulement %s de produits et profitez d\'un cadeau !';
+$_MODULE['<{giveagift}prestashop>shoppingcart_b9041a370e399cd8a67d26489e0f08d1'] = 'Ajoutez seulement %s TTC de produits et profitez d\'un cadeau !';
+$_MODULE['<{giveagift}prestashop>shoppingcart_effb0b628167778bb2ea993df763b59e'] = 'Ajoutez seulement %s HT de produits et profitez d\'un cadeau !';
 $_MODULE['<{giveagift}prestashop>shoppingcart_a3b9d2cd764b05f4be59cba8f03c01e4'] = 'Image produit';
 $_MODULE['<{giveagift}prestashop>shoppingcart_a56c6ae040f1c08bfcd12876964dec79'] = 'Le cadeau a bien été ajouté au panier. Vous pouvez toujours en sélectionner un autre à la place.';
 $_MODULE['<{giveagift}prestashop>shoppingcart_7326d841872ebb935d755492dede6cd5'] = 'Le cadeau a bien été changé dans votre panier.';

themes/roykin/modules/giveagift/translations/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;