Merge branch 'ticket-14231-inteMobile' into develop

This commit is contained in:
Marion Muszynski 2017-10-13 11:17:51 +02:00
commit f36495dcfb
2 changed files with 38 additions and 5 deletions

View File

@ -5321,4 +5321,17 @@ h3.gift_title {
margin-right: 5px;
}
body#order-detail table#order-product tbody tr.item td{
padding: 2px 0px;
}
body#order-detail table#order-product tbody tr.item tr{
border-bottom: 0px;
}
body#order-detail table#order-product tbody tr.item tr.title span.price{
color:#e26ea2;
font-family: Georgia;
}
body#order-detail table#order-product tbody tr.item tr.title span.quantity{
font-size: 16px;
font-family: Georgia;
}

View File

@ -316,22 +316,42 @@
<table>
<tbody>
<tr class="title">
<td width="15%">
{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}
<span id="cart_quantity_custom_{$product.product_id}_{$product.product_attribute_id}" >{$product.customizationQuantityTotal}</span>
{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<span class="quantity">{$productQuantity|intval} x</span>
{/if}
</td>
<td>
<h5>
{*<a href="{$link->getPageLink('get-file.php', true)}?key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}{if isset($is_guest) && $is_guest}&id_order={$order->id}&secure_key={$order->secure_key}{/if}" title="{l s='download this product'}">*}
{$product.product_name|escape:'htmlall':'UTF-9'}
{if isset($product.attributes) && $product.attributes}
<br>{$product.attributes|escape:'htmlall':'UTF-8'}
{/if}
{*</a>*}
</h5>
</td>
<td width="25%" style="text-align: right;">
<span class="price" id="product_price_{$product.product_id}_{$product.product_attribute_id}">
{if $group_use_tax}
{convertPriceWithCurrency price=$product.total_wt currency=$currency convert=0}
{else}
{convertPriceWithCurrency price=$product.total_price currency=$currency convert=0}
{/if}
</span>
</td>
</tr>
<tr class="attribute">
{* <tr class="attribute">
<td>
{if isset($product.attributes) && $product.attributes}
<a href="{$link->getProductLink($product.product_id, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a>
{/if}
</td>
</tr>
<tr class="price">
</tr> *}
{* <tr class="price">
<td>
<div class="cart_unit">
<span class="price" id="product_price_{$product.product_id}_{$product.product_attribute_id}">
@ -359,7 +379,7 @@
</div>
</div>
</td>
</tr>
</tr> *}
{*<tr class="delete">
<td>
<div class="gradient">