Skip to content

Resolve "Send Payment Failed Email Copy To" field has no validate email issue24312 #24313

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
magento-engcom-team merged 9 commits into from
Sep 2, 2019
Merged

Resolve "Send Payment Failed Email Copy To" field has no validate email issue24312 #24313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afc57f9
Resolve No validate "Day" in PayPal Express Checkout Settings issue24302
quocviet312 Aug 27, 2019
35befe1
Resolve No validate "Proxy Port" in Paypal Module (Paypal Express, Pa…
quocviet312 Aug 27, 2019
57db0ea
Resolve Many field has no validate number in Checkout settings issue2…
quocviet312 Aug 27, 2019
66f8376
Resolve "Send Payment Failed Email Copy To" field has no validate ema…
quocviet312 Aug 27, 2019
8cc0b25
Validate port range issue 24304
quocviet312 Aug 27, 2019
c68b200
Merge pull request https://github.com/magento/magento2/pull/24309 to …
magento-engcom-team Aug 28, 2019
aca055b
Merge pull request https://github.com/magento/magento2/pull/24303 to …
magento-engcom-team Aug 28, 2019
f48c62b
Merge pull request https://github.com/magento/magento2/pull/24305 to …
magento-engcom-team Aug 28, 2019
21b91d9
Validate proxy port issue 24312
quocviet312 Aug 29, 2019
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
6 changes: 6 additions & 0 deletions app/code/Magento/Checkout/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,22 @@
</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>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</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>
Expand All @@ -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">
Expand All @@ -83,6 +88,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">
Expand Down
6 changes: 5 additions & 1 deletion app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@
<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>
<field id="use_proxy">1</field>
</depends>
<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">
Expand Down Expand Up @@ -348,6 +350,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>
Expand All @@ -357,6 +360,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>
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@
</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>
</depends>
<attribute type="shared">1</attribute>
<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>
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,15 @@
</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>
</depends>
<attribute type="shared">1</attribute>
<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>
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@
</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>
</depends>
<attribute type="shared">1</attribute>
<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">
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Paypal/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"