Skip to content

Commit 346061d

Browse files
rohit053rohit053
authored
Merge pull request #1201 from shreesh-webkul/gli-2260
Updated: Cart total summary on checkout page
2 parents 20858d3 + 8aca873 commit 346061d

File tree

5 files changed

+65
-107
lines changed

5 files changed

+65
-107
lines changed

‎install/data/xml/configuration.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<value>id_shop;id_currency;id_country;id_group</value>
277277
</configuration>
278278
<configuration id="PS_TAX_DISPLAY" name="PS_TAX_DISPLAY">
279-
<value>0</value>
279+
<value>1</value>
280280
</configuration>
281281
<configuration id="PS_SMARTY_FORCE_COMPILE" name="PS_SMARTY_FORCE_COMPILE">
282282
<value>0</value>
@@ -522,7 +522,7 @@
522522
<value>1</value>
523523
</configuration>
524524
<configuration id="PS_TAX_ADDRESS_TYPE" name="PS_TAX_ADDRESS_TYPE">
525-
<value>id_address_delivery</value>
525+
<value>id_address_invoice</value>
526526
</configuration>
527527
<configuration id="PS_SHOP_DEFAULT" name="PS_SHOP_DEFAULT">
528528
<value>1</value>

‎modules/blockcart/blockcart.tpl

+10-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,16 @@
356356
</div> -->
357357
{if isset($total_convenience_fee)}
358358
<div class="layer_cart_row">
359-
<strong class="dark">{l s='Convenience Fees' mod='blockcart'}</strong>
359+
<strong class="dark">
360+
{l s='Convenience Fees' mod='blockcart'}
361+
{if $display_tax_label}
362+
{if $priceDisplay == 1}
363+
{l s='(tax excl.)' mod='blockcart'}
364+
{else}
365+
{l s='(tax incl.)' mod='blockcart'}
366+
{/if}
367+
{/if}
368+
</strong>
360369
<span class="price ajax_cart_convenience_fee pull-right">{convertPrice price=$total_convenience_fee}</span>
361370
</div>
362371
{/if}

‎themes/hotel-reservation-theme/css/order-opc.css

+7
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,20 @@
438438
margin-top: 10px;
439439
margin-bottom: 10px;
440440
}
441+
#order-opc .cart_total_detail_block hr {
442+
margin: 9px 0;
443+
}
444+
#order-opc .cart_total_detail_block .strong {
445+
font-weight: 600;
446+
}
441447
#order-opc .cart_total_detail_block .cart_total_values {
442448
float: right;
443449
}
444450
#order-opc .cart_total_detail_block .total_discount_block {
445451
color: #459C3D;
446452
}
447453
#order-opc .cart_total_detail_block .cart_final_total_block {
454+
margin-bottom: 0;
448455
line-height: 40px;
449456
}
450457
#order-opc .cart_total_detail_block .cart_final_total_block > .cart_total_values {

‎themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl

+10-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,16 @@
356356
</div> -->
357357
{if isset($total_convenience_fee)}
358358
<div class="layer_cart_row">
359-
<strong class="dark">{l s='Convenience Fees' mod='blockcart'}</strong>
359+
<strong class="dark">
360+
{l s='Convenience Fees' mod='blockcart'}
361+
{if $display_tax_label}
362+
{if $priceDisplay == 1}
363+
{l s='(tax excl.)' mod='blockcart'}
364+
{else}
365+
{l s='(tax incl.)' mod='blockcart'}
366+
{/if}
367+
{/if}
368+
</strong>
360369
<span class="price ajax_cart_convenience_fee pull-right">{convertPrice price=$total_convenience_fee}</span>
361370
</div>
362371
{/if}

‎themes/hotel-reservation-theme/order-opc.tpl

+36-103
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,6 @@
211211
<div class="col-md-4">
212212
{* Total cart details, tax details, advance payment details and voucher details *}
213213
<div class="col-sm-12 card cart_total_detail_block">
214-
{* {if $total_rooms}
215-
<p>
216-
<span>{l s='Total rooms cost'}{if $display_tax_label}{l s=' (tax excl.)'}{/if}</span>
217-
<span class="cart_total_values">{displayPrice price=$total_rooms}</span>
218-
</p>
219-
{/if}
220-
{if (isset($total_extra_demands) && $total_extra_demands) || (isset($total_additional_services) && $total_additional_services)}
221-
<p>
222-
<span>{l s='Total extra services'}{if $display_tax_label}{l s=' (tax excl.)'}{/if}</span>
223-
<span class="cart_total_values">{displayPrice price=($total_extra_demands + $total_additional_services)}</span>
224-
</p>
225-
{/if} *}
226214
{* {if $total_service_products}
227215
<p>
228216
<span>{l s='Total service products cost'}{if $display_tax_label}{l s=' (tax excl.)'}{/if}</span>
@@ -249,31 +237,10 @@
249237
{displayPrice price=$total_rooms_cost}
250238
</span>
251239
</p>
252-
<p class="total_discount_block {if $total_discounts == 0}unvisible{/if}">
253-
<span>
254-
{if $display_tax_label}
255-
{if $use_taxes && $priceDisplay == 0}
256-
{l s='Total Discount (tax incl)'}
257-
{else}
258-
{l s='Total Discount (tax excl)'}
259-
{/if}
260-
{else}
261-
{l s='Total Discount'}
262-
{/if}
263-
</span>
264-
<span class="cart_total_values">
265-
{if $use_taxes && $priceDisplay == 0}
266-
{assign var='total_discounts_negative' value=$total_discounts * -1}
267-
{else}
268-
{assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1}
269-
{/if}
270-
{displayPrice price=$total_discounts_negative}
271-
</span>
272-
</p>
273-
{* {if $priceDisplay != 0} *}
274-
<p class="cart_total_price {if $total_discounts == 0}unvisible{/if}" >
240+
{if $convenience_fee_wt}
241+
<p>
275242
<span>
276-
{l s='Total'}
243+
{l s='Convenience Fees'}
277244
{if $display_tax_label}
278245
{if $use_taxes && $priceDisplay == 0}
279246
{l s='(tax incl)'}
@@ -283,24 +250,6 @@
283250
{/if}
284251
</span>
285252
<span class="cart_total_values">
286-
{if $use_taxes && $priceDisplay == 0}
287-
{displayPrice price=$total_price - $convenience_fee_wt}
288-
{else}
289-
{displayPrice price=$total_price_without_tax - $convenience_fee}
290-
{/if}
291-
</span>
292-
</p>
293-
{* {/if} *}
294-
{* {if $total_rooms_wt != 0}
295-
<p class="cart_total_tax">
296-
<span>{l s='Tax on rooms'}</span>
297-
<span class="cart_total_values">{displayPrice price=($total_rooms_wt - $total_rooms)}</span>
298-
</p>
299-
{/if} *}
300-
{if $convenience_fee_wt}
301-
<p>
302-
<span>{l s='Convenience Fees'}</span>
303-
<span class="cart_total_values">
304253
{if $use_taxes && $priceDisplay == 0}
305254
{displayPrice price=$convenience_fee_wt}
306255
{else}
@@ -309,73 +258,57 @@
309258
</span>
310259
</p>
311260
{/if}
312-
{hook h="displayCartTotalPriceLabel" type='before_tax'}
313-
314-
<p class="cart_total_tax">
315-
<span>{l s='Total tax'}</span>
316-
<span class="cart_total_values">{displayPrice price=($total_tax)}</span>
317-
</p>
318-
{* {if $use_taxes && $show_taxes && ($total_extra_demands_wt + $total_additional_services_wt)!= 0 }
261+
{if $show_taxes}
319262
<p class="cart_total_tax">
320-
<span>{l s='Tax on services'}</span>
321-
<span class="cart_total_values">{displayPrice price=(($total_extra_demands_wt - $total_extra_demands) + ($total_additional_services_wt - $total_additional_services))}</span>
263+
<span>{l s='Total tax'}</span>
264+
<span class="cart_total_values">{displayPrice price=($total_tax)}</span>
322265
</p>
323-
{/if} *}
324-
{* {if $use_taxes && $show_taxes && $total_service_products_wt != 0 }
325-
<p class="cart_total_tax">
326-
<span>{l s='Tax on service products'}</span>
327-
<span class="cart_total_values">{displayPrice price=($total_service_products_wt - $total_service_products)}</span>
328-
</p>
329-
{/if} *}
330-
331-
<p {if $total_wrapping == 0}class="unvisible"{/if}>
266+
{/if}
267+
<p class="total_discount_block {if $total_discounts == 0}unvisible{/if}">
332268
<span>
333-
{if $use_taxes}
334-
{if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift-wrapping cost'}{/if}
269+
{if $display_tax_label}
270+
{if $use_taxes && $priceDisplay == 0}
271+
{l s='Total Discount (tax incl)'}
272+
{else}
273+
{l s='Total Discount (tax excl)'}
274+
{/if}
335275
{else}
336-
{l s='Total gift-wrapping cost'}
276+
{l s='Total Discount'}
337277
{/if}
338278
</span>
339279
<span class="cart_total_values">
280+
{if $use_taxes && $priceDisplay == 0}
281+
{assign var='total_discounts_negative' value=$total_discounts * -1}
282+
{else}
283+
{assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1}
284+
{/if}
285+
{displayPrice price=$total_discounts_negative}
286+
</span>
287+
</p>
288+
<hr>
289+
<p {if !isset($is_advance_payment) || !$is_advance_payment}class="cart_final_total_block"{/if}>
290+
<span class="strong">{l s='Total'}</span>
291+
{hook h="displayCartTotalPriceLabel" type='total'}
292+
<span class="cart_total_values{if isset($is_advance_payment) && $is_advance_payment} strong{/if}">
340293
{if $use_taxes}
341-
{if $priceDisplay}
342-
{displayPrice price=$total_wrapping_tax_exc}
343-
{else}
344-
{displayPrice price=$total_wrapping}
345-
{/if}
294+
{displayPrice price=$total_price}
346295
{else}
347-
{displayPrice price=$total_wrapping_tax_exc}
296+
{displayPrice price=$total_price_without_tax}
348297
{/if}
349298
</span>
350299
</p>
351-
352300
{if isset($is_advance_payment) && $is_advance_payment}
353-
<p>
354-
<span>{l s='Advance Payment Amount'}</span>
355-
<span class="cart_total_values">{displayPrice price=$advPaymentAmount}</span>
356-
</p>
301+
<hr>
357302
<p>
358303
<span>{l s='Due Amount'}</span>
359304
<span class="cart_total_values">{displayPrice price=$dueAmount}</span>
360305
</p>
361-
{/if}
362-
<p class="cart_final_total_block">
363-
<span>{l s='Final Total'}</span>
364-
{if isset($is_advance_payment) && $is_advance_payment}
306+
<p class="cart_final_total_block">
307+
<span class="strong">{l s='Partially Payable Total'}</span>
308+
{hook h="displayCartTotalPriceLabel" type='partial'}
365309
<span class="cart_total_values">{displayPrice price=$advPaymentAmount}</span>
366-
{else}
367-
<span class="cart_total_values">
368-
{if $use_taxes}
369-
{displayPrice price=$total_price}
370-
{else}
371-
{displayPrice price=$total_price_without_tax}
372-
{/if}
373-
</span>
374-
<div class="hookDisplayProductPriceBlock-price">
375-
{hook h="displayCartTotalPriceLabel"}
376-
</div>
377-
{/if}
378-
</p>
310+
</p>
311+
{/if}
379312
</div>
380313
{* Check if voucher feature is enabled currently *}
381314
{if $voucherAllowed}

0 commit comments

Comments
 (0)