diff --git a/CHANGELOG.md b/CHANGELOG.md index 890a0b4..ad89371 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Add signer line in the invoice document only if value is not empty +### Removed +- Smarty support + ## [v2.1.0] - 2023-11-08 ### Added diff --git a/views/admin_smarty/de/fainvoice_lang.php b/views/admin_smarty/de/fainvoice_lang.php deleted file mode 100644 index cfff31e..0000000 --- a/views/admin_smarty/de/fainvoice_lang.php +++ /dev/null @@ -1,5 +0,0 @@ -getSelfLink()}]" method="post"> - [{$oViewConf->getHiddenSid()}] - - - - -[{assign var="configuration" value=$invoiceData->getInvoiceConfiguration() }] - -
- [{$oViewConf->getHiddenSid()}] - - - - - - -
[{oxmultilang ident="FA_INVOICE_FORM_DATE"}]:
-
[{oxmultilang ident="FA_INVOICE_FORM_NUMBER"}]:
-
[{oxmultilang ident="FA_INVOICE_FORM_SIGNER"}]:
-
-
- -
-
- [{$oViewConf->getHiddenSid()}] - - - - - - -
-
- -[{include file="bottomnaviitem.tpl"}] -[{include file="bottomitem.tpl"}] diff --git a/views/smarty/invoice/body.tpl b/views/smarty/invoice/body.tpl deleted file mode 100644 index 086c693..0000000 --- a/views/smarty/invoice/body.tpl +++ /dev/null @@ -1,168 +0,0 @@ -[{assign var="order" value=$invoice->getOrder() }] -[{assign var="shop" value=$invoice->getShop() }] -[{assign var="configuration" value=$invoice->getInvoiceConfiguration() }] - - - -
-
[{oxmultilang ident="FA_INVOICE_SELLER"}]
-
- [{$shop->getFieldData('OXCOMPANY')}]
- [{$shop->getFieldData('OXSTREET')}]
- [{$shop->getFieldData('OXZIP')}] [{$shop->getFieldData('OXCITY')}], [{$shop->getFieldData('OXCOUNTRY')}]
- [{oxmultilang ident="FA_INVOICE_TAXID"}]: [{$shop->getFieldData('OXTAXNUMBER')}]
- [{$shop->getFieldData('OXINFOEMAIL')}] -
-
- -
-
[{oxmultilang ident="FA_INVOICE_BUYER"}]
-
- [{if $order->getFieldData('oxbillcompany') }] - [{$order->getFieldData('oxbillcompany')}]
- [{/if}] - - [{if $order->getFieldData('oxbillustid') }] - [{$order->getFieldData('oxbillustid')}]
- [{/if}] - - [{$order->getFieldData('OXBILLFNAME')}] [{$order->getFieldData('OXBILLLNAME')}]
- [{$order->getFieldData('OXBILLZIP')}] [{$order->getFieldData('OXBILLCITY')}], [{$order->getBillCountry()}]
- [{$order->getFieldData('OXBILLEMAIL')}] -
-
- -
- -
[{oxmultilang ident="FA_INVOICE_ORDERNR"}]: [{$order->getFieldData('oxordernr')}]
-
[{oxmultilang ident="FA_INVOICE_DATE"}]: [{$configuration->getDate()}]
- -
[{oxmultilang ident="FA_INVOICE_NUMBER"}] [{$configuration->getNumber()}]
- - - - - - - - - - - - [{foreach from=$order->getOrderArticles() item=item}] - - - - - - - - - [{/foreach}] - - [{if $order->getFieldData('oxdiscount') }] - - - - - [{/if}] - - [{if $order->getFieldData('oxvoucherdiscount') }] - - - - - [{/if}] - - [{if $order->getFieldData('oxdelcost') }] - - - - - [{/if}] - - [{if $order->getFieldData('oxpaycost') }] - - - - - [{/if}] - - [{foreach key=vat from=$order->getProductVats() item=vatPrice}] - - - - - [{/foreach}] - - - - - - -
[{oxmultilang ident="FA_INVOICE_ITEM_TITLE"}][{oxmultilang ident="FA_INVOICE_ITEM_CODE"}][{oxmultilang ident="FA_INVOICE_ITEM_TYPE"}][{oxmultilang ident="FA_INVOICE_ITEM_COUNT"}][{oxmultilang ident="FA_INVOICE_ITEM_PRICE"}][{oxmultilang ident="FA_INVOICE_ITEM_PRICE_TOTAL"}]
[{$item->faGetTranslatedTitle($invoice->getLanguageId())}][{$item->getFieldData('oxartnum')}][{oxmultilang ident="FA_INVOICE_PCS"}][{$item->getFieldData('oxamount')}][{$item->getNetPriceFormated()}] [{$order->getFieldData('oxcurrency')}][{$item->getTotalNetPriceFormated()}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_DISCOUNT"}]:- [{$order->getFormattedDiscount()}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_VOUCHERS"}]:- [{$order->getFormattedTotalVouchers()}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_DELIVERY"}]:[{$order->getFormattedDeliveryCost()}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_PAYMENT"}]:[{$order->getFormattedPayCost()}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_VATS"}] ([{$vat}]%):[{$vatPrice}] [{$order->getFieldData('oxcurrency')}]
[{oxmultilang ident="FA_INVOICE_TOTAL"}]:[{$order->getFormattedTotalOrderSum()}] [{$order->getFieldData('oxcurrency')}]
- -[{math assign="sumWithCents" equation="a*b" a=$order->getFieldData('oxtotalordersum') b=100}] -[{oxmultilang ident="FA_INVOICE_TOTAL_IN_WORDS"}]: [{$wording->currencyToWords($sumWithCents, $order->getFieldData('oxcurrency'))}] - -
[{oxmultilang ident="FA_INVOICE_SIGNED"}]: [{$configuration->getSigner()}]