From f85b5b8b197b0bc4944fafb063b280eea34c1b4f Mon Sep 17 00:00:00 2001
From: leon-zhang-awx <leon.zhang.ctr@airwallex.com>
Date: Mon, 6 May 2024 17:18:42 +0800
Subject: [PATCH] Update display text in admin page to improve user clarity

---
 etc/adminhtml/system/card.xml               |  5 ++--
 etc/adminhtml/system/express.xml            | 29 ++++++++++++---------
 etc/adminhtml/system/express/apple_pay.xml  |  4 +--
 etc/adminhtml/system/express/google_pay.xml | 14 +++++-----
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/etc/adminhtml/system/card.xml b/etc/adminhtml/system/card.xml
index 91a3f16..a2ca816 100644
--- a/etc/adminhtml/system/card.xml
+++ b/etc/adminhtml/system/card.xml
@@ -19,7 +19,8 @@
     <group id="card" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Credit Card</label>
         <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" canRestore="1">
-            <label>Enable</label>
+            <label>Enable/Disable</label>
+            <comment>Enable Credit Card</comment>
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>payment/airwallex_payments_card/active</config_path>
         </field>
@@ -29,7 +30,7 @@
             <config_path>payment/airwallex_payments_card/title</config_path>
         </field>
         <field id="airwallex_payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
-            <label>Payment Action</label>
+            <label>Capture Preferences</label>
             <source_model>Airwallex\Payments\Model\Config\Source\PaymentAction</source_model>
             <config_path>payment/airwallex_payments_card/airwallex_payment_action</config_path>
         </field>
diff --git a/etc/adminhtml/system/express.xml b/etc/adminhtml/system/express.xml
index 88c0f12..9a2bfc8 100644
--- a/etc/adminhtml/system/express.xml
+++ b/etc/adminhtml/system/express.xml
@@ -7,22 +7,16 @@
         <label>Express Checkout</label>
         <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1"
                canRestore="1">
-            <label>Enable</label>
+            <label>Enable/Disable</label>
+            <comment>
+                <![CDATA[Enable Express Checkout]]>
+            </comment>
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>payment/airwallex_payments_express/active</config_path>
         </field>
-        <field id="airwallex_payment_action" translate="label" type="select" sortOrder="30" showInDefault="1"
-               showInWebsite="0" showInStore="0">
-            <label>Payment Action</label>
-            <source_model>Airwallex\Payments\Model\Config\Source\PaymentAction</source_model>
-            <config_path>payment/airwallex_payments_express/airwallex_payment_action</config_path>
-            <depends>
-                <field id="active">1</field>
-            </depends>
-        </field>
         <field id="locations" translate="label" type="multiselect" sortOrder="5" showInDefault="1" showInWebsite="1"
                showInStore="1">
-            <label>Locations</label>
+            <label>Show Button On</label>
             <source_model>Airwallex\Payments\Model\Config\Source\Express\DisplayArea</source_model>
             <config_path>payment/airwallex_payments_express/display_area</config_path>
             <depends>
@@ -31,15 +25,24 @@
         </field>
         <field id="seller_name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1"
                showInStore="1">
-            <label>Seller name</label>
+            <label>Store Name</label>
             <comment>
-                <![CDATA[This is the text that appears as PAY SELLER NAME in the payment modal.]]>
+                <![CDATA[The store name your shoppers will see during payment]]>
             </comment>
             <config_path>payment/airwallex_payments_express/seller_name</config_path>
             <depends>
                 <field id="active">1</field>
             </depends>
         </field>
+        <field id="airwallex_payment_action" translate="label" type="select" sortOrder="30" showInDefault="1"
+               showInWebsite="0" showInStore="0">
+            <label>Capture Preferences</label>
+            <source_model>Airwallex\Payments\Model\Config\Source\PaymentAction</source_model>
+            <config_path>payment/airwallex_payments_express/airwallex_payment_action</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
 <!--        <include path="Airwallex_Payments::system/express/apple_pay.xml"/>-->
         <include path="Airwallex_Payments::system/express/google_pay.xml"/>
     </group>
diff --git a/etc/adminhtml/system/express/apple_pay.xml b/etc/adminhtml/system/express/apple_pay.xml
index de851df..4a34450 100644
--- a/etc/adminhtml/system/express/apple_pay.xml
+++ b/etc/adminhtml/system/express/apple_pay.xml
@@ -3,12 +3,12 @@
     <group id="apple_pay" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Apple Pay</label>
         <field id="button_theme" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Button theme</label>
+            <label>Button Theme</label>
             <source_model>Airwallex\Payments\Model\Config\Source\Express\ApplePay\ButtonTheme</source_model>
             <config_path>payment/airwallex_payments_express/apple_pay_button_theme</config_path>
         </field>
         <field id="button_type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Button type</label>
+            <label>Call To Action</label>
             <source_model>Airwallex\Payments\Model\Config\Source\Express\ApplePay\ButtonType</source_model>
             <config_path>payment/airwallex_payments_express/apple_pay_button_type</config_path>
         </field>
diff --git a/etc/adminhtml/system/express/google_pay.xml b/etc/adminhtml/system/express/google_pay.xml
index 01dd136..64ce419 100644
--- a/etc/adminhtml/system/express/google_pay.xml
+++ b/etc/adminhtml/system/express/google_pay.xml
@@ -3,19 +3,19 @@
     <group id="google_pay" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
         <label>Google Pay</label>
         <field id="button_theme" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Button theme</label>
+            <label>Button Theme</label>
             <source_model>Airwallex\Payments\Model\Config\Source\Express\GooglePay\ButtonTheme</source_model>
             <config_path>payment/airwallex_payments_express/google_pay_button_theme</config_path>
         </field>
         <field id="button_type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Button type</label>
+            <label>Call To Action</label>
             <source_model>Airwallex\Payments\Model\Config\Source\Express\GooglePay\ButtonType</source_model>
             <config_path>payment/airwallex_payments_express/google_pay_button_type</config_path>
         </field>
-        <field id="sort_order" translate="label" type="text" sortOrder="210" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Sort Order</label>
-            <frontend_class>validate-number</frontend_class>
-            <config_path>payment/airwallex_payments_express/google_pay_sort_order</config_path>
-        </field>
+<!--        <field id="sort_order" translate="label" type="text" sortOrder="210" showInDefault="1" showInWebsite="1" showInStore="1">-->
+<!--            <label>Sort Order</label>-->
+<!--            <frontend_class>validate-number</frontend_class>-->
+<!--            <config_path>payment/airwallex_payments_express/google_pay_sort_order</config_path>-->
+<!--        </field>-->
     </group>
 </include>