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

[-] Fo : Fix bug #PSCFV-7956 select invoice address when adding a first new address

Browse Source
This commit is contained in:
gRoussac
2013-03-07 18:47:34 +01:00
parent 458fc7ad1e
commit 88eb72ab17
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressController.php
+1 -1
View File
@@ -237,7 +237,7 @@ class AddressControllerCore extends FrontController
else // Update cart address else // Update cart address
$this->context->cart->autosetProductAddress(); $this->context->cart->autosetProductAddress();
if (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;
$this->context->cart->update(); $this->context->cart->update();
themes/default/address.tpl
+1 -1
View File
@@ -218,7 +218,7 @@ $(function(){ldelim}
</p> </p>
<p class="required text" id="adress_alias"> <p class="required text" id="adress_alias">
<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label> <label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{else if isset($select_address)}{l s='My address'}{/if}" /> <input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{else if !isset($select_address)}{l s='My address'}{/if}" />
</p> </p>
</fieldset> </fieldset>
<p class="submit2"> <p class="submit2">
themes/default/shopping-cart.tpl
+2 -2
View File
@@ -390,7 +390,7 @@
{else} {else}
{foreach from=$formattedAddresses key=k item=address} {foreach from=$formattedAddresses key=k item=address}
<ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if}"> <ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if}">
<li class="address_title">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery'}{l s='Delivery address'}{/if}&nbsp;<span class="address_alias">({$address.object.alias})</span></li> <li class="address_title">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)}&nbsp;<span class="address_alias">({$address.object.alias})</span>{/if}</li>
{foreach $address.ordered as $pattern} {foreach $address.ordered as $pattern}
{assign var=addressKey value=" "|explode:$pattern} {assign var=addressKey value=" "|explode:$pattern}
<li> <li>
@@ -405,7 +405,7 @@
{/foreach} {/foreach}
</ul> </ul>
{/foreach} {/foreach}
<p class="clear" /> <br class="clear"/>
{/if} {/if}
</div> </div>
{/if} {/if}