MC-38498: "Save to Address Book" in Admin checkout causes duplicate address book entries

Author: rostyslav-hymon

app/code/Magento/Sales/ViewModel/Customer/Address/Billing/Address.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\ViewModel\Customer\Address\Billing;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Sales\Model\AdminOrder\Create;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+/**
+ * Customer address formatter
+ */
+class Address implements ArgumentInterface
+{
+    /**
+     * @var Create
+     */
+    protected $orderCreate;
+
+    /**
+     * Customer billing address
+     *
+     * @param Create $orderCreate
+     */
+    public function __construct(
+        Create $orderCreate
+    ) {
+        $this->orderCreate = $orderCreate;
+    }
+
+    /**
+     * Return billing address object
+     *
+     * @return QuoteAddress
+     */
+    public function getAddress(): QuoteAddress
+    {
+        return $this->orderCreate->getBillingAddress();
+    }
+
+    /**
+     * Get save billing address in the address book
+     *
+     * @return int
+     */
+    public function getSaveInAddressBook(): int
+    {
+        return (int)$this->getAddress()->getSaveInAddressBook();
+    }
+}

app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml

@@ -12,6 +12,7 @@
                 <arguments>
                     <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
                     <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                    <argument name="customerBillingAddress" xsi:type="object">Magento\Sales\ViewModel\Customer\Address\Billing\Address</argument>
                 </arguments>
             </block>
         </referenceContainer>

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

@@ -24,6 +24,11 @@ endif;
  */
 $customerAddressFormatter = $block->getData('customerAddressFormatter');
 
+/**
+ * @var \Magento\Sales\ViewModel\Customer\Address\Billing\Address $billingAddress
+ */
+$billingAddress = $block->getData('customerBillingAddress');
+
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|
  * \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
@@ -114,7 +119,9 @@ endif; ?>
                    type="checkbox"
                    id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
                    value="1"
-                <?php if (!$block->getDontSaveInAddressBook() && !$block->getAddressId()): ?>
+                <?php if ($billingAddress && $billingAddress->getSaveInAddressBook()): ?>
+                    checked="checked"
+                <?php elseif ($block->getIsShipping() && !$block->getDontSaveInAddressBook() && !$block->getAddressId()): ?>
                     checked="checked"
                 <?php endif; ?>
                    class="admin__control-checkbox"/>