TheCoreDev/bio-concept-pharma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evolution n°0000019 pour remise en page des factures

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-03-28 09:46:23 +01:00
parent 239479d854
commit ed8206cbce
5 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
web/pdf/invoice.product-tab.tpl
View File

@@ -22,21 +22,20 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<table class="product" width="100%" cellpadding="4" cellspacing="0">
<table class="product" width="100%" cellpadding="2" cellspacing="0">
<thead>
<tr>
<th class="product header small" width="{$layout.reference.width}%">{l s='Reference' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.product.width}%">{l s='Product' d='Shop.Pdf' pdf='true'}</th>
<th class="product header-right small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.tax_code.width}%">{l s='Tax Rate' d='Shop.Pdf' pdf='true'}</th>
{if isset($layout.before_discount)}
<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Base price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
{/if}
<th class="product header small" width="{$layout.unit_price_tax_excl.width}%">{l s='Unit Price' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax Incl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.quantity.width}%">{l s='Qty' d='Shop.Pdf' pdf='true'}</th>
<th class="product header-right small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax excl.)' d='Shop.Pdf' pdf='true'}</th>
<th class="product header small" width="{$layout.total_tax_excl.width}%">{l s='Total' d='Shop.Pdf' pdf='true'} <br /> {l s='(Tax Incl.)' d='Shop.Pdf' pdf='true'}</th>
</tr>
</thead>
@@ -60,7 +59,7 @@
{/if}
</td>
<td width="5%">&nbsp;</td>
<td width="80%">
<td width="75">
{$order_detail.product_name}
</td>
</tr>
@@ -69,14 +68,15 @@
{$order_detail.product_name}
{/if}
</td>
<td class="product right">
<!-- Prix unitaire (HT) //-->
<td class="product center">
{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl_including_ecotax}
{if $order_detail.ecotax_tax_excl > 0}
<br>
<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_excl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
{/if}
</td>
<!-- Taux de taxe //-->
<td class="product center">
{$order_detail.order_detail_tax_label}
</td>
@@ -89,12 +89,21 @@
{/if}
</td>
{/if}
<!-- Prix unitaire (TTC) //-->
<td class="product center">
{displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_incl_including_ecotax}
{if $order_detail.ecotax_tax_incl > 0}
<br>
<small>{{displayPrice currency=$order->id_currency price=$order_detail.ecotax_tax_incl}|string_format:{l s='ecotax: %s' d='Shop.Pdf' pdf='true'}}</small>
{/if}
</td>
<!-- Quantité //-->
<td class="product center">
{$order_detail.product_quantity}
</td>
<!-- Total (TTC) //-->
<td class="product right">
{displayPrice currency=$order->id_currency price=$order_detail.total_price_tax_excl_including_ecotax}
{displayPrice currency=$order->id_currency price=$order_detail.total_price_tax_incl_including_ecotax}
</td>
</tr>
@@ -131,7 +140,7 @@
({if $customization.quantity == 0}1{else}{$customization.quantity}{/if})
</td>
{assign var=end value=($layout._colCount-3)}
{assign var=end value=($layout._colCount-2)}
{for $var=0 to $end}
<td class="center">
--
@@ -142,26 +151,26 @@
<!--if !$smarty.foreach.custo_foreach.last-->
{/foreach}
{/foreach}
{/foreach}
<!-- END PRODUCTS -->
<!-- CART RULES -->
{assign var="shipping_discount_tax_incl" value="0"}
{foreach from=$cart_rules item=cart_rule name="cart_rules_loop"}
{if $smarty.foreach.cart_rules_loop.first}
<tr class="discount">
<th class="header" colspan="{$layout._colCount}">
{l s='Discounts' d='Shop.Pdf' pdf='true'}
<th class="header" colspan="{$layout._colCount + 1}">
{l s='Total Discounts' d='Shop.Pdf' pdf='true'}
</th>
</tr>
{/if}
<tr class="discount">
<td class="white right" colspan="{$layout._colCount - 1}">
<td class="white right" colspan="{$layout._colCount - 2}">
{$cart_rule.name}
</td>
<td class="right white">
- {displayPrice currency=$order->id_currency price=$cart_rule.value_tax_excl}
<td class="right white" colspan=2>
- {displayPrice currency=$order->id_currency price=$footer.product_discounts_tax_incl}
</td>
</tr>
{/foreach}