Skip to content

BP-3698-Adjust the default Riverty name for Magento 2 Refactor #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2024
Merged

BP-3698-Adjust the default Riverty name for Magento 2 Refactor #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Block/Adminhtml/Config/Support/SupportTab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' => ['+']],
];

/**
Expand Down
6 changes: 3 additions & 3 deletions Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')],
Expand Down
2 changes: 1 addition & 1 deletion Model/ConfigProvider/Method/Afterpay.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Model/Method/DefaultTitles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion Test/Unit/Block/Adminhtml/Config/Support/SupportTabTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
];
}
Expand Down
12 changes: 6 additions & 6 deletions etc/adminhtml/system/payment_methods/afterpay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
<!-- Afterpay Payment method group -->
<group id="buckaroo_magento2_afterpay" translate="label" type="text" sortOrder="240" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay (old)</label>
<label>Riverty (old)</label>
<frontend_model>Buckaroo\Magento2\Block\Config\Form\Field\Fieldset</frontend_model>

<field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enable Riverty | Afterpay</label>
<label>Enable Riverty</label>
<comment><![CDATA[Enable or disable this payment method.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Enablemode</source_model>
<config_path>payment/buckaroo_magento2_afterpay/active</config_path>
Expand Down Expand Up @@ -76,15 +76,15 @@
<label>Method specific configuration</label>

<field id="payment_method" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty | Afterpay.]]></comment>
<label>Riverty payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\AfterpayPaymentMethods</source_model>
<config_path>payment/buckaroo_magento2_afterpay/payment_method</config_path>
</field>

<field id="business" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty | Afterpay.]]></comment>
<label>Riverty payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Business</source_model>
<config_path>payment/buckaroo_magento2_afterpay/business</config_path>
<depends>
Expand Down
12 changes: 6 additions & 6 deletions etc/adminhtml/system/payment_methods/afterpay2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
<!-- Afterpay Payment method group -->
<group id="buckaroo_magento2_afterpay2" translate="label" type="text" sortOrder="250" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay 2 (old)</label>
<label>Riverty 2 (old)</label>
<frontend_model>Buckaroo\Magento2\Block\Config\Form\Field\Fieldset</frontend_model>

<field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enable Riverty | Afterpay 2</label>
<label>Enable Riverty 2</label>
<comment><![CDATA[Enable or disable this payment method.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Enablemode</source_model>
<config_path>payment/buckaroo_magento2_afterpay2/active</config_path>
Expand Down Expand Up @@ -76,15 +76,15 @@
<label>Method specific configuration</label>

<field id="payment_method" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay 2 payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty | Afterpay.]]></comment>
<label>Riverty 2 payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Afterpay2PaymentMethods</source_model>
<config_path>payment/buckaroo_magento2_afterpay2/payment_method</config_path>
</field>

<field id="business" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay 2 payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty | Afterpay.]]></comment>
<label>Riverty 2 payment method</label>
<comment><![CDATA[Select which paymethod must be used at Riverty.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Business</source_model>
<config_path>payment/buckaroo_magento2_afterpay2/business</config_path>
<depends>
Expand Down
8 changes: 4 additions & 4 deletions etc/adminhtml/system/payment_methods/afterpay20.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
<!-- Afterpay Payment method group -->
<group id="buckaroo_magento2_afterpay20" translate="label" type="text" sortOrder="260" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay</label>
<label>Riverty</label>
<frontend_model>Buckaroo\Magento2\Block\Config\Form\Field\Fieldset</frontend_model>

<field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enable Riverty | Afterpay</label>
<label>Enable Riverty</label>
<comment><![CDATA[Enable or disable this payment method.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\Enablemode</source_model>
<config_path>payment/buckaroo_magento2_afterpay20/active</config_path>
Expand Down Expand Up @@ -94,8 +94,8 @@
<group id="buckaroo_magento2_default" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Method specific configuration</label>
<field id="customer_type" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Riverty | Afterpay customer type</label>
<comment><![CDATA[This setting determines whether you accept Riverty | Afterpay payments for B2C, B2B or both customer types. When B2B is selected, this method is only shown when a company name is entered in the checkout process.]]></comment>
<label>Riverty customer type</label>
<comment><![CDATA[This setting determines whether you accept Riverty payments for B2C, B2B or both customer types. When B2B is selected, this method is only shown when a company name is entered in the checkout process.]]></comment>
<source_model>Buckaroo\Magento2\Model\Config\Source\AfterpayCustomerType</source_model>
<config_path>payment/buckaroo_magento2_afterpay20/customer_type</config_path>
</field>
Expand Down
6 changes: 3 additions & 3 deletions etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
<active>0</active>
<model>AfterpayOldFacade</model>
<order_status>pending</order_status>
<title>Buckaroo Riverty | Afterpay</title>
<title>Buckaroo Riverty</title>
<allowspecific>0</allowspecific>
<sort_order>150</sort_order>
<order_email>1</order_email>
Expand All @@ -384,7 +384,7 @@
<active>0</active>
<model>AfterpayOldFacade2</model>
<order_status>pending</order_status>
<title>Buckaroo Riverty | Afterpay 2</title>
<title>Buckaroo Riverty 2</title>
<allowspecific>0</allowspecific>
<sort_order>160</sort_order>
<order_email>1</order_email>
Expand Down Expand Up @@ -637,7 +637,7 @@
<active>0</active>
<model>AfterpayFacade</model>
<order_status>pending</order_status>
<title>Buckaroo Riverty | Afterpay</title>
<title>Buckaroo Riverty</title>
<allowspecific>0</allowspecific>
<sort_order>240</sort_order>
<order_email>1</order_email>
Expand Down
6 changes: 3 additions & 3 deletions i18n/de_DE.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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? <a target=\"_blank\" href=\"%s\"> Please let us know! </a>","Irgendwelche Kommentare zu dieser Beta-Version? <a target=\"_blank\" href=\"%s\"> Lass uns wissen! </a>"
Expand Down
6 changes: 3 additions & 3 deletions i18n/es_ES.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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? <a target=\"_blank\" href=\"%s\"> Please let us know! </a>","Quiere comentarnos algo acerca de esta versión beta? <a target=\"_blank\" href=\"%s\"> ¡Cuéntenoslo! </a>"
Expand Down
4 changes: 2 additions & 2 deletions i18n/fr_FR.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions i18n/nl_BE.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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? <a target=\"_blank\" href=\"%s\"> Please let us know! </a>","Heeft u opmerkingen over deze Beta release? <a target=\"_blank\" href=\"%s\"> Laat het ons weten! </a>"
Expand Down
14 changes: 7 additions & 7 deletions i18n/nl_NL.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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? <a target=\"_blank\" href=\"%s\"> Please let us know! </a>","Heeft u opmerkingen over deze Beta release? <a target=\"_blank\" href=\"%s\"> Laat het ons weten! </a>"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Loading
Loading