From 96faf7891da69713185ec422f9742c8ef297980c Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Tue, 13 Jun 2023 11:55:28 +0200 Subject: [PATCH] add 6.4.2.0 (sourceGuardian for PHP 8.x) --- README.en.md | 2 ++ README.md | 2 ++ docs/daux/changelog/010_Changelog.md | 12 +++++++++++- docs/daux/config.json | 4 ++-- docs/html/changelog/Changelog.html | 17 ++++++++++++++--- .../html/changelog/Channel_Rekonfiguration.html | 2 +- docs/html/changelog/MGW_Implementation.html | 2 +- .../Cronjob_per_Konsole_einrichten.html | 2 +- .../Cronjob_per_Webaufruf_einrichten.html | 2 +- .../OXID_eShop_Enterprise_Edition.html | 2 +- ...seingaenge_bei_Heidelpay_erneut_abrufen.html | 2 +- .../Infos_fuer_Entwickler.html | 2 +- ...as_hat_sich_im_Bestellprozess_geaendert.html | 2 +- .../Was_ist_noch_zu_beachten.html | 2 +- .../Was_macht_der_Cronjob.html | 2 +- .../Was_passiert_bei_einem_Refund.html | 2 +- .../Wie_ist_der_Cronjob_einzurichten.html | 2 +- .../Konfiguration_der_Zahlungsarten.html | 2 +- .../configuration/Konfiguration/Webhooks.html | 2 +- ...hnungskauf_und_Vorkasse_anzeigen_lassen.html | 2 +- ...automatische_Vorkasse_und_Rechnungskauf.html | 2 +- .../Konfiguration/Channeleinstellungen.html | 2 +- .../Konfiguration/Channelzuordnungen.html | 2 +- .../Konfiguration/Schluesselpaar_eintragen.html | 2 +- .../Schnittstellenwechsel/Nacharbeiten.html | 2 +- .../Schnittstellenwechsel/Start.html | 2 +- .../Vorbereitung/Schluesselpaare_finden.html | 2 +- .../Vorbereitung/Sicherung.html | 2 +- .../Vorbereitung/Unzer_Insights.html | 2 +- .../Vorbereitung/Zahlarten.html | 2 +- .../Vorbereitung/was_wird_benoetigt.html | 2 +- docs/html/configuration/index.html | 2 +- docs/html/description/Beschreibung.html | 2 +- docs/html/description/Editionsunterschiede.html | 2 +- docs/html/index.html | 2 +- .../Anforderungen/Beiliegende_Bibliotheken.html | 2 +- .../Anforderungen/Systemanforderungen.html | 2 +- .../Anforderungen/Vorbereitungen.html | 2 +- .../Anforderungen/wichtige_Hinweise.html | 2 +- .../Deinstallation/Dateien_loeschen.html | 2 +- .../Deinstallation/Datenbank_bereinigen.html | 2 +- .../Modul_aus_der_Installation_entfernen.html | 2 +- .../Deinstallation/Modul_deaktivieren.html | 2 +- ...rweiterungen_deaktivieren_und_entfernen.html | 2 +- .../Deinstallation/TMP-Ordner_leeren.html | 2 +- docs/html/installation/Installation.html | 2 +- .../installation/Installationspruefung.html | 2 +- .../Konfiguration_einstellen.html | 2 +- .../Neuinstallation/Lizenz_eintragen.html | 2 +- .../Neuinstallation/Modul_hinzufuegen.html | 4 ++-- .../Modul_im_Shop_aktivieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Shopanpassungen_installieren.html | 2 +- .../Neuinstallation/TMP-Ordner_leeren.html | 2 +- .../Neuinstallation/Updatefaehigkeit.html | 2 +- .../Verwendung_eigener_Themes.html | 2 +- .../installation/Neuinstallation/index.html | 4 ++-- docs/html/installation/Schnellstart.html | 2 +- .../Update/Aenderungen_kontrollieren.html | 2 +- .../installation/Update/Dateien_erneuern.html | 4 ++-- .../Update/Erweiterungen_anpassen.html | 2 +- .../Update/Lizenzschluessel_aktualisieren.html | 2 +- .../installation/Update/Modul_deaktivieren.html | 2 +- .../Modulinformationen_aktualisieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Update/Shopanpassungen_installieren.html | 2 +- .../installation/Update/TMP-Ordner_leeren.html | 2 +- .../installation/Update/Updatedefinition.html | 2 +- docs/html/support/Hilfe-und-Support.html | 2 +- docs/html/tipuesearch/tipuesearch_content.json | 2 +- src/.php-cs-fixer.php | 4 ++-- src/Controllers/Admin/AdminList.php | 4 ++-- src/Controllers/Admin/Base.php | 4 ++-- src/Controllers/Admin/Channels/AdminList.php | 4 ++-- src/Controllers/Admin/Channels/Base.php | 4 ++-- src/Controllers/Admin/Channels/Main.php | 4 ++-- src/Controllers/Admin/Channels/Payments.php | 4 ++-- src/Controllers/Admin/Log.php | 4 ++-- src/Controllers/Admin/LogList.php | 4 ++-- src/Controllers/Admin/Order/Heidelpay.php | 4 ++-- src/Controllers/Admin/Settings.php | 4 ++-- src/Controllers/Admin/Support.php | 4 ++-- src/Controllers/Admin/TransactionlogList.php | 4 ++-- src/Controllers/ChannelProvider.php | 4 ++-- src/Controllers/MGWUserInputValidator.php | 4 ++-- src/Controllers/MgwOrder.php | 4 ++-- src/Controllers/MgwResourceHandler.php | 4 ++-- src/Controllers/ModuleProvider.php | 4 ++-- src/Controllers/Notify.php | 4 ++-- src/Controllers/Order.php | 4 ++-- src/Controllers/OxidProvider.php | 4 ++-- src/Controllers/Payment.php | 4 ++-- src/Controllers/PaymentCollector.php | 4 ++-- src/Controllers/PaymentGateway.php | 4 ++-- src/Controllers/Response.php | 4 ++-- src/Interfaces/Config/ConstantInterface.php | 4 ++-- src/Interfaces/Criterion/ContainerInterface.php | 4 ++-- src/Interfaces/Parameter/GroupInterface.php | 4 ++-- src/Models/Actions/Action.php | 4 ++-- src/Models/Actions/Capture.php | 4 ++-- src/Models/Actions/Debit.php | 4 ++-- src/Models/Actions/Finalize.php | 4 ++-- src/Models/Actions/Preauthorization.php | 4 ++-- src/Models/Actions/Rebill.php | 4 ++-- src/Models/Actions/Refund.php | 4 ++-- src/Models/Actions/Reversal.php | 4 ++-- src/Models/Bankaccount.php | 4 ++-- src/Models/Communicator.php | 4 ++-- src/Models/Configuration/ModProfile.php | 4 ++-- src/Models/Containers/Criterions.php | 4 ++-- src/Models/Containers/Criterions/Easycredit.php | 4 ++-- src/Models/Containers/InputContainer.php | 4 ++-- src/Models/Containers/Parameter.php | 4 ++-- src/Models/Containers/PrepaymentData.php | 4 ++-- src/Models/Containers/Skeleton.php | 4 ++-- src/Models/Factory.php | 4 ++-- .../MgwCustomerAttributeFormatter.php | 4 ++-- src/Models/Formatters/abstractFormatter.php | 4 ++-- src/Models/Generators/Basket.php | 4 ++-- src/Models/Generators/Body.php | 4 ++-- src/Models/Generators/MGWBasket.php | 4 ++-- .../Hostdecorators/hostDecoratorsInterface.php | 4 ++-- .../Hostdecorators/hostDecoratorsRegistry.php | 4 ++-- .../Hostdecorators/removePortFromHost.php | 4 ++-- src/Models/MGWDebugHandler.php | 4 ++-- src/Models/Mail.php | 4 ++-- src/Models/Ngw.php | 4 ++-- src/Models/Parameter/Criterion.php | 4 ++-- src/Models/Parameter/Dynvalues.php | 4 ++-- src/Models/Parameter/Group/AccountData.php | 4 ++-- src/Models/Parameter/Group/CompanyData.php | 4 ++-- src/Models/Parameter/Group/CustomerData.php | 4 ++-- src/Models/Parameter/Group/FrontendData.php | 4 ++-- src/Models/Parameter/Group/MandatoryData.php | 4 ++-- .../Parameter/Group/RiskInformationData.php | 4 ++-- src/Models/Parameter/StoredData.php | 4 ++-- src/Models/Payment/Btobbillpurchase.php | 4 ++-- src/Models/Payment/Cards.php | 4 ++-- src/Models/Payment/Creditcard.php | 4 ++-- src/Models/Payment/Debitcard.php | 4 ++-- src/Models/Payment/Directdebit.php | 4 ++-- src/Models/Payment/Directdebit/Secured.php | 4 ++-- src/Models/Payment/Easycredit.php | 4 ++-- src/Models/Payment/Eps.php | 4 ++-- ...PaymentNotReferencedToHeidelpayException.php | 4 ++-- .../UnknownRedirectParameterException.php | 4 ++-- src/Models/Payment/FlexiPayDirect.php | 4 ++-- src/Models/Payment/Giropay.php | 4 ++-- src/Models/Payment/Ideal.php | 4 ++-- src/Models/Payment/Invoice/Secured.php | 4 ++-- src/Models/Payment/Invoice/Unsecured.php | 4 ++-- src/Models/Payment/Masterpass.php | 4 ++-- src/Models/Payment/Payment.php | 4 ++-- src/Models/Payment/Paypal.php | 4 ++-- src/Models/Payment/Postfinance.php | 4 ++-- src/Models/Payment/Prepayment.php | 4 ++-- src/Models/Payment/Przelewy24.php | 4 ++-- src/Models/Payment/Sofortueberweisung.php | 4 ++-- src/Models/Redirect.php | 4 ++-- src/Models/Request.php | 4 ++-- .../Exception/InvalidHeidelpayDataException.php | 4 ++-- .../Exception/InvalidTagNameException.php | 4 ++-- .../Request/Exception/NoBasketException.php | 4 ++-- .../Request/Exception/NoOrderException.php | 4 ++-- .../Exception/NoPaymentMethodException.php | 4 ++-- .../Exception/NoPaymentOptionException.php | 4 ++-- .../Request/Exception/NoTransactionUniqueId.php | 4 ++-- ...nHeidelpayOnlinetransferPaymentException.php | 4 ++-- src/Models/Request/Pattern/BankAccountCheck.php | 4 ++-- src/Models/Request/Pattern/Creditcard.php | 4 ++-- src/Models/Request/Pattern/Debitcard.php | 4 ++-- src/Models/Request/Pattern/Directdebit.php | 4 ++-- src/Models/Request/Pattern/Hip.php | 4 ++-- src/Models/Request/Pattern/Onlinetransfer.php | 4 ++-- .../Request/Pattern/OnlinetransferCheck.php | 4 ++-- src/Models/Request/Pattern/Pattern.php | 4 ++-- src/Models/Request/Pattern/Prepayment.php | 4 ++-- src/Models/Request/Xml.php | 4 ++-- src/Models/Response.php | 4 ++-- src/Models/Response/Parser.php | 4 ++-- .../Settings/Channels/BToBBillPurchase.php | 4 ++-- src/Models/Settings/Channels/CardPayments.php | 4 ++-- src/Models/Settings/Channels/Cards.php | 4 ++-- src/Models/Settings/Channels/Channels.php | 4 ++-- src/Models/Settings/Channels/CreditCard.php | 4 ++-- src/Models/Settings/Channels/DebitCard.php | 4 ++-- .../Settings/Channels/Directdebit/Secured.php | 4 ++-- .../Settings/Channels/Directdebit/Unsecured.php | 4 ++-- src/Models/Settings/Channels/EasyCredit.php | 4 ++-- src/Models/Settings/Channels/Eps.php | 4 ++-- src/Models/Settings/Channels/FlexiPayDirect.php | 4 ++-- src/Models/Settings/Channels/Giropay.php | 4 ++-- src/Models/Settings/Channels/Ideal.php | 4 ++-- .../Settings/Channels/Invoice/Secured.php | 4 ++-- .../Settings/Channels/Invoice/Unsecured.php | 4 ++-- src/Models/Settings/Channels/Masterpass.php | 4 ++-- src/Models/Settings/Channels/OnlineTransfer.php | 4 ++-- src/Models/Settings/Channels/Paypal.php | 4 ++-- src/Models/Settings/Channels/Postfinance.php | 4 ++-- src/Models/Settings/Channels/Prepayment.php | 4 ++-- src/Models/Settings/Channels/Przelewy24.php | 4 ++-- src/Models/Settings/Channels/Sofort.php | 4 ++-- .../Exception/EmptyPasswordException.php | 4 ++-- .../Exception/EmptySecuritySenderException.php | 4 ++-- .../Exception/EmptyUsernameException.php | 4 ++-- src/Models/Settings/Heidelpay.php | 4 ++-- .../Statushandlers/AbstractErrorHandler.php | 4 ++-- src/Models/Statushandlers/AbstractHandler.php | 4 ++-- src/Models/Statushandlers/AbstractOkHandler.php | 4 ++-- .../Statushandlers/AbstractPendingHandler.php | 4 ++-- src/Models/Statushandlers/HandlerInterface.php | 4 ++-- src/Models/Statushandlers/HandlerList.php | 4 ++-- src/Models/Statushandlers/OnPaymentCanceled.php | 4 ++-- .../Statushandlers/OnPaymentChargeback.php | 4 ++-- .../Statushandlers/OnPaymentCompleted.php | 4 ++-- .../Statushandlers/OnPaymentPartlyPaid.php | 4 ++-- src/Models/Statushandlers/OnPaymentPending.php | 4 ++-- src/Models/Statushandlers/OnPaymentReview.php | 4 ++-- src/Models/Transactionlog/Reader/Heidelpay.php | 4 ++-- src/Models/Transactionlog/Reader/Mgw.php | 4 ++-- .../Exception/AgbNotAcceptedException.php | 4 ++-- .../CheckSessionChallengeException.php | 4 ++-- .../CustomerinformationNotAcceptedException.php | 4 ++-- .../Verify/Exception/NotLoggedInException.php | 4 ++-- .../Verify/Exception/UnzerApiException.php | 4 ++-- src/Models/Verify/Input.php | 4 ++-- src/Models/Verify/OrderContext.php | 4 ++-- src/Models/Verify/PaymentSuccess.php | 4 ++-- src/Models/Verify/PreInputValidator.php | 4 ++-- src/Models/Verify/Verify.php | 4 ++-- src/Models/Viewconfig.php | 4 ++-- src/Models/Webhooks/Handler.php | 4 ++-- src/Models/Webhooks/ResponseHandler.php | 4 ++-- .../Webhooks/UnauthorizedCallException.php | 4 ++-- src/Models/Webhooks/UnhandledEventException.php | 4 ++-- .../Webhooks/WebhookExceptionInterface.php | 4 ++-- .../Application/Controller/OrderController.php | 8 +++++++- .../Controller/PaymentController.php | 7 ++++--- src/Modules/Application/Model/Order.php | 5 ++--- src/Setup/InstallRoutine.php | 16 ++++++++-------- src/metadata.php | 2 +- src/translations/de/d3_heidelpay_lang.php | 4 +++- src/translations/en/d3_heidelpay_lang.php | 2 ++ tests/unittests/MC_Metrics.php | 4 ++-- tests/unittests/additional.inc.php | 4 ++-- tests/unittests/bootstrap.php | 4 ++-- tests/unittests/libs/d3heidelpayTestCase.php | 4 ++-- tests/unittests/unit/OxidCommand.php | 4 ++-- tests/unittests/unit/OxidTestCase.php | 4 ++-- tests/unittests/unit/criticalerrorshandler.php | 4 ++-- tests/unittests/unit/dbMaintenance.php | 4 ++-- .../controllers/admin/order/heidelpayTest.php | 4 ++-- .../controllers/admin/settingsTest.php | 4 ++-- .../d3/d3heidelpay/controllers/orderTest.php | 4 ++-- .../controllers/paymentgatewayTest.php | 4 ++-- .../d3/d3heidelpay/models/communicatorTest.php | 4 ++-- .../models/containers/parameterTest.php | 4 ++-- .../models/containers/skeletonTest.php | 4 ++-- .../d3heidelpay/models/d3_hp_responseTest.php | 4 ++-- .../models/d3hpprepaymentdataTest.php | 4 ++-- .../d3/d3heidelpay/models/factoryTest.php | 4 ++-- .../models/generators/basketTest.php | 4 ++-- .../d3heidelpay/models/generators/bodyTest.php | 4 ++-- ...entnotreferencedtoheidelpayexceptionTest.php | 4 ++-- .../d3heidelpay/models/payment/paymentTest.php | 4 ++-- .../invalidheidelpaydataexceptionTest.php | 4 ++-- .../exception/invalidtagnameexceptionTest.php | 4 ++-- .../request/exception/nobasketexceptionTest.php | 4 ++-- .../request/exception/noorderexceptionTest.php | 4 ++-- .../exception/nopaymentmethodexceptionTest.php | 4 ++-- .../exception/nopaymentoptionexceptionTest.php | 4 ++-- .../exception/notransactionuniqueidTest.php | 4 ++-- ...delpayonlinetransferpaymentexceptionTest.php | 4 ++-- .../models/request/pattern/patternTest.php | 4 ++-- .../d3/d3heidelpay/models/request/xmlTest.php | 4 ++-- .../d3/d3heidelpay/models/requestTest.php | 4 ++-- .../d3heidelpay/models/response/parserTest.php | 4 ++-- .../d3/d3heidelpay/models/responseTest.php | 4 ++-- .../exception/emptypasswordexceptionTest.php | 4 ++-- .../emptysecuritysenderexceptionTest.php | 4 ++-- .../exception/emptyusernameexceptionTest.php | 4 ++-- .../models/settings/heidelpayTest.php | 4 ++-- .../transactionlog/reader/heidelpayTest.php | 4 ++-- .../transactionlog/reader/testdata/PostData.php | 4 ++-- .../reader/testdata/xmlInPostData.php | 4 ++-- .../d3/d3heidelpay/models/verify/inputTest.php | 4 ++-- .../models/verify/ordercontextTest.php | 4 ++-- .../models/verify/paymentsuccessTest.php | 4 ++-- .../d3/d3heidelpay/models/viewconfigTest.php | 4 ++-- .../controllers/d3_order_heidelpayTest.php | 4 ++-- .../controllers/d3_payment_heidelpayTest.php | 4 ++-- .../modules/core/d3_oxemail_heidelpayTest.php | 4 ++-- .../models/d3_d3counter_heidelpayTest.php | 4 ++-- .../d3_oxinputvalidator_heidelpayTest.php | 4 ++-- .../modules/models/d3_oxorder_heidelpayTest.php | 4 ++-- .../d3_oxpaymentgateway_heidelpayTest.php | 4 ++-- tests/unittests/unit/oxPrinter.php | 4 ++-- tests/unittests/unit/test_config.inc.php | 4 ++-- tests/unittests/unit/test_utils.php | 4 ++-- 299 files changed, 570 insertions(+), 535 deletions(-) diff --git a/README.en.md b/README.en.md index 29803920..86afd6d9 100644 --- a/README.en.md +++ b/README.en.md @@ -7,6 +7,8 @@ Unzer GmbH offers merchants a payment system for all common payment payment meth Please refer to the documentation [online](https://docs.oxidmodule.com/Unzer/) and the docs directory of this package for the requirements of this plugin, installation and configuration instructions, changelog and further informations. +Note that when using the NGW interface, the config parameter "disallowForceSessionIdInRequest" must not be activated. + ## Changelog See [CHANGELOG](docs/daux/changelog/010_Changelog.md) for further informations. diff --git a/README.md b/README.md index 9dd9d20b..896650ba 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Die Unzer GmbH bietet Händlern ein Zahlungssystem für alle gängigen Zahlungsv Die Anforderungen des Moduls, Installations- und Konfigurationshinweise, Changelog und weitere Informationen entnehmen Sie bitte der Dokumentation [online](https://docs.oxidmodule.com/Unzer/) und im docs-Verzeichnis dieses Paketes. +Beachten Sie, dass bei Verwendung der NGW-Schnittstelle der Config-Parameter "disallowForceSessionIdInRequest" nicht aktiviert sein darf. + ## Changelog Siehe [CHANGELOG](docs/daux/changelog/010_Changelog.md) für weitere Informationen. diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index c939daac..5485350a 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -9,7 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://git.d3data.de/D3Private/Unzer/compare/6.4.1.1...rel_6.x_mgw) -## [6.4.1.1](https://git.d3data.de/D3Private/Unzer/compare/6.4.1.0...6.4.1.1) - 2023-01-25 +## [6.4.2.0](https://git.d3data.de/D3Private/Unzer/compare/6.4.1.1...6.4.2.0) - 2023-06-13 +### Changed +- Kundendaten werden vor Übergabe getrimmt um unnötige Übertragungen zu verhindern und Reproduktionsfälle zu ermöglichen +- im Fehlerfall wird das protokollierte Charge-Objekt gekürzt, um die Fehlermeldung zuverlässiger zu erhalten +- "Order in progress" Status wird nur von Unzer bearbeiteten Zahlungen zugewiesen +- Meldungen bei Charge-Fehlern werden separat protokolliert +- löscht vorangelegte Bestellungen bei Abbruch (canceled) +- Payerror 2 wird bei bei Unzer zugeordneten Zahlungsarten gesetzt +- bei gelöschten Unzer Bestellungen werden keine Zahlungsdaten abgefragt + +## [6.4.1.1](https://git.d3data.de/D3Private/Unzer/compare/6.4.1.0...6.4.1.1) - 2023-03-08 ### Fixed - abgebrochener Zahlungsprozess führt zu geleertem Warenkorb - Bypass umgeht Anzeige des Zahlungsprozesses diff --git a/docs/daux/config.json b/docs/daux/config.json index c3dee4fc..6839478e 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " unzer", - "moduleversion": "6.4.1.1", + "moduleversion": "6.4.2.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "25.01.2023", + "moduledate": "13.06.2023", "editors": "", "tagline": "", "image": "", diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index c4500221..3516e983 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -91,7 +91,7 @@

Changelog

- 25.01.2023 + 13.06.2023
@@ -99,7 +99,18 @@

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

Unreleased

-

6.4.1.1 - 2023-01-25

+

6.4.2.0 - 2023-06-13

+

Changed

+ +

6.4.1.1 - 2023-03-08

Fixed

-

Changed

+

Changed