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

[-] FO : #PSCFV-3055 - Part 2 : Hidding shipping price if a cart rule make shipping free

Browse Source
This commit is contained in:
mDeflotte
2012-07-05 13:44:48 +00:00
parent 3fa0d8ff9e
commit a59f3ac4e2
4 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
themes/default/css/global.css
View File

@@ -707,10 +707,11 @@ table#cart_summary .cart_product {
border-bottom: 1px solid #999;
}
table#cart_summary .cart_product img {border:1px solid #ccc}
table#cart_summary .cart_description {
table#cart_summary .cart_description {
width:230px;
}
table#cart_summary .cart_unit {width:130px}
table#cart_summary .cart_unit {width:130px;text-align: center}
table#cart_summary td.cart_unit {text-align: right}
table#cart_summary .cart_quantity {width:130px}
table#cart_summary .customization .cart_quantity {padding: 8px 12px 0;}
.cart_quantity .cart_quantity_input {
@@ -724,11 +725,13 @@ table#cart_summary .customization .cart_quantity {padding: 8px 12px 0;}
position: relative;
top: -5px
}
table#cart_summary .cart_total {width:120px}
table#cart_summary .cart_total {width:120px;text-align: center}
table#cart_summary td.cart_total {text-align: right}
table#cart_summary .cart_delete {
width:64px;
text-align:center
}
table#cart_summary .cart_discount_price {text-align: right}
.cart_delete a.cart_quantity_delete,
a.price_discount_delete {
display:inline-block;
@@ -798,6 +801,7 @@ table#cart_summary #total_price_container {
#cart_summary .price {
border-right:none;
text-align: right;
white-space: nowrap;
}
.total_price_container p {text-align: left}

5
themes/default/lang/fr.php
View File

@@ -493,7 +493,6 @@ $_LANG['order-opc_db671b8ceed664eaecb59a4e6075ec9f'] = 'Veuillez commencer par s
$_LANG['order-opc_ea295188b69aa5e04810abcc38b2b2be'] = 'a été sélectionné';
$_LANG['order-payment_03ab340b3f99e03cff9e84314ead38c0'] = 'Qté';
$_LANG['order-payment_1021f02536dc46ab3b07c269949e4de7'] = 'Texte #%s : ';
$_LANG['order-payment_12d3c7a4296542c62474856ec452c045'] = 'Réf.';
$_LANG['order-payment_1ac6ee29e9e68fb71bad91c1d34348cc'] = '%s : ';
$_LANG['order-payment_1d4c9008fd49770971ffc2e8f32df870'] = 'Total transport TTC :';
$_LANG['order-payment_1d9baf077ee87921f57a8fe42d510b65'] = 'Soustraire';
@@ -506,6 +505,7 @@ $_LANG['order-payment_4e59b98d7fa1d964bfd9841ad5c34980'] = 'Total bons d\'achats
$_LANG['order-payment_543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total produits :';
$_LANG['order-payment_59319ac504f7ad04ae16126cf49e7f7e'] = 'Votre méthode de paiement';
$_LANG['order-payment_66c4c5112f455a19afde47829df363fa'] = 'Total :';
$_LANG['order-payment_66f51e43606e2baebb8e9c3bfe965da4'] = 'Transport :';
$_LANG['order-payment_691b338fa68b3c177c6ebbc745624c6a'] = 'Total transport :';
$_LANG['order-payment_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Prix unitaire';
$_LANG['order-payment_6f758a9cd90f467e432a019b87fee031'] = 'Total papiers cadeaux HT :';
@@ -523,6 +523,7 @@ $_LANG['order-payment_c8cd21bd2e33378f10611bc4498cf96f'] = 'Supprimer cette pers
$_LANG['order-payment_dd1f775e443ff3b9a89270713580a51b'] = 'Précédent';
$_LANG['order-payment_deb10517653c255364175796ace3553f'] = 'Produit';
$_LANG['order-payment_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
$_LANG['order-payment_ecba3578d8cd65126d4a47c76b3c9c2d'] = 'Livraison gratuite !';
$_LANG['order-payment_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
$_LANG['order-payment_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
$_LANG['order-payment_f7b96335c6a33477579e43f3da368507'] = 'Profitez de nos offres';
@@ -728,7 +729,7 @@ $_LANG['shopping-cart_d6bf6fa1b9ec58788836df2f1019cdb0'] = 'Votre panier contien
$_LANG['shopping-cart_deb10517653c255364175796ace3553f'] = 'Produit';
$_LANG['shopping-cart_e0aa021e21dddbd6d8cecec71e9cf564'] = 'ok';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
$_LANG['shopping-cart_ecba3578d8cd65126d4a47c76b3c9c2d'] = 'Livraison gratuite!';
$_LANG['shopping-cart_ecba3578d8cd65126d4a47c76b3c9c2d'] = 'Livraison gratuite !';
$_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
$_LANG['shopping-cart_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
$_LANG['shopping-cart_f7b96335c6a33477579e43f3da368507'] = 'Profitez de nos offres :';

33
themes/default/order-payment.tpl
View File

@@ -137,23 +137,30 @@
{/if}
</td>
</tr>
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}}</td>
<td class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery">
<td colspan="5">{l s='Shipping:'}</td>
<td class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}}</td>
<td class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
<td colspan="5">{l s='Total shipping:'}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="5">{l s='Total shipping:'}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{/if}
{if $use_taxes}

24
themes/default/shopping-cart.tpl
View File

@@ -138,13 +138,13 @@
{/if}
</td>
</tr>
{if $use_taxes}
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery">
<td colspan="5">{l s='Shipping:'}</td>
<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery">
<td colspan="5">{l s='Shipping:'}</td>
<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}</td>
@@ -156,12 +156,12 @@
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<td colspan="5">{l s='Total shipping:'}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping_tax_exc}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
<td colspan="5">{l s='Total shipping:'}</td>
<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping_tax_exc}</td>
</tr>
{/if}
<tr class="cart_total_price">