From 438545baac92c63c578431041ebd194f6fab5b03 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 20 Aug 2024 13:39:57 +0200 Subject: [PATCH] BP-3698-Adjust the default Riverty name for Magento 2 Refactor --- Block/Adminhtml/Config/Support/SupportTab.php | 2 +- Helper/Data.php | 6 +++--- Model/ConfigProvider/Method/Afterpay.php | 2 +- Model/Method/DefaultTitles.php | 6 +++--- .../Adminhtml/Config/Support/SupportTabTest.php | 2 +- etc/adminhtml/system/payment_methods/afterpay.xml | 12 ++++++------ etc/adminhtml/system/payment_methods/afterpay2.xml | 12 ++++++------ .../system/payment_methods/afterpay20.xml | 8 ++++---- etc/config.xml | 6 +++--- i18n/de_DE.csv | 6 +++--- i18n/es_ES.csv | 6 +++--- i18n/fr_FR.csv | 4 ++-- i18n/nl_BE.csv | 6 +++--- i18n/nl_NL.csv | 14 +++++++------- view/adminhtml/templates/supportTab.phtml | 2 +- .../payment/buckaroo_magento2_afterpay.html | 2 +- .../payment/buckaroo_magento2_afterpay20.html | 2 +- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Block/Adminhtml/Config/Support/SupportTab.php b/Block/Adminhtml/Config/Support/SupportTab.php index 06a72565f..ef8b312f4 100644 --- a/Block/Adminhtml/Config/Support/SupportTab.php +++ b/Block/Adminhtml/Config/Support/SupportTab.php @@ -39,7 +39,7 @@ class SupportTab extends Template implements RendererInterface * @var array */ private array $phpVersionSupport = [ - '2.4' => ['7.4' => ['+'], '8.1' => ['+'], '8.2' => ['+']], + '2.4' => ['8.1' => ['+'], '8.2' => ['+'], '8.3' => ['+']], ]; /** diff --git a/Helper/Data.php b/Helper/Data.php index 5f2aa33ca..7a200c914 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -453,9 +453,9 @@ public function getJson() public function getPaymentMethodsList() { return [ - ['value' => 'afterpay', 'label' => __('Riverty | Afterpay (old)')], - ['value' => 'afterpay2', 'label' => __('Riverty | Afterpay 2 (old)')], - ['value' => 'afterpay20', 'label' => __('Riverty | Afterpay')], + ['value' => 'afterpay', 'label' => __('Riverty (old)')], + ['value' => 'afterpay2', 'label' => __('Riverty 2 (old)')], + ['value' => 'afterpay20', 'label' => __('Riverty')], ['value' => 'alipay', 'label' => __('Alipay')], ['value' => 'applepay', 'label' => __('Apple Pay')], ['value' => 'billink', 'label' => __('Billink')], diff --git a/Model/ConfigProvider/Method/Afterpay.php b/Model/ConfigProvider/Method/Afterpay.php index 75d282825..159b11ee7 100644 --- a/Model/ConfigProvider/Method/Afterpay.php +++ b/Model/ConfigProvider/Method/Afterpay.php @@ -54,7 +54,7 @@ public function getConfig(): array } /** - * This setting determines whether you accept Riverty | Afterpay payments for B2C, B2B or both customer types + * This setting determines whether you accept Riverty payments for B2C, B2B or both customer types * businessMethod 1 = B2C * businessMethod 2 = B2B * businessMethod 3 = Both diff --git a/Model/Method/DefaultTitles.php b/Model/Method/DefaultTitles.php index d16fae3c9..b0357cc92 100644 --- a/Model/Method/DefaultTitles.php +++ b/Model/Method/DefaultTitles.php @@ -25,9 +25,9 @@ class DefaultTitles { protected static array $labels = [ - 'afterpay' => 'Riverty | Afterpay', - 'afterpay2' => 'Riverty | Afterpay', - 'afterpay20' => 'Riverty | Afterpay', + 'afterpay' => 'Riverty', + 'afterpay2' => 'Riverty', + 'afterpay20' => 'Riverty', 'billink' => 'Billink', 'payperemail' => 'PayPerEmail', 'paylink' => 'PayLink', diff --git a/Test/Unit/Block/Adminhtml/Config/Support/SupportTabTest.php b/Test/Unit/Block/Adminhtml/Config/Support/SupportTabTest.php index 9f36f4e00..ea28748f0 100644 --- a/Test/Unit/Block/Adminhtml/Config/Support/SupportTabTest.php +++ b/Test/Unit/Block/Adminhtml/Config/Support/SupportTabTest.php @@ -69,7 +69,7 @@ public function testWithDifferentMagentoVersionsAndPhpVersions(string $version, public function getVersionsDataProvider(): array { return [ - ['2.4.5', '7.4, 8.1, 8.2', 1], + ['2.4.5', '8.1, 8.2, 8.3', 1], ['6.6.6', 'Cannot determine compatible PHP versions', 0] ]; } diff --git a/etc/adminhtml/system/payment_methods/afterpay.xml b/etc/adminhtml/system/payment_methods/afterpay.xml index 0debc75bb..9cde01dcf 100644 --- a/etc/adminhtml/system/payment_methods/afterpay.xml +++ b/etc/adminhtml/system/payment_methods/afterpay.xml @@ -22,11 +22,11 @@ - + Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - + Buckaroo\Magento2\Model\Config\Source\Enablemode payment/buckaroo_magento2_afterpay/active @@ -76,15 +76,15 @@ - - + + Buckaroo\Magento2\Model\Config\Source\AfterpayPaymentMethods payment/buckaroo_magento2_afterpay/payment_method - - + + Buckaroo\Magento2\Model\Config\Source\Business payment/buckaroo_magento2_afterpay/business diff --git a/etc/adminhtml/system/payment_methods/afterpay2.xml b/etc/adminhtml/system/payment_methods/afterpay2.xml index 94166203b..b833895b5 100644 --- a/etc/adminhtml/system/payment_methods/afterpay2.xml +++ b/etc/adminhtml/system/payment_methods/afterpay2.xml @@ -22,11 +22,11 @@ - + Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - + Buckaroo\Magento2\Model\Config\Source\Enablemode payment/buckaroo_magento2_afterpay2/active @@ -76,15 +76,15 @@ - - + + Buckaroo\Magento2\Model\Config\Source\Afterpay2PaymentMethods payment/buckaroo_magento2_afterpay2/payment_method - - + + Buckaroo\Magento2\Model\Config\Source\Business payment/buckaroo_magento2_afterpay2/business diff --git a/etc/adminhtml/system/payment_methods/afterpay20.xml b/etc/adminhtml/system/payment_methods/afterpay20.xml index 0c8707faf..e82a15068 100644 --- a/etc/adminhtml/system/payment_methods/afterpay20.xml +++ b/etc/adminhtml/system/payment_methods/afterpay20.xml @@ -22,11 +22,11 @@ - + Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - + Buckaroo\Magento2\Model\Config\Source\Enablemode payment/buckaroo_magento2_afterpay20/active @@ -94,8 +94,8 @@ - - + + Buckaroo\Magento2\Model\Config\Source\AfterpayCustomerType payment/buckaroo_magento2_afterpay20/customer_type diff --git a/etc/config.xml b/etc/config.xml index 9e5415f01..e7b69376b 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -357,7 +357,7 @@ 0 AfterpayOldFacade pending - Buckaroo Riverty | Afterpay + Buckaroo Riverty 0 150 1 @@ -384,7 +384,7 @@ 0 AfterpayOldFacade2 pending - Buckaroo Riverty | Afterpay 2 + Buckaroo Riverty 2 0 160 1 @@ -637,7 +637,7 @@ 0 AfterpayFacade pending - Buckaroo Riverty | Afterpay + Buckaroo Riverty 0 240 1 diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv index caf6ffae3..e715feff0 100644 --- a/i18n/de_DE.csv +++ b/i18n/de_DE.csv @@ -232,8 +232,8 @@ "Adjustment Refund","Anpassungsrückerstattung" "Adjustment Fee","Anpassungsgebühr" "Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Leider ist bei der Verarbeitung Ihrer Zahlung ein Fehler aufgetreten. Bitte versuche es erneut. Wenn dieser Fehler weiterhin besteht, wählen Sie bitte eine andere Zahlungsmethode." -"Riverty | Afterpay","Riverty | Afterpay" -"Enable Riverty | Afterpay","Riverty | Afterpay activieren" +"Riverty","Riverty" +"Enable Riverty","Riverty activieren" "Giftcard","Geschenkkarte" "Enable Giftcard","Geschenkkarte aktivieren" "PayPerEmail","PayPerEmail" @@ -287,7 +287,7 @@ "Terms and Conditions:","Geschäftsbedingungen:" "Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." "Not Applicable","Unzutreffend" -"Yes, I accept the terms and condition for the use of Riverty | Afterpay.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty | Afterpay." +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty." "Accept terms of use","Akzeptieren Sie die Allgemeinen Geschäftsbedingungen" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Irgendwelche Kommentare zu dieser Beta-Version? Lass uns wissen! " diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv index 835cf594b..c17cec490 100644 --- a/i18n/es_ES.csv +++ b/i18n/es_ES.csv @@ -234,8 +234,8 @@ "Adjustment Refund","Reembolso de ajuste" "Adjustment Fee","Tarifa de ajuste" "Unfortunately an error occurred while processing your payment. Please try again. If this error persists","Se ha producido un error al procesar el pago. Inténtelo de nuevo. Si el error continúa produciéndose, elija un método de pago diferente." -"Riverty | Afterpay","Riverty | Afterpay" -"Enable Riverty | Afterpay","Activar Riverty | Afterpay" +"Riverty","Riverty" +"Enable Riverty","Activar Riverty" "Giftcard","Giftcard" "Enable Giftcard","Activar Giftcard" "PayPerEmail","PayPerEmail" @@ -295,7 +295,7 @@ "Please make sure all fields are filled in correctly before proceeding.","Antes de continuar, compruebe que ha rellenado todos los campos correctamente." "Not Applicable","No aplicable" "Yes","Sí" -"Yes, I accept the terms and condition for the use of Riverty | Afterpay.","Sí, acepto los términos y condiciones de uso de Riverty | Afterpay." +"Yes, I accept the terms and condition for the use of Riverty.","Sí, acepto los términos y condiciones de uso de Riverty." "Accept terms of use","Aceptar los términos de uso" "(DD/MM/YYYY)","(DD/MM/AAAA)" "Any comments about this Beta release? Please let us know! ","Quiere comentarnos algo acerca de esta versión beta? ¡Cuéntenoslo! " diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv index fb20533eb..9d3d67e4d 100644 --- a/i18n/fr_FR.csv +++ b/i18n/fr_FR.csv @@ -232,8 +232,8 @@ "Adjustment Refund","Remboursement d'ajustement" "Adjustment Fee","Frais d'ajustement" "Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Malheureusement, une erreur s'est produite lors du traitement de votre paiement. Veuillez réessayer. Si cette erreur persiste, veuillez choisir un autre mode de paiement." -"Riverty | Afterpay","Riverty | Afterpay" -"Enable Riverty | Afterpay","Activer Riverty | Afterpay" +"Riverty","Riverty" +"Enable Riverty","Activer Riverty" "Giftcard","Carte cadeau" "Enable Giftcard","Activer la carte-cadeau" "PayPerEmail","PayPerEmail" diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv index 7dce15d73..273e2fc36 100644 --- a/i18n/nl_BE.csv +++ b/i18n/nl_BE.csv @@ -232,8 +232,8 @@ "Adjustment Refund","Aanpassingsbetaling" "Adjustment Fee","Aanpassingstoeslag" "Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Er is een fout opgetreden tijdens het verwerken van uw betaling. Probeer het opnieuw. Als deze fout aanhoudt, kies dan een andere betaalmethode." -"Riverty | Afterpay","Riverty | Afterpay" -"Enable Riverty | Afterpay","Riverty | Afterpay inschakelen" +"Riverty","Riverty" +"Enable Riverty","Riverty inschakelen" "Giftcard","Cadeaukaarten" "Enable Giftcard","Cadeaukaarten inschakelen" "PayPerEmail","PayPerEmail" @@ -291,7 +291,7 @@ "Terms and Conditions:","Algemene voorwaarden:" "Please make sure all fields are filled in correctly before proceeding.","Zorg ervoor dat alle velden correct ingevuld zijn voordat u doorgaat." "Not Applicable","Niet van toepassing" -"Yes, I accept the terms and condition for the use of Riverty | Afterpay.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty | Afterpay" +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty" "Accept terms of use","Accepteer algemene voorwaarden" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Heeft u opmerkingen over deze Beta release? Laat het ons weten! " diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 6806d1618..03718ddd6 100644 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -232,8 +232,8 @@ "Adjustment Refund","Aanpassingsbetaling" "Adjustment Fee","Aanpassingstoeslag" "Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Er is een fout opgetreden tijdens het verwerken van uw betaling. Probeer het opnieuw. Als deze fout aanhoudt, kies dan een andere betaalmethode." -"Riverty | Afterpay","Riverty | Afterpay" -"Enable Riverty | Afterpay","Riverty | Afterpay inschakelen" +"Riverty","Riverty" +"Enable Riverty","Riverty inschakelen" "Giftcard","Cadeaukaarten" "Enable Giftcard","Cadeaukaarten inschakelen" "PayPerEmail","PayPerEmail" @@ -291,7 +291,7 @@ "Terms and Conditions:","Algemene voorwaarden:" "Please make sure all fields are filled in correctly before proceeding.","Zorg ervoor dat alle velden correct ingevuld zijn voordat u doorgaat." "Not Applicable","Niet van toepassing" -"Yes, I accept the terms and condition for the use of Riverty | Afterpay.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty | Afterpay" +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty" "Accept terms of use","Accepteer algemene voorwaarden" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Heeft u opmerkingen over deze Beta release? Laat het ons weten! " @@ -634,8 +634,8 @@ "Unique User-Agent","Unieke User-Agent" "The payment method will be shown only when the User-Agent matches this configuration value. The payment method will always be shown when this value is empty.","De betaalmethode wordt alleen getoond wanneer de User-Agent overeenkomt met deze configuratiewaarde. De betaalmethode wordt altijd getoond wanneer deze waarde leeg is." "By default in case of active Point of Sale all other payment methods will be explicitly hidden.","Standaard worden bij actieve point of sale alle andere betaalmethoden expliciet verborgen." -"Riverty | Afterpay payment method","Riverty | Afterpay betaalmethode" -"Select which paymethod must be used at Riverty | Afterpay.","Selecteer welke betaalmethode moet worden gebruikt bij Riverty | Afterpay." +"Riverty payment method","Riverty betaalmethode" +"Select which paymethod must be used at Riverty.","Selecteer welke betaalmethode moet worden gebruikt bij Riverty." "High VAT tax classes","Hoog btw-tarief classificaties" "Select which tax classes count as 'high' VAT.","Selecteer welke belastingklassen worden beschouwd als 'hoog' BTW-tarief." "Middle VAT tax classes","Belastingklassen met een gemiddeld BTW-tarief" @@ -646,10 +646,10 @@ "Select which tax classes count as 'zero' VAT.","Selecteer welke belastingklassen worden beschouwd als 'nul' BTW-tarief." "No VAT tax classes","Belastingklassen zonder BTW" "Select which tax classes count as 'no' VAT.","Selecteer welke belastingklassen worden beschouwd als 'geen' BTW." -"Enable Riverty | Afterpay 2","Riverty | Afterpay 2 inschakelen" +"Enable Riverty 2","Riverty 2 inschakelen" "Enable Strong Customer Authentication","Strong Customer Authentication inschakelen" "Strong Customer Authentication (also known as SCA) fulfills a set of regulatory requirements, designed to reduce fraud, making online payments more secure while establishing trust with consumers.","Strong Customer Authentication (ook wel bekend als SCA) voldoet aan een reeks wettelijke vereisten die zijn ontworpen om fraude te verminderen, waardoor online betalingen veiliger worden en het vertrouwen van consumenten wordt versterkt." -"Riverty | Afterpay customer type","Klanttype voor Riverty | Afterpay" +"Riverty customer type","Klanttype voor Riverty" "Min order amount for B2B (in Base Currency)","Minimale bestelhoeveelheid voor B2B (in standaard valuta)" "Max order amount for B2B (in Base Currency)","Maximale bestelhoeveelheid voor B2B (in standaard valuta)" "Enable iDIN verification","iDIN verificatie inschakelen" \ No newline at end of file diff --git a/view/adminhtml/templates/supportTab.phtml b/view/adminhtml/templates/supportTab.phtml index 1b5e30500..bd78a50a4 100644 --- a/view/adminhtml/templates/supportTab.phtml +++ b/view/adminhtml/templates/supportTab.phtml @@ -38,7 +38,7 @@

escapeHtml(__('Supported versions:'));?>

escapeHtml(__('Magento versions'));?>:

-

2.4.4, 2.4.5, 2.4.6

+

2.4.5, 2.4.6, 2.4.7

escapeHtml(__('PHP versions'));?>:

diff --git a/view/frontend/web/template/payment/buckaroo_magento2_afterpay.html b/view/frontend/web/template/payment/buckaroo_magento2_afterpay.html index 8010f442b..12ea65ff9 100644 --- a/view/frontend/web/template/payment/buckaroo_magento2_afterpay.html +++ b/view/frontend/web/template/payment/buckaroo_magento2_afterpay.html @@ -180,7 +180,7 @@ diff --git a/view/frontend/web/template/payment/buckaroo_magento2_afterpay20.html b/view/frontend/web/template/payment/buckaroo_magento2_afterpay20.html index 340e88dd8..cac48cf2d 100644 --- a/view/frontend/web/template/payment/buckaroo_magento2_afterpay20.html +++ b/view/frontend/web/template/payment/buckaroo_magento2_afterpay20.html @@ -134,7 +134,7 @@