TheCoreDev/domokits
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Suite à MAJ 2.3.4, il manquait des choses dans des templates

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-05-03 09:13:06 +02:00
parent 35a800ca0e
commit 3f71343401
212 changed files with 1396 additions and 7451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/pdf/default/I18n/en_US.php Normal file → Executable file
View File

@@ -1,6 +1,7 @@
<?php
return array(
'Combination ref : ' => 'Combination ref : ',
'Customer Number' => 'Customer Number',
'DELIVERY' => 'DELIVERY',
'Delivery address' => 'Delivery address',
@@ -15,6 +16,7 @@ return array(
'Phone: ' => 'Phone: ',
'Postage' => 'Postage',
'Product' => 'Product',
'Product ref : ' => 'Product ref : ',
'Quantity' => 'Quantity',
'Ref' => 'Ref',
'Tax' => 'Tax',
@@ -24,8 +26,6 @@ return array(
'Total without tax' => 'Total without tax',
'Unit taxed price' => 'Unit taxed price',
'Unit. price' => 'Unit. price',
'delivery.imprint' => 'delivery.imprint',
'invoice.imprint' => 'invoice.imprint',
'page' => 'page',
'product' => 'product',
);

0
templates/pdf/default/I18n/es_ES.php Normal file → Executable file
View File

0
templates/pdf/default/I18n/fr_FR.php Normal file → Executable file
View File

0
templates/pdf/default/I18n/it_IT.php Normal file → Executable file
View File

BIN
templates/pdf/default/assets/img/LogoLD.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 126 KiB

2
templates/pdf/default/delivery.html
View File

@@ -238,6 +238,7 @@
<tr>
<td style="border:solid 1px #dddddd;">
<p>{$REF}</p>
{if $REF != $PRODUCT_SALE_ELEMENTS_REF}<p>{$PRODUCT_SALE_ELEMENTS_REF}</p>{/if}
</td>
<td style="border:solid 1px #dddddd;">
<p>{$TITLE}</p>
@@ -246,6 +247,7 @@
{$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>
{/loop}
{/ifloop}
{hook name="delivery.product-list" order_product=$ID order=$order_id}
</td>
<td style="border:solid 1px #dddddd; text-align:center;">
<p>{$QUANTITY}</p>

147
templates/pdf/default/invoice.html
View File

@@ -127,77 +127,67 @@
{/literal}
<page backtop="10mm" backleft="10mm" backright="10mm" backbottom="10mm">
<page_header>
<img src="{image file="assets/img/LogoLD.png"}" style="height:20px;margin:30px">
{hook name="invoice.header" order=$order_id}
</page_header>
<page_footer>
{hook name="invoice.footer-top" order="{$order_id}"}
<table style="width: 100%; padding: 20mm">
{hook name="invoice.footer-top" order=$order_id}
<table>
<col style="width: 80%; padding: 1mm; border: none; text-align: left;" />
<col style="width: 20%; padding: 1mm; border: none; text-align: right;" />
<tbody>
<tr>
<td>
{hook name="invoice.imprint" order="{$order_id}"}
{hook name="invoice.imprint" order=$order_id}
{elsehook rel="invoice.imprint"}
<!-- Imprint -->
<b><h3>{config key="store_name"}</h3></b>
{$addresses="{config key="store_address1"}
{config key="store_address2"} {config key="store_address3"}"}
{config key="store_name"}
{$addresses="{config key="store_address1"} {config key="store_address2"} {config key="store_address3"}"}
{$city="{config key="store_zipcode"} {config key="store_city"}"}
{if $addresses != " "}{$addresses}
<br>
{if $addresses != " "}- {$addresses}{/if}
{if $city != " " }- {$city}{/if}
{if {config key="store_country"} }
{loop type="country" visible="*" name="address.country.title" id={config key="store_country"}} - {$TITLE}{/loop}
{/if}
{if $city != " " }{$city}
<br>
{/if}
{if {config key="store_business_id"} }
{config key="store_business_id"}
<br>
- {config key="store_business_id"}
{/if}
<br>
{if {config key="store_phone"} }
{intl l="Phone: "}{config key="store_phone"}
{/if}
<br>
{if {config key="store_email"} }
{intl l="Email: "}{config key="store_email"}
{/if}
{/elsehook}
<br>{intl l="page"} [[page_cu]]/[[page_nb]]</td>
</td>
<td>{intl l="page"} [[page_cu]]/[[page_nb]]</td>
</tr>
</tbody>
</table>
{hook name="invoice.footer-bottom" order="{$order_id}"}
{hook name="invoice.footer-bottom" order=$order_id}
</page_footer>
{$taxes = []}
{loop name="order.invoice" type="order" id=$order_id customer="*"}
{loop name="currency.order" type="currency" id=$CURRENCY}
{assign "orderCurrency" $SYMBOL}
{/loop}
<table class="table-info">
<col style="width: 100%; padding: 0mm;" />
<tr>
<td>
<br><h2>{intl l="INVOICE"}</h2>
<h1>{intl l="INVOICE"}</h1>
</td>
</tr>
<tr>
<td><h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE output="date"}</span></h3></td>
</tr>
<tr>
<td><h3>{intl l="Invoice REF"} : <span>{$INVOICE_REF}</span></h3></td>
<td><h3>{intl l="Invoice REF"} : <span>{$REF}</span></h3></td>
</tr>
<tr>
<td><h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3></td>
</tr>
{hookblock name="invoice.information" order="{$order_id}" fields="title,value"}
{hookblock name="invoice.information" order=$order_id fields="title,value"}
{forhook rel="invoice.information"}
<tr>
<td><h3>{$title} : <span>{$value}</span></h3></td>
@@ -206,7 +196,7 @@
{/hookblock}
</table>
{hook name="invoice.after-information" order="{$order_id}"}
{hook name="invoice.after-information" order=$order_id}
<table class="table-address">
<col style="width: 50%; padding: 3mm;" />
@@ -216,40 +206,21 @@
<h3>{intl l="Delivery address"}</h3>
{ifhook rel="invoice.delivery-address"}
{* delivery module can customize the delivery address *}
{hook name="invoice.delivery-address" module="{order attr="delivery_module"}" order="{$order_id}"}
{hook name="invoice.delivery-address" module={$DELIVERY_MODULE} order=$order_id}
{/ifhook}
{elsehook rel="invoice.delivery-address"}
<p>
{loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
{$COMPANY}<br />
{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG} {/loop}
{$FIRSTNAME} {$LASTNAME}<br />
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop}
</p>
{elsehook rel="invoice.delivery-address"}
{format_address order_address=$DELIVERY_ADDRESS locale=$locale}
{/elsehook}
</td>
<td style="border-left: solid 1mm #f6993c;">
<h3>{intl l="Invoice address"}</h3>
<p>
{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
{$COMPANY}<br />
{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG} {/loop}
{$FIRSTNAME} {$LASTNAME}<br/>
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop}
</p>
{format_address order_address=$INVOICE_ADDRESS locale=$locale}
</td>
</tr>
</table>
{hook name="invoice.after-addresses" order="{$order_id}"}
{hook name="invoice.after-addresses" order=$order_id}
{$totalArticlesHtSansRemise = 0}
<table cellspacing="0" cellpadding="0" style="padding-top: 5mm;">
<col style="width: 40%; padding: 1mm;" />
<col style="width: 12%; padding: 1mm;" />
@@ -271,39 +242,42 @@
{assign "realPrice" $PROMO_PRICE}
{assign "realTax" $PROMO_PRICE_TAX}
{assign "realTaxedPrice" $TAXED_PROMO_PRICE}
{assign "realTotalPrice" $TOTAL_TAXED_PROMO_PRICE}
{else}
{assign "realPrice" $PRICE}
{assign "realTax" $PRICE_TAX}
{assign "realTaxedPrice" $TAXED_PRICE}
{assign "realTotalPrice" $TOTAL_TAXED_PRICE}
{/if}
{$taxes[{$TAX_RULE_TITLE}][] = $realTax * $QUANTITY}
{$totalArticlesHtSansRemise = $totalArticlesHtSansRemise + $realPrice * $QUANTITY}
<tr class="table-2">
<td>
<p>{$TITLE}</p>
<p>
{intl l="Product ref : "}{$REF}<br>
{intl l="Combination ref : "}{$PRODUCT_SALE_ELEMENTS_REF}
</p>
{ifloop rel="combinations"}
{loop type="order_product_attribute_combination" name="combinations" order_product=$ID}
{$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>
{/loop}
{/ifloop}
{hook name="invoice.product-list" order_product=$ID order=$order_id}
</td>
<td><p class="align-right">{format_money number=$realPrice symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTax symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTaxedPrice symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realPrice currency_id=$CURRENCY}</p></td>
<td><p class="align-right">{format_money number=$realTax currency_id=$CURRENCY}</p></td>
<td><p class="align-right">{format_money number=$realTaxedPrice currency_id=$CURRENCY}</p></td>
<td><p class="align-center">{$QUANTITY}</p></td>
<td><p class="align-right">{format_money number={$realTaxedPrice * $QUANTITY} symbol=$orderCurrency}</p></td>
<td><p class="align-right">{format_money number=$realTotalPrice currency_id=$CURRENCY}</p></td>
</tr>
{hook name="invoice.order-product" order="{$order_id}" order_product="{$ID}"}
{/loop}
</table>
{hook name="invoice.after-products" order="{$order_id}"}
{if $POSTAGE_TAX_RULE_TITLE}
{$taxes[$POSTAGE_TAX_RULE_TITLE][] = $POSTAGE_TAX}
{/if}
{hook name="invoice.after-products" order=$order_id}
<table cellspacing="0" cellpadding="0" style="padding-top: 5mm;">
<col style="width: 60%; padding: 1mm;" />
@@ -316,19 +290,30 @@
<span>{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span>
</p>
{hook name="invoice.after-payment-module" order=$order_id module_id=$PAYMENT_MODULE}
<h3>{intl l="Delivery module"}</h3>
<p>
<span>{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</span>
</p>
{hook name="invoice.after-delivery-module" order=$order_id module_id=$DELIVERY_MODULE}
</td>
<td>
<table class="table-3">
<col style="width: 50%; padding: 1mm;">
<col style="width: 50%; padding: 1mm;">
{if $DISCOUNT}
<tr>
<td class="table-3-1"><p>{intl l="Discount"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$DISCOUNT currency_id=$CURRENCY}</p></td>
</tr>
{/if}
<tr>
<td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$totalArticlesHtSansRemise} symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} currency_id=$CURRENCY}</p></td>
</tr>
{strip}
{capture name="tax"}
@@ -340,47 +325,43 @@
{if $_price_taxe_ != 0}
<tr>
<td class="table-3-2"><p>{$name}</p></td>
<td class="table-3-2 align-right"><P>{format_money number=$_price_taxe_ symbol=$orderCurrency}</P></td>
<td class="table-3-2 align-right"><p>{format_money number=$_price_taxe_ currency_id=$CURRENCY}</p></td>
</tr>
{/if}
{/foreach}
{if $POSTAGE_TAX != 0}
<tr>
<td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}</p></td>
<td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX currency_id=$CURRENCY}</p></td>
</tr>
{/if}
{/capture}
{/strip}
{if $smarty.capture.tax ne ""}
<tr>
<td class="table-3-1"><p>{intl l="Tax"}</p></td>
<td class="table-3-1 align-right"><P>{format_money number=$TOTAL_TAX symbol=$orderCurrency}</P></td>
<td class="table-3-1 align-right"><p>{format_money number=$TOTAL_TAX currency_id=$CURRENCY}</p></td>
</tr>
{$smarty.capture.tax nofilter}
{/if}
<tr>
<tr>
<td class="table-3-1"><p>{intl l="Total with tax"}</p></td>
<td class="table-3-1 align-right"><P>{format_money number={$TOTAL_TAXED_AMOUNT + $DISCOUNT - $POSTAGE_UNTAXED} symbol=$orderCurrency}</P></td>
<td class="table-3-1 align-right"><p>{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} currency_id=$CURRENCY}</p></td>
</tr>
{if $DISCOUNT}
<tr>
<td class="table-3-1"><p>{intl l="Discount"}</p></td>
<td class="table-3-1 align-right"><p>-{format_money number=$DISCOUNT symbol=$orderCurrency}</p></td>
</tr>
{/if}
<tr>
<td class="table-3-1"><p>{intl l="Postage"}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE symbol=$orderCurrency}</p></td>
<td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
</tr>
<tr>
<td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td>
<td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</h3></td>
<td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}</h3></td>
</tr>
</table>
</td>
</tr>
</table>
{hook name="invoice.after-summary" order="{$order_id}"}
{hook name="invoice.after-summary" order=$order_id}
{/loop}
</page>