From afc57f92bb4a2deb13dcf88907eb6686957d9e9e Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Tue, 27 Aug 2019 12:22:04 +0700
Subject: [PATCH 1/6] Resolve No validate "Day" in PayPal Express Checkout
 Settings issue24302

---
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index d5287659ee7d2..86887ae2b6cb7 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -348,6 +348,7 @@
                 <depends>
                     <field id="payment_action">Order</field>
                 </depends>
+                <validate>validate-zero-or-greater validate-digits</validate>
             </field>
             <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
                 <label>Order Valid Period (days)</label>
@@ -357,6 +358,7 @@
                 <depends>
                     <field id="payment_action">Order</field>
                 </depends>
+                <validate>validate-zero-or-greater validate-digits</validate>
             </field>
             <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
                 <label>Number of Child Authorizations</label>

From 35befe1985f88d8832a1b3654329a288b29bc4ab Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Tue, 27 Aug 2019 12:33:57 +0700
Subject: [PATCH 2/6] Resolve No validate "Proxy Port" in Paypal Module (Paypal
 Express, Paypal Payflow -Link, Pro, Advanced) issue24304

---
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml     | 1 +
 .../Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml     | 1 +
 app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml    | 1 +
 .../Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index d5287659ee7d2..9dffb61b6f960 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -124,6 +124,7 @@
                     <depends>
                         <field id="use_proxy">1</field>
                     </depends>
+                    <validate>validate-digits validate-zero-or-greater</validate>
                 </field>
             </group>
             <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index cba36916c3305..4d9b7dcf0492d 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -76,6 +76,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
+                    <validate>validate-digits validate-zero-or-greater</validate>
                 </field>
                 <field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index ed11e8ba18d07..234ed5c37c1b6 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -77,6 +77,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
+                    <validate>validate-digits validate-zero-or-greater</validate>
                 </field>
                 <field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index e5a0319bdc1bf..7930027d3d085 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -72,6 +72,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
+                    <validate>validate-digits validate-zero-or-greater</validate>
                 </field>
             </group>
             <field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">

From 57db0ea78210d5d70ff844aad7ad5ee29ef67d9b Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Tue, 27 Aug 2019 12:44:27 +0700
Subject: [PATCH 3/6] Resolve Many field has no validate number in Checkout
 settings issue24307

---
 app/code/Magento/Checkout/etc/adminhtml/system.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 11e3ba5f3ed9a..c66ce0b487790 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -27,12 +27,14 @@
                 </field>
                 <field id="max_items_display_count" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Number of Items to Display in Order Summary</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
             </group>
             <group id="cart" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Shopping Cart</label>
                 <field id="delete_quote_after" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Quote Lifetime (days)</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="redirect_to_cart" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>After Adding a Product Redirect to Shopping Cart</label>
@@ -40,6 +42,7 @@
                 </field>
                 <field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Pager</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Show Cross-sell Items in the Shopping Cart</label>
@@ -61,9 +64,11 @@
                 </field>
                 <field id="count" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Scrollbar</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="max_items_display_count" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Number of Items to Display</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
             </group>
             <group id="payment_failed" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">

From 66f8376d8d40d43c54c2ae6becd721eb16b4f9de Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Tue, 27 Aug 2019 13:05:44 +0700
Subject: [PATCH 4/6] Resolve "Send Payment Failed Email Copy To" field has no
 validate email issue24312

---
 app/code/Magento/Checkout/etc/adminhtml/system.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 11e3ba5f3ed9a..64dae36c4b719 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -83,6 +83,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Payment Failed Email Copy To</label>
+                    <validate>validate-emails</validate>
                     <comment>Separate by ",".</comment>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">

From 8cc0b25f98aad08fc00c40dc63dd1d983e068d7e Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Tue, 27 Aug 2019 14:49:33 +0700
Subject: [PATCH 5/6] Validate port range issue 24304

---
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml    | 2 +-
 .../Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml    | 2 +-
 app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml   | 2 +-
 .../Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 9dffb61b6f960..1d72d3a86e4be 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -124,7 +124,7 @@
                     <depends>
                         <field id="use_proxy">1</field>
                     </depends>
-                    <validate>validate-digits validate-zero-or-greater</validate>
+                    <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
             </group>
             <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index 4d9b7dcf0492d..492d4b2ac9ce4 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -76,7 +76,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
-                    <validate>validate-digits validate-zero-or-greater</validate>
+                    <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
                 <field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index 234ed5c37c1b6..2e25dd6a66124 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -77,7 +77,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
-                    <validate>validate-digits validate-zero-or-greater</validate>
+                    <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
                 <field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index 7930027d3d085..91396d2a95ac2 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -72,7 +72,7 @@
                         <field id="use_proxy">1</field>
                     </depends>
                     <attribute type="shared">1</attribute>
-                    <validate>validate-digits validate-zero-or-greater</validate>
+                    <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
                 </field>
             </group>
             <field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">

From 21b91d92bec2d2367c9c038b2ef676b04e1456b0 Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Thu, 29 Aug 2019 18:36:38 +0700
Subject: [PATCH 6/6] Validate proxy port issue 24312

---
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml   | 3 ++-
 .../Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml   | 3 ++-
 app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml  | 3 ++-
 .../Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml  | 3 ++-
 app/code/Magento/Paypal/i18n/en_US.csv                         | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 9301b5ffbde8f..04d5fae435816 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -117,8 +117,9 @@
                         <field id="use_proxy">1</field>
                     </depends>
                 </field>
-                <field id="proxy_port" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
                     <label>Proxy Port</label>
+                    <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>paypal/wpp/proxy_port</config_path>
                     <attribute type="shared">1</attribute>
                     <depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index 492d4b2ac9ce4..1ae0b52146c38 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -69,8 +69,9 @@
                     </depends>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
                     <label>Proxy Port</label>
+                    <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>payment/payflow_advanced/proxy_port</config_path>
                     <depends>
                         <field id="use_proxy">1</field>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index 2e25dd6a66124..ead70eca3fadd 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -70,8 +70,9 @@
                     </depends>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="proxy_port" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
                     <label>Proxy Port</label>
+                    <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>payment/payflow_link/proxy_port</config_path>
                     <depends>
                         <field id="use_proxy">1</field>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
index 91396d2a95ac2..c87a781f36c00 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -65,8 +65,9 @@
                     </depends>
                     <attribute type="shared">1</attribute>
                 </field>
-                <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
+                <field id="proxy_port" translate="label comment" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
                     <label>Proxy Port</label>
+                    <comment>Please enter at least 0 and at most 65535</comment>
                     <config_path>payment/payflowpro/proxy_port</config_path>
                     <depends>
                         <field id="use_proxy">1</field>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index e7264a6de807f..4e47c4c1f9e9f 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -737,3 +737,4 @@ User,User
 "PayPal Credit","PayPal Credit"
 "PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
 "Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
+"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"