BUG#AC-838: New Checkout Shipping Address Has Company After Changing Show Company to No - issue fixed

Author: glo80326

app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php

@@ -15,6 +15,8 @@
  */
 class Customer extends \Magento\Framework\App\Config\Value
 {
+    public const XML_PATH_CUSTOMER_ADDRESS_SHOW_COMPANY = 'customer/address/company_show';
+
     /**
      * @var \Magento\Eav\Model\Config
      */

app/code/Magento/Quote/Model/ShippingAddressManagement.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Quote\Model;
 
+use Magento\Customer\Model\Config\Backend\Show\Customer;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -95,6 +96,10 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
         $sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
         $customerAddressId = $address->getCustomerAddressId();
+        if ($saveInAddressBook &&
+            !$this->scopeConfig->getValue(Customer::XML_PATH_CUSTOMER_ADDRESS_SHOW_COMPANY)) {
+            $address->setCompany(null);
+        }
         $this->addressValidator->validateForCart($quote, $address);
         $quote->setShippingAddress($address);
         $address = $quote->getShippingAddress();