Merge remote-tracking branch 'origin/ticket/r15172-change-adress-socol' into develop

This commit is contained in:
Michael RICOIS 2017-12-21 12:36:32 +01:00
commit 6ab4df6b66

View File

@ -174,7 +174,12 @@ class AdminAddresses extends AdminTab
{
if (isset($_POST['submitAdd'.$this->table]) &&
($id_order = (int)(Tools::getValue('id_order'))) && !sizeof($this->_errors)) {
$address_type = ((int)(Tools::getValue('address_type')) == 2 ? 'invoice' : ((int)(Tools::getValue('address_type')) == 1 ? 'delivery' : ''));
if ($address_type == 'invoice') {
return;
}
// If socol AND delivery to DOM AND address change, update ps_socolissimo_delivery_info
$cart = Cart::getCartByOrderId($id_order);
if ((int)$cart->id_carrier == (int)Configuration::get('ANT_CARRIER_DOM')) {