Skip to content

Commit 26a2b86

Browse files
authored
ENGCOM-5710: Resolve "Send Payment Failed Email Copy To" field has no validate email issue24312 #24313
2 parents 6de4937 + bb764e0 commit 26a2b86

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-4
lines changed

app/code/Magento/Checkout/etc/adminhtml/system.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@
2727
</field>
2828
<field id="max_items_display_count" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2929
<label>Maximum Number of Items to Display in Order Summary</label>
30+
<validate>validate-zero-or-greater validate-digits</validate>
3031
</field>
3132
</group>
3233
<group id="cart" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
3334
<label>Shopping Cart</label>
3435
<field id="delete_quote_after" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
3536
<label>Quote Lifetime (days)</label>
37+
<validate>validate-zero-or-greater validate-digits</validate>
3638
</field>
3739
<field id="redirect_to_cart" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3840
<label>After Adding a Product Redirect to Shopping Cart</label>
3941
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
4042
</field>
4143
<field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4244
<label>Number of Items to Display Pager</label>
45+
<validate>validate-zero-or-greater validate-digits</validate>
4346
</field>
4447
<field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4548
<label>Show Cross-sell Items in the Shopping Cart</label>
@@ -61,9 +64,11 @@
6164
</field>
6265
<field id="count" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
6366
<label>Number of Items to Display Scrollbar</label>
67+
<validate>validate-zero-or-greater validate-digits</validate>
6468
</field>
6569
<field id="max_items_display_count" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
6670
<label>Maximum Number of Items to Display</label>
71+
<validate>validate-zero-or-greater validate-digits</validate>
6772
</field>
6873
</group>
6974
<group id="payment_failed" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -83,6 +88,7 @@
8388
</field>
8489
<field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
8590
<label>Send Payment Failed Email Copy To</label>
91+
<validate>validate-emails</validate>
8692
<comment>Separate by ",".</comment>
8793
</field>
8894
<field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">

app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,15 @@
117117
<field id="use_proxy">1</field>
118118
</depends>
119119
</field>
120-
<field id="proxy_port" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
120+
<field id="proxy_port" translate="label comment" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
121121
<label>Proxy Port</label>
122+
<comment>Please enter at least 0 and at most 65535</comment>
122123
<config_path>paypal/wpp/proxy_port</config_path>
123124
<attribute type="shared">1</attribute>
124125
<depends>
125126
<field id="use_proxy">1</field>
126127
</depends>
128+
<validate>validate-digits validate-digits-range digits-range-0-65535</validate>
127129
</field>
128130
</group>
129131
<field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
@@ -348,6 +350,7 @@
348350
<depends>
349351
<field id="payment_action">Order</field>
350352
</depends>
353+
<validate>validate-zero-or-greater validate-digits</validate>
351354
</field>
352355
<field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
353356
<label>Order Valid Period (days)</label>
@@ -357,6 +360,7 @@
357360
<depends>
358361
<field id="payment_action">Order</field>
359362
</depends>
363+
<validate>validate-zero-or-greater validate-digits</validate>
360364
</field>
361365
<field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
362366
<label>Number of Child Authorizations</label>

app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,15 @@
6969
</depends>
7070
<attribute type="shared">1</attribute>
7171
</field>
72-
<field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
72+
<field id="proxy_port" translate="label comment" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
7373
<label>Proxy Port</label>
74+
<comment>Please enter at least 0 and at most 65535</comment>
7475
<config_path>payment/payflow_advanced/proxy_port</config_path>
7576
<depends>
7677
<field id="use_proxy">1</field>
7778
</depends>
7879
<attribute type="shared">1</attribute>
80+
<validate>validate-digits validate-digits-range digits-range-0-65535</validate>
7981
</field>
8082
<field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
8183
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>

app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,15 @@
7070
</depends>
7171
<attribute type="shared">1</attribute>
7272
</field>
73-
<field id="proxy_port" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
73+
<field id="proxy_port" translate="label comment" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
7474
<label>Proxy Port</label>
75+
<comment>Please enter at least 0 and at most 65535</comment>
7576
<config_path>payment/payflow_link/proxy_port</config_path>
7677
<depends>
7778
<field id="use_proxy">1</field>
7879
</depends>
7980
<attribute type="shared">1</attribute>
81+
<validate>validate-digits validate-digits-range digits-range-0-65535</validate>
8082
</field>
8183
<field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
8284
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>

app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@
6565
</depends>
6666
<attribute type="shared">1</attribute>
6767
</field>
68-
<field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
68+
<field id="proxy_port" translate="label comment" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
6969
<label>Proxy Port</label>
70+
<comment>Please enter at least 0 and at most 65535</comment>
7071
<config_path>payment/payflowpro/proxy_port</config_path>
7172
<depends>
7273
<field id="use_proxy">1</field>
7374
</depends>
7475
<attribute type="shared">1</attribute>
76+
<validate>validate-digits validate-digits-range digits-range-0-65535</validate>
7577
</field>
7678
</group>
7779
<field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">

app/code/Magento/Paypal/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,3 +737,4 @@ User,User
737737
"PayPal Credit","PayPal Credit"
738738
"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
739739
"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
740+
"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"

0 commit comments

Comments
 (0)