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

// Adding reference of the order on the history

Browse Source 
// Improving render of the button multi-shipping

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10825 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-01 12:58:21 +00:00
parent 562adfc172
commit e111883814
4 changed files with 92 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/css/global.css
+54 -8
View File
@@ -1022,17 +1022,62 @@ p.address_navigation input[type=submit].button { float: right }
p.cart_navigation { padding: 1em 0!important }
p.cart_navigation .button,
p.cart_navigation .button_large { float: left }
p.cart_navigation .button_large { float: left }
p.cart_navigation .exclusive,
p.cart_navigation .exclusive_large,
p.cart_navigation .exclusive_large_disabled { float: right }
p.cart_navigation .exclusive_large,
p.cart_navigation .exclusive_large_disabled { float: right }
p.cart_navigation .multishipping-button { margin-right: 10px }
p.cart_navigation_extra {
text-align: center;
width: auto
}
.address-form-multishipping { padding: 10px; }
.address-form-multishipping a { float: none; margin-left: 210px; }
.address-form-multishipping { padding: 10px 0px; }
#multishipping_mode_box {
border: 1px solid #D0D3D8;
background: url("../img/form_bg.jpg") repeat-x scroll left top #D0D1D5;
margin-bottom: 10px;
padding: 5px;
}
#multishipping_mode_checkbox {
vertical-align: middle;
margin-right: 5px;
}
#multishipping_mode_box.on {
border: 1px solid #ddd;
}
#multishipping_mode_box .title {
padding: 5px;
font-weight: bold;
}
#multishipping_mode_box .description, #multishipping_mode_box .description_off {
padding: 5px;
}
#multishipping_mode_box .description_off {
display: none;
padding: 5px;
}
#multishipping_mode_box .description_off div {
margin-bottom: 10px;
}
#multishipping_mode_box .description_off a, #multishipping_mode_box .description a {
display: block;
text-align: center;
text-decoration: none;
padding: 5px 10px;
margin: 0 160px;
border: 1px solid #ccc;
background: #ddd;
}
#multishipping_mode_box .description_off a:hover, #multishipping_mode_box .description a:hover {
background: #f3f3f3;
border: 1px solid #ccc;
}
#multishipping_mode_box.on .description_off {
display: block;
}
form.std p.cart_navigation span {
float: none;
text-align: left;
@@ -1050,7 +1095,7 @@ form.std p.cart_navigation span {
text-decoration: none
}
tr.cart_item td .cart_address_delivery { width: 100px; margin-right: 10px; }
tr.cart_item td { padding: 0.5em 0 }
tr.cart_item td { padding: 0.5em 5px 0.5em 0; }
td.cart_product a { margin: 0 0.6em }
td.cart_product a img {
border: 1px solid #d0d1d5;
@@ -1133,6 +1178,7 @@ tr.cart_total_price { font-weight: bold }
padding: 5px 10px;
margin: 10px 0 0 0;
}
#order .delivery_option_radio, #orderopc .delivery_option_radio {
float: left;
margin-top: 12px;
@@ -1145,14 +1191,14 @@ tr.cart_total_price { font-weight: bold }
width: 522px;
height: 40px;
}
#order .delivery_option.item, #orderopc .delivery_option.item, #orderopc {
#order .delivery_option.item, #orderopc .delivery_option.item {
background: #FAFAFA;
}
#order .delivery_option.alternate_item, #orderopc .delivery_option.alternate_item {
background: #F1F2F4;
border-top: 1px solid #BDC2C9;
}
#order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td, #orderopc {
#order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td {
padding: 0 8px;
}
#order .delivery_option label > table.resume td + td, #orderopc .delivery_option label > table.resume td + td {
themes/prestashop/js/order-opc.js
+12 -8
View File
@@ -666,12 +666,13 @@ $(function() {
function multishippingMode(it)
{
if (!$(it).hasClass('on'))
if ($(it).attr('checked'))
{
$('#address_delivery').hide();
$('#address_invoice').removeClass('alternate_item').addClass('item');
$(it).addClass('on');
$('#link_multishipping_form').show();
$('#multishipping_mode_box').addClass('on');
$('#link_multishipping_form').click(function() {return false;});
$('#link_multishipping_form').fancybox({
'transitionIn': 'elastic',
@@ -709,13 +710,12 @@ function multishippingMode(it)
{
$('#address_delivery').show();
$('#address_invoice').removeClass('item').addClass('alternate_item');
$(it).removeClass('on');
$('#link_multishipping_form').hide();
$('#multishipping_mode_box').removeClass('on');
// Disable multi address shipping
$.ajax({
url: orderOpcUrl,
async: false,
async: true,
cache: false,
data: 'ajax=true&method=noMultiAddressDelivery',
});
@@ -723,7 +723,7 @@ function multishippingMode(it)
// Reload the cart
$.ajax({
url: orderOpcUrl,
async: false,
async: true,
cache: false,
data: 'ajax=true&method=cartReload',
dataType : 'html',
@@ -735,6 +735,10 @@ function multishippingMode(it)
}
$(document).ready(function() {
// If the multishipping mode is off assure us the checkbox "I want to specify a delivery address for each products I order." is unchecked.
$('#multishipping_mode_checkbox').attr('checked', false);
// If the multishipping mode is on, check the box "I want to specify a delivery address for each products I order.".
if (typeof(multishipping_mode) != 'undefined' && multishipping_mode)
$('#multishipping_mode').click();
$('#multishipping_mode_checkbox').click()
});
themes/prestashop/order-address.tpl
+25 -15
View File
@@ -160,24 +160,34 @@
{if !$opc}<h1>{l s='Addresses'}</h1>{else}<h2>1. {l s='Addresses'}</h2>{/if}
{if !$opc}
{assign var='current_step' value='address'}
{include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"}
<div class="address-form-multishipping">
<a href="{$link->getPageLink('order', true, NULL, 'step=1&multi-shipping=1')}" title="{l s='Multi-shipping'}" class="button exclusive">
{l s='Multi-shipping'}
</a>
</div>
{assign var='current_step' value='address'}
{include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"}
{if !$multi_shipping}
<div class="button_multishipping_mode" id="multishipping_mode_box">
<div class="title">{l s='Multi-shipping'}</div>
<div class="description">
<a href="{$link->getPageLink('order', true, NULL, 'step=1&multi-shipping=1')}"/>
{l s='Specify a delivery address for each products ordered.'}
</a>
</div>
</div>
{/if}
<form action="{$link->getPageLink($back_order_page, true)}" method="post">
{else}
<div class="address-form-multishipping">
<a href="#" id="multishipping_mode" title="{l s='Multi-shipping'}" class="button exclusive" onclick="multishippingMode(this); return false;">
{l s='Multi-shipping'}
</a>
<a href="{$link->getPageLink('order-opc', true, NULL, 'ajax=1&multi-shipping=1&method=multishipping')}" id="link_multishipping_form" title="{l s='Choose the delivery addresses'}" class="button exclusive" style="display:none">
{l s='Choose the delivery addresses'}
</a>
<div class="button_multishipping_mode" id="multishipping_mode_box">
<div class="title">{l s='Multi-shipping'}</div>
<div class="description">
<input type="checkbox" id="multishipping_mode_checkbox" onchange="multishippingMode(this); return false;"/><label for="multishipping_mode_checkbox">{l s='I want to specify a delivery address for each products I order.'}</label>
</div>
<div class="description_off">
<a href="{$link->getPageLink('order-opc', true, NULL, 'ajax=1&multi-shipping=1&method=multishipping')}" id="link_multishipping_form" title="{l s='Choose the delivery addresses'}">
{l s='Specify a delivery address for each products.'}
</a>
</div>
</div>
<script type="text/javascript">
{if $is_multi_address_delivery}
var multishipping_mode = true;
themes/prestashop/order-detail.tpl
+1
View File
@@ -67,6 +67,7 @@
{/if}
<p class="bold">{l s='Order:'} <span class="color-myaccount">{l s='#'}{$order->id|string_format:"%06d"}</span></p>
<p class="bold">{l s='Refrence:'} <span class="color-myaccount">{$order->reference}</span></p>
{if $carrier->id}<p class="bold">{l s='Carrier:'} {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</p>{/if}
<p class="bold">{l s='Payment method:'} <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></p>
{if $invoice AND $invoiceAllowed}