Skip to content

push new 1.8.1 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PascalKleindienst merged 1 commit into from
Jun 19, 2025
Merged

push new 1.8.1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ class Bootstrap extends Bootstrapper implements BootstrapperInterface
public function boot(Dispatcher $dispatcher): void
{
parent::boot($dispatcher);
require_once __DIR__ . '/vendor/autoload.php';

/**
* Register Services
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.8.1] (June 2025)
### Added
- added JTL 5.5 and PHP 8.4 compatability

## [1.8.0] (February 2025)
### Added
- added new Unzer Direct Bank Transfer
Expand Down
12 changes: 6 additions & 6 deletions adminmenu/template/partials/_order_item.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
</td>
<td class="hp-order-table-column hp-shop-order-status">
{if isset($hpOrder->getOrder()->cStatus)}
{if $hpOrder->getOrder()->cStatus === "-1"}
{if $hpOrder->getOrder()->cStatus == "-1"}
{__('hpStateCanceled')}
{elseif $hpOrder->getOrder()->cStatus === "1"}
{elseif $hpOrder->getOrder()->cStatus == "1"}
{__('hpStateOpen')}
{elseif $hpOrder->getOrder()->cStatus === "2"}
{elseif $hpOrder->getOrder()->cStatus == "2"}
{__('hpStateInProgress')}
{elseif $hpOrder->getOrder()->cStatus === "3"}
{elseif $hpOrder->getOrder()->cStatus == "3"}
{__('hpStatePaid')}
{elseif $hpOrder->getOrder()->cStatus === "4"}
{elseif $hpOrder->getOrder()->cStatus == "4"}
{__('hpStateShipped')}
{elseif $hpOrder->getOrder()->cStatus === "5"}
{elseif $hpOrder->getOrder()->cStatus == "5"}
{__('hpStatePartlyShipped')}
{else}
{$hpOrder->getOrder()->cStatus}
Expand Down
36 changes: 18 additions & 18 deletions checksums.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
4db0ef5803b943bc62cf9a6e0f7b40b5;Seeders/Shop4PluginMigrationSeeder.php
e1b9ba833fa2eae5ce86ea735f13d3ad;.babelrc
0a341f37810d33c6345ba571e2f24485;CHANGELOG.md
0d6ba0f68cb7716a858dd8be454fabe6;CHANGELOG.md
c9f6e33220cf462393c7070cffcfff1a;NOTICE
bdab240d9f8ee3c00116400e934ca225;locale/de-DE/base.mo
efdf0b7b90984a3a2edb35a789f88248;locale/de-DE/base.po
a0445456d7fdf6274dc3f36d6c85b64d;locale/en-GB/base.mo
f36b138cb92f15ae3826dd31855d53e8;locale/en-GB/base.po
c466bfceae7a1c850f00a4bd2c8400db;composer.json
0c7d14f4b8923e90f70291f86ef0092e;src/Orders/OrderMappingModel.php
bcc814dcdea7b1904456777943f2b18f;src/Orders/OrderMappingModel.php
3da45aa29a08f869b95627a6e46e5f9a;src/Orders/OrderViewStruct.php
c1f8da0ce57d62d455c5e259c24685d0;src/Orders/OrderMappingEntity.php
8e0682ac5c506aa7ed6bc23a06970633;src/KeyPairs/KeyPairService.php
4a6bd5f25d0487b44b664403d6b0315c;src/KeyPairs/KeyPairModel.php
9762d228da7aed20ba5f75aa3aa1fe66;src/KeyPairs/KeyPairEntity.php
02ead16397ed114e97dc4a017cf2b30e;src/KeyPairs/KeyPairEntity.php
a3255fc904b7509e171553ea009c9c82;src/ApplePay/ActivateCertificateResource.php
1c8b2fa06b94c2fd1fd098791cb30b60;src/ApplePay/PrivateKeysResource.php
4ad80bac1bc3c0c244426c6dd6279a96;src/ApplePay/CertificateException.php
Expand All @@ -36,14 +36,14 @@ a73ea5c19bab6939e41d81018eb6c8e4;src/Charges/ChargeHandler.php
24bea0a602bf575ea6c7d432587c4fba;src/Charges/ChargeMappingModel.php
20db0d8770933362b0b8b7fa32c18494;src/Charges/ChargeMappingEntity.php
cdd8473949f46c33f6eda27bf3df5df5;src/Utils/Config.php
a55391fc76b21e41d4f183d808064bd6;src/Utils/TranslatorTrait.php
48830baed39f5710178337ad6d6f8444;src/Utils/TranslatorTrait.php
ff2e8ea1952f33020fe432ab359624d6;src/Utils/JtlLinkHelper.php
8f2caa19fb7682dcb18361609d625d05;src/Utils/Compatibility.php
d46480f934c97334f23fae23b7343deb;src/Utils/SessionHelper.php
d5d5d79ab6d86b5a965cf17240ff601e;src/Utils/JtlLoggerTrait.php
e82f4155e818503fe1e24b9fb8d5fbc7;src/Utils/Logger.php
521e61755ca1485bfe834b40a50ac426;src/Utils/Logger.php
a78e5bba0c2635642ab607fbf73b0cea;src/Foundation/EventPayload.php
1a8a935e77ddae51a25cfed6f9139bb9;src/Foundation/ServiceProvider.php
666e75baf5eddfcf0c50e83a5386bb5d;src/Foundation/ServiceProvider.php
b93684508161f05d1e5ab245170921cf;src/Foundation/EventSubscriber.php
a09b4b6da00f1cd498ddbac5b8c4d051;src/Foundation/Entity.php
fda45f203428056c6676cf83a15b4387;src/Foundation/Seeder.php
Expand All @@ -52,38 +52,38 @@ fda45f203428056c6676cf83a15b4387;src/Foundation/Seeder.php
07e542740aeb10d40b387b86ff17ca15;src/Foundation/Struct.php
8670bbececd78c3c6a8e52dd9105dc1d;src/Webhooks/PaymentEventSubscriber.php
6f67c55f48343fe977839454503b419a;src/Payments/PaymentMethodModuleFactory.php
c4990e7a6fb98a12c8914953fa146fe9;src/Payments/PaymentHandler.php
c9906b5bb77b052053d6f30197354631;src/Payments/PaymentHandler.php
d78c74c0918be9b079a8cf4655446589;src/Payments/Traits/HasState.php
e4bd8a246a535ec52a7b3f14c6b8369d;src/Payments/Traits/HasCustomer.php
1dc91617834a5b508913f5266b6e509a;src/Payments/Traits/HasCustomer.php
54f0fff5386a4145ce981a2c4e24d576;src/Payments/Traits/SupportsB2B.php
aa1212a34a1c3b4f1475e6b439603404;src/Payments/Traits/HasMetadata.php
5aefd466eee6fd9307f5a4226fc9a4ec;src/Payments/Traits/HasBasket.php
85dadc4e055384cf11546247308921f5;src/Payments/Traits/PriceCurrencyConverter.php
eafbb3fd550ede774e80f963759e71ea;src/Payments/Traits/HasPayStatus.php
4358bf25129c1cb3615eb2d37fc63285;src/Payments/Traits/CancelPaymentTransaction.php
7e92f962e6b3493af18618d393feb691;src/Payments/HeidelpayApiAdapter.php
82b5f8220dd91549d98371aaed0ab134;src/Payments/HeidelpayPaymentMethod.php
f39b9c7f0a70380be58eb6873474cd22;src/Payments/HeidelpayPaymentMethod.php
b40a39212fa05718f866b4326766043c;src/Payments/Interfaces/RedirectPaymentInterface.php
ab1b1e5c0f257e793786fd8f49b3a9b7;src/Payments/Interfaces/NotificationInterface.php
04525b7293527904b5c527dd5aecbd9b;src/Payments/Interfaces/HandleStepReviewOrderInterface.php
36e5aa72d873a51ef1c3bd79a32acade;src/Payments/Interfaces/HandleStepAdditionalInterface.php
5a17589c176c45aedb1879dc120fcf86;src/Payments/Interfaces/CancelableInterface.php
ac4adca913172393fba84fda8c388a10;src/Payments/Interfaces/PaymentStatusInterface.php
d98195f0c1485f6412b599b3f1581902;src/Payments/Interfaces/HasPayButton.php
92e796942e3b2ad8e3cc475be2d0cc39;info.xml
bbc9c3875307fcc8ac77578d80d67bb9;info.xml
780b2b8990e8dba5534b2d1fa468c6f3;frontend/webhook.php
408da6438974a122f4853b7986b631b7;frontend/js/unzer.js
0c2c1c12f8530542f8ee1e8a0d429cb7;frontend/js/unzer.min.js
6cd3f625b82e162b2ee4358f6843a4ef;frontend/js/unzer.min.js.map
cecb744ed9a6b7959198eff97b76d930;frontend/js/unzer.js.map
d1cefc6592de8b40196a42fe29bf0b90;frontend/js/unzer.js
14347895d75c97975bd9fb96b1045f45;frontend/js/unzer.min.js
31b71988e4e9842199662383cd53004f;frontend/js/unzer.min.js.map
0a55c155b365f45e44a746fb9fadb0c0;frontend/js/unzer.js.map
7d33252335a08f70cdcf96bf75198070;frontend/src/scss/unzer.scss
15112aab51c1133c80096c05759e4008;frontend/src/js/utils/errors.js
cf44e5fa2ae44e1a9756651963bfe755;frontend/src/js/utils/debugging.js
47ca20fc9ed32ccc3789b88ab9c6f5c3;frontend/src/js/utils/types.js
e0f7fef48cb41f84f48b8d74c4e65700;frontend/src/js/payments/applepay.js
2d7423cbab40b379c86b8e7a55c5747b;frontend/src/js/payments/googlepay.js
ec006ece0868adb711ee2fd5dbbbd966;frontend/src/js/payments/applepay_v2.js
32d90d846d14068cc4ea89b75d903a03;frontend/src/js/payments/general.js
af6ab64577fa45987da4b50631d1f8e6;frontend/src/js/payments/general.js
c0d6fea5b6f79b94d5f15234cec4e856;frontend/src/js/payments/instalment.js
58f523f49a1d7f9eafaac13f17f847c5;frontend/src/js/app.js
69e55611331387e2c73e9562b7491fe3;frontend/template/dummy.tpl
Expand Down Expand Up @@ -112,7 +112,7 @@ ec0675d513fe14aa3766347ab3fe45ba;paymentmethod/UnzerDirectBankTransfer.php
dbcc0575277980988db941ad8c5119fb;paymentmethod/UnzerPaylaterInstallment.php
48bd0bd6ada6c60c68be29f98872022b;paymentmethod/UnzerPaylaterDirectDebit.php
b620607859a543b6b39a4dd0f8713d10;paymentmethod/HeidelpayInvoice.php
a9414b8a4fbc4e3b5c4de0ec01900841;paymentmethod/UnzerPaylaterInvoice.php
ef681dfaf1a3d16adb00a24d90c9c8f2;paymentmethod/UnzerPaylaterInvoice.php
b4e9f466cbc90886f8b05b52f0d656f3;paymentmethod/HeidelpayPayPal.php
cdb6414c94813a842353d8a5e249b9a6;paymentmethod/template/flexipay_direct_form.tpl
de71ef7ad1d74778d6aefa06353ea7c1;paymentmethod/template/ideal_form.tpl
Expand Down Expand Up @@ -154,7 +154,7 @@ c65a3c33c1ee600a39978def51d21510;paymentmethod/HeidelpayInvoiceGuaranteed.php
1f91db143a39995cc686619f6c4a882c;paymentmethod/HeidelpaySEPADirectDebitGuaranteed.php
e569da9af0bcb8225ff8f3d6c949f418;apple-developer-merchantid-domain-association
e73740baa8bcab9ac6d47b2a95daa826;jsconfig.json
cd9775fda8778662a3f19f373df9467c;Bootstrap.php
dc1c2234c6d677f57fab5413554bdc95;Bootstrap.php
c2405627e35992f208ba7281a6490256;adminmenu/scss/admin.scss
ef5d72b877de66653e21bf6cafd03bd5;adminmenu/js/keypairs.js
593e3e1024084fc1ee04e38a3a2e3ad7;adminmenu/js/admin.js
Expand All @@ -167,7 +167,7 @@ e0b9e6894421345360862d2571283a23;adminmenu/template/partials/_header.tpl
e68888b6874c60a42db48e2ead9dba40;adminmenu/template/partials/_keypair_item.tpl
94692a0334d6eeefe4b4806fc5832914;adminmenu/template/partials/_includes.tpl
7fce418366a4acd0f313f00ac2a48901;adminmenu/template/partials/_order_detail.tpl
cd49f410d8c6d8176702d879b5a72e34;adminmenu/template/partials/_order_item.tpl
b7e308e5ff89b5c6d00956183db19a2d;adminmenu/template/partials/_order_item.tpl
50329cc04d18170a2e8f086579a67366;adminmenu/template/partials/_keypair_list.tpl
746bd73bf157393d5d55f4b559a8c6e5;adminmenu/css/admin.css.map
7597a877c5a0775fbaddce1b2ab27eb8;adminmenu/css/admin.css
Expand Down
36 changes: 21 additions & 15 deletions frontend/js/unzer.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/js/unzer.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/js/unzer.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/js/unzer.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions frontend/src/js/payments/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ export default class UnzerPayment {
field.find('.unzerUI.form>.checkboxLabel').hide();
field.find('.unzerUI.form>.salutation-unzer-' + paymentMethodName + '-customer').hide();
}

field.find('.companyType').on('change', e => this.hideFormFields(paymentMethodName));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<URL>http://www.solution360.de</URL>
<XMLVersion>100</XMLVersion>
<MinShopVersion>5.0.0</MinShopVersion>
<Version>1.8.0</Version>
<Version>1.8.1</Version>
<PluginID>s360_unzer_shop5</PluginID>
<CreateDate>2020-10-27</CreateDate>

Expand Down
2 changes: 1 addition & 1 deletion paymentmethod/UnzerPaylaterInvoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public function validateAdditional(): bool
$shopCustomer->cNachname = $names['lastname'] ?: $shopCustomer->cNachname;

if ($this->isB2BCustomer($shopCustomer)) {
$shopCustomer->cBundesland = $customer->getBillingAddress()->getState();
$shopCustomer->cBundesland = $customer->getBillingAddress()->getState() ?? '';
$shopCustomer->cPLZ = $customer->getBillingAddress()->getZip();
$shopCustomer->cOrt = $customer->getBillingAddress()->getCity();
$shopCustomer->cLand = $customer->getBillingAddress()->getCountry();
Expand Down
2 changes: 2 additions & 0 deletions src/Foundation/ServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public function __construct(Container $container)
*/
public function register(): void
{
require_once __DIR__ . '/../../vendor/autoload.php';

// Wrap Helper in a singleton because it does not cache it (=> many initializations during a request!)
$this->app->setSingleton(Config::PLUGIN_ID, function () {
return Helper::getPluginById(Config::PLUGIN_ID);
Expand Down
4 changes: 2 additions & 2 deletions src/KeyPairs/KeyPairEntity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public function toObject(): stdClass
public static function create(stdClass $data): Entity
{
$entity = new self(
$data->private_key,
$data->public_key,
trim($data->private_key),
trim($data->public_key),
(bool) $data->is_b2b,
(int) $data->currency_id,
(int) $data->payment_method_id
Expand Down
14 changes: 7 additions & 7 deletions src/Orders/OrderMappingModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public function loadOrders(int $limit, int $offset, ?string $search = null): arr
$order->kVersandart = (int)$row->kVersandart;
$order->kSprache = (int)$row->kSprache;
$order->kWaehrung = (int)$row->kWaehrung;
$order->fGuthaben = $row->fGuthaben;
$order->fGuthaben = $row->fGuthaben ?? '';
$order->fGesamtsumme = $row->fGesamtsumme;
$order->cSession = $row->cSession;
$order->cVersandartName = $row->cVersandartName;
Expand All @@ -166,13 +166,13 @@ public function loadOrders(int $limit, int $offset, ?string $search = null): arr
$order->dBewertungErinnerung = $row->dBewertungErinnerung;
$order->cTracking = $row->cTracking;
$order->cKommentar = $row->cKommentar;
$order->cLogistiker = $row->cLogistiker;
$order->cTrackingURL = $row->cTrackingURL;
$order->cIP = $row->cIP;
$order->cAbgeholt = $row->cAbgeholt;
$order->cStatus = $row->cStatus;
$order->cLogistiker = $row->cLogistiker ?? '';
$order->cTrackingURL = $row->cTrackingURL ?? '';
$order->cIP = $row->cIP ?? '';
$order->cAbgeholt = $row->cAbgeholt ?? '';
$order->cStatus = $row->cStatus ? (int)$row->cStatus : null;
$order->dErstellt = $row->dErstellt;
$order->fWaehrungsFaktor = $row->fWaehrungsFaktor;
$order->fWaehrungsFaktor = $row->fWaehrungsFaktor ? (float)$row->fWaehrungsFaktor : 1.0;
$order->cPUIZahlungsdaten = $row->cPUIZahlungsdaten;

if (isset($order->nLongestMinDelivery, $order->nLongestMaxDelivery)) {
Expand Down
Loading