MC-19515: Cart price rule based on payment methods not applied in checkout

- Fix static

Author: viktym

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml

@@ -24,12 +24,6 @@
             <magentoCLI command="config:set {{AdminFreeshippingActiveConfigData.path}} {{AdminFreeshippingActiveConfigData.enabled}}" stepKey="enableFreeShippingMethod" />
             <magentoCLI command="config:set {{AdminFreeshippingMinimumOrderAmountConfigData.path}} {{AdminFreeshippingMinimumOrderAmountConfigData.hundred}}" stepKey="setFreeShippingMethodMinimumOrderAmountToBe100" />
 
-            <!--Set Fedex configs data-->
-            <magentoCLI command="config:set {{AdminFedexEnableForCheckoutConfigData.path}} {{AdminFedexEnableForCheckoutConfigData.value}}" stepKey="enableCheckout"/>
-            <magentoCLI command="config:set {{AdminFedexEnableSandboxModeConfigData.path}} {{AdminFedexEnableSandboxModeConfigData.value}}" stepKey="enableSandbox"/>
-            <magentoCLI command="config:set {{AdminFedexEnableDebugConfigData.path}} {{AdminFedexEnableDebugConfigData.value}}" stepKey="enableDebug"/>
-            <magentoCLI command="config:set {{AdminFedexEnableShowMethodConfigData.path}} {{AdminFedexEnableShowMethodConfigData.value}}" stepKey="enableShowMethod"/>
-
             <!--Set StoreInformation configs data-->
             <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} '{{AdminGeneralSetStoreNameConfigData.value}}'" stepKey="setStoreInformationName"/>
             <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.telephone}}" stepKey="setStoreInformationPhone"/>
@@ -72,10 +66,6 @@
             <magentoCLI command="config:set {{AdminFreeshippingMinimumOrderAmountConfigData.path}} {{AdminFreeshippingMinimumOrderAmountConfigData.default}}" stepKey="setFreeShippingMethodMinimumOrderAmountAsDefault" />
             <magentoCLI command="config:set {{AdminFreeshippingActiveConfigData.path}} {{AdminFreeshippingActiveConfigData.disabled}}" stepKey="disableFreeShippingMethod" />
             <!--Reset configs-->
-            <magentoCLI command="config:set {{AdminFedexDisableForCheckoutConfigData.path}} {{AdminFedexDisableForCheckoutConfigData.value}}" stepKey="disableCheckout"/>
-            <magentoCLI command="config:set {{AdminFedexDisableSandboxModeConfigData.path}} {{AdminFedexDisableSandboxModeConfigData.value}}" stepKey="disableSandbox"/>
-            <magentoCLI command="config:set {{AdminFedexDisableDebugConfigData.path}} {{AdminFedexDisableDebugConfigData.value}}" stepKey="disableDebug"/>
-            <magentoCLI command="config:set {{AdminFedexDisableShowMethodConfigData.path}} {{AdminFedexDisableShowMethodConfigData.value}}" stepKey="disableShowMethod"/>
             <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} ''" stepKey="setStoreInformationName"/>
             <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} ''" stepKey="setStoreInformationPhone"/>
             <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} ''" stepKey="setStoreInformationCity"/>
@@ -184,7 +174,7 @@
         <!-- Assert Shipping total is not yet calculated -->
         <actionGroup ref="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup" stepKey="assertNotYetCalculated2"/>
 
-        <!--  Assert order cannot be placed and error message will shown. -->
+        <!-- Assert order cannot be placed and error message will shown. -->
         <actionGroup ref="AssertStorefrontOrderCannotBePlacedActionGroup" stepKey="assertOrderCannotBePlaced2">
             <argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
         </actionGroup>

app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Conditions.php

@@ -196,7 +196,6 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
         )->setRenderer(
             $this->_conditions
         );
-        $this->addComment($model, $fieldset);
 
         $form->setValues($model->getData());
         $this->setConditionFormName($model->getConditions(), $formName);
@@ -219,22 +218,4 @@ private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCond
             }
         }
     }
-
-    /**
-     * Adding comment if using specific sales rule.
-     *
-     * @param Rule $rule
-     * @param Fieldset $fieldset
-     * @return void
-     */
-    private function addComment(Rule $rule, Fieldset $fieldset): void
-    {
-        foreach ($rule->getConditions()->getConditions() as $condition) {
-            if ($condition->getAttribute() === 'payment_method') {
-                $fieldset->setComment(
-                    __('Adding "Payment Method" condition to Checkout pages may increase load time on the storefront.')
-                );
-            }
-        }
-    }
 }

app/code/Magento/SalesRule/Model/Quote/Discount.php

@@ -85,6 +85,7 @@ public function __construct(
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml

@@ -15,7 +15,7 @@
         <click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToAddDiscount"/>
         <fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{discountCode}}" stepKey="fillFieldDiscountCode"/>
         <click selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="clickToApplyDiscount"/>
-        <waitForPageLoad stepKey="waitForDiscountToBeAdded"/>
+        <waitForElement selector="{{DiscountSection.DiscountVerificationMsg}}" time="30" stepKey="waitForDiscountToBeAdded"/>
         <see selector="{{DiscountSection.DiscountVerificationMsg}}" userInput="Your coupon was successfully applied" stepKey="assertDiscountApplyMessage"/>
     </actionGroup>
 </actionGroups>

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

@@ -164,4 +164,3 @@ Apply,Apply
 "Apply to Shipping Amount","Apply to Shipping Amount"
 "Discard subsequent rules","Discard subsequent rules"
 "Default Rule Label for All Store Views","Default Rule Label for All Store Views"
-"Adding ""Payment Method"" condition to Checkout pages may increase load time on the storefront.","Adding ""Payment Method"" condition to Checkout pages may increase load time on the storefront."

app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js

@@ -18,10 +18,9 @@ define([
     'Magento_Checkout/js/action/get-payment-information',
     'Magento_Checkout/js/model/totals',
     'Magento_Checkout/js/model/full-screen-loader',
-    'Magento_Checkout/js/action/recollect-shipping-rates',
-    'Magento_Checkout/js/action/set-payment-information'
+    'Magento_Checkout/js/action/recollect-shipping-rates'
 ], function (ko, $, quote, urlManager, errorProcessor, messageContainer, storage, $t, getPaymentInformationAction,
-    totals, fullScreenLoader, recollectShippingRates, setPaymentInformationAction
+    totals, fullScreenLoader, recollectShippingRates
 ) {
     'use strict';
 
@@ -50,15 +49,6 @@ define([
         });
         fullScreenLoader.startLoader();
 
-        if (quote.paymentMethod()) {
-            setPaymentInformationAction(
-                messageContainer,
-                {
-                    method: quote.paymentMethod().method
-                }
-            );
-        }
-
         return storage.put(
             url,
             data,

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt

@@ -217,4 +217,5 @@ Magento/Config/App/Config/Type
 Magento/InventoryReservationCli/Test/Integration
 Magento/InventoryAdminUi/Controller/Adminhtml
 Magento/Newsletter/Model/Queue
-Magento/Framework/Mail/Template
+Magento/Framework/Mail/Template
+Magento/CheckoutAgreements/Model/Checkout/Plugin