Merge branch 'fix-soflexibilite' into develop
This commit is contained in:
commit
f96e09e8b0
@ -99,7 +99,7 @@ class SoFlexibiliteDeliverySave extends SoFlexibilite
|
|||||||
$soDelivery->indice = pSQL($indice);
|
$soDelivery->indice = pSQL($indice);
|
||||||
$soDelivery->postcode = pSQL($codePostal);
|
$soDelivery->postcode = pSQL($codePostal);
|
||||||
$soDelivery->city = pSQL($commune);
|
$soDelivery->city = pSQL($commune);
|
||||||
$soDelivery->country = (($type == 'CMT' || $type == 'BDP') ? pSQL('BE') : pSQL('FR'));
|
$soDelivery->country = pSQL(substr(Tools::getValue('pays', 'FR'), 0, 2));
|
||||||
$soDelivery->address1 = pSQL($adresse1);
|
$soDelivery->address1 = pSQL($adresse1);
|
||||||
$soDelivery->address2 = pSQL('');
|
$soDelivery->address2 = pSQL('');
|
||||||
$soDelivery->lieudit = pSQL('');
|
$soDelivery->lieudit = pSQL('');
|
||||||
|
@ -686,7 +686,8 @@ $(document).ready(function () {
|
|||||||
adresse1: $('#' + idPoint).find('.address1').text(),
|
adresse1: $('#' + idPoint).find('.address1').text(),
|
||||||
code_postal: $('#' + idPoint).find('.code_postal').text(),
|
code_postal: $('#' + idPoint).find('.code_postal').text(),
|
||||||
commune: $('#' + idPoint).find('.commune').text(),
|
commune: $('#' + idPoint).find('.commune').text(),
|
||||||
id_cart: $('#soflexibilite_cart_id').val()
|
id_cart: $('#soflexibilite_cart_id').val(),
|
||||||
|
pays: $("#sl-0-country").val()
|
||||||
},
|
},
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
/* if (window.console) {
|
/* if (window.console) {
|
||||||
@ -728,7 +729,8 @@ $(document).ready(function () {
|
|||||||
address2: $(fullid).find('.pr-indice').val(),
|
address2: $(fullid).find('.pr-indice').val(),
|
||||||
postcode: $(fullid).find('.code_postal').html(),
|
postcode: $(fullid).find('.code_postal').html(),
|
||||||
city: $(fullid).find('.commune').html(),
|
city: $(fullid).find('.commune').html(),
|
||||||
country: $(fullid).is('.BPR, .A2P, .CIT, .CDI') ? 'France' : 'Belgique'
|
country: $("#sl-0-country").val()
|
||||||
|
//country: $(fullid).is('.BPR, .A2P, .CIT, .CDI') ? 'France' : 'Belgique'
|
||||||
}));
|
}));
|
||||||
$('#custMail').val(sf_customer_mail);
|
$('#custMail').val(sf_customer_mail);
|
||||||
$('#custPhone').val(sf_customer_phone);
|
$('#custPhone').val(sf_customer_phone);
|
||||||
|
Loading…
Reference in New Issue
Block a user