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

// Multishipping button is replaced by a checkbox

Browse Source 
// BugFix with back params in the checkout process
This commit is contained in:
mDeflotte
2011-12-06 14:56:29 +00:00
parent 9d0bf47084
commit 8adff9fb5b
5 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/cart-summary.js
+11
View File
@@ -646,4 +646,15 @@ $(document).ready(function() {
});
$('#gift').checkboxChange(function() { $('#gift_div').show('slow'); }, function() { $('#gift_div').hide('slow'); });
$('#enable-multishipping').checkboxChange(
function() {
$('.standard-checkout').hide(0);
$('.multishipping-checkout').show(0);
},
function() {
$('.standard-checkout').show(0);
$('.multishipping-checkout').hide(0);
}
);
});
themes/default/shopping-cart.tpl
+17 -31
View File
@@ -321,34 +321,20 @@
</table>
</div>
{if !$cart->isAllProductsInStock()}
<p>
<input type="checkbox" name="allow_seperated_package" id="allow_seperated_package" {if $cart->allow_seperated_package}checked="checked"{/if} />
<label for="allow_seperated_package">{l s="Send the available products first"}</label>
</p>
{/if}
{if !$opc}
{if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<p>
<input type="checkbox" {if $multi_shipping}checked="checked"{/if} id="enable-multishipping" />
<label for="enable-multishipping">{l s="I want to specify a delivery address for each products ordered."}</label>
</p>
{/if}
{/if}
<div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div>
@@ -415,9 +401,9 @@
{/if}
<p class="cart_navigation">
{if !$opc}
<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}" class="exclusive" title="{l s='Next'}">{l s='Next'} &raquo;</a>
{if {Configuration::get('PS_ALLOW_MULTISHIPPING')}}
<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}&amp;multi-shipping=1" class="multishipping-button exclusive" title="{l s='Multi-shipping'}">{l s='Multi-shipping'} &raquo;</a>
<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}" class="exclusive standard-checkout" title="{l s='Next'}">{l s='Next'} &raquo;</a>
{if Configuration::get('PS_ALLOW_MULTISHIPPING')}
<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}&amp;multi-shipping=1" class="multishipping-button multishipping-checkout exclusive" title="{l s='Next'}">{l s='Next'} &raquo;</a>
{/if}
{/if}
<a href="{if (isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order.php')) || !isset($smarty.server.HTTP_REFERER)}{$link->getPageLink('index')}', {else}{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}{/if}" class="button_large" title="{l s='Continue shopping'}">&laquo; {l s='Continue shopping'}</a>