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 committed 2013-10-21 00:00:17 +02:00
1 parent f2d70076bd
commit c9d20f35b3
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/AddressController.php
+3 -3
View File
@@ -225,11 +225,11 @@ class AddressControllerCore extends FrontController
else // Update cart address else // Update cart address
$this->context->cart->autosetProductAddress(); $this->context->cart->autosetProductAddress();
if ((bool)(Tools::getValue('select_address', false)) == true OR (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))) 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; $this->context->cart->id_address_invoice = (int)$address->id;
elseif (Configuration::get('PS_ORDER_PROCESS_TYPE')) elseif (Configuration::get('PS_ORDER_PROCESS_TYPE'))
$this->context->cart->id_address_invoice = (int)$this->context->cart->id_address_delivery; $this->context->cart->id_address_invoice = (int)$this->context->cart->id_address_delivery;
$this->context->cart->update(); $this->context->cart->update();
if ($this->ajax) if ($this->ajax)
{ {
themes/default/authentication.tpl
+1 -1
View File
@@ -303,7 +303,7 @@ $(document).ready(function() {
{/if} {/if}
<h3>{l s='Delivery address'}</h3> <h3>{l s='Delivery address'}</h3>
{foreach from=$dlv_all_fields item=field_name} {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"> <p class="text">
<label for="company">{l s='Company'}</label> <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}" /> <input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />