Merge pull request #7398 from magento-gl/gl_pr_jan13_2022_latest

GL PR raised on Jan13, 2022
magento · Jan 18, 2022 · b225913 · b225913
2 parents b12f867 + b2dad9e
commit b225913
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 3 deletions.
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -230,7 +230,9 @@ define([
                             if (response.error) {
                                 this.blockMsg.show();
                                 this.blockMsgError.innerHTML = response.message;
-                                this.blockCancelBtn.hide();
+                                if(this.blockCancelBtn) {
+                                    this.blockCancelBtn.hide();
+                                }
                                 this.setConfirmCallback(listType, null);
                                 this._showWindow();
                             }
@@ -584,7 +586,9 @@ define([
                     this.blockFormFields.update();
                     this.blockMsg.hide();
                     this.blockMsgError.update();
-                    this.blockCancelBtn.show();
+                    if(this.blockCancelBtn) {
+                        this.blockCancelBtn.show();
+                    }
                     break;
                 default:
                     // search in list types for its cleaning
@@ -603,7 +607,9 @@ define([
                         this.blockFormFields.update();
                         this.blockMsg.hide();
                         this.blockMsgError.update();
-                        this.blockCancelBtn.show();
+                        if(this.blockCancelBtn) {
+                            this.blockCancelBtn.show();
+                        }
                     }
                     break;
             }

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithConfigurableProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithConfigurableProductTest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderWithConfigurableProductTest">
+        <annotations>
+            <title value="Create Order in Admin with simple product"/>
+            <stories value="AC-2040"/>
+            <description value="Create order with configurable product."/>
+            <features value="Sales"/>
+            <testCaseId value="AC-2040"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <actionGroup ref="CreateConfigurableProductActionGroup" stepKey="createConfigurableProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="AddConfigurableProductToOrderActionGroup" stepKey="addFirstConfigurableProductToOrder">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="attribute" value="colorProductAttribute"/>
+            <argument name="option" value="colorProductAttribute1"/>
+        </actionGroup>
+        <actionGroup ref="SelectCashOnDeliveryPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+    </test>
+</tests>