[-] BO : #PSTEST-219 : fix small bugs and translations

admin-dev/themes/default/template/cart_rules/actions.tpl

@@ -40,7 +40,7 @@
 	<label class="t" for="apply_discount_percent"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Percent (%)'}</label>
 	&nbsp;&nbsp;
 	<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount"  {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|intval}checked="checked"{/if} />
-	<label class="t" for="apply_discount_amount"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Amount (¤)'}</label>
+	<label class="t" for="apply_discount_amount"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Amount'}</label>
 	&nbsp;&nbsp;
 	<input type="radio" name="apply_discount" id="apply_discount_off" value="off"  {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|intval && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|intval}checked="checked"{/if} />
 	<label class="t" for="apply_discount_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /> {l s='None'}</label>
@@ -53,7 +53,7 @@
 	</div>
 </div>
 <div id="apply_discount_amount_div">
-	<label>{l s='Value (¤)'}</label>
+	<label>{l s='Value'}</label>
 	<div class="margin-form">
 		<input type="text" id="reduction_amount" name="reduction_amount" value="{$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval}" />
 		<select name="reduction_currency">

admin-dev/themes/default/template/cart_rules/form.tpl

@@ -83,117 +83,6 @@
 	var currentToken = '{$currentToken}';
 	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
 
-	$('.cart_rule_tab').hide();
-	$('.tab-page').removeClass('selected');
-	$('#cart_rule_' + currentFormTab).show();
-	$('#cart_rule_link_' + currentFormTab).addClass('selected');
-
-	$('#giftProductFilter')
-		.autocomplete(
-				'ajax-tab.php', {
-				minChars: 2,
-				max: 50,
-				width: 500,
-				selectFirst: false,
-				scroll: false,
-				dataType: 'json',
-				formatItem: function(data, i, max, value, term) {
-					return value;
-				},
-				parse: function(data) {
-					var mytab = new Array();
-					for (var i = 0; i < data.length; i++)
-						mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
-					return mytab;
-				},
-				extraParams: {
-					controller: 'AdminCartRules',
-					token: currentToken,
-					giftProductFilter: 1
-				}
-			}
-		)
-		.result(function(event, data, formatted) {
-			$('#gift_product').val(data.id_product);
-			$('#giftProductFilter').val((data.reference + ' ' + data.name).trim());
-		});
-		
-	$('#reductionProductFilter')
-		.autocomplete(
-				'ajax-tab.php', {
-				minChars: 2,
-				max: 50,
-				width: 500,
-				selectFirst: false,
-				scroll: false,
-				dataType: 'json',
-				formatItem: function(data, i, max, value, term) {
-					return value;
-				},
-				parse: function(data) {
-					var mytab = new Array();
-					for (var i = 0; i < data.length; i++)
-						mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
-					return mytab;
-				},
-				extraParams: {
-					controller: 'AdminCartRules',
-					token: currentToken,
-					reductionProductFilter: 1
-				}
-			}
-		)
-		.result(function(event, data, formatted) {
-			$('#reduction_product').val(data.id_product);
-			$('#reductionProductFilter').val((data.reference + ' ' + data.name).trim());
-		});
-		
-	$('#customerFilter')
-		.autocomplete(
-				'ajax-tab.php', {
-				minChars: 2,
-				max: 50,
-				width: 500,
-				selectFirst: false,
-				scroll: false,
-				dataType: 'json',
-				formatItem: function(data, i, max, value, term) {
-					return value;
-				},
-				parse: function(data) {
-					var mytab = new Array();
-					for (var i = 0; i < data.length; i++)
-						mytab[mytab.length] = { data: data[i], value: data[i].cname + ' (' + data[i].email + ')' };
-					return mytab;
-				},
-				extraParams: {
-					controller: 'AdminCartRules',
-					token: currentToken,
-					customerFilter: 1
-				}
-			}
-		)
-		.result(function(event, data, formatted) {
-			$('#id_customer').val(data.id_customer);
-			$('#customerFilter').val(data.cname + ' (' + data.email + ')');
-		});
-
-	var date = new Date();
-	var hours = date.getHours();
-	if (hours < 10)
-		hours = "0" + hours;
-	var mins = date.getMinutes();
-	if (mins < 10)
-		mins = "0" + mins;
-	var secs = date.getSeconds();
-	if (secs < 10)
-		secs = "0" + secs;
-	$('.datepicker').datepicker({
-		prevText: '',
-		nextText: '',
-		dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs
-	});
-
 	var languages = new Array();
 	{foreach from=$languages item=language key=k}
 		languages[{$k}] = {
@@ -204,3 +93,5 @@
 	{/foreach}
 	displayFlags(languages, {$defaultLanguage});
 </script>
+
+<script src="../js/admin_cart_rules.js" type="text/javascript"></script>

controllers/admin/AdminCartRulesController.php

@@ -343,12 +343,6 @@ class AdminCartRulesControllerCore extends AdminController
 		return parent::renderForm();
 	}
 
-	public function setMedia()
-	{
-		parent::setMedia();
-		$this->addJS(_PS_JS_DIR_.'admin_cart_rules.js');
-	}
-
 	public function displayAjaxSearchCartRuleVouchers()
 	{
 		$found = false;

js/admin_cart_rules.js

@@ -1,28 +1,28 @@
 /*
-* 2007-2011 PrestaShop
+ * 2007-2011 PrestaShop
-*
+ *
-* NOTICE OF LICENSE
+ * NOTICE OF LICENSE
-*
+ *
-* This source file is subject to the Academic Free License (AFL 3.0)
+ * This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
+ * that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
+ * It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
+ * http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
+ * 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
+ * obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
+ * to license@prestashop.com so we can send you a copy immediately.
-*
+ *
-* DISCLAIMER
+ * DISCLAIMER
-*
+ *
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * 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
+ * versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
+ * needs please refer to http://www.prestashop.com for more information.
-*
+ *
-*  @author PrestaShop SA <contact@prestashop.com>
+ *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
+ *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7040 $
+ *  @version  Release: $Revision: 7040 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
+ *  International Registered Trademark & Property of PrestaShop SA
-*/
+ */
 
 function addProductRule()
 {
@@ -209,6 +209,96 @@ $('#cart_rule_form').submit(function() {
     });
 });
 
+$('#giftProductFilter')
+    .autocomplete(
+    'ajax-tab.php', {
+        minChars: 2,
+        max: 50,
+        width: 500,
+        selectFirst: false,
+        scroll: false,
+        dataType: 'json',
+        formatItem: function(data, i, max, value, term) {
+            return value;
+        },
+        parse: function(data) {
+            var mytab = new Array();
+            for (var i = 0; i < data.length; i++)
+                mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
+            return mytab;
+        },
+        extraParams: {
+            controller: 'AdminCartRules',
+            token: currentToken,
+            giftProductFilter: 1
+        }
+    }
+)
+    .result(function(event, data, formatted) {
+        $('#gift_product').val(data.id_product);
+        $('#giftProductFilter').val((data.reference + ' ' + data.name).trim());
+    });
+
+$('#reductionProductFilter')
+    .autocomplete(
+    'ajax-tab.php', {
+        minChars: 2,
+        max: 50,
+        width: 500,
+        selectFirst: false,
+        scroll: false,
+        dataType: 'json',
+        formatItem: function(data, i, max, value, term) {
+            return value;
+        },
+        parse: function(data) {
+            var mytab = new Array();
+            for (var i = 0; i < data.length; i++)
+                mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
+            return mytab;
+        },
+        extraParams: {
+            controller: 'AdminCartRules',
+            token: currentToken,
+            reductionProductFilter: 1
+        }
+    }
+)
+    .result(function(event, data, formatted) {
+        $('#reduction_product').val(data.id_product);
+        $('#reductionProductFilter').val((data.reference + ' ' + data.name).trim());
+    });
+
+$('#customerFilter')
+    .autocomplete(
+    'ajax-tab.php', {
+        minChars: 2,
+        max: 50,
+        width: 500,
+        selectFirst: false,
+        scroll: false,
+        dataType: 'json',
+        formatItem: function(data, i, max, value, term) {
+            return value;
+        },
+        parse: function(data) {
+            var mytab = new Array();
+            for (var i = 0; i < data.length; i++)
+                mytab[mytab.length] = { data: data[i], value: data[i].cname + ' (' + data[i].email + ')' };
+            return mytab;
+        },
+        extraParams: {
+            controller: 'AdminCartRules',
+            token: currentToken,
+            customerFilter: 1
+        }
+    }
+)
+    .result(function(event, data, formatted) {
+        $('#id_customer').val(data.id_customer);
+        $('#customerFilter').val(data.cname + ' (' + data.email + ')');
+    });
+
 function displayCartRuleTab(tab)
 {
     $('.cart_rule_tab').hide();
@@ -217,3 +307,24 @@ function displayCartRuleTab(tab)
     $('#cart_rule_link_' + tab).addClass('selected');
     $('#currentFormTab').val(tab);
 }
+
+$('.cart_rule_tab').hide();
+$('.tab-page').removeClass('selected');
+$('#cart_rule_' + currentFormTab).show();
+$('#cart_rule_link_' + currentFormTab).addClass('selected');
+
+var date = new Date();
+var hours = date.getHours();
+if (hours < 10)
+    hours = "0" + hours;
+var mins = date.getMinutes();
+if (mins < 10)
+    mins = "0" + mins;
+var secs = date.getSeconds();
+if (secs < 10)
+    secs = "0" + secs;
+$('.datepicker').datepicker({
+    prevText: '',
+    nextText: '',
+    dateFormat: 'yy-mm-dd ' + hours + ':' + mins + ':' + secs
+});

translations/fr/admin.php

@@ -2676,11 +2676,11 @@ $_LANGADM['AdminCartRules00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminCartRulesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminCartRulesfc6341fa76fe93b837d748563e0a60c1'] = 'Appliquer une réduction';
 $_LANGADM['AdminCartRulesda73ea07f51049046d527dabd85170e1'] = 'En pourcent (%)';
-$_LANGADM['AdminCartRules96d60bee29d908c1cb0fb4fd3f28ed42'] = 'En devise (¤)';
+$_LANGADM['AdminCartRulesb2f40690858b404ed10e62bdf422c704'] = 'Montant';
 $_LANGADM['AdminCartRules6adf97f83acf6453d4a6a4b1070f3754'] = 'Aucune';
 $_LANGADM['AdminCartRules407d3e36cf562094fc5802889c592fa6'] = 'Valeur (en %)';
 $_LANGADM['AdminCartRulesde11e2e4296bb20487b6430508866e06'] = 'Ne s\'applique pas aux frais de ports';
-$_LANGADM['AdminCartRules717a25e452275655de73204c68072f0f'] = 'Valeur (en ¤)';
+$_LANGADM['AdminCartRules689202409e48743b914713f96d93947c'] = 'Valeur';
 $_LANGADM['AdminCartRulesbefcac0f9644a7abee43e69f49252ac4'] = 'HT';
 $_LANGADM['AdminCartRulesf4a0d7cb0cd45214c8ca5912c970de13'] = 'TTC';
 $_LANGADM['AdminCartRules4ec534e482b91898178fa7c6b2235459'] = 'Appliquer la réduction à';