Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

[-] FO: Integrate bugfixes from upstream 1.6.1.x #189

Merged
merged 5 commits into from
Apr 14, 2016
Merged

[-] FO: Integrate bugfixes from upstream 1.6.1.x #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15ad82f
[-] FO: Fix translatable module string.
Apr 14, 2016
74054de
[-] JS: Fix typeof comparison in blocklayered
Apr 14, 2016
6893362
[-] JS: Fix comparison in stores.js
Apr 14, 2016
a4a1e0f
[-] FO: #PSCSX-5582 fix wrong displayed specific price on product detail
Apr 14, 2016
c385dd8
[-] JS: Fix specific price display in product page
Apr 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion themes/community-theme-16/js/modules/blocklayered/blocklayered.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 6 additions & 0 deletions themes/community-theme-16/js/product.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion themes/community-theme-16/js/stores.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
2 changes: 1 addition & 1 deletion themes/community-theme-16/modules/bankwire/views/templates/hook/payment_return.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down