[Magento Community Engineering] Community Contributions - 2.4-develop

- merged latest code from mainline branch
magento · Apr 8, 2020 · a9c148c · a9c148c
2 parents 5b7af4b + e344d30
commit a9c148c
Show file tree

Hide file tree

Showing 364 changed files with 31 additions and 25,856 deletions.
diff --git a/app/code/Magento/Analytics/etc/di.xml b/app/code/Magento/Analytics/etc/di.xml
@@ -161,15 +161,13 @@
                 <item name="25" xsi:type="string">payment/banktransfer/active</item>
                 <item name="26" xsi:type="string">payment/cashondelivery/title</item>
                 <item name="27" xsi:type="string">payment/cashondelivery/active</item>
-                <item name="28" xsi:type="string">payment/authorizenet_directpost/title</item>
-                <item name="29" xsi:type="string">payment/authorizenet_directpost/active</item>
-                <item name="30" xsi:type="string">payment/paypal_billing_agreement/title</item>
-                <item name="31" xsi:type="string">payment/paypal_billing_agreement/active</item>
-                <item name="32" xsi:type="string">payment/braintree/title</item>
-                <item name="33" xsi:type="string">payment/braintree/active</item>
-                <item name="34" xsi:type="string">payment/braintree_paypal/title</item>
-                <item name="35" xsi:type="string">payment/braintree_paypal/active</item>
-                <item name="36" xsi:type="string">analytics/general/vertical</item>
+                <item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
+                <item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
+                <item name="30" xsi:type="string">payment/braintree/title</item>
+                <item name="31" xsi:type="string">payment/braintree/active</item>
+                <item name="32" xsi:type="string">payment/braintree_paypal/title</item>
+                <item name="33" xsi:type="string">payment/braintree_paypal/active</item>
+                <item name="34" xsi:type="string">analytics/general/vertical</item>
             </argument>
         </arguments>
     </type>

diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php
diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
diff --git a/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php b/app/code/Magento/Authorizenet/Block/Transparent/Iframe.php
diff --git a/...gento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php b/...gento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/AddConfigured.php
diff --git a/...code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php b/...code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Cancel.php
diff --git a/...thorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php b/...thorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureProductToAdd.php
diff --git a/...Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php b/...Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/ConfigureQuoteItems.php
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Index.php
diff --git a/...e/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php b/...e/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/LoadBlock.php