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

// maj

Browse Source
This commit is contained in:
sThiebaut
2011-12-08 17:08:13 +00:00
parent e49b875a1a
commit 6e1143fb9b
12 changed files with 268 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/addresses.tpl
+2 -2
View File
@@ -113,8 +113,8 @@
{/foreach} {/foreach}
</li> </li>
{/foreach} {/foreach}
<li class="address_update"><a href="{$link->getPageLink('address', true, NULL, "id_address={$address.object.id|intval}")}" title="{l s='Update'}">{l s='Update'}</a></li> <li class="address_update"><a href="{$link->getPageLink('address', true, NULL, "id_address={$address.object.id|intval}")}" title="{l s='Update'}">&raquo; {l s='Update'}</a></li>
<li class="address_delete"><a href="{$link->getPageLink('address', true, NULL, "id_address={$address.object.id|intval}&amp;delete")}" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">{l s='Delete'}</a></li> <li class="address_delete"><a href="{$link->getPageLink('address', true, NULL, "id_address={$address.object.id|intval}&amp;delete")}" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">&raquo; {l s='Delete'}</a></li>
</ul> </ul>
{/foreach} {/foreach}
</div> </div>
themes/default/css/global.css
+48 -29
View File
@@ -202,9 +202,11 @@ input.button_small, input.button_small_disabled, input.exclusive_small, input.ex
/*width: 60px; /*width: 60px;
background-image: url('../img/button-small.png')*/ background-image: url('../img/button-small.png')*/
} }
input.button, input.button_disabled, input.exclusive, input.exclusive_disabled, a.button, a.exclusive, span.button, span.exclusive { input.button_disabled, input.exclusive_disabled, span.exclusive {
/*width: 120px; border:1px solid #ccc;
background-image: url('../img/button-medium.png')*/ color:#999;
background:url(../img/bg_bt_2.gif) repeat-x 0 0 #f4b61b;
cursor:default;
} }
input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled { input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled {
/*width: 180px; /*width: 180px;
@@ -552,6 +554,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
padding:0 0 10px 0; padding:0 0 10px 0;
background:none; background:none;
} }
#footer .myaccount .lnk_wishlist img {display:none}
/* ************************************************************************************************ /* ************************************************************************************************
PRODUCT PAGE PRODUCT PAGE
@@ -695,7 +698,8 @@ table#cart_summary .cart_delete {
.cart_total_tax {display:none} .cart_total_tax {display:none}
.cart_total_delivery #total_shipping, .cart_total_delivery #total_shipping,
.cart_total_price #total_price { .cart_total_price #total_price,
.cart_total_price #total_product {
border-right:none border-right:none
} }
@@ -954,29 +958,30 @@ margin: 10px 0 0 0;*/
#order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td { #order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td {
padding: 0 8px; padding: 0 8px;
} }
#order .delivery_option label > table.resume td + td, #order .delivery_option_carrier label > table.resume td + td, #orderopc .delivery_option label > table.resume td + td { #order .delivery_option label > table.resume td + td, #orderopc .delivery_option label > table.resume td + td {
width: 280px; width: 300px;
} }
#order .delivery_option label > table.resume td + td + td, #order .delivery_option_carrier label > table.resume td + td + td, #orderopc .delivery_option label > table.resume td + td + td { #order .delivery_option label > table.resume td + td + td, #orderopc .delivery_option label > table.resume td + td + td {
width: 100px; width: 100px;
text-align: right; 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, #orderopc .delivery_options_address .delivery_option_logo {
padding-left:10px; padding-left:10px;
width: 190px; width: 160px;
} }
#order .delivery_options_address .delivery_option_logo img, #orderopc .delivery_options_address .delivery_option_logo img { height: 40px; } #order .delivery_options_address .delivery_option_logo img, #orderopc .delivery_options_address .delivery_option_logo img { height: 40px; }
#orderopc .delivery_option_carrier { #orderopc .delivery_option_carrier {
margin: 5px 20px; margin: 0 0 0 45px;
padding: 5px; padding: 5px;
width: 500px; width: 680px;
border: 1px solid #bdc2c9;
background: white; background: white;
} }
#order .delivery_option_carrier { #order .delivery_option_carrier .first_item {
margin: 0 0 0 45px; padding:0 0 0 5px;
width: 585px; background:url(../img/arrow_right_2.png) no-repeat 0 2px
background: white;
} }
.order_carrier_content { .order_carrier_content {
@@ -1078,45 +1083,59 @@ a.iframe {font-weight:bold}
/* ************************************************************************************************ /* ************************************************************************************************
PAGE ORDER-OPC PAGE ORDER-OPC
************************************************************************************************ */ ************************************************************************************************ */
#order-opc #left_column {display:none} #orderopc #left_column {display:none}
#order-opc #center_column{width:757px} #orderopc #center_column{width:757px}
#order-opc h2 {} #orderopc h2 {}
#order-opc h2 span { #orderopc h2 span {
display:inline-block; display:inline-block;
padding:5px 7px; padding:5px 7px;
color:#fff; color:#fff;
background:#333; background:#333;
} }
#order-opc #login_form fieldset { #orderopc #login_form fieldset {
background: none repeat scroll 0 0 #FFFFE0; background: none repeat scroll 0 0 #FFFFE0;
border: 1px solid #E6DB55; border: 1px solid #E6DB55;
font-size: 13px; font-size: 13px;
margin: 0 0 10px; margin: 0 0 10px;
padding: 10px; padding: 10px;
} }
#order-opc #login_form fieldset p {padding:0} #orderopc #login_form fieldset p {padding:0}
#order-opc #login_form fieldset p a {padding:0} #orderopc #login_form fieldset p a {padding:0}
#order-opc #new_account_form p.submit { #orderopc #new_account_form p.submit {
margin-right: 120px; margin-right: 120px;
text-align:right text-align:right
} }
#order-opc #new_account_form p.opc-required {margin-left:20px} #orderopc #new_account_form p.opc-required {margin-left:20px}
#order-opc .addresses {margin-bottom:20px} #orderopc .addresses {margin-bottom:20px}
#order-opc #opc_delivery_methods h3 {margin-top:20px;} #orderopc #opc_delivery_methods h3 {margin-top:20px;}
#order-opc #opc_delivery_methods textarea { #orderopc #opc_delivery_methods textarea {
height:60px; height:60px;
width:755px; width:755px;
border:1px solid #ccc border:1px solid #ccc
} }
#order-opc #opc_payment_methods {margin-bottom:20px} #orderopc #opc_payment_methods {margin-bottom:20px}
#order-opc #opc_payment_methods #opc_payment_methods-content p{margin:0} #orderopc #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 {
margin: 0 0 0 45px;
padding: 5px;
width: 680px;
background: white;
}
#orderopc .delivery_option_carrier .first_item {
padding:0 0 0 5px;
background:url(../img/arrow_right_2.png) no-repeat 0 2px
}
/* ************************************************************************************************ /* ************************************************************************************************
themes/default/css/product.css
+42
View File
@@ -133,6 +133,9 @@ span.view_scroll_spacer {
text-align:right text-align:right
} }
/* short description pack */
.short_description_pack {display:none;}
/* color_picker */ /* color_picker */
#pb-left-column #color_picker p { #pb-left-column #color_picker p {
padding-bottom:5px; padding-bottom:5px;
@@ -322,6 +325,8 @@ span.view_scroll_spacer {
#send_friend_form .form_container p.txt_required { #send_friend_form .form_container p.txt_required {
padding-bottom:0; padding-bottom:0;
color:#666 color:#666
/* SEND TO FRIEND (pop-in) ##################################################################### */
} }
#send_friend_form .form_container .text {padding-bottom:10px} #send_friend_form .form_container .text {padding-bottom:10px}
#send_friend_form .form_container .text label { #send_friend_form .form_container .text label {
@@ -345,3 +350,40 @@ span.view_scroll_spacer {
text-align:right text-align:right
} }
/* PACK ##################################################################### */
#blockpack {
margin-top:20px;
padding-top:20px;
border-top:1px dotted #999
}
/* PERSONNALISATION ##################################################################### */
.customization_block {}
.customization_block p.infoCustomizable {
margin:10px 0 20px;
padding:0 0 0 20px;
background:url(../img/icon/infos.gif) no-repeat 0 0 transparent
}
ul#uploadable_files,
ul#text_fields {list-style-type:none}
.customizableProductsFile,
.customizableProductsText{
margin-bottom:20px;
padding-bottom:10px;
border-bottom:1px dotted #ccc;
}
.customizationUploadLine {padding-bottom:10px}
.customizationUploadLine label {
display:inline-block;
width:150px;
vertical-align:top
}
.customizationUploadLine textarea {
height:50px;
width:300px;
border:1px solid #ccc
}
#customizedDatas {
float:right;
}
themes/default/css/product_list.css
+1 -3
View File
@@ -103,9 +103,7 @@ ul#product_list {
background: none repeat scroll 0 0 #9B0000 background: none repeat scroll 0 0 #9B0000
} }
#product_list li .online_only { #product_list li .online_only {
position:absolute; margin:0 0 10px 0
top:20px;
right:0;
} }
#product_list li .content_price { #product_list li .content_price {
margin:26px 0 15px 0; margin:26px 0 15px 0;
themes/default/order-address-multishipping-products.tpl
+1
View File
@@ -34,6 +34,7 @@
<th class="cart_ref item">{l s='Ref.'}</th> <th class="cart_ref item">{l s='Ref.'}</th>
<th class="cart_quantity item">{l s='Qty'}</th> <th class="cart_quantity item">{l s='Qty'}</th>
<th class="shipping_address last_item">{l s='Shipping address'}</th> <th class="shipping_address last_item">{l s='Shipping address'}</th>
<th class="delete">{l s=''}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
themes/default/order-address-multishipping.tpl
+6 -6
View File
@@ -166,7 +166,7 @@
<div id="opc_account" class="opc-main-block"> <div id="opc_account" class="opc-main-block">
<div id="opc_account-overlay" class="opc-overlay" style="display: none;"></div> <div id="opc_account-overlay" class="opc-overlay" style="display: none;"></div>
{/if} {/if}
<div class="addresses"> <div class="addresses clearfix">
<input type="hidden" name="id_address_delivery" id="id_address_delivery" value="{$cart->id_address_delivery}" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}" /> <input type="hidden" name="id_address_delivery" id="id_address_delivery" value="{$cart->id_address_delivery}" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}" />
<p id="address_invoice_form" class="select" {if $cart->id_address_invoice == $cart->id_address_delivery}style="display: none;"{/if}> <p id="address_invoice_form" class="select" {if $cart->id_address_invoice == $cart->id_address_delivery}style="display: none;"{/if}>
@@ -181,12 +181,12 @@
<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a> <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a>
{/if} {/if}
</p> </p>
<div class="clear"></div> <div class="clearfix">
<ul class="address alternate_item {if $cart->isVirtualCart()}full_width{/if}" id="address_invoice"> <ul class="address alternate_item {if $cart->isVirtualCart()}full_width{/if}" id="address_invoice">
</ul> </ul>
<br class="clear" /> </div>
<p class="address_add submit"> <p class="address_add submit">
<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back|urlencode}{/if}")}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a> <a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back|urlencode}{/if}")}" title="{l s='Add'}" class="button_large">&raquo; {l s='Add a new address'}</a>
</p> </p>
{if !$opc} {if !$opc}
<div id="ordermsg" class="clearfix"> <div id="ordermsg" class="clearfix">
themes/default/order-address-product-line.tpl
+46 -44
View File
@@ -33,52 +33,54 @@
</td> </td>
<td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td> <td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
<td class="cart_quantity"{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} style="text-align: center;"{/if}> <td class="cart_quantity"{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} style="text-align: center;"{/if}>
{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}
{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> <div id="cart_quantity_button" style="float:left;">
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_0_{$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_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="icon" width="11" height="13" /></a> <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 />
</div> {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
<div id="cart_quantity_button" style="float:left;"> <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_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 /> <img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} </a>
<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'}"> {else}
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> <a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of '}{$product.minimal_quantity}{l s=' of this product.'}">
</a> <img src="{$img_dir}icon/quantity_down.gif" width="14" height="9" alt="{l s='Subtract'}" />
{else} </a>
<a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of '}{$product.minimal_quantity}{l s=' of this product.'}">
<img src="{$img_dir}icon/quantity_down.gif" width="14" height="9" alt="{l s='Subtract'}" />
</a>
{/if}
</div>
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}_hidden" />
<input size="2" type="text" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" />
{/if} {/if}
</div>
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}_hidden" />
<input size="2" type="text" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" />
{/if} {/if}
{/if}
</td> </td>
<td> <td>
<from method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")}"> <form method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")}">
<input type="hidden" name="id_product" value="{$product.id_product}" /> <input type="hidden" name="id_product" value="{$product.id_product}" />
<input type="hidden" name="id_product_attribute" value="{$product.id_product_attribute}" /> <input type="hidden" name="id_product_attribute" value="{$product.id_product_attribute}" />
<select name="address_delivery" id="select_address_delivery_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" class="cart_address_delivery"> <select name="address_delivery" id="select_address_delivery_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" class="cart_address_delivery">
{if $product.id_address_delivery == 0 && $delivery->id == 0} {if $product.id_address_delivery == 0 && $delivery->id == 0}
<option></option> <option></option>
{/if} {/if}
<option value="-1">{l s='New address'}</option> <option value="-1">{l s='New address'}</option>
{foreach $address_list as $address} {foreach $address_list as $address}
<option value="{$address.id_address}" <option value="{$address.id_address}"
{if ($product.id_address_delivery > 0 && $product.id_address_delivery == $address.id_address) || ($product.id_address_delivery == 0 && $address.id_address == $delivery->id)} {if ($product.id_address_delivery > 0 && $product.id_address_delivery == $address.id_address) || ($product.id_address_delivery == 0 && $address.id_address == $delivery->id)}
selected="selected" selected="selected"
{/if} {/if}
> >
{$address.alias} {$address.alias}
</option> </option>
{/foreach} {/foreach}
<option value="-2">{l s='Ship to an other address'}</option> <option value="-2">{l s='Ship to an other address'}</option>
</select> </select>
</form> </form>
</td> </td>
<td class="cart_delete">
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_0_{$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_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Delete'}">{l s='Delete'}</a>
{/if}
</td>
</tr> </tr>
themes/default/order-carrier.tpl
+19 -19
View File
@@ -157,25 +157,25 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="delivery_option_carrier"> <table class="delivery_option_carrier">
{foreach $option.carrier_list as $carrier} {foreach $option.carrier_list as $carrier}
<tr> <tr>
<td> <td class="first_item">
{if $carrier.logo} {if $carrier.logo}
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/> <img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
{/if} {/if}
</td> </td>
<td> <td>
{$carrier.instance->name} {$carrier.instance->name}
</td> </td>
<td> <td>
{if isset($carrier.instance->delay[$cookie->id_lang])} {if isset($carrier.instance->delay[$cookie->id_lang])}
{$carrier.instance->delay[$cookie->id_lang]} {$carrier.instance->delay[$cookie->id_lang]}
{/if} {/if}
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
</label> </label>
</div> </div>
{/foreach} {/foreach}
themes/default/order-payment.tpl
+48 -31
View File
@@ -160,45 +160,62 @@
{if $use_taxes} {if $use_taxes}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td colspan="6"> <td colspan="5" id="cart_voucher" class="cart_voucher">
{if $display_tax_label} {if $voucherAllowed}
{l s='Total (tax excl.):'} {if isset($errors_discount) && $errors_discount}
{else} <ul class="error">
{l s='Subtotal:'} {foreach from=$errors_discount key=k item=error}
<li>{$error|escape:'htmlall':'UTF-8'}</li>
{/foreach}
</ul>
{/if} {/if}
{/if}
</td> </td>
<td class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td> <td colspan="2" class="price" id="total_price">
</tr> <p>{l s='Total:'}</p>
<tr class="cart_total_tax"> <span>{displayPrice price=$total_price}</span>
<td colspan="6">
{if $display_tax_label}
{l s='Total tax:'}
{else}
{l s='Estimated Sales Tax:'}
{/if}
</td> </td>
<td class="price" id="total_tax">{displayPrice price=$total_tax}</td>
</tr>
<tr class="cart_total_price">
<td colspan="6">
{if $display_tax_label}
{l s='Total (tax incl.):'}
{else}
{l s='Total:'}
{/if}
</td>
<td class="price" id="total_price">{displayPrice price=$total_price}</td>
</tr> </tr>
{else} {else}
<tr class="cart_total_price"> <tr class="cart_total_price">
<td colspan="6">{l s='Total:'}</td> <td colspan="4" id="cart_voucher" class="cart_voucher">
<td class="price" id="total_price">{displayPrice price=$total_price_without_tax}</td> {if $voucherAllowed}
<div id="cart_voucher" class="table_block">
{if isset($errors_discount) && $errors_discount}
<ul class="error">
{foreach from=$errors_discount key=k item=error}
<li>{$error|escape:'htmlall':'UTF-8'}</li>
{/foreach}
</ul>
{/if}
{if $voucherAllowed}
<form action="{if $opc}{$link->getPageLink('order-opc.php', true)}{else}{$link->getPageLink('order.php', true)}{/if}" method="post" id="voucher">
<fieldset>
<h4><label for="discount_name">{l s='Vouchers'}</label></h4>
<p>
<input type="text" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" />
</p>
<p class="submit"><input type="hidden" name="submitDiscount" /><input type="submit" name="submitAddDiscount" value="{l s='ok'}" class="button" /></p>
{if $displayVouchers}
<h4 class="title_offers">{l s='Take advantage of our offers:'}</h4>
<div id="display_cart_vouchers">
{foreach from=$displayVouchers item=voucher}
<span onclick="$('#discount_name').val('{$voucher.name}');return false;" class="voucher_name">{$voucher.name}</span> - {$voucher.description} <br />
{/foreach}
</div>
{/if}
</fieldset>
</form>
{/if}
</div>
{/if}
</td>
<td colspan="2" id="total_price" class="price">
<p>{l s='Total:'}</p>
<span>{displayPrice price=$total_price_without_tax}</span>
</td>
</tr> </tr>
{/if} {/if}
{*<tr class="cart_free_shipping" {if $free_ship <= 0 || $isVirtualCart} style="display: none;" {/if}>
<td colspan="6" style="white-space: normal;">{l s='Remaining amount to be added to your cart in order to obtain free shipping:'}</td>
<td id="free_shipping" class="price">{displayPrice price=$free_ship}</td>
</tr>*}
</tfoot> </tfoot>
<tbody> <tbody>
{foreach from=$products item=product name=productLoop} {foreach from=$products item=product name=productLoop}
themes/default/product-list.tpl
+3 -2
View File
@@ -48,12 +48,12 @@
<div class="right_block"> <div class="right_block">
{if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="on_sale">{l s='On sale!'}</span> {if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="on_sale">{l s='On sale!'}</span>
{elseif isset($product.reduction) && $product.reduction && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="discount">{l s='Reduced price!'}</span>{/if} {elseif isset($product.reduction) && $product.reduction && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="discount">{l s='Reduced price!'}</span>{/if}
{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only!'}</span>{/if}
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
<div class="content_price"> <div class="content_price">
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if} {if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if}
{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if} {if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if}
</div> </div>
{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only!'}</span>{/if}
{/if} {/if}
{if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE} {if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE}
{if ($product.allow_oosp || $product.quantity > 0)} {if ($product.allow_oosp || $product.quantity > 0)}
@@ -61,7 +61,8 @@
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}&amp;token={$static_token}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a> <a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}&amp;token={$static_token}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a>
{else} {else}
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a> <a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a>
{/if} {else} {/if}
{else}
<span class="exclusive"><span></span>{l s='Add to cart'}</span><br /> <span class="exclusive"><span></span>{l s='Add to cart'}</span><br />
{/if} {/if}
{/if} {/if}
themes/default/product.tpl
+51 -43
View File
@@ -156,7 +156,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad}', 0)"/> <input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad}', 0)"/>
<input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad}', 1)"/> <input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad}', 1)"/>
</p> </p>
<div class="clear" ></div>
<p id="admin-action-result"></p> <p id="admin-action-result"></p>
</p> </p>
</div> </div>
@@ -233,13 +232,15 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p> <p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p>
{/if} {/if}
{if $packItems|@count > 0} {if $packItems|@count > 0}
<div class="short_description_pack">
<h3>{l s='Pack content'}</h3> <h3>{l s='Pack content'}</h3>
{foreach from=$packItems item=packItem} {foreach from=$packItems item=packItem}
<div class="pack_content"> <div class="pack_content">
{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)}">{$packItem.name|escape:'htmlall':'UTF-8'}</a> {$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)}">{$packItem.name|escape:'htmlall':'UTF-8'}</a>
<p>{$packItem.description_short}</p> <p>{$packItem.description_short}</p>
</div> </div>
{/foreach} {/foreach}
</div>
{/if} {/if}
</div> </div>
{/if} {/if}
@@ -332,7 +333,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<script type="text/javascript"> <script type="text/javascript">
checkMinimalQuantity(); checkMinimalQuantity();
</script> </script>
{/if} {/if}
<!-- availability --> <!-- availability -->
<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> <p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
@@ -357,10 +358,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p> </p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none"{/if} >{l s='Warning: Last items in stock!'}</p> <p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none"{/if} >{l s='Warning: Last items in stock!'}</p>
{if $product->online_only}
<p class="online_only">{l s='Online only'}</p>
{/if}
</div> </div>
<div class="content_prices clearfix"> <div class="content_prices clearfix">
@@ -432,7 +429,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{*close if for show price*} {*close if for show price*}
{/if} {/if}
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><span></span><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p> {if $product->online_only}
<p class="online_only">{l s='Online only'}</p>
{/if}
<p{if (!$allow_oosp && $product->quantity > 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><span></span><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
{if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if} {if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if}
@@ -446,8 +447,8 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if isset($quantity_discounts) && $quantity_discounts} {if isset($quantity_discounts) && $quantity_discounts}
<!-- quantity discount --> <!-- quantity discount -->
<ul class="idTabs"> <ul class="idTabs clearfix">
<li><a style="cursor: pointer" class="selected">{l s='Quantity discount'}</a></li> <li><a href="#" style="cursor: pointer" class="selected">{l s='Quantity discount'}</a></li>
</ul> </ul>
<div id="quantityDiscount"> <div id="quantityDiscount">
<table class="std"> <table class="std">
@@ -548,53 +549,60 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- Customizable products --> <!-- Customizable products -->
{if isset($product) && $product->customizable} {if isset($product) && $product->customizable}
<ul class="idTabs"> <ul class="idTabs clearfix">
<li><a style="cursor: pointer">{l s='Product customization'}</a></li> <li><a href="#">{l s='Product customization'}</a></li>
</ul> </ul>
<div class="customization_block"> <div class="customization_block">
<form method="post" action="{$customizationFormTarget}" enctype="multipart/form-data" id="customizationForm"> <form method="post" action="{$customizationFormTarget}" enctype="multipart/form-data" id="customizationForm" class="clearfix">
<p> <p class="infoCustomizable">
<img src="{$img_dir}icon/infos.gif" alt="Informations" />
{l s='After saving your customized product, remember to add it to your cart.'} {l s='After saving your customized product, remember to add it to your cart.'}
{if $product->uploadable_files}<br />{l s='Allowed file formats are: GIF, JPG, PNG'}{/if} {if $product->uploadable_files}<br />{l s='Allowed file formats are: GIF, JPG, PNG'}{/if}
</p> </p>
{if $product->uploadable_files|intval} {if $product->uploadable_files|intval}
<h2>{l s='Pictures'}</h2> <div class="customizableProductsFile">
<ul id="uploadable_files"> <h3>{l s='Pictures'}</h3>
{counter start=0 assign='customizationField'} <ul id="uploadable_files" class="clearfix">
{foreach from=$customizationFields item='field' name='customizationFields'} {counter start=0 assign='customizationField'}
{if $field.type == 0} {foreach from=$customizationFields item='field' name='customizationFields'}
<li class="customizationUploadLine{if $field.required} required{/if}">{assign var='key' value='pictures_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} {if $field.type == 0}
{if isset($pictures.$key)}<div class="customizationUploadBrowse"> <li class="customizationUploadLine{if $field.required} required{/if}">{assign var='key' value='pictures_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field}
{if isset($pictures.$key)}
<div class="customizationUploadBrowse">
<img src="{$pic_dir}{$pictures.$key}_small" alt="" /> <img src="{$pic_dir}{$pictures.$key}_small" alt="" />
<a href="{$link->getProductDeletePictureLink($product, $field.id_customization_field)}" title="{l s='Delete'}" > <a href="{$link->getProductDeletePictureLink($product, $field.id_customization_field)}" title="{l s='Delete'}" >
<img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="customization_delete_icon" width="11" height="13" /> <img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="customization_delete_icon" width="11" height="13" />
</a> </a>
</div>{/if} </div>
<div class="customizationUploadBrowse"><input type="file" name="file{$field.id_customization_field}" id="img{$customizationField}" class="customization_block_input {if isset($pictures.$key)}filled{/if}" />{if $field.required}<sup>*</sup>{/if} {/if}
<div class="customizationUploadBrowseDescription">{if !empty($field.name)}{$field.name}{else}{l s='Please select an image file from your hard drive'}{/if}</div></div> <div class="customizationUploadBrowse">
</li> <label class="customizationUploadBrowseDescription">{if !empty($field.name)}{$field.name}{else}{l s='Please select an image file from your hard drive'}{/if}{if $field.required}<sup>*</sup>{/if}</label>
{counter} <input type="file" name="file{$field.id_customization_field}" id="img{$customizationField}" class="customization_block_input {if isset($pictures.$key)}filled{/if}" />
{/if} </div>
{/foreach} </li>
</ul> {counter}
{/if}
{/foreach}
</ul>
</div>
{/if} {/if}
<div class="clear"></div>
{if $product->text_fields|intval} {if $product->text_fields|intval}
<h2>{l s='Texts'}</h2> <div class="customizableProductsText">
<ul id="text_fields"> <h3>{l s='Texts'}</h3>
<ul id="text_fields">
{counter start=0 assign='customizationField'} {counter start=0 assign='customizationField'}
{foreach from=$customizationFields item='field' name='customizationFields'} {foreach from=$customizationFields item='field' name='customizationFields'}
{if $field.type == 1} {if $field.type == 1}
<li class="customizationUploadLine{if $field.required} required{/if}">{assign var='key' value='textFields_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} <li class="customizationUploadLine{if $field.required} required{/if}">
{if !empty($field.name)}{$field.name}{/if}{if $field.required}<sup>*</sup>{/if}<textarea type="text" name="textField{$field.id_customization_field}" id="textField{$customizationField}" rows="1" cols="40" class="customization_block_input" />{if isset($textFields.$key)}{$textFields.$key|stripslashes}{/if}</textarea> <label for ="textField{$customizationField}">{assign var='key' value='textFields_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} {if !empty($field.name)}{$field.name}{/if}{if $field.required}<sup>*</sup>{/if}</label>
</li> <textarea type="text" name="textField{$field.id_customization_field}" id="textField{$customizationField}" rows="1" cols="40" class="customization_block_input" />{if isset($textFields.$key)}{$textFields.$key|stripslashes}{/if}</textarea>
{counter} </li>
{counter}
{/if} {/if}
{/foreach} {/foreach}
</ul> </ul>
</div>
{/if} {/if}
<p style="clear: left;" id="customizedDatas"> <p id="customizedDatas">
<input type="hidden" name="quantityBackup" id="quantityBackup" value="" /> <input type="hidden" name="quantityBackup" id="quantityBackup" value="" />
<input type="hidden" name="submitCustomizedDatas" value="1" /> <input type="hidden" name="submitCustomizedDatas" value="1" />
<input type="button" class="button" value="{l s='Save'}" onclick="javascript:saveCustomization()" /> <input type="button" class="button" value="{l s='Save'}" onclick="javascript:saveCustomization()" />
@@ -606,7 +614,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if} {/if}
{if isset($packItems) && $packItems|@count > 0} {if isset($packItems) && $packItems|@count > 0}
<div> <div id="blockpack">
<h2>{l s='Pack content'}</h2> <h2>{l s='Pack content'}</h2>
{include file="$tpl_dir./product-list.tpl" products=$packItems} {include file="$tpl_dir./product-list.tpl" products=$packItems}
</div> </div>
themes/default/shopping-cart.tpl
+1 -20
View File
@@ -82,25 +82,6 @@
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
<tr class="cart_total_voucher" {if $total_discounts == 0}style="display: none;"{/if}> <tr class="cart_total_voucher" {if $total_discounts == 0}style="display: none;"{/if}>
<td colspan="6"> <td colspan="6">
{if $use_taxes} {if $use_taxes}
@@ -355,7 +336,7 @@
{/if} {/if}
{if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc} {if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc}
<div class="order_delivery"> <div class="order_delivery clearfix">
{if !isset($formattedAddresses)} {if !isset($formattedAddresses)}
{if $delivery->id} {if $delivery->id}
<ul id="delivery_address" class="address item"> <ul id="delivery_address" class="address item">