Merge pull request #189 from gskema/dev

[-] FO: Integrate bugfixes from upstream 1.6.1.x
PrestaShop · Apr 14, 2016 · d9b2708 · d9b2708
2 parents a0a829d + c385dd8
commit d9b2708
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/themes/community-theme-16/js/modules/blocklayered/blocklayered.js b/themes/community-theme-16/js/modules/blocklayered/blocklayered.js
@@ -399,7 +399,7 @@ function reloadContent(params_plus) {
   }
 
   var slideUp = true;
-  if (typeof params_plus === undefined || !(typeof params_plus === 'string')) {
+  if (typeof params_plus === 'undefined' || !(typeof params_plus === 'string')) {
     params_plus = '';
     slideUp = false;
   }

diff --git a/themes/community-theme-16/js/product.js b/themes/community-theme-16/js/product.js
@@ -816,6 +816,11 @@ function updatePrice() {
 
   if (priceWithDiscountsDisplay > 0) {
     $ourPriceDisplay.text(formatCurrency(priceWithDiscountsDisplay, currencyFormat, currencySign, currencyBlank)).trigger('change');
+    if (findSpecificPrice()) {
+      $('#our_price_display').text(findSpecificPrice()).trigger('change');
+    } else {
+      $('#our_price_display').text(formatCurrency(priceWithDiscountsDisplay, currencyFormat, currencySign, currencyBlank)).trigger('change');
+    }
   } else {
     $ourPriceDisplay.text(formatCurrency(0, currencyFormat, currencySign, currencyBlank)).trigger('change');
   }
@@ -888,6 +893,7 @@ function displayDiscounts(combination) {
   // If there is some combinations specific quantity discount, show them, else, if there are some
   // products quantity discount: show them. In case of result, show the category.
   if (combinationsSpecificQuantityDiscount.length != 0) {
+    quantityDiscountTable.find('tbody tr').hide();
     combinationsSpecificQuantityDiscount.show();
     quantityDiscountTable.show();
   } else if (allQuantityDiscount.length != 0) {

diff --git a/themes/community-theme-16/js/stores.js b/themes/community-theme-16/js/stores.js
@@ -17,7 +17,7 @@ $(function() {
 
   $('#addressInput').keypress(function(e) {
     code = e.keyCode ? e.keyCode : e.which;
-    if (code.toString() === 13)
+    if (code.toString() == 13)
       searchLocations();
   });
 

diff --git a/themes/community-theme-16/modules/bankwire/views/templates/hook/payment_return.tpl b/themes/community-theme-16/modules/bankwire/views/templates/hook/payment_return.tpl
@@ -1,5 +1,5 @@
 {if $status == 'ok'}
-  <div class="alert alert-success">{l s='Your order on %s is complete.' sprintf=$shop_name mod='cheque'}</div>
+  <div class="alert alert-success">{l s='Your order on %s is complete.' sprintf=$shop_name mod='bankwire'}</div>
   <div class="box">
     {l s='Please send us a bank wire with' mod='bankwire'}
     <br />- {l s='Amount' mod='bankwire'} <span class="price"><strong>{$total_to_pay}</strong></span>