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

// Retrocompatibility with carriers modules

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12614 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-23 15:50:50 +00:00
parent 2227bdc63f
commit 441f643fda
10 changed files with 186 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/global.css
+47 -43
View File
@@ -860,7 +860,7 @@ table#cart_summary .cart_total_price .total_price_container {
color:#666
}
#orderopc #login_form_content label {
#order-opc #login_form_content label {
display:block;
margin:0 0 10px 0
}
@@ -889,7 +889,7 @@ table#cart_summary .cart_total_price .total_price_container {
}
.lost_password a {color:#666}
#orderopc .lost_password {
#order-opc .lost_password {
display:block;
float:none;
margin:5px 0 10px;
@@ -962,12 +962,12 @@ table#cart_summary .cart_total_price .total_price_container {
/* step 4 - paiement ************************************************************************** */
/* #################### CSS MAXENCE ########################
#order .delivery_options_address, #orderopc .delivery_options_address {
#order .delivery_options_address, #order-opc .delivery_options_address {
width: 541px;
margin-left: 7px;
}
*/
#order .delivery_options_address h3, #orderopc .delivery_options_address h3 {
#order .delivery_options_address h3, #order-opc .delivery_options_address h3 {
/*background: url("../img/table_header.gif") no-repeat;
color: #374853;
font-weight: bold;
@@ -981,51 +981,51 @@ margin: 10px 0 0 0;*/
text-transform: uppercase;
background: none repeat scroll 0 0 #383838;
}
#order .delivery_option_radio, #orderopc .delivery_option_radio {
#order .delivery_option_radio, #order-opc .delivery_option_radio {
float: left;
margin: 12px;
}
#order .delivery_option label, #orderopc .delivery_option label {
#order .delivery_option label, #order-opc .delivery_option label {
display: block;
padding-bottom: 5px;
}
#order .delivery_option label > table.resume, #orderopc .delivery_option label > table.resume {
#order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume {
height: 40px;
width: 685px;
}
#order .delivery_option.item, #orderopc .delivery_option.item {
#order .delivery_option.item, #order-opc .delivery_option.item {
background: #fafafa;
}
#order .delivery_option.alternate_item, #orderopc .delivery_option.alternate_item {
#order .delivery_option.alternate_item, #order-opc .delivery_option.alternate_item {
border-top: 1px solid #bdc2c9;
background: #f1f2f4;
border-bottom: 1px solid #bdc2c9;
}
#order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td {
#order .delivery_option label > table.resume td, #order-opc .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 {
#order .delivery_option label > table.resume td + td, #order-opc .delivery_option label > table.resume td + td {
width: 300px;
}
#order .delivery_option label > table.resume td + td + td, #orderopc .delivery_option label > table.resume td + td + td {
#order .delivery_option label > table.resume td + td + td, #order-opc .delivery_option label > table.resume td + td + td {
width: 100px;
text-align: right;
}
#order .delivery_option_carrier td {width:200px}
#order .delivery_option_carrier td + td {width:280px;}
#order .delivery_option_carrier td + td + td {width:200px}
#order .delivery_options_address .delivery_option_logo, #order .delivery_option_carrier .delivery_option_logo, #orderopc .delivery_options_address .delivery_option_logo {
#order .delivery_options_address .delivery_option_logo, #order .delivery_option_carrier .delivery_option_logo, #order-opc .delivery_options_address .delivery_option_logo {
padding-left:10px;
width: 160px;
}
#order .delivery_options_address .delivery_option_logo img, #orderopc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ }
#orderopc .delivery_option_carrier {
#order .delivery_options_address .delivery_option_logo img, #order-opc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ }
#order-opc .delivery_option_carrier {
margin: 0 0 0 45px;
padding: 5px;
width: 680px;
background: white;
}
#order .delivery_option_carrier .first_item {
#order .delivery_option_carrier .first_item, #order-opc .delivery_option_carrier .first_item {
padding:0 0 0 5px;
background:url(../img/arrow_right_2.png) no-repeat 0 2px
}
@@ -1060,11 +1060,11 @@ margin: 10px 0 0 0;*/
#carrierTable th {
padding:0 15px;
height: 29px;
font-weight: bold;
line-height:29px;
color:#fff;
font-weight: bold;
line-height:29px;
color:#fff;
text-transform:uppercase;
background:url(../img/bg_address_title.png) repeat-x 0 0 #989898
background:url(../img/bg_address_title.png) repeat-x 0 0 #989898
}
#carrierTable td {
padding:15px;
@@ -1129,56 +1129,60 @@ a.iframe {font-weight:bold}
/* ************************************************************************************************
PAGE ORDER-OPC
************************************************************************************************ */
#orderopc #left_column {display:none}
#orderopc #center_column{width:757px}
#order-opc #left_column {display:none}
#order-opc #center_column{width:757px}
#orderopc h2 {}
#orderopc h2 span {
#order-opc h2 {}
#order-opc h2 span {
display:inline-block;
padding:5px 7px;
color:#fff;
background:#333;
}
#orderopc #login_form fieldset {
#order-opc #login_form fieldset {
background: none repeat scroll 0 0 #FFFFE0;
border: 1px solid #E6DB55;
font-size: 13px;
margin: 0 0 10px;
padding: 10px;
border: 1px solid #E6DB55;
font-size: 13px;
margin: 0 0 10px;
padding: 10px;
}
#orderopc #login_form fieldset p {padding:0}
#orderopc #login_form fieldset p a {padding:0}
#order-opc #login_form fieldset p {padding:0}
#order-opc #login_form fieldset p a {padding:0}
#orderopc #new_account_form p.submit {
#order-opc #new_account_form p.submit {
margin-right: 120px;
text-align:right
}
#orderopc #new_account_form p.opc-required {margin-left:20px}
#order-opc #new_account_form p.opc-required {margin-left:20px}
#orderopc .addresses {margin-bottom:20px}
#order-opc .addresses {margin-bottom:20px}
#orderopc #opc_delivery_methods h3 {margin-top:20px;}
#orderopc #opc_delivery_methods textarea {
#order-opc #opc_delivery_methods h3 {margin-top:20px;}
#order-opc #opc_delivery_methods textarea {
height:60px;
width:755px;
border:1px solid #ccc
}
#orderopc #opc_payment_methods {margin-bottom:20px}
#orderopc #opc_payment_methods #opc_payment_methods-content p{margin:0}
#order-opc #opc_payment_methods {margin-bottom:20px}
#order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0}
#orderopc .delivery_option_carrier td {width:200px}
#orderopc .delivery_option_carrier td + td {width:280px;}
#orderopc .delivery_option_carrier td + td + td {width:200px}
#orderopc .delivery_option_carrier {
#order-opc .delivery_option_carrier td {width:200px}
#order-opc .delivery_option_carrier td + td {width:280px;}
#order-opc .delivery_option_carrier td + td + td {width:200px}
#order-opc .delivery_option_carrier {
margin: 0 0 0 45px;
padding: 5px;
width: 680px;
background: white;
display: none;
}
#orderopc .delivery_option_carrier .first_item {padding:0 0 0 5px}
#order-opc .delivery_option_carrier.selected {
display: table;
}
#order-opc .delivery_option_carrier .first_item {padding:0 0 0 5px}
/* ************************************************************************************************
themes/default/js/cart-summary.js
+30
View File
@@ -615,7 +615,15 @@ function refreshDeliveryOptions()
{
$.each($('.delivery_option_radio'), function() {
if ($(this).attr('checked'))
{
$(this).parent().find('.delivery_option_carrier').show();
var carrier_id_list = $(this).val().split(',');
carrier_id_list.pop();
var it = this;
$(carrier_id_list).each(function() {
$(it).parent().find('input[value="'+this.toString()+'"]').change();
});
}
else
$(this).parent().find('.delivery_option_carrier').hide();
});
@@ -658,3 +666,25 @@ $(document).ready(function() {
}
);
});
function updateExtraCarrier(id_delivery_option, id_address)
{
if(typeof(orderOpcUrl) != 'undefined')
var url = orderOpcUrl;
else
var url = orderUrl;
$.ajax({
type: 'POST',
url: url,
async: true,
cache: false,
dataType : "json",
data: 'ajax=true&method=updateExtraCarrier&id_address='+id_address+'&id_delivery_option='+id_delivery_option+'&token=' + static_token,
success: function(jsonData)
{
console.log(jsonData);
$('#HOOK_EXTRACARRIER_'+id_address).html(jsonData['content']);
}
});
}
themes/default/js/order-opc.js
+4 -3
View File
@@ -28,8 +28,9 @@ function updateCarrierList(json)
{
var html = json.carrier_block;
if (json.HOOK_EXTRACARRIER !== null && json.HOOK_EXTRACARRIER != undefined)
html += json.HOOK_EXTRACARRIER;
// @todo check with theme 1.4
//if ($('#HOOK_EXTRACARRIER').length == 0 && json.HOOK_EXTRACARRIER !== null && json.HOOK_EXTRACARRIER != undefined)
// html += json.HOOK_EXTRACARRIER;
$('#carrier_area').replaceWith(html);
@@ -181,7 +182,7 @@ function updateCarrierSelectionAndGift()
$('#opc_payment_methods-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow');
}
});
});
}
function confirmFreeOrder()
themes/default/order-address-multishipping-products.tpl
+3 -3
View File
@@ -25,9 +25,9 @@
*}
<p>{l s='Choose the delivery addresses:'}</p>
<script type="text/javascript">
CloseTxt = '{l s='Submit'}';
QtyChanged = '{l s='Some product quantities has changed, please check them.'}';
ShipToAnOtherAddress = '{l s='Ship to multiple addresses'}';
CloseTxt = '{l s='Submit' js=1}';
QtyChanged = '{l s='Some product quantities has changed, please check them.' js=1}';
ShipToAnOtherAddress = '{l s='Ship to multiple addresses' js=1}';
</script>
<div id="order-detail-content" class="table_block">
<table id="cart_summary" class="std">
themes/default/order-carrier.tpl
+9 -4
View File
@@ -34,6 +34,7 @@
var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}";
var txtProducts = "{l s='products'}";
var orderUrl = '{$link->getPageLink("order", true)}';
var msg = "{l s='You must agree to the terms of service before continuing.' js=1}";
{literal}
@@ -117,7 +118,7 @@
<div class="delivery_options">
{foreach $option_list as $key => $option}
<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if $delivery_option[$id_address] == $key}checked="checked"{/if} />
<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" onclick="{if $opc}updateCarrierSelectionAndGift();{else}updateExtraCarrier('{$key}', {$id_address});{/if}" id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if $delivery_option[$id_address] == $key}checked="checked"{/if} />
<label for="delivery_option_{$id_address}_{$option@index}">
<table class="resume">
<tr>
@@ -132,7 +133,6 @@
{/foreach}
</td>
<td>
{if $option.unique_carrier}
{foreach $option.carrier_list as $carrier}
{$carrier.instance->name}
@@ -167,18 +167,22 @@
</td>
</tr>
</table>
<table class="delivery_option_carrier">
<table class="delivery_option_carrier {if $delivery_option[$id_address] == $key}selected{/if}">
{foreach $option.carrier_list as $carrier}
<tr>
{if !$option.unique_carrier}
<td class="first_item">
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
{if $carrier.logo}
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
{/if}
</td>
<td>{$carrier.instance->name}</td>
<td>
{$carrier.instance->name}
</td>
{/if}
<td {if $option.unique_carrier}class="first_item" colspan="2"{/if}>
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
{if isset($carrier.instance->delay[$cookie->id_lang])}
{$carrier.instance->delay[$cookie->id_lang]}
{/if}
@@ -190,6 +194,7 @@
</div>
{/foreach}
</div>
<div id="HOOK_EXTRACARRIER_{$id_address}">{$HOOK_EXTRACARRIER_ADDR.$id_address}</div>
{foreachelse}
<p class="warning" id="noCarrierWarning">
{if $cart->isMultiAddressDelivery()}