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

// norms

Browse Source
This commit is contained in:
gRoussac
2013-10-21 00:00:17 +02:00
parent f2d70076bd
commit c9d20f35b3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/front/AddressController.php
View File

@@ -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)
{

2
themes/default/authentication.tpl
View File

@@ -303,7 +303,7 @@ $(document).ready(function() {
{/if}
<h3>{l s='Delivery address'}</h3>
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company" && $b2b_enable}
{if $field_name eq "company" && $b2b_enable}
<p class="text">
<label for="company">{l s='Company'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />