From 987a98c1451ff5da40c50afff7f1b0199f3d41ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Mon, 4 Mar 2024 16:06:11 +0100 Subject: [PATCH] MAG2-305 - Paydirekt is now Giropay --- Helper/Payment.php | 2 +- Model/Methods/Paydirekt.php | 6 ++++ Model/Source/GuaranteeTime.php | 35 +++++++++++++++++++ etc/adminhtml/system.xml | 8 ++--- etc/adminhtml/system/payone_paydirekt.xml | 17 +++++++-- etc/config.xml | 14 ++++---- etc/payment.xml | 4 +-- i18n/de_DE.csv | 5 +++ view/frontend/layout/checkout_index_index.xml | 4 +-- .../web/js/view/payment/payone-payments.js | 4 +-- 10 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 Model/Source/GuaranteeTime.php diff --git a/Helper/Payment.php b/Helper/Payment.php index f47e5a5d..5fde9f1f 100644 --- a/Helper/Payment.php +++ b/Helper/Payment.php @@ -48,7 +48,7 @@ class Payment extends \Payone\Core\Helper\Base PayoneConfig::METHOD_ADVANCE_PAYMENT, PayoneConfig::METHOD_INVOICE, PayoneConfig::METHOD_OBT_SOFORTUEBERWEISUNG, - PayoneConfig::METHOD_OBT_GIROPAY, + #PayoneConfig::METHOD_OBT_GIROPAY,#Giropay has been disabled, Paydirekt is now Giropay PayoneConfig::METHOD_OBT_EPS, PayoneConfig::METHOD_OBT_POSTFINANCE_EFINANCE, PayoneConfig::METHOD_OBT_POSTFINANCE_CARD, diff --git a/Model/Methods/Paydirekt.php b/Model/Methods/Paydirekt.php index db184418..3f2df516 100644 --- a/Model/Methods/Paydirekt.php +++ b/Model/Methods/Paydirekt.php @@ -86,8 +86,14 @@ public function getPaymentSpecificParameters(Order $oOrder) $aParams['add_paydata[terminal_address_streetnumber]'] = '';// IS THIS NECESSARY? $aParams['add_paydata[terminal_address_zip]'] = $this->shopHelper->getConfigParam('postcode', 'store_information', 'general'); $aParams['add_paydata[terminal_id]'] = $this->shopHelper->getConfigParam('name', 'store_information', 'general'); + } + $blSecuredOrder = (bool)$this->getCustomConfigParam('order_secured'); + if ($blSecuredOrder === true && $this->getAuthorizationMode() == PayoneConfig::REQUEST_TYPE_PREAUTHORIZATION) { // params only available with preauth + $aParams['add_paydata[order_secured]'] = 'yes'; + $aParams['add_paydata[preauthorization_validity]'] = (int)$this->getCustomConfigParam('preauthorization_validity'); } + return $aParams; } diff --git a/Model/Source/GuaranteeTime.php b/Model/Source/GuaranteeTime.php new file mode 100644 index 00000000..e2591776 --- /dev/null +++ b/Model/Source/GuaranteeTime.php @@ -0,0 +1,35 @@ +iAllowedDaysMin; $i <= $this->iAllowedDaysMax; $i ++) { + $aOptions[] = [ + 'value' => $i, + 'label' => $i, + ]; + } + return $aOptions; + } +} diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 9b6e986c..593038fd 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -141,11 +141,11 @@ Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping Payone\Core\Model\Config\Backend\SerializedOrJson - + Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping @@ -177,7 +177,7 @@ Payone\Core\Model\Config\Backend\SerializedOrJson - + Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping Payone\Core\Model\Config\Backend\SerializedOrJson @@ -306,7 +306,7 @@ - + diff --git a/etc/adminhtml/system/payone_paydirekt.xml b/etc/adminhtml/system/payone_paydirekt.xml index deb5a528..c8432d1f 100644 --- a/etc/adminhtml/system/payone_paydirekt.xml +++ b/etc/adminhtml/system/payone_paydirekt.xml @@ -26,7 +26,7 @@ --> - + Magento\Config\Model\Config\Source\Yesno @@ -40,7 +40,20 @@ payment/payone_paydirekt/title - + + + With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period. Only available in preauthorization mode. + Magento\Config\Model\Config\Source\Yesno + + + + + 1 + + With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period. + Payone\Core\Model\Source\GuaranteeTime + + Magento\Sales\Model\Config\Source\Order\Status\NewStatus payment/payone_paydirekt/order_status diff --git a/etc/config.xml b/etc/config.xml index 81521eb5..24b72e96 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -92,7 +92,7 @@ 0 payone - + 1 Authorization @@ -160,7 +160,7 @@ Authorization Payone\Core\Model\Methods\Paydirekt pending - PAYONE paydirekt + PAYONE Giropay 0 payone @@ -376,7 +376,7 @@ {"_1338893611948_948":{"txaction":"appointed","state_status":"processing"}} {"_1338893618715_715":{"txaction":"appointed","state_status":"pending"},"_1458214328719_719":{"txaction":"paid","state_status":"processing"}} {"_1343137411652_152":{"txaction":"appointed","state_status":"processing"}} - {"_1343137411652_252":{"txaction":"appointed","state_status":"processing"}} + {"_1343137411652_352":{"txaction":"appointed","state_status":"processing"}} {"_1343137411652_452":{"txaction":"appointed","state_status":"processing"}} {"_1343137411652_552":{"txaction":"appointed","state_status":"processing"}} @@ -481,9 +481,9 @@ 1 - + 1 @@ -504,6 +504,8 @@ 1 + 0 + 15 1 diff --git a/etc/payment.xml b/etc/payment.xml index aa2916d7..92e2fa5e 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -52,9 +52,9 @@ 0 - + 0 diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv index b09145d6..1f79975b 100644 --- a/i18n/de_DE.csv +++ b/i18n/de_DE.csv @@ -1042,6 +1042,11 @@ "Billing address as delivery address","Rechnungsadresse als Lieferadresse" "Transmit the billing address as delivery address if delivery address is missing.","Rechnungsadresse bei fehlender Lieferadresse als Lieferadresse übergeben." +"Secured order","Gesicherte Vorbestellung" +"With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period. Only available in preauthorization mode.","Bei einer gesicherten Vorbestellung wird dem Händler eine Zahlunqsgarantie für den gewählten Zeitraum (maximal 15 Kalendertage) gewährt. Captures (Teilzahlungen) müssen immer innerhalb des Garantiezeitraums ausgeruhrt werden. Nur im Vorautorisierung Modus verfügbar." +"Guarantee time period","Garantiezeitraum" +"Desired guarantee time period (max. 15 running days) für a secured order.","Gewünschter Garantiezeitraum (maximal 15 Kalendertage) für eine gesicherte Vorbestellung." + "PayPal Express Enabled","PayPal Express aktiviert" "An error occured during the PayPal Express transaction.","Während der PayPal Express Transaktion ist ein Fehler aufgetreten." "Please sign in to check out.","Bitte loggen Sie sich ein für den Einkauf." diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index fa56efdb..3e546985 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -73,9 +73,9 @@ true - + true diff --git a/view/frontend/web/js/view/payment/payone-payments.js b/view/frontend/web/js/view/payment/payone-payments.js index ee500b09..fc9d93ff 100644 --- a/view/frontend/web/js/view/payment/payone-payments.js +++ b/view/frontend/web/js/view/payment/payone-payments.js @@ -60,10 +60,10 @@ define( type: 'payone_obt_sofortueberweisung', component: 'Payone_Core/js/view/payment/method-renderer/obt_sofortueberweisung-method' }, - { + /*{ type: 'payone_obt_giropay', component: 'Payone_Core/js/view/payment/method-renderer/obt_giropay-method' - }, + }, Giropay has been disabled, Paydirekt is now Giropay */ { type: 'payone_obt_eps', component: 'Payone_Core/js/view/payment/method-renderer/obt_eps-method'