Skip to content

Commit

Permalink
Merge pull request #209 from OXID-eSales/UNZER-214_Dispay_Bank_Data
Browse files Browse the repository at this point in the history
Unzer-214: Added display of bank detail on unzer order tab
  • Loading branch information
mariolorenz authored Nov 14, 2023
2 parents f907ea8 + 45fed3e commit aab44a1
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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/).

## [1.1.3] - 2023-??-??
## [1.1.3] - 2023-11-14

- [0007526](https://bugs.oxid-esales.com/view.php?id=7526) Order would be saved only, if everything is correct. In all other cases redirect to checkout
- [0007509](https://bugs.oxid-esales.com/view.php?id=7509) Order would be saved only, if everything is correct. In all other cases redirect to checkout
Expand All @@ -13,9 +13,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [0007544](https://bugs.oxid-esales.com/view.php?id=7544) Add Error handling When unsupported Credit Card is used (e.g. Amex)
- [0007553](https://bugs.oxid-esales.com/view.php?id=7553) The billing and delivery address must be identical for invoice purchases (Paylater)
- [0007546](https://bugs.oxid-esales.com/view.php?id=7546): We provide an additional Order Number to Unzer for identify the Order in OXID-Backend and Unzer-Insights

- Prepayment - Adjust payment date when the payment has been completed
- change information for Unzer-Metadata
- Unzer Invoice (Paylater): Display bank details for invoice

## [1.1.2] - 2023-08-18

Expand Down
2 changes: 1 addition & 1 deletion metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</ul>',
],
'thumbnail' => 'logo.svg',
'version' => '1.1.3-rc.3',
'version' => '1.1.3',
'author' => 'OXID eSales AG',
'url' => 'https://www.oxid-esales.com',
'email' => 'info@oxid-esales.com',
Expand Down
6 changes: 6 additions & 0 deletions src/Controller/Admin/AdminOrderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ protected function addAuthorizationViewData(Authorization $authorization): void
$this->_aViewData["AuthShortId"] = $authorization->getShortId();
$this->_aViewData["AuthId"] = $authorization->getId();
$this->_aViewData["AuthAmount"] = $authorization->getAmount();
$holderData = [];
$holderData['bic'] = $authorization->getBic();
$holderData['iban'] = $authorization->getIban();
$holderData['descriptor'] = $authorization->getDescriptor();
$holderData['holder'] = $authorization->getHolder();
$this->_aViewData["holderData"] = $holderData;
}

/**
Expand Down
5 changes: 5 additions & 0 deletions views/admin/de/oscunzer_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
'OSCUNZER_CHARGE_COLLECT' => 'Einziehen',
'OSCUNZER_CHARGE_ID' => 'Charge-ID',
'OSCUNZER_CANCEL_ID' => 'Cancel-ID',
'OSCUNZER_BANK_HOLDER_DETAILS' => 'Bankinformationen',
'OSCUNZER_IBAN' => 'IBAN',
'OSCUNZER_BIC' => 'BIC',
'OSCUNZER_HOLDER' => 'Inhaber',
'OSCUNZER_DESCRIPTOR' => 'Beschreibung',
'OSCUNZER_AUTHORIZATION' => 'Autorisierung',
'OSCUNZER_NOSHIPINGYET' => 'Bestellung ist bei Unzer noch nicht als Versendet markiert',
'OSCUNZER_SHIPMENTS' => 'Auslieferungen',
Expand Down
5 changes: 5 additions & 0 deletions views/admin/en/oscunzer_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
'OSCUNZER_CHARGE_COLLECT' => 'Collect',
'OSCUNZER_CHARGE_ID' => 'Charge-ID',
'OSCUNZER_CANCEL_ID' => 'Cancel-ID',
'OSCUNZER_BANK_HOLDER_DETAILS' => 'Bankdetails',
'OSCUNZER_IBAN' => 'IBAN',
'OSCUNZER_BIC' => 'BIC',
'OSCUNZER_HOLDER' => 'Holder',
'OSCUNZER_DESCRIPTOR' => 'Descriptor',
'OSCUNZER_AUTHORIZATION' => 'Authorization',
'OSCUNZER_NOSHIPINGYET' => 'order has not yet been marked as shipped',
'OSCUNZER_SHIPMENTS' => 'Shipments',
Expand Down
21 changes: 21 additions & 0 deletions views/admin/tpl/oscunzer_order.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,27 @@
</table>
[{/if}]
[{/block}]
[{block name="unzer_holder"}]
[{if $holderData }]
<h3>[{oxmultilang ident="OSCUNZER_BANK_HOLDER_DETAILS"}]</h3>
<table style="width:50%">
<tbody>
<tr>
<td class="listheader">[{oxmultilang ident="OSCUNZER_IBAN"}]</td>
<td class="listheader">[{oxmultilang ident="OSCUNZER_BIC"}]</td>
<td class="listheader">[{oxmultilang ident="OSCUNZER_HOLDER"}]</td>
<td class="listheader">[{oxmultilang ident="OSCUNZER_DESCRIPTOR"}]</td>
</tr>
<tr>
<td>[{$holderData.iban}]</td>
<td>[{$holderData.bic}]</td>
<td>[{$holderData.holder}]</td>
<td>[{$holderData.descriptor}]</td>
</tr>
</tbody>
</table>
[{/if}]
[{/block}]
</div>
[{capture assign="cancelConfirm"}]
let handleUnzerForm = function(formElement) {
Expand Down

0 comments on commit aab44a1

Please sign in to comment.