ENGCOM-3674: [Forwardport] Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products. #19343

 - Merge Pull Request #19343 from nmalevanec/magento2:2.3-develop-PR-port-16342
 - Merged commits:
   1. ae5dfae
   2. 7125136
   3. 6754554

Author: magento-engcom-team

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -9,7 +9,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

@@ -150,9 +150,9 @@
             <argument name="sortBy" value="price"/>
             <argument name="sort" value="desc"/>
         </actionGroup>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
 
         <!-- Delete the rule -->
         <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition;
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\SalesRule\Model\Rule\Condition;
 
 use Magento\Backend\Helper\Data;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -27,6 +27,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
-        <element name="header" type="text" selector="#order-methods span.title"/>
+        <element name="header" type="text" selector="#shipping-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
         <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>

app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml

@@ -47,17 +47,15 @@
             </div>
         </section>
 
-        <section id="order-methods" class="admin__page-section order-methods">
-            <div class="admin__page-section-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Information') ?></span>
+        <section id="shipping-methods" class="admin__page-section order-methods">
+            <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
+                <?= $block->getChildHtml('shipping_method') ?>
             </div>
-            <div class="admin__page-section-content">
-                <div id="order-billing_method" class="admin__page-section-item order-billing-method">
-                    <?= $block->getChildHtml('billing_method') ?>
-                </div>
-                <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
-                    <?= $block->getChildHtml('shipping_method') ?>
-                </div>
+        </section>
+
+        <section id="payment-methods" class="admin__page-section payment-methods">
+            <div id="order-billing_method" class="admin__page-section-item order-billing-method">
+                <?= $block->getChildHtml('billing_method') ?>
             </div>
         </section>
 

app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml

@@ -100,12 +100,8 @@ require(['prototype'], function(){
 </div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
-
         order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
         order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
-
-        <?php if ($block->getQuote()->isVirtual()): ?>
-            order.isOnlyVirtualProduct = true;
-        <?php endif; ?>
+        order.isOnlyVirtualProduct = <?= /* @noEscape */ $block->getQuote()->isVirtual() ? 'true' : 'false'; ?>;
     });
 </script>