From ae32f70f63599d934111b82aa290b8d4a024186b Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 19 Apr 2024 16:04:05 +0200 Subject: [PATCH] add 6.4.3.0 (ionCube for PHP 7.1 to 7.4) --- docs/daux/changelog/010_Changelog.md | 12 +- docs/daux/config.json | 4 +- docs/html/changelog/Changelog.html | 23 +- .../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 +- ...ingaenge_bei_Heidelpay_erneut_abrufen.html | 2 +- .../Infos_fuer_Entwickler.html | 2 +- ..._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 +- ...ungskauf_und_Vorkasse_anzeigen_lassen.html | 2 +- ...tomatische_Vorkasse_und_Rechnungskauf.html | 2 +- .../Konfiguration/Channeleinstellungen.html | 2 +- .../Konfiguration/Channelzuordnungen.html | 2 +- .../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 +- .../description/Editionsunterschiede.html | 2 +- docs/html/index.html | 2 +- .../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 +- ...eiterungen_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 +- .../Lizenzschluessel_aktualisieren.html | 2 +- .../Update/Modul_deaktivieren.html | 2 +- .../Modulinformationen_aktualisieren.html | 2 +- .../Providerspezifische_Installation.html | 2 +- .../Update/Shopanpassungen_installieren.html | 2 +- .../Update/TMP-Ordner_leeren.html | 2 +- .../installation/Update/Updatedefinition.html | 2 +- docs/html/support/Hilfe-und-Support.html | 2 +- .../html/tipuesearch/tipuesearch_content.json | 2 +- src/.php-cs-fixer.php | 32 +- src/Controllers/Admin/AdminList.php | 46 +- src/Controllers/Admin/Base.php | 26 +- src/Controllers/Admin/Channels/AdminList.php | 263 ++- src/Controllers/Admin/Channels/Base.php | 30 +- src/Controllers/Admin/Channels/Main.php | 439 ++-- src/Controllers/Admin/Channels/Payments.php | 310 +-- src/Controllers/Admin/Log.php | 50 +- src/Controllers/Admin/LogList.php | 36 +- src/Controllers/Admin/Order/Heidelpay.php | 815 ++++--- src/Controllers/Admin/Settings.php | 446 ++-- src/Controllers/Admin/Support.php | 30 +- src/Controllers/Admin/TransactionlogList.php | 286 +-- src/Controllers/ChannelProvider.php | 113 +- src/Controllers/MGWUserInputValidator.php | 116 +- src/Controllers/MgwOrder.php | 553 +++-- src/Controllers/MgwResourceHandler.php | 391 ++-- src/Controllers/ModuleProvider.php | 416 ++-- src/Controllers/Notify.php | 434 ++-- src/Controllers/Order.php | 1155 +++++----- src/Controllers/OxidProvider.php | 90 +- src/Controllers/Payment.php | 148 +- src/Controllers/PaymentCollector.php | 656 +++--- src/Controllers/PaymentGateway.php | 540 ++--- src/Controllers/Response.php | 1706 +++++++-------- src/Interfaces/Config/ConstantInterface.php | 56 +- .../Criterion/ContainerInterface.php | 24 +- src/Interfaces/Parameter/GroupInterface.php | 22 +- src/Models/Actions/Action.php | 58 +- src/Models/Actions/Capture.php | 40 +- src/Models/Actions/Debit.php | 40 +- src/Models/Actions/Finalize.php | 40 +- src/Models/Actions/Preauthorization.php | 40 +- src/Models/Actions/Rebill.php | 46 +- src/Models/Actions/Refund.php | 50 +- src/Models/Actions/Reversal.php | 42 +- src/Models/Bankaccount.php | 559 +++-- src/Models/Communicator.php | 390 ++-- src/Models/Configuration/ModProfile.php | 30 +- src/Models/Constants.php | 20 +- src/Models/Containers/Criterions.php | 51 +- .../Containers/Criterions/Easycredit.php | 40 +- src/Models/Containers/InputContainer.php | 32 +- src/Models/Containers/Parameter.php | 887 ++++---- src/Models/Containers/PrepaymentData.php | 178 +- src/Models/Containers/Skeleton.php | 89 +- src/Models/Factory.php | 1180 +++++------ .../MgwCustomerAttributeFormatter.php | 213 +- src/Models/Formatters/abstractFormatter.php | 116 +- src/Models/Generators/Basket.php | 630 +++--- src/Models/Generators/Body.php | 62 +- src/Models/Generators/MGWBasket.php | 623 +++--- .../hostDecoratorsInterface.php | 24 +- .../Hostdecorators/hostDecoratorsRegistry.php | 76 +- .../Hostdecorators/removePortFromHost.php | 56 +- src/Models/MGWDebugHandler.php | 120 +- src/Models/Mail.php | 100 +- src/Models/Ngw.php | 339 +-- src/Models/Parameter/Criterion.php | 26 +- src/Models/Parameter/Dynvalues.php | 76 +- src/Models/Parameter/Group/AccountData.php | 108 +- src/Models/Parameter/Group/CompanyData.php | 206 +- src/Models/Parameter/Group/CustomerData.php | 122 +- src/Models/Parameter/Group/FrontendData.php | 80 +- src/Models/Parameter/Group/MandatoryData.php | 178 +- .../Parameter/Group/RiskInformationData.php | 57 +- src/Models/Parameter/StoredData.php | 74 +- src/Models/Payment/Btobbillpurchase.php | 348 +-- src/Models/Payment/Cards.php | 66 +- src/Models/Payment/Creditcard.php | 66 +- src/Models/Payment/Debitcard.php | 73 +- src/Models/Payment/Directdebit.php | 68 +- src/Models/Payment/Directdebit/Secured.php | 89 +- src/Models/Payment/Easycredit.php | 88 +- src/Models/Payment/Eps.php | 66 +- ...ymentNotReferencedToHeidelpayException.php | 48 +- .../UnknownRedirectParameterException.php | 46 +- src/Models/Payment/FlexiPayDirect.php | 64 +- src/Models/Payment/Giropay.php | 66 +- src/Models/Payment/Ideal.php | 66 +- src/Models/Payment/Invoice/Secured.php | 101 +- src/Models/Payment/Invoice/Unsecured.php | 64 +- src/Models/Payment/Masterpass.php | 78 +- src/Models/Payment/Payment.php | 189 +- src/Models/Payment/Paypal.php | 64 +- src/Models/Payment/Postfinance.php | 66 +- src/Models/Payment/Prepayment.php | 71 +- src/Models/Payment/Przelewy24.php | 76 +- src/Models/Payment/Sofortueberweisung.php | 66 +- src/Models/Redirect.php | 68 +- src/Models/Request.php | 101 +- .../InvalidHeidelpayDataException.php | 48 +- .../Exception/InvalidTagNameException.php | 48 +- .../Request/Exception/NoBasketException.php | 42 +- .../Request/Exception/NoOrderException.php | 42 +- .../Exception/NoPaymentMethodException.php | 42 +- .../Exception/NoPaymentOptionException.php | 42 +- .../Exception/NoTransactionUniqueId.php | 42 +- ...eidelpayOnlinetransferPaymentException.php | 48 +- .../Request/Pattern/BankAccountCheck.php | 32 +- src/Models/Request/Pattern/Creditcard.php | 32 +- src/Models/Request/Pattern/Debitcard.php | 26 +- src/Models/Request/Pattern/Directdebit.php | 26 +- src/Models/Request/Pattern/Hip.php | 32 +- src/Models/Request/Pattern/Onlinetransfer.php | 34 +- .../Request/Pattern/OnlinetransferCheck.php | 42 +- src/Models/Request/Pattern/Pattern.php | 25 +- src/Models/Request/Pattern/Prepayment.php | 32 +- src/Models/Request/Xml.php | 1357 ++++++------ src/Models/Response.php | 178 +- src/Models/Response/Parser.php | 296 +-- .../Settings/Channels/BToBBillPurchase.php | 28 +- src/Models/Settings/Channels/CardPayments.php | 38 +- src/Models/Settings/Channels/Cards.php | 38 +- src/Models/Settings/Channels/Channels.php | 267 ++- src/Models/Settings/Channels/CreditCard.php | 39 +- src/Models/Settings/Channels/DebitCard.php | 40 +- .../Settings/Channels/Directdebit/Secured.php | 36 +- .../Channels/Directdebit/Unsecured.php | 28 +- src/Models/Settings/Channels/EasyCredit.php | 42 +- src/Models/Settings/Channels/Eps.php | 28 +- .../Settings/Channels/FlexiPayDirect.php | 28 +- src/Models/Settings/Channels/Giropay.php | 28 +- src/Models/Settings/Channels/Ideal.php | 54 +- .../Settings/Channels/Invoice/Secured.php | 42 +- .../Settings/Channels/Invoice/Unsecured.php | 28 +- src/Models/Settings/Channels/Masterpass.php | 38 +- .../Settings/Channels/OnlineTransfer.php | 25 +- src/Models/Settings/Channels/Paypal.php | 36 +- src/Models/Settings/Channels/Postfinance.php | 28 +- src/Models/Settings/Channels/Prepayment.php | 26 +- src/Models/Settings/Channels/Przelewy24.php | 54 +- src/Models/Settings/Channels/Sofort.php | 28 +- .../Exception/EmptyPasswordException.php | 40 +- .../EmptySecuritySenderException.php | 41 +- .../Exception/EmptyUsernameException.php | 40 +- src/Models/Settings/Heidelpay.php | 390 ++-- .../Statushandlers/AbstractErrorHandler.php | 120 +- src/Models/Statushandlers/AbstractHandler.php | 61 +- .../Statushandlers/AbstractOkHandler.php | 122 +- .../Statushandlers/AbstractPendingHandler.php | 131 +- .../Statushandlers/HandlerInterface.php | 32 +- src/Models/Statushandlers/HandlerList.php | 78 +- .../Statushandlers/OnPaymentCanceled.php | 36 +- .../Statushandlers/OnPaymentChargeback.php | 72 +- .../Statushandlers/OnPaymentCompleted.php | 42 +- .../Statushandlers/OnPaymentPartlyPaid.php | 74 +- .../Statushandlers/OnPaymentPending.php | 36 +- src/Models/Statushandlers/OnPaymentReview.php | 36 +- .../Transactionlog/Reader/Heidelpay.php | 609 +++--- src/Models/Transactionlog/Reader/Mgw.php | 212 +- .../Exception/AgbNotAcceptedException.php | 27 +- .../CheckSessionChallengeException.php | 27 +- ...ustomerinformationNotAcceptedException.php | 28 +- .../Verify/Exception/NotLoggedInException.php | 26 +- .../Verify/Exception/UnzerApiException.php | 26 +- src/Models/Verify/Input.php | 170 +- src/Models/Verify/OrderContext.php | 116 +- src/Models/Verify/PaymentSuccess.php | 38 +- src/Models/Verify/PreInputValidator.php | 57 +- src/Models/Verify/Verify.php | 36 +- src/Models/Viewconfig.php | 562 ++--- src/Models/Webhooks/Handler.php | 140 +- src/Models/Webhooks/ResponseHandler.php | 80 +- .../Webhooks/UnauthorizedCallException.php | 28 +- .../Webhooks/UnhandledEventException.php | 36 +- .../Webhooks/WebhookExceptionInterface.php | 18 +- .../Controller/PaymentController.php | 59 +- src/Setup/InstallRoutine.php | 16 +- src/metadata.php | 2 +- src/views/admin/tpl/order/mgw.tpl | 2 + tests/unittests/MC_Metrics.php | 513 +++-- tests/unittests/additional.inc.php | 36 +- tests/unittests/bootstrap.php | 60 +- tests/unittests/libs/d3heidelpayTestCase.php | 160 +- tests/unittests/unit/OxidCommand.php | 70 +- tests/unittests/unit/OxidTestCase.php | 739 +++---- .../unittests/unit/criticalerrorshandler.php | 82 +- tests/unittests/unit/dbMaintenance.php | 262 +-- .../controllers/admin/order/heidelpayTest.php | 365 ++-- .../controllers/admin/settingsTest.php | 68 +- .../d3/d3heidelpay/controllers/orderTest.php | 547 +++-- .../controllers/paymentgatewayTest.php | 1002 ++++----- .../d3heidelpay/models/communicatorTest.php | 165 +- .../models/containers/parameterTest.php | 90 +- .../models/containers/skeletonTest.php | 96 +- .../d3heidelpay/models/d3_hp_responseTest.php | 1111 +++++----- .../models/d3hpprepaymentdataTest.php | 318 +-- .../d3/d3heidelpay/models/factoryTest.php | 465 ++-- .../models/generators/basketTest.php | 362 ++-- .../models/generators/bodyTest.php | 82 +- ...tnotreferencedtoheidelpayexceptionTest.php | 68 +- .../models/payment/paymentTest.php | 225 +- .../invalidheidelpaydataexceptionTest.php | 67 +- .../exception/invalidtagnameexceptionTest.php | 68 +- .../exception/nobasketexceptionTest.php | 64 +- .../exception/noorderexceptionTest.php | 64 +- .../nopaymentmethodexceptionTest.php | 64 +- .../nopaymentoptionexceptionTest.php | 65 +- .../exception/notransactionuniqueidTest.php | 64 +- ...lpayonlinetransferpaymentexceptionTest.php | 67 +- .../models/request/pattern/patternTest.php | 74 +- .../d3/d3heidelpay/models/request/xmlTest.php | 1886 ++++++++--------- .../d3/d3heidelpay/models/requestTest.php | 298 +-- .../models/response/parserTest.php | 332 +-- .../d3/d3heidelpay/models/responseTest.php | 117 +- .../exception/emptypasswordexceptionTest.php | 64 +- .../emptysecuritysenderexceptionTest.php | 64 +- .../exception/emptyusernameexceptionTest.php | 64 +- .../models/settings/heidelpayTest.php | 554 +++-- .../transactionlog/reader/heidelpayTest.php | 370 ++-- .../reader/testdata/PostData.php | 66 +- .../reader/testdata/xmlInPostData.php | 86 +- .../d3heidelpay/models/verify/inputTest.php | 130 +- .../models/verify/ordercontextTest.php | 211 +- .../models/verify/paymentsuccessTest.php | 68 +- .../d3/d3heidelpay/models/viewconfigTest.php | 737 ++++--- .../controllers/d3_order_heidelpayTest.php | 1401 ++++++------ .../controllers/d3_payment_heidelpayTest.php | 485 ++--- .../modules/core/d3_oxemail_heidelpayTest.php | 198 +- .../models/d3_d3counter_heidelpayTest.php | 120 +- .../d3_oxinputvalidator_heidelpayTest.php | 141 +- .../models/d3_oxorder_heidelpayTest.php | 558 ++--- .../d3_oxpaymentgateway_heidelpayTest.php | 1148 +++++----- tests/unittests/unit/oxPrinter.php | 208 +- tests/unittests/unit/test_config.inc.php | 160 +- tests/unittests/unit/test_utils.php | 1336 ++++++------ 295 files changed, 22040 insertions(+), 21976 deletions(-) diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index 1afb921d..d86732c4 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -7,7 +7,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://git.d3data.de/D3Private/Unzer/compare/6.4.2.2...rel_6.x_mgw) +## [Unreleased](https://git.d3data.de/D3Private/Unzer/compare/6.4.3.0...rel_6.x_mgw) + +## [6.4.3.0](https://git.d3data.de/D3Private/Unzer/compare/6.4.2.2...6.4.3.0) - 2024-04-19 +### Fixed +- Finalisierung und Reservierungsstorno über den Shopadmin übergibt die Höhe des Betrages + +### Added +- Transactionsinformation werden an die Bestellung geschrieben + +### Changed +- (von Unzer) unbehandelte Abbruchbestellungen werden stroniert und gelöscht ## [6.4.2.2](https://git.d3data.de/D3Private/Unzer/compare/6.4.2.1...6.4.2.2) - 2024-04-10 ### Fixed diff --git a/docs/daux/config.json b/docs/daux/config.json index 0054f238..3a11fca3 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " unzer", - "moduleversion": "6.4.2.2", + "moduleversion": "6.4.3.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "08.04.2024", + "moduledate": "19.04.2024", "editors": "", "tagline": "", "image": "", diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index 062c8754..a9a47f60 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -91,17 +91,30 @@

Changelog

- 10.04.2024 + 19.04.2024

All notable changes to this project will be documented in this file.

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

-

Unreleased

-

6.4.2.2 - 2024-04-10

+

Unreleased

+

6.4.3.0 - 2024-04-19

Fixed

+

Added

+ +

Changed

+ +

6.4.2.2 - 2024-04-10

+

Fixed

+

6.4.2.1 - 2024-04-08

@@ -112,7 +125,7 @@ and this project adheres to verhindert Änderung des Admin-Status bei der Container Kompilierung

6.4.2.0 - 2023-06-13

-

Changed

+

Changed

6.4.1.0 - 2022-12-16

-

Added

+

Added