MAGETWO-93065: [GitHub] PayPal standard settings for active/sandbox m…

…ode not carried across #545
magento · Jul 5, 2018 · 51d4b77 · 51d4b77
1 parent 0e5a522
commit 51d4b77
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/etc/commerce-to-commerce/settings.xml.dist b/etc/commerce-to-commerce/settings.xml.dist
@@ -706,9 +706,6 @@
         <ignore>
             <path>payment/payflow_link/mobile_optimized</path>
         </ignore>
-        <ignore>
-            <path>payment/paypal_wps_express/active</path>
-        </ignore>
         <ignore>
             <path>payment/verisign/active</path>
         </ignore>
@@ -1449,6 +1446,14 @@
             <path>payment/paypaluk_express_bml/active</path>
             <to>payment/payflow_express_bml/active</to>
         </rename>
+        <rename>
+            <path>payment/paypal_standard/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
+        <rename>
+            <path>payment/paypal_wps_express/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
         <rename>
             <path>promo/enterprise_reminder/enabled</path>
             <to>promo/magento_reminder/enabled</to>

diff --git a/etc/opensource-to-commerce/settings.xml.dist b/etc/opensource-to-commerce/settings.xml.dist
@@ -691,9 +691,6 @@
         <ignore>
             <path>payment/payflow_link/mobile_optimized</path>
         </ignore>
-        <ignore>
-            <path>payment/paypal_wps_express/active</path>
-        </ignore>
         <ignore>
             <path>payment/verisign/active</path>
         </ignore>
@@ -1117,6 +1114,14 @@
             <path>payment/paypaluk_express_bml/active</path>
             <to>payment/payflow_express_bml/active</to>
         </rename>
+        <rename>
+            <path>payment/paypal_standard/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
+        <rename>
+            <path>payment/paypal_wps_express/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
         <rename>
             <path>rss/order/status_notified</path>
             <to>rss/order/status</to>

diff --git a/etc/opensource-to-opensource/settings.xml.dist b/etc/opensource-to-opensource/settings.xml.dist
@@ -691,9 +691,6 @@
         <ignore>
             <path>payment/payflow_link/mobile_optimized</path>
         </ignore>
-        <ignore>
-            <path>payment/paypal_wps_express/active</path>
-        </ignore>
         <ignore>
             <path>payment/verisign/active</path>
         </ignore>
@@ -1117,6 +1114,14 @@
             <path>payment/paypaluk_express_bml/active</path>
             <to>payment/payflow_express_bml/active</to>
         </rename>
+        <rename>
+            <path>payment/paypal_standard/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
+        <rename>
+            <path>payment/paypal_wps_express/active</path>
+            <to>payment/wps_express/active</to>
+        </rename>
         <rename>
             <path>rss/order/status_notified</path>
             <to>rss/order/status</to>