Merge pull request #45 from paynl/feature/PLUG-991

PLUG-991 - Updated texts
paynl · Jun 17, 2022 · 6639af0 · 6639af0
2 parents b8be4ba + b402ffd
commit 6639af0
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 39 deletions.
diff --git a/Model/Config/Source/InstorePickupAddress.php b/Model/Config/Source/InstorePickupAddress.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Paynl\Payment\Model\Config\Source;
+
+use \Magento\Framework\Option\ArrayInterface;
+
+class InstorePickupAddress implements ArrayInterface
+{
+
+    /**
+     * Options getter
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $arrOptions = $this->toArray();
+
+        $arrResult = [];
+        foreach ($arrOptions as $value => $label) {
+            $arrResult[] = ['value' => $value, 'label' => $label];
+        }
+        return $arrResult;
+    }
+
+    /**
+     * Get options in "key-value" format
+     *
+     * @return array
+     */
+
+    public function toArray()
+    {
+        return [
+            '0' => __('Leave shipping address unchanged (Default)'),
+            '1' => __('Use billing address as shipping address'),
+        ];
+    }
+}
diff --git a/etc/adminhtml/paymentmethods/afterpay.xml b/etc/adminhtml/paymentmethods/afterpay.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_afterpay/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>

diff --git a/etc/adminhtml/paymentmethods/afterpay_international.xml b/etc/adminhtml/paymentmethods/afterpay_international.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_afterpay_international/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>

diff --git a/etc/adminhtml/paymentmethods/billink.xml b/etc/adminhtml/paymentmethods/billink.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_billink/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>

diff --git a/etc/adminhtml/paymentmethods/capayable.xml b/etc/adminhtml/paymentmethods/capayable.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_capayable/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
@@ -192,4 +192,3 @@
         </group>
     </group>
 </include>
-
diff --git a/etc/adminhtml/paymentmethods/capayable_gespreid.xml b/etc/adminhtml/paymentmethods/capayable_gespreid.xml
@@ -171,15 +171,6 @@
             <config_path>payment/paynl_payment_capayable_gespreid/turn_off_invoices_b2b</config_path>
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
-        <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
-            <depends>
-                <field id="active">1</field>
-            </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-            <config_path>payment/paynl_payment_capayable_gespreid/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
-        </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
             <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
@@ -192,4 +183,3 @@
         </group>
     </group>
 </include>
-
diff --git a/etc/adminhtml/paymentmethods/focum.xml b/etc/adminhtml/paymentmethods/focum.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_focum/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
@@ -192,4 +192,3 @@
         </group>
     </group>
 </include>
-
diff --git a/etc/adminhtml/paymentmethods/klarna.xml b/etc/adminhtml/paymentmethods/klarna.xml
@@ -172,13 +172,13 @@
             <comment><![CDATA[Set to `Yes` to disable creating invoices for business orders]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_klarna/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
@@ -192,4 +192,3 @@
         </group>
     </group>
 </include>
-
diff --git a/etc/adminhtml/paymentmethods/spraypay.xml b/etc/adminhtml/paymentmethods/spraypay.xml
@@ -163,13 +163,13 @@
             <comment><![CDATA[Show payment method only to specific customer groups.]]></comment>
         </field>
         <field id="forcebilling" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Force Billing Address for Instore Pickups</label>
+            <label>Instore Pickup Address</label>
             <depends>
                 <field id="active">1</field>
             </depends>
-            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <source_model>Paynl\Payment\Model\Config\Source\InstorePickupAddress</source_model>
             <config_path>payment/paynl_payment_spraypay/useBillingAddressInstorePickup</config_path>
-            <comment><![CDATA[Use the Billing address as Shipping address for instore pickups.]]></comment>
+            <comment><![CDATA[Select how shipping address should be handled in case of instore pickup.]]></comment>
         </field>
         <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
@@ -183,4 +183,3 @@
         </group>
     </group>
 </include>
-
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -123,9 +123,11 @@
 "You must first agree to the payment terms.","You must first agree to the payment terms."
 "Yes, as dropdown","Yes, as dropdown"
 "Yes, as list","Yes, as list"
-"Force Billing Address for Instore Pickups","Force Billing Address for Instore Pickups"
-"Use the Billing address as Shipping address for instore pickups.","Use the Billing address as Shipping address for instore pickups."
+"Instore Pickup Address","Instore Pickup Address"
+"Select how shipping address should be handled in case of instore pickup.","Select how shipping address should be handled in case of instore pickup."
 "Transfer analytics to PAY.","Transfer analytics to PAY."
 "Disable","Disable"
 "Select whether you want to use PAY. as Google Analytics proxy.","Select whether you want to use PAY. as Google Analytics proxy."
 "Set which product data to use as product ID in the PAY. backend.","Stel in welke productgegevens u wilt gebruiken als product-ID in de PAY. backend."
+"Leave shipping address unchanged (Default)","Leave shipping address unchanged (Default)"
+"Use billing address as shipping address","Use billing address as shipping address"
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
@@ -126,9 +126,11 @@
 "You must first agree to the payment terms.","U dient eerst akkoord te gaan met de betalingsvoorwaarden."
 "Yes, as dropdown","Ja, als dropdown"
 "Yes, as list","Ja, als lijst"
-"Force Billing Address for Instore Pickups","Factuuradres forceren voor afhalingen in de winkel"
-"Use the Billing address as Shipping address for instore pickups.","Gebruik factuuradres als bezorgadres voor het afhalen in de winkel."
+"Instore Pickup Address","Instore Pickup Address"
+"Select how shipping address should be handled in case of instore pickup.","Selecteer hoe om te gaan met bezorgadres in het gaval van Instore Pickup."
 "Transfer analytics to PAY.","Stuur analytics via PAY."
 "Disable","Uitzetten"
 "Select whether you want to use PAY. as Google Analytics proxy.","Geef aan of u PAY. als Google Analytics proxy wilt gebruiken."
 "Set which product data to use as product ID in the PAY. backend.","Set which product data to use as product ID in the PAY. backend."
+"Leave shipping address unchanged (Default)","Pas verzendadres niet aan (standaard)"
+"Use billing address as shipping address","Gebruik factuuradres als verzendadres"