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

// Improving adding address with order-opc

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13256 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-02-13 14:15:23 +00:00
parent f8750bfafe
commit 68b4b1c6bc
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+1 -1
View File
@@ -2470,7 +2470,7 @@ class CartCore extends ObjectModel
'total_price' => $this->getOrderTotal(),
'total_tax' => $total_tax,
'total_price_without_tax' => $this->getOrderTotal(false),
'is_multi_address_delivery' => $this->isMultiAddressDelivery(),
'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1),
'free_ship' => 0,
'carrier' => new Carrier($this->id_carrier, $id_lang),
);
controllers/front/OrderOpcController.php
+2 -1
View File
@@ -41,7 +41,8 @@ class OrderOpcControllerCore extends ParentOrderController
if ($this->nbProducts)
$this->context->smarty->assign('virtual_cart', false);
$this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery());
$this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1));
$this->context->smarty->assign('open_multishipping_fancybox', (int)Tools::getValue('multi-shipping') == 1);
$this->isLogged = (bool)($this->context->customer->id && Customer::customerIdExistsStatic((int)$this->context->cookie->id_customer));
themes/default/css/global.css
-1
View File
@@ -825,7 +825,6 @@ table#cart_summary .cart_total_price .total_price_container {
.multishipping_close_container {
text-align: center;
margin-top: -30px;
}
/* step 2 - authentification ******************************************************************* */
themes/default/js/order-opc.js
+5
View File
@@ -678,6 +678,7 @@ function multishippingMode(it)
$('#address_invoice_form').show();
$('#link_multishipping_form').click(function() {return false;});
$('.address_add a').attr('href', addressMultishippingUrl);
$('#link_multishipping_form').fancybox({
'transitionIn': 'elastic',
@@ -740,6 +741,7 @@ function multishippingMode(it)
} else {
$('#address_invoice_form').show();
}
$('.address_add a').attr('href', addressUrl);
// Disable multi address shipping
$.ajax({
@@ -772,4 +774,7 @@ $(document).ready(function() {
$('.addressesAreEquals').hide();
$('.addressesAreEquals').find('input').attr('checked', false);
}
if (open_multishipping_fancybox)
$('#link_multishipping_form').click();
});
themes/default/order-address.tpl
+4
View File
@@ -75,6 +75,9 @@
var txtProduct = "{l s='product'}";
var txtProducts = "{l s='products'}";
{/if}
var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}";
var addressUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}";
var formatedAddressFieldsValuesList = new Array();
@@ -195,6 +198,7 @@
{else}
var multishipping_mode = false;
{/if}
var open_multishipping_fancybox = {$open_multishipping_fancybox|intval};
</script>
</div>
{/if}