Skip to content

Commit

Permalink
Release 1.3.0
Browse files Browse the repository at this point in the history
Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>
  • Loading branch information
Sieg committed Mar 6, 2023
1 parent 089ed4b commit f837e50
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [v1.3.0] - 2023-03-06

### Added
- Show company VAT Id in the invoice buyer column

## [v1.2.0] - 2023-03-04

### Added
Expand All @@ -30,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- PDF file generated from order data with possibility to adjust some of the fields and regenerate the invoice file
- Invoice generated in Shop's main language (if translation available)

[v1.3.0]: https://github.com/Fresh-Advance/Invoice/compare/v1.2.0...v1.3.0
[v1.2.0]: https://github.com/Fresh-Advance/Invoice/compare/v1.1.0...v1.2.0
[v1.1.0]: https://github.com/Fresh-Advance/Invoice/compare/v1.0.0...v1.1.0
[v1.0.0]: https://github.com/Fresh-Advance/Invoice/compare/6e6618ba66...v1.0.0
2 changes: 1 addition & 1 deletion metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'description' => [
'en' => 'Invoice module for OXID eShop.',
],
'version' => '1.2.0',
'version' => '1.3.0',
'author' => 'Anton Fedurtsya',
'email' => 'anton@fedurtsya.com',
'url' => '',
Expand Down
7 changes: 6 additions & 1 deletion views/smarty/invoice/body.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,13 @@
<div class="contactHead">[{oxmultilang ident="FA_INVOICE_BUYER"}]</div>
<div>
[{if $order->getFieldData('oxbillcompany') }]
<strong>[{$order->getFieldData('oxbillcompany')}]<br/>
<strong>[{$order->getFieldData('oxbillcompany')}]</strong><br/>
[{/if}]

[{if $order->getFieldData('oxbillustid') }]
[{$order->getFieldData('oxbillustid')}]<br/>
[{/if}]

[{$order->getFieldData('OXBILLFNAME')}] [{$order->getFieldData('OXBILLLNAME')}]<br/>
[{$order->getFieldData('OXBILLZIP')}] [{$order->getFieldData('OXBILLCITY')}], [{$order->getBillCountry()}]<br/>
[{$order->getFieldData('OXBILLEMAIL')}]
Expand Down
7 changes: 6 additions & 1 deletion views/twig/invoice/body.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,13 @@
<div class="contactHead">{{ translate({ ident: "FA_INVOICE_BUYER" }) }}</div>
<div>
{% if order.getFieldData('oxbillcompany') %}
<strong>{{ order.getFieldData('oxbillcompany') }}<br/>
<strong>{{ order.getFieldData('oxbillcompany') }}</strong><br/>
{% endif %}

{% if order.getFieldData('oxbillustid') %}
{{ order.getFieldData('oxbillustid') }}<br/>
{% endif %}

{{ order.getFieldData('OXBILLFNAME') }} {{ order.getFieldData('OXBILLLNAME') }}<br/>
{{ order.getFieldData('OXBILLZIP') }} {{ order.getFieldData('OXBILLCITY') }}, {{ order.getBillCountry() }}<br/>
{{ order.getFieldData('OXBILLEMAIL') }}
Expand Down

0 comments on commit f837e50

Please sign in to comment.