dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC

Browse Source
This commit is contained in:
gRoussac committed 2013-01-22 16:32:55 +01:00
1 parent 7cb6f55193
commit 1ed094abfb
2 files changed
+30 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/js/cart-summary.js
+4
View File
@@ -432,6 +432,8 @@ function upQuantity(id, qty)
updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA); updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA);
if (typeof(getCarrierListAndUpdate) !== 'undefined') if (typeof(getCarrierListAndUpdate) !== 'undefined')
getCarrierListAndUpdate(); getCarrierListAndUpdate();
if (typeof(updatePaymentMethodsDisplay) !== 'undefined')
updatePaymentMethodsDisplay();
} }
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) { error: function(XMLHttpRequest, textStatus, errorThrown) {
@@ -515,6 +517,8 @@ function downQuantity(id, qty)
if (typeof(getCarrierListAndUpdate) !== 'undefined') if (typeof(getCarrierListAndUpdate) !== 'undefined')
getCarrierListAndUpdate(); getCarrierListAndUpdate();
if (typeof(updatePaymentMethodsDisplay) !== 'undefined')
updatePaymentMethodsDisplay();
} }
}, },
error: function(XMLHttpRequest, textStatus, errorThrown) { error: function(XMLHttpRequest, textStatus, errorThrown) {
themes/default/js/order-opc.js
+26 -24
View File
@@ -43,6 +43,30 @@ function updatePaymentMethods(json)
$('#opc_payment_methods-content #HOOK_PAYMENT').html(json.HOOK_PAYMENT); $('#opc_payment_methods-content #HOOK_PAYMENT').html(json.HOOK_PAYMENT);
} }
function updatePaymentMethodsDisplay()
{
var checked = '';
if ($('#cgv:checked').length !== 0)
checked = 1;
else
checked = 0;
$('#opc_payment_methods-overlay').fadeIn('slow', function(){
$.ajax({
type: 'POST',
url: orderOpcUrl,
async: true,
cache: false,
dataType : "json",
data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token,
success: function(json)
{
updatePaymentMethods(json);
}
});
$(this).fadeOut('slow');
});
}
function updateAddressSelection() function updateAddressSelection()
{ {
var idAddress_delivery = ($('#opc_id_address_delivery').length === 1 ? $('#opc_id_address_delivery').val() : $('#id_address_delivery').val()); var idAddress_delivery = ($('#opc_id_address_delivery').length === 1 ? $('#opc_id_address_delivery').val() : $('#id_address_delivery').val());
@@ -111,8 +135,7 @@ function updateAddressSelection()
$(this).find('.cart_quantity_up') $(this).find('.cart_quantity_up')
.attr('id', $(this).find('.cart_quantity_up').attr('id').replace(/_\d+$/, '_'+idAddress_delivery)) .attr('id', $(this).find('.cart_quantity_up').attr('id').replace(/_\d+$/, '_'+idAddress_delivery))
.attr('href', $(this).find('.cart_quantity_up').attr('href').replace(/id_address_delivery=\d+&/, 'id_address_delivery='+idAddress_delivery+'&')); .attr('href', $(this).find('.cart_quantity_up').attr('href').replace(/id_address_delivery=\d+&/, 'id_address_delivery='+idAddress_delivery+'&'));
} }
}); });
// Update global var deliveryAddress // Update global var deliveryAddress
@@ -705,28 +728,7 @@ function bindInputs()
// Term Of Service (TOS) // Term Of Service (TOS)
$('#cgv').click(function() { $('#cgv').click(function() {
var checked = ''; updatePaymentMethodsDisplay();
if ($('#cgv:checked').length !== 0)
checked = 1;
else
checked = 0;
$('#opc_payment_methods-overlay').fadeIn('slow');
$.ajax({
type: 'POST',
url: orderOpcUrl,
async: true,
cache: false,
dataType : "json",
data: 'ajax=true&method=updateTOSStatusAndGetPayments&checked=' + checked + '&token=' + static_token,
success: function(json)
{
$('div#HOOK_TOP_PAYMENT').html(json.HOOK_TOP_PAYMENT);
$('#opc_payment_methods-content div#HOOK_PAYMENT').html(json.HOOK_PAYMENT);
$('#opc_payment_methods-overlay').fadeOut('slow');
}
});
}); });
} }