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

// Replacing css rules using ids for the cart-summary

Browse Source 
// Adding a button to submit "multishipping address" on OPC
This commit is contained in:
mDeflotte committed 2012-01-02 09:57:13 +00:00
1 parent 724b700676
commit f0e90323f2
6 files changed
+45 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/css/global.css
+27 -30
View File
@@ -690,13 +690,13 @@ table#cart_summary .cart_quantity {width:130px}
width: 20px; width: 20px;
border:1px solid #fff border:1px solid #fff
} }
.cart_quantity #cart_quantity_button { .cart_quantity .cart_quantity_button {
float:left; float:left;
position: relative; position: relative;
top: -5px top: -5px
} }
table#cart_summary .cart_total {width:120px} table#cart_summary .cart_total {width:120px}
table#cart_summary .cart_delete { table#cart_summary .cart_delete {
width:64px; width:64px;
text-align:center text-align:center
} }
@@ -716,18 +716,7 @@ a.price_discount_delete {
.cart_total_tax {display:none} .cart_total_tax {display:none}
.cart_total_delivery #total_shipping, .cart_total_price .total_price_container {
.cart_total_price #total_product,
.cart_total_price #total_price_without_tax,
.cart_total_price #total_tax,
.cart_total_voucher #total_discount,
.cart_total_voucher #total_wrapping,
.cart_total_tax #total_tax {
border-right:none;
text-align: right
}
.cart_total_price #total_price_container {
border-right:none; border-right:none;
} }
@@ -736,14 +725,14 @@ table#cart_summary .cart_total_price td.cart_voucher {
border-bottom:1px solid #999; border-bottom:1px solid #999;
vertical-align:middle vertical-align:middle
} }
#cart_voucher h4, .cart_voucher h4,
#cart_voucher p {float:left;} .cart_voucher p {float:left;}
#cart_voucher h4 { .cart_voucher h4 {
margin-right:12px; margin-right:12px;
padding:5px 0; padding:5px 0;
font-size:13px font-size:13px
} }
#cart_voucher p {padding-bottom:0;} .cart_voucher p {padding-bottom:0;}
.cart_voucher #display_cart_vouchers { .cart_voucher #display_cart_vouchers {
clear:both; clear:both;
line-height: 16px; line-height: 16px;
@@ -753,7 +742,7 @@ table#cart_summary .cart_total_price td.cart_voucher {
} }
.cart_voucher #display_cart_vouchers .title_offers {margin-top:10px} .cart_voucher #display_cart_vouchers .title_offers {margin-top:10px}
.cart_voucher #display_cart_vouchers span {font-weight:bold} .cart_voucher #display_cart_vouchers span {font-weight:bold}
#cart_voucher input#discount_name { .cart_voucher input.discount_name {
padding:0 5px; padding:0 5px;
height:22px; height:22px;
width:170px;/* 180 */ width:170px;/* 180 */
@@ -761,7 +750,7 @@ table#cart_summary .cart_total_price td.cart_voucher {
font-weight:normal; font-weight:normal;
background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff background:url(../img/bg_discount_name.png) repeat-x 0 0 #fff
} }
#cart_voucher .submit input.button { .cart_voucher .submit input.button {
margin-left:2px; margin-left:2px;
padding:2px; padding:2px;
height:24px; height:24px;
@@ -775,15 +764,18 @@ table#cart_summary .cart_total_price td.cart_voucher {
background:url(../img/bg_cart_voucher_submit.png) repeat-x 0 0 #000 background:url(../img/bg_cart_voucher_submit.png) repeat-x 0 0 #000
} }
.cart_total_price #total_product, #cart_summary .price {
.cart_total_price #total_price_without_tax, border-right:none;
.cart_total_price #total_tax, text-align: right;
.cart_total_price #total_shipping {text-align:right}
.cart_total_price #total_price_container {
padding:0;
border-bottom:1px solid #999
} }
.cart_total_price #total_price_container p { .total_price_container p {text-align: left}
table#cart_summary .cart_total_price .total_price_container {
padding:0;
border-bottom:1px solid #999;
border-right:1px solid #999;
}
.cart_total_price .total_price_container p {
display:block; display:block;
padding:8px; padding:8px;
font-weight:bold; font-weight:bold;
@@ -791,7 +783,7 @@ table#cart_summary .cart_total_price td.cart_voucher {
text-transform:uppercase; text-transform:uppercase;
background:#333 background:#333
} }
.cart_total_price #total_price_container span { .cart_total_price .total_price_container span {
display:block; display:block;
padding:15px; padding:15px;
font-weight:bold; font-weight:bold;
@@ -822,6 +814,11 @@ table#cart_summary .cart_total_price td.cart_voucher {
.order_delivery .first_item {margin-right:35px;} .order_delivery .first_item {margin-right:35px;}
.multishipping_close_container {
text-align: center;
margin-top: -30px;
}
/* step 2 - authentification ******************************************************************* */ /* step 2 - authentification ******************************************************************* */
#create-account_form, #authentication #login_form { #create-account_form, #authentication #login_form {
clear: none; clear: none;
themes/default/js/order-opc.js
+5
View File
@@ -705,6 +705,11 @@ function multishippingMode(it)
'onComplete': function() 'onComplete': function()
{ {
cleanSelectAddressDelivery(); cleanSelectAddressDelivery();
$('#fancybox-content').append($('<div class="multishipping_close_container"><a id="multishipping-close" class="button_large" href="#">' + CloseTxt + '</a></div>'));
$('#multishipping-close').click(function() {
$.fancybox.close();
return false;
});
} }
}); });
} }
themes/default/order-address-multishipping-products.tpl
+4 -2
View File
@@ -24,7 +24,9 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<p>{l s='Choose the delivery addresses:'}</p> <p>{l s='Choose the delivery addresses:'}</p>
<script type="text/javascript">
CloseTxt = '{l s='Submit'}';
</script>
<div id="order-detail-content" class="table_block"> <div id="order-detail-content" class="table_block">
<table id="cart_summary" class="std"> <table id="cart_summary" class="std">
<thead> <thead>
@@ -70,7 +72,7 @@
<div style="float:right"> <div style="float:right">
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" /></a> <a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" /></a>
</div> </div>
<div id="cart_quantity_button" style="float:left"> <div id="cart_quantity_button" class="cart_quantity_button" style="float:left">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}"> <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
themes/default/order-address-product-line.tpl
+1 -1
View File
@@ -38,7 +38,7 @@
{else} {else}
{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}<span id="cart_quantity_custom_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" >{$product.customizationQuantityTotal}</span>{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}<span id="cart_quantity_custom_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" >{$product.customizationQuantityTotal}</span>{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<div id="cart_quantity_button" style="float:left;"> <div id="cart_quantity_button" class="cart_quantity_button" style="float:left;">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}"> <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
themes/default/shopping-cart-product-line.tpl
+1 -1
View File
@@ -51,7 +51,7 @@
{else} {else}
{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}<span id="cart_quantity_custom_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" >{$product.customizationQuantityTotal}</span>{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}<span id="cart_quantity_custom_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" >{$product.customizationQuantityTotal}</span>{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0} {if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<div id="cart_quantity_button" style="float:left;"> <div id="cart_quantity_button" class="cart_quantity_button" style="float:left;">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}"> <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
themes/default/shopping-cart.tpl
+7 -7
View File
@@ -112,7 +112,7 @@
{l s='Total vouchers:'} {l s='Total vouchers:'}
{/if} {/if}
</td> </td>
<td colspan="2" class="price-discount" id="total_discount"> <td colspan="2" class="price-discount price" id="total_discount">
{if $use_taxes} {if $use_taxes}
{if $priceDisplay} {if $priceDisplay}
{displayPrice price=$total_discounts_tax_exc} {displayPrice price=$total_discounts_tax_exc}
@@ -136,7 +136,7 @@
{l s='Total gift-wrapping:'} {l s='Total gift-wrapping:'}
{/if} {/if}
</td> </td>
<td colspan="2" class="price-discount" id="total_wrapping"> <td colspan="2" class="price-discount price" id="total_wrapping">
{if $use_taxes} {if $use_taxes}
{if $priceDisplay} {if $priceDisplay}
{displayPrice price=$total_wrapping_tax_exc} {displayPrice price=$total_wrapping_tax_exc}
@@ -189,7 +189,7 @@
<fieldset> <fieldset>
<h4><label for="discount_name">{l s='Vouchers'}</label></h4> <h4><label for="discount_name">{l s='Vouchers'}</label></h4>
<p> <p>
<input type="text" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" /> <input type="text" class="discount_name" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" />
</p> </p>
<p class="submit"><input type="hidden" name="submitDiscount" /><input type="submit" name="submitAddDiscount" value="{l s='ok'}" class="button" /></p> <p class="submit"><input type="hidden" name="submitDiscount" /><input type="submit" name="submitAddDiscount" value="{l s='ok'}" class="button" /></p>
{if $displayVouchers} {if $displayVouchers}
@@ -205,12 +205,12 @@
{/if} {/if}
</td> </td>
{if $use_taxes} {if $use_taxes}
<td colspan="2" class="price" id="total_price_container"> <td colspan="2" class="price total_price_container" id="total_price_container">
<p>{l s='Total:'}</p> <p>{l s='Total:'}</p>
<span id="total_price">{displayPrice price=$total_price}</span> <span id="total_price">{displayPrice price=$total_price}</span>
</td> </td>
{else} {else}
<td colspan="2" class="price" id="total_price_container"> <td colspan="2" class="price total_price_container" id="total_price_container">
<p>{l s='Total:'}</p> <p>{l s='Total:'}</p>
<span id="total_price">{displayPrice price=$total_price_without_tax}</span> <span id="total_price">{displayPrice price=$total_price_without_tax}</span>
</td> </td>
@@ -259,7 +259,7 @@
{if isset($cannotModify) AND $cannotModify == 1} {if isset($cannotModify) AND $cannotModify == 1}
<span style="float:left">{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span> <span style="float:left">{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span>
{else} {else}
<div id="cart_quantity_button" style="float:left"> <div id="cart_quantity_button" class="cart_quantity_button" style="float:left">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br /> <a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}"> <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
@@ -301,7 +301,7 @@
</span></td> </span></td>
<td class="cart_discount_delete">1</td> <td class="cart_discount_delete">1</td>
<td class="cart_discount_price"> <td class="cart_discount_price">
<span class="price-discount">{if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if}</span> <span class="price-discount price">{if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if}</span>
</td> </td>
<td class="price_discount_del"> <td class="price_discount_del">
<a href="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}?deleteDiscount={$discount.id_discount}" class="price_discount_delete" title="{l s='Delete'}">{l s='Delete'}</a> <a href="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}?deleteDiscount={$discount.id_discount}" class="price_discount_delete" title="{l s='Delete'}">{l s='Delete'}</a>