Merge branch 'ticket-blockOrderSummary' into develop

This commit is contained in:
Marion Muszynski 2016-07-13 15:17:13 +02:00
commit 951ffd3e4b
2 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@
<h5>{l s='My cart' mod='blockordersummary'}</h5>
<ul>
{foreach $products as $product}
<li>{$product.quantity} x {$product.name|truncate:20:'…'} <span class="price">{convertPrice price=$product.total_wt}</span></li>
<li>{$product.quantity} x {$product.name|truncate:18:'…'} <span class="price">{convertPrice price=$product.total_wt}</span></li>
{/foreach}
</ul>
<p>{l s='Products total' mod='blockordersummary'} <span class="price price_total">{convertPrice price=$cart->getOrderTotal(TRUE, 1)}</span></p>

View File

@ -6676,7 +6676,7 @@ table#carrierTable tbody td {
}
#left_column #blockordersummary .content div{
color: #1e1633;
margin: 0px 10px;
margin: 0px 5px;
font-size: 12px;
padding: 8px 0px 5px;
border-top: 1px dashed #ccc;
@ -6690,7 +6690,7 @@ table#carrierTable tbody td {
font-size: 18px;
color: #796dc7;
font-weight: normal;
margin: 0px 10px 2px;
margin: 0px 5px 2px;
padding: 12px 0px 10px;
border-bottom: 1px solid #ccc;
}