diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index dcb34df88..a6dbe02e4 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -225,11 +225,11 @@ class AddressControllerCore extends FrontController else // Update cart address $this->context->cart->autosetProductAddress(); - if ((bool)(Tools::getValue('select_address', false)) == true OR (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))) - $this->context->cart->id_address_invoice = (int)$address->id; + if ((bool)(Tools::getValue('select_address', false)) == true OR (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))) + $this->context->cart->id_address_invoice = (int)$address->id; elseif (Configuration::get('PS_ORDER_PROCESS_TYPE')) $this->context->cart->id_address_invoice = (int)$this->context->cart->id_address_delivery; - $this->context->cart->update(); + $this->context->cart->update(); if ($this->ajax) { diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl index 043854730..de7859286 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -303,7 +303,7 @@ $(document).ready(function() { {/if}

{l s='Delivery address'}

{foreach from=$dlv_all_fields item=field_name} - {if $field_name eq "company" && $b2b_enable} + {if $field_name eq "company" && $b2b_enable}