From 8f10a1030e8cd71ddfc46774bf8aef3d6ace3e52 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Mon, 9 May 2022 11:14:37 +0200 Subject: [PATCH] add 6.2.5.0 (ionCube for PHP 7.1 to 8.0) --- docs/daux/changelog/010_Changelog.md | 18 + docs/daux/changelog/030_MGW_Implementation.md | 3 + docs/daux/config.json | 4 +- .../010_Vorbereitung/050_Zahlarten.md | 3 + .../010_Systemanforderungen.md | 1 + docs/html/changelog/Changelog.html | 28 +- .../changelog/Channel_Rekonfiguration.html | 2 +- docs/html/changelog/MGW_Implementation.html | 5 +- .../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 +- ...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 | 5 +- .../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 | 3 +- .../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/Controllers/Admin/AdminList.php | 46 +- src/Controllers/Admin/Base.php | 26 +- src/Controllers/Admin/Channels/AdminList.php | 264 +-- src/Controllers/Admin/Channels/Base.php | 30 +- src/Controllers/Admin/Channels/Main.php | 440 ++-- src/Controllers/Admin/Channels/Payments.php | 310 +-- src/Controllers/Admin/Log.php | 50 +- src/Controllers/Admin/LogList.php | 37 +- src/Controllers/Admin/Order/Heidelpay.php | 750 +++---- src/Controllers/Admin/Settings.php | 390 ++-- src/Controllers/Admin/Support.php | 30 +- src/Controllers/Admin/TransactionlogList.php | 286 +-- src/Controllers/ChannelProvider.php | 112 +- src/Controllers/MGWUserInputValidator.php | 116 +- src/Controllers/MgwOrder.php | 574 ++--- src/Controllers/MgwResourceHandler.php | 369 ++-- src/Controllers/ModuleProvider.php | 415 ++-- src/Controllers/Notify.php | 447 ++-- src/Controllers/Order.php | 1171 +++++----- src/Controllers/OxidProvider.php | 89 +- src/Controllers/Payment.php | 148 +- src/Controllers/PaymentCollector.php | 669 +++--- src/Controllers/PaymentGateway.php | 548 ++--- src/Controllers/Response.php | 1721 +++++++-------- src/Interfaces/Config/ConstantInterface.php | 56 +- .../Criterion/ContainerInterface.php | 24 +- src/Interfaces/Parameter/GroupInterface.php | 22 +- src/Models/Actions/Action.php | 56 +- 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 | 560 ++--- src/Models/Communicator.php | 393 ++-- src/Models/Configuration/ModProfile.php | 30 +- src/Models/Containers/Criterions.php | 51 +- .../Containers/Criterions/Easycredit.php | 40 +- src/Models/Containers/InputContainer.php | 32 +- src/Models/Containers/Parameter.php | 875 ++++---- src/Models/Containers/PrepaymentData.php | 178 +- src/Models/Containers/Skeleton.php | 89 +- src/Models/Factory.php | 1189 +++++------ .../MgwCustomerAttributeFormatter.php | 212 +- src/Models/Formatters/abstractFormatter.php | 112 +- src/Models/Generators/Basket.php | 626 +++--- src/Models/Generators/Body.php | 61 +- src/Models/Generators/MGWBasket.php | 622 +++--- src/Models/MGWDebugHandler.php | 134 +- src/Models/Mail.php | 104 +- src/Models/Ngw.php | 352 +-- 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 | 78 +- src/Models/Parameter/Group/MandatoryData.php | 178 +- .../Parameter/Group/RiskInformationData.php | 56 +- src/Models/Parameter/StoredData.php | 74 +- src/Models/Payment/Btobbillpurchase.php | 349 +-- src/Models/Payment/Cards.php | 66 +- src/Models/Payment/Creditcard.php | 66 +- src/Models/Payment/Debitcard.php | 74 +- src/Models/Payment/Directdebit.php | 68 +- src/Models/Payment/Directdebit/Secured.php | 88 +- src/Models/Payment/Easycredit.php | 88 +- src/Models/Payment/Eps.php | 65 +- ...ymentNotReferencedToHeidelpayException.php | 48 +- .../UnknownRedirectParameterException.php | 46 +- src/Models/Payment/FlexiPayDirect.php | 64 +- src/Models/Payment/Giropay.php | 65 +- src/Models/Payment/Ideal.php | 66 +- src/Models/Payment/Invoice/Secured.php | 100 +- src/Models/Payment/Invoice/Unsecured.php | 64 +- src/Models/Payment/Masterpass.php | 78 +- src/Models/Payment/Payment.php | 190 +- src/Models/Payment/Paypal.php | 64 +- src/Models/Payment/Postfinance.php | 66 +- src/Models/Payment/Prepayment.php | 71 +- src/Models/Payment/Przelewy24.php | 77 +- src/Models/Payment/Sofortueberweisung.php | 64 +- src/Models/Redirect.php | 68 +- src/Models/Request.php | 100 +- .../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 | 33 +- src/Models/Request/Pattern/Debitcard.php | 25 +- src/Models/Request/Pattern/Directdebit.php | 26 +- src/Models/Request/Pattern/Hip.php | 32 +- src/Models/Request/Pattern/Onlinetransfer.php | 33 +- .../Request/Pattern/OnlinetransferCheck.php | 42 +- src/Models/Request/Pattern/Pattern.php | 24 +- src/Models/Request/Pattern/Prepayment.php | 32 +- src/Models/Request/Xml.php | 1348 ++++++------ src/Models/Response.php | 179 +- 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 | 268 +-- src/Models/Settings/Channels/CreditCard.php | 38 +- src/Models/Settings/Channels/DebitCard.php | 40 +- .../Settings/Channels/Directdebit/Secured.php | 36 +- .../Channels/Directdebit/Unsecured.php | 28 +- src/Models/Settings/Channels/EasyCredit.php | 41 +- src/Models/Settings/Channels/Eps.php | 27 +- .../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 | 26 +- 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 | 42 +- .../Exception/EmptyUsernameException.php | 40 +- src/Models/Settings/Heidelpay.php | 386 ++-- .../Transactionlog/Reader/Heidelpay.php | 612 +++--- src/Models/Transactionlog/Reader/Mgw.php | 212 +- .../Exception/AgbNotAcceptedException.php | 26 +- .../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 | 115 +- src/Models/Verify/PaymentSuccess.php | 38 +- src/Models/Verify/PreInputValidator.php | 58 +- src/Models/Verify/Verify.php | 36 +- src/Models/Viewconfig.php | 542 ++--- .../Controller/OrderController.php | 18 +- .../Controller/PaymentController.php | 54 +- src/Setup/InstallRoutine.php | 16 +- src/metadata.php | 11 +- src/out/img/logo_eps.jpg | Bin 1930 -> 2760 bytes src/out/img/mgw/eps.png | Bin 0 -> 1390 bytes src/out/img/mgw/giropay.png | Bin 0 -> 2210 bytes src/out/img/mgw/przelewy24.png | Bin 0 -> 2040 bytes src/out/img/mgw/sofort.png | Bin 2956 -> 1825 bytes .../{d3heidelpayMGW.css => d3unzerMGW.css} | 4 +- src/out/src/js/{d3heidelpay.js => d3unzer.js} | 4 +- src/views/admin/de/d3_heidelpay_lang.php | 5 + src/views/admin/en/d3_heidelpay_lang.php | 4 + src/views/admin/tpl/order/mgw.tpl | 9 + src/views/flow/tpl/mgw/missingfields.tpl | 16 +- src/views/flow/tpl/payment/mgw/eps.tpl | 46 + src/views/flow/tpl/payment/mgw/giropay.tpl | 46 + src/views/flow/tpl/payment/mgw/przelewy24.tpl | 46 + src/views/tpl/mgw/cards.tpl | 32 +- src/views/tpl/mgw/directdebit.tpl | 32 +- src/views/tpl/mgw/directdebit_secured.tpl | 179 +- src/views/tpl/mgw/eps.tpl | 72 + src/views/tpl/mgw/flexipaydirect.tpl | 20 +- src/views/tpl/mgw/giropay.tpl | 48 + src/views/tpl/mgw/ideal.tpl | 20 +- src/views/tpl/mgw/invoice_b2b.tpl | 129 +- src/views/tpl/mgw/invoice_secured.tpl | 18 +- src/views/tpl/mgw/invoice_unsecured.tpl | 16 +- src/views/tpl/mgw/paypal.tpl | 20 +- src/views/tpl/mgw/prepayment.tpl | 20 +- src/views/tpl/mgw/przelewy24.tpl | 48 + src/views/tpl/mgw/sofort.tpl | 20 +- src/views/wave/tpl/mgw/missingfields.tpl | 16 +- .../tpl/payment/mgw/directdebit_secured.tpl | 2 +- src/views/wave/tpl/payment/mgw/eps.tpl | 46 + .../wave/tpl/payment/mgw/flexipaydirect.tpl | 2 +- src/views/wave/tpl/payment/mgw/giropay.tpl | 46 + src/views/wave/tpl/payment/mgw/ideal.tpl | 2 +- .../wave/tpl/payment/mgw/invoice_b2b.tpl | 2 +- .../wave/tpl/payment/mgw/invoice_secured.tpl | 2 +- .../tpl/payment/mgw/invoice_unsecured.tpl | 2 +- src/views/wave/tpl/payment/mgw/paypal.tpl | 2 +- src/views/wave/tpl/payment/mgw/prepayment.tpl | 2 +- src/views/wave/tpl/payment/mgw/przelewy24.tpl | 46 + src/views/wave/tpl/payment/mgw/sofort.tpl | 2 +- tests/unittests/MC_Metrics.php | 513 +++-- tests/unittests/additional.inc.php | 36 +- tests/unittests/bootstrap.php | 61 +- tests/unittests/libs/d3heidelpayTestCase.php | 158 +- tests/unittests/libs/vfsStream/vfsStream.php | 319 ++- .../vfsStream/vfsStreamAbstractContent.php | 224 +- .../libs/vfsStream/vfsStreamContainer.php | 58 +- .../vfsStream/vfsStreamContainerIterator.php | 78 +- .../libs/vfsStream/vfsStreamContent.php | 112 +- .../libs/vfsStream/vfsStreamDirectory.php | 208 +- .../libs/vfsStream/vfsStreamException.php | 26 +- .../libs/vfsStream/vfsStreamFile.php | 239 ++- .../libs/vfsStream/vfsStreamWrapper.php | 778 +++---- .../visitor/vfsStreamAbstractVisitor.php | 60 +- .../visitor/vfsStreamPrintVisitor.php | 100 +- .../visitor/vfsStreamStructureVisitor.php | 94 +- .../vfsStream/visitor/vfsStreamVisitor.php | 49 +- 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 | 368 ++-- .../controllers/admin/settingsTest.php | 67 +- .../d3/d3heidelpay/controllers/orderTest.php | 544 +++-- .../controllers/paymentgatewayTest.php | 984 ++++----- .../d3heidelpay/models/communicatorTest.php | 164 +- .../models/containers/parameterTest.php | 90 +- .../models/containers/skeletonTest.php | 90 +- .../d3heidelpay/models/d3_hp_responseTest.php | 1109 +++++----- .../models/d3hpprepaymentdataTest.php | 316 +-- .../d3/d3heidelpay/models/factoryTest.php | 465 ++-- .../models/generators/basketTest.php | 358 ++-- .../models/generators/bodyTest.php | 82 +- ...tnotreferencedtoheidelpayexceptionTest.php | 67 +- .../models/payment/paymentTest.php | 227 +- .../invalidheidelpaydataexceptionTest.php | 67 +- .../exception/invalidtagnameexceptionTest.php | 67 +- .../exception/nobasketexceptionTest.php | 65 +- .../exception/noorderexceptionTest.php | 66 +- .../nopaymentmethodexceptionTest.php | 64 +- .../nopaymentoptionexceptionTest.php | 64 +- .../exception/notransactionuniqueidTest.php | 65 +- ...lpayonlinetransferpaymentexceptionTest.php | 68 +- .../models/request/pattern/patternTest.php | 74 +- .../d3/d3heidelpay/models/request/xmlTest.php | 1882 ++++++++--------- .../d3/d3heidelpay/models/requestTest.php | 297 +-- .../models/response/parserTest.php | 329 +-- .../d3/d3heidelpay/models/responseTest.php | 117 +- .../exception/emptypasswordexceptionTest.php | 64 +- .../emptysecuritysenderexceptionTest.php | 64 +- .../exception/emptyusernameexceptionTest.php | 64 +- .../models/settings/heidelpayTest.php | 546 ++--- .../transactionlog/reader/heidelpayTest.php | 365 ++-- .../reader/testdata/PostData.php | 66 +- .../reader/testdata/xmlInPostData.php | 86 +- .../d3heidelpay/models/verify/inputTest.php | 134 +- .../models/verify/ordercontextTest.php | 210 +- .../models/verify/paymentsuccessTest.php | 66 +- .../d3/d3heidelpay/models/viewconfigTest.php | 731 ++++--- .../controllers/d3_order_heidelpayTest.php | 1400 ++++++------ .../controllers/d3_payment_heidelpayTest.php | 478 ++--- .../modules/core/d3_oxemail_heidelpayTest.php | 195 +- .../models/d3_d3counter_heidelpayTest.php | 120 +- .../d3_oxinputvalidator_heidelpayTest.php | 143 +- .../models/d3_oxorder_heidelpayTest.php | 560 ++--- .../d3_oxpaymentgateway_heidelpayTest.php | 1147 +++++----- tests/unittests/unit/oxPrinter.php | 208 +- tests/unittests/unit/test_config.inc.php | 160 +- tests/unittests/unit/test_utils.php | 1333 ++++++------ 329 files changed, 23280 insertions(+), 22656 deletions(-) create mode 100644 src/out/img/mgw/eps.png create mode 100644 src/out/img/mgw/giropay.png create mode 100644 src/out/img/mgw/przelewy24.png rename src/out/src/css/{d3heidelpayMGW.css => d3unzerMGW.css} (75%) rename src/out/src/js/{d3heidelpay.js => d3unzer.js} (80%) create mode 100644 src/views/flow/tpl/payment/mgw/eps.tpl create mode 100644 src/views/flow/tpl/payment/mgw/giropay.tpl create mode 100644 src/views/flow/tpl/payment/mgw/przelewy24.tpl create mode 100644 src/views/tpl/mgw/eps.tpl create mode 100644 src/views/tpl/mgw/giropay.tpl create mode 100644 src/views/tpl/mgw/przelewy24.tpl create mode 100644 src/views/wave/tpl/payment/mgw/eps.tpl create mode 100644 src/views/wave/tpl/payment/mgw/giropay.tpl create mode 100644 src/views/wave/tpl/payment/mgw/przelewy24.tpl diff --git a/docs/daux/changelog/010_Changelog.md b/docs/daux/changelog/010_Changelog.md index b6db7a84..20f1122c 100644 --- a/docs/daux/changelog/010_Changelog.md +++ b/docs/daux/changelog/010_Changelog.md @@ -1,5 +1,23 @@ --- title: Changelog +--- +## 6.2.5.0 - (2022-05-06) + +### added +- MGW: Zahlart EPS hinzugefügt +- MGW: Zahlart Przelewy24 hinzugefügt +- MGW: Zahlart Giropay hinzugefügt +- Eingabefeld fürden Karteninhaber bei kartenbasierten Zahlarten hinzugefügt +- bei Stornierung einer Zahlung: Auswahlbox für den Stornierungsgrund integriert (Pflicht für die Zahlart 'abgesicherter Rechnungskauf') + +### changed +- Frontend Bestellschritt 3 auf unzerSDK migriert +- Abhängigkeiten der composer.json auf UnzerSDK aktualisiert + +### fixed +- bei Zahlungsart Vorkasse und Rechnung blieb der Status einer Bestellung auf "NOT_FINISHED" +- einige Template-Block-Namen korrigiert + --- ## 6.2.4.0 - (2022-01-14) diff --git a/docs/daux/changelog/030_MGW_Implementation.md b/docs/daux/changelog/030_MGW_Implementation.md index fb232949..21af67b9 100644 --- a/docs/daux/changelog/030_MGW_Implementation.md +++ b/docs/daux/changelog/030_MGW_Implementation.md @@ -25,3 +25,6 @@ Den Zahlungsmitteln entsprechende Formulare werden im Bestellschritt "3. Versand - Paypal - Vorkasse - Sofort +- EPS +- Przelewy24 +- Giropay diff --git a/docs/daux/config.json b/docs/daux/config.json index 43de241a..9b62e1d4 100644 --- a/docs/daux/config.json +++ b/docs/daux/config.json @@ -1,9 +1,9 @@ { "title": " unzer", - "moduleversion": "6.2.4.0", + "moduleversion": "6.2.5.0", "titledesc": "für den Oxid eShop", "author": "D³ Data Development", - "moduledate": "14.01.2022", + "moduledate": "06.05.2022", "editors": "", "tagline": "", "image": "", diff --git a/docs/daux/configuration/040_Schnittstellenwechsel/010_Vorbereitung/050_Zahlarten.md b/docs/daux/configuration/040_Schnittstellenwechsel/010_Vorbereitung/050_Zahlarten.md index 95bb4777..3371cecc 100644 --- a/docs/daux/configuration/040_Schnittstellenwechsel/010_Vorbereitung/050_Zahlarten.md +++ b/docs/daux/configuration/040_Schnittstellenwechsel/010_Vorbereitung/050_Zahlarten.md @@ -13,5 +13,8 @@ In der PaymentApi / MGW-Schnittstelle stehen Ihnen die folgenden Zahlungstypen z - Unzer Direct Debit (Lastschrift mit Zahlungsgarantie - DE/AT) - Unzer Invoice (abgesicherter Rechnungskauf B2C - DE/AT) - Unzer Prepayment (autom. Vorkasse) +- EPS +- Przelewy24 +- Giropay Prüfen Sie bitte, dass Sie ausschließlich die oben genannten Unzer-Zahlarten verwenden möchten. Dann kann das Modul auf PaymentApi / MGW umgestellt werden. \ No newline at end of file diff --git a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md index 2a113d78..c4816ead 100644 --- a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md +++ b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md @@ -17,6 +17,7 @@ title: Systemanforderungen * 6.1.x * 6.2.x * 6.3.x + * 6.4.x * Themes * flow * wave diff --git a/docs/html/changelog/Changelog.html b/docs/html/changelog/Changelog.html index e1e0ffc9..6d760946 100644 --- a/docs/html/changelog/Changelog.html +++ b/docs/html/changelog/Changelog.html @@ -91,23 +91,43 @@
-

6.2.4.0 - (2022-01-14)

+

6.2.5.0 - (2022-05-06)

added

+

changed

+ +

fixed

+ +
+

6.2.4.0 - (2022-01-14)

+

added

+ -

changed

+

changed

-

fixed

+

fixed

diff --git a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Konsole_einrichten.html b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Konsole_einrichten.html index 2ab4704f..7e575f04 100644 --- a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Konsole_einrichten.html +++ b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Konsole_einrichten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Webaufruf_einrichten.html b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Webaufruf_einrichten.html index 1e740b7d..f61cb57c 100644 --- a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Webaufruf_einrichten.html +++ b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Cronjob_per_Webaufruf_einrichten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Cronjob_einrichten/OXID_eShop_Enterprise_Edition.html b/docs/html/configuration/Konfiguration/Cronjob_einrichten/OXID_eShop_Enterprise_Edition.html index bed45a6a..9b1635d3 100644 --- a/docs/html/configuration/Konfiguration/Cronjob_einrichten/OXID_eShop_Enterprise_Edition.html +++ b/docs/html/configuration/Konfiguration/Cronjob_einrichten/OXID_eShop_Enterprise_Edition.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Zahlungseingaenge_bei_Heidelpay_erneut_abrufen.html b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Zahlungseingaenge_bei_Heidelpay_erneut_abrufen.html index 616e5b41..facf5bb4 100644 --- a/docs/html/configuration/Konfiguration/Cronjob_einrichten/Zahlungseingaenge_bei_Heidelpay_erneut_abrufen.html +++ b/docs/html/configuration/Konfiguration/Cronjob_einrichten/Zahlungseingaenge_bei_Heidelpay_erneut_abrufen.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Infos_fuer_Entwickler.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Infos_fuer_Entwickler.html index 80e3396c..5ac15bc3 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Infos_fuer_Entwickler.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Infos_fuer_Entwickler.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_hat_sich_im_Bestellprozess_geaendert.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_hat_sich_im_Bestellprozess_geaendert.html index e9f06dee..71cf34d9 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_hat_sich_im_Bestellprozess_geaendert.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_hat_sich_im_Bestellprozess_geaendert.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_ist_noch_zu_beachten.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_ist_noch_zu_beachten.html index 8c5ebc0e..f946b972 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_ist_noch_zu_beachten.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_ist_noch_zu_beachten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_macht_der_Cronjob.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_macht_der_Cronjob.html index ce87b4be..5e0a2387 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_macht_der_Cronjob.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_macht_der_Cronjob.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_passiert_bei_einem_Refund.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_passiert_bei_einem_Refund.html index 60ced54c..ccefe0af 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_passiert_bei_einem_Refund.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Was_passiert_bei_einem_Refund.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Wie_ist_der_Cronjob_einzurichten.html b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Wie_ist_der_Cronjob_einzurichten.html index eb1e252c..d6301661 100644 --- a/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Wie_ist_der_Cronjob_einzurichten.html +++ b/docs/html/configuration/Konfiguration/Informationen_und_Anleitung_von_iDeal_und_Przelewy24/Wie_ist_der_Cronjob_einzurichten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Konfiguration_der_Zahlungsarten.html b/docs/html/configuration/Konfiguration/Konfiguration_der_Zahlungsarten.html index e89b0346..ace0031c 100644 --- a/docs/html/configuration/Konfiguration/Konfiguration_der_Zahlungsarten.html +++ b/docs/html/configuration/Konfiguration/Konfiguration_der_Zahlungsarten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/Zahlungsinformationen_fuer_Rechnungskauf_und_Vorkasse_anzeigen_lassen.html b/docs/html/configuration/Konfiguration/Zahlungsinformationen_fuer_Rechnungskauf_und_Vorkasse_anzeigen_lassen.html index 063c1e56..19db5be9 100644 --- a/docs/html/configuration/Konfiguration/Zahlungsinformationen_fuer_Rechnungskauf_und_Vorkasse_anzeigen_lassen.html +++ b/docs/html/configuration/Konfiguration/Zahlungsinformationen_fuer_Rechnungskauf_und_Vorkasse_anzeigen_lassen.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Konfiguration/automatische_Vorkasse_und_Rechnungskauf.html b/docs/html/configuration/Konfiguration/automatische_Vorkasse_und_Rechnungskauf.html index 85cc1d20..8a1a55ef 100644 --- a/docs/html/configuration/Konfiguration/automatische_Vorkasse_und_Rechnungskauf.html +++ b/docs/html/configuration/Konfiguration/automatische_Vorkasse_und_Rechnungskauf.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channeleinstellungen.html b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channeleinstellungen.html index 727bee7d..e09c301b 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channeleinstellungen.html +++ b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channeleinstellungen.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channelzuordnungen.html b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channelzuordnungen.html index 8f9e7ab6..f0ed2b7e 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channelzuordnungen.html +++ b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Channelzuordnungen.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Schluesselpaar_eintragen.html b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Schluesselpaar_eintragen.html index f24c532d..7d705c04 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Schluesselpaar_eintragen.html +++ b/docs/html/configuration/Schnittstellenwechsel/Konfiguration/Schluesselpaar_eintragen.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Nacharbeiten.html b/docs/html/configuration/Schnittstellenwechsel/Nacharbeiten.html index 8fab8ff3..dc79ded0 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Nacharbeiten.html +++ b/docs/html/configuration/Schnittstellenwechsel/Nacharbeiten.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Start.html b/docs/html/configuration/Schnittstellenwechsel/Start.html index fde21e03..4b27a4e9 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Start.html +++ b/docs/html/configuration/Schnittstellenwechsel/Start.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Schluesselpaare_finden.html b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Schluesselpaare_finden.html index 99e64c85..a4c85b06 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Schluesselpaare_finden.html +++ b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Schluesselpaare_finden.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Sicherung.html b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Sicherung.html index 10b97600..c0c8a795 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Sicherung.html +++ b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Sicherung.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Unzer_Insights.html b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Unzer_Insights.html index 2ecbe3db..78489205 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Unzer_Insights.html +++ b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Unzer_Insights.html @@ -91,7 +91,7 @@
diff --git a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Zahlarten.html b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Zahlarten.html index e6ca7338..7d3bb169 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Zahlarten.html +++ b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/Zahlarten.html @@ -91,7 +91,7 @@
@@ -106,6 +106,9 @@
  • Unzer Direct Debit (Lastschrift mit Zahlungsgarantie - DE/AT)
  • Unzer Invoice (abgesicherter Rechnungskauf B2C - DE/AT)
  • Unzer Prepayment (autom. Vorkasse)
  • +
  • EPS
  • +
  • Przelewy24
  • +
  • Giropay
  • Prüfen Sie bitte, dass Sie ausschließlich die oben genannten Unzer-Zahlarten verwenden möchten. Dann kann das Modul auf PaymentApi / MGW umgestellt werden.

    diff --git a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/was_wird_benoetigt.html b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/was_wird_benoetigt.html index 3011390d..eebacff2 100644 --- a/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/was_wird_benoetigt.html +++ b/docs/html/configuration/Schnittstellenwechsel/Vorbereitung/was_wird_benoetigt.html @@ -91,7 +91,7 @@
    diff --git a/docs/html/configuration/index.html b/docs/html/configuration/index.html index 771d10ea..cbe54413 100644 --- a/docs/html/configuration/index.html +++ b/docs/html/configuration/index.html @@ -91,7 +91,7 @@
    diff --git a/docs/html/description/Beschreibung.html b/docs/html/description/Beschreibung.html index 2175ee48..a7e401bd 100644 --- a/docs/html/description/Beschreibung.html +++ b/docs/html/description/Beschreibung.html @@ -91,7 +91,7 @@
    diff --git a/docs/html/description/Editionsunterschiede.html b/docs/html/description/Editionsunterschiede.html index 4be84e86..810c9d8d 100644 --- a/docs/html/description/Editionsunterschiede.html +++ b/docs/html/description/Editionsunterschiede.html @@ -91,7 +91,7 @@
    diff --git a/docs/html/index.html b/docs/html/index.html index 9306cba8..cdbe7522 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -48,7 +48,7 @@
    -
    Autor: D³ Data Development
    Stand: 14.01.2022
    +
    Autor: D³ Data Development
    Stand: 06.05.2022
    Version wechseln: diff --git a/src/views/flow/tpl/mgw/missingfields.tpl b/src/views/flow/tpl/mgw/missingfields.tpl index cc36bb31..0ded7a54 100644 --- a/src/views/flow/tpl/mgw/missingfields.tpl +++ b/src/views/flow/tpl/mgw/missingfields.tpl @@ -1,18 +1,18 @@ -[{if isset($d3HeidelpayMissingUserParameter[$oxidPaymentId])}] -
    - [{foreach from=$d3HeidelpayMissingUserParameter[$oxidPaymentId] item="heidelpayFieldname" key="oxidFieldname"}] +[{if isset($d3UnzerMissingUserParameter[$oxidPaymentId])}] +
    + [{foreach from=$d3UnzerMissingUserParameter[$oxidPaymentId] item="unzerFieldname" key="oxidFieldname"}] [{if $oxidFieldname == 'oxbirthdate'}]
    -
    -
    -
    @@ -32,7 +32,7 @@
    - +
    @@ -40,6 +40,6 @@ [{/foreach}]
    [{else}] -
    [{$d3HeidelpayMissingUserParameter|@debug_print_var}]
    +
    [{$d3UnzerMissingUserParameter|@debug_print_var}]
    [{$oxidPaymentId}]
    [{/if}] \ No newline at end of file diff --git a/src/views/flow/tpl/payment/mgw/eps.tpl b/src/views/flow/tpl/payment/mgw/eps.tpl new file mode 100644 index 00000000..1faf53e0 --- /dev/null +++ b/src/views/flow/tpl/payment/mgw/eps.tpl @@ -0,0 +1,46 @@ +[{assign var="sImageUrl" value=$oViewConf->getModuleUrl('d3heidelpay','out/img/mgw/')}] +[{block name="heidelpay_eps"}] +
    +
    +
    + getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]> + +
    +
    + [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}] + [{if $oPaymentPrice->getPrice()}] + [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}] + ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}] + [{if $oPaymentPrice->getVatValue() > 0}] + [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}] + [{/if}]) + [{else}] + ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}]) + [{/if}] + [{/if}] + [{include file="d3_heidelpay_views_flow_mgw_missingfields.tpl" oxidPaymentId=$sPaymentID}] + + [{include file="d3_heidelpay_views_tpl_mgw_eps.tpl" paymentId=$sPaymentID selectorId="payment_`$sPaymentID`"}] + + [{block name="checkout_payment_longdesc"}] + [{if $paymentmethod->oxpayments__oxlongdesc->value}] +
    +
    +
    + [{$paymentmethod->oxpayments__oxlongdesc->getRawValue()}] +
    +
    +
    + [{/if}] + [{/block}] +
    +
    +
    +[{/block}] diff --git a/src/views/flow/tpl/payment/mgw/giropay.tpl b/src/views/flow/tpl/payment/mgw/giropay.tpl new file mode 100644 index 00000000..dd675f92 --- /dev/null +++ b/src/views/flow/tpl/payment/mgw/giropay.tpl @@ -0,0 +1,46 @@ +[{assign var="sImageUrl" value=$oViewConf->getModuleUrl('d3heidelpay','out/img/mgw/')}] +[{block name="heidelpay_giropay"}] +
    +
    +
    + getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]> + +
    +
    + [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}] + [{if $oPaymentPrice->getPrice()}] + [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}] + ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}] + [{if $oPaymentPrice->getVatValue() > 0}] + [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}] + [{/if}]) + [{else}] + ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}]) + [{/if}] + [{/if}] + [{include file="d3_heidelpay_views_flow_mgw_missingfields.tpl" oxidPaymentId=$sPaymentID}] + + [{include file="d3_heidelpay_views_tpl_mgw_giropay.tpl" paymentId=$sPaymentID selectorId="payment_`$sPaymentID`"}] + + [{block name="checkout_payment_longdesc"}] + [{if $paymentmethod->oxpayments__oxlongdesc->value}] +
    +
    +
    + [{$paymentmethod->oxpayments__oxlongdesc->getRawValue()}] +
    +
    +
    + [{/if}] + [{/block}] +
    +
    +
    +[{/block}] diff --git a/src/views/flow/tpl/payment/mgw/przelewy24.tpl b/src/views/flow/tpl/payment/mgw/przelewy24.tpl new file mode 100644 index 00000000..15ffa053 --- /dev/null +++ b/src/views/flow/tpl/payment/mgw/przelewy24.tpl @@ -0,0 +1,46 @@ +[{assign var="sImageUrl" value=$oViewConf->getModuleUrl('d3heidelpay','out/img/mgw/')}] +[{block name="heidelpay_przelewy"}] +
    +
    +
    + getCheckedPaymentId() == $paymentmethod->oxpayments__oxid->value}]checked[{/if}]> + +
    +
    + [{assign var="oPaymentPrice" value=$paymentmethod->getPrice()}] + [{if $oPaymentPrice->getPrice()}] + [{if $oViewConf->isFunctionalityEnabled('blShowVATForPayCharge')}] + ([{oxprice price=$oPaymentPrice->getNettoPrice() currency=$currency}] + [{if $oPaymentPrice->getVatValue() > 0}] + [{oxmultilang ident="PLUS_VAT"}] [{oxprice price=$oPaymentPrice->getVatValue() currency=$currency}] + [{/if}]) + [{else}] + ([{oxprice price=$oPaymentPrice->getBruttoPrice() currency=$currency}]) + [{/if}] + [{/if}] + [{include file="d3_heidelpay_views_flow_mgw_missingfields.tpl" oxidPaymentId=$sPaymentID}] + + [{include file="d3_heidelpay_views_tpl_mgw_przelewy24.tpl" paymentId=$sPaymentID selectorId="payment_`$sPaymentID`"}] + + [{block name="checkout_payment_longdesc"}] + [{if $paymentmethod->oxpayments__oxlongdesc->value}] +
    +
    +
    + [{$paymentmethod->oxpayments__oxlongdesc->getRawValue()}] +
    +
    +
    + [{/if}] + [{/block}] +
    +
    +
    +[{/block}] diff --git a/src/views/tpl/mgw/cards.tpl b/src/views/tpl/mgw/cards.tpl index 38f58d0e..8700fa7f 100644 --- a/src/views/tpl/mgw/cards.tpl +++ b/src/views/tpl/mgw/cards.tpl @@ -1,22 +1,26 @@ -
    +
    -
    +
    +
    +
    +
    +
    -
    +
    -
    +
    -