MC-42704: Admin Checkout validation bug-

Working on second approach to resolve the issue

Author: pradeep.rauthan

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -257,13 +257,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      */
     private $customAttributeList;
 
-    /**
-     * Constructor
-     *
-     * @var \Magento\Customer\Model\Address\Mapper
-     */
-    private $addressMapper;
-
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -297,7 +290,6 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * @param ExtensibleDataObjectConverter|null $dataObjectConverter
      * @param StoreManagerInterface $storeManager
      * @param CustomAttributeListInterface|null $customAttributeList
-     * @param \Magento\Customer\Model\Address\Mapper $addressMapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -332,8 +324,7 @@ public function __construct(
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         ExtensibleDataObjectConverter $dataObjectConverter = null,
         StoreManagerInterface $storeManager = null,
-        CustomAttributeListInterface $customAttributeList = null,
-        \Magento\Customer\Model\Address\Mapper $addressMapper = null
+        CustomAttributeListInterface $customAttributeList = null
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -370,8 +361,6 @@ public function __construct(
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         $this->customAttributeList = $customAttributeList ?: ObjectManager::getInstance()
             ->get(CustomAttributeListInterface::class);
-        $this->addressMapper = $addressMapper ?: ObjectManager::getInstance()
-            ->get(\Magento\Customer\Model\Address\Mapper::class);
     }
 
     /**
@@ -1466,7 +1455,6 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
     public function setShippingAddress($address)
     {
         if (is_array($address)) {
-
             $shippingAddress = $this->_objectManager->create(
                 \Magento\Quote\Model\Quote\Address::class
             )->setData(
@@ -1539,12 +1527,6 @@ public function setBillingAddress($address)
             return $this;
         }
 
-        /**
-         * A new quote has been generated everytime, so for storing current form data from default
-         * customer address `customer_address_id` need to be set to `null`
-         */
-        $address['customer_address_id'] = null;
-
         $billingAddress = $this->_objectManager->create(Address::class)
             ->setData($address)
             ->setAddressType(Address::TYPE_BILLING);

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -245,7 +245,8 @@ define([
                 type,
                 name,
                 data,
-                resetShipping = false;
+                resetShipping = false,
+                resetBilling = false;
 
             if (!matchRes) {
                 return;
@@ -264,14 +265,29 @@ define([
             if (type === 'billing' && this.shippingAsBilling) {
                 this.syncAddressField(this.shippingAddressContainer, field.name, field);
                 resetShipping = true;
+                resetBilling = true;
             }
 
             if (type === 'shipping' && !this.shippingAsBilling) {
                 resetShipping = true;
             }
 
+            if (type === 'billing' && !this.shippingAsBilling) {
+                resetBilling = true;
+            }
+
             if (resetShipping) {
                 data['reset_shipping'] = true;
+
+                if(name !== 'customer_address_id' && this.selectAddressEvent === false) {
+                    this.clearSelected('order-shipping_address_customer_address_id');
+                }
+            }
+
+            if (resetBilling) {
+                if(name !== 'customer_address_id' && this.selectAddressEvent === false) {
+                    this.clearSelected('order-billing_address_customer_address_id');
+                }
             }
 
             data['order[' + type + '_address][customer_address_id]'] = null;
@@ -280,6 +296,11 @@ define([
             if (name === 'customer_address_id') {
                 data['order[' + type + '_address][customer_address_id]'] =
                     $('order-' + type + '_address_customer_address_id').value;
+
+                if(this.shippingAsBilling) {
+                    document.getElementById('order-shipping_address_customer_address_id').value =
+                        $('order-' + type + '_address_customer_address_id').value;
+                }
             }
 
             if (name === 'country_id' && this.selectAddressEvent === false) {
@@ -299,6 +320,23 @@ define([
             }
         },
 
+        /**
+         * Deselect customer address selected value.
+         *
+         * @param {String} id - field ID
+         */
+        clearSelected: function(id){
+            let element = document.getElementById(id);
+            if(typeof element !== 'undefined' && element !== null) {
+                if(element.value){
+                    let elem = element.options;
+                    for(let i = 0; i < elem.length; i++){
+                        elem[i].selected = false;
+                    }
+                }
+            }
+        },
+
         /**
          * Set address container form field value.
          *