fix: possible fix for #35

events.xml

@@ -12,6 +12,9 @@
     <event on="onQuiqqerOrderCustomerDataSave"
            fire="\QUI\ERP\Shipping\EventHandler::onQuiqqerOrderCustomerDataSave"
     />
+    <event on="onQuiqqerOrderOrderProcessCheckoutOutput"
+           fire="\QUI\ERP\Shipping\EventHandler::onQuiqqerOrderOrderProcessCheckoutOutput"
+    />
     <event on="onUserSaveBegin"
            fire="\QUI\ERP\Shipping\EventHandler::onUserSaveBegin"
     />

src/QUI/ERP/Shipping/EventHandler.php

@@ -8,7 +8,7 @@
 
 use QUI;
 use QUI\ERP\Products\Handler\Fields as ProductFields;
-use QUI\ERP\Shipping\ShippingStatus\Handler;
+use QUI\ERP\Order\Controls\OrderProcess\Checkout as OrderCheckoutStepControl;
 use \Quiqqer\Engine\Collector;
 
 /**
@@ -210,6 +210,50 @@ public static function onOrderProcessCustomerDataEnd(
         $Collector->append($Control->create());
     }
 
+    /**
+     * quiqqer/order: onQuiqqerOrderOrderProcessCheckoutOutput
+     *
+     * @param OrderCheckoutStepControl $Checkout
+     * @param string $text
+     * @return void
+     */
+    public static function onQuiqqerOrderOrderProcessCheckoutOutput(OrderCheckoutStepControl $Checkout, string $text)
+    {
+        if (Shipping::getInstance()->shippingDisabled()) {
+            return;
+        }
+
+        $Order = $Checkout->getOrder();
+
+        if (!$Order) {
+            return;
+        }
+
+        $DeliveryAddress = $Order->getDeliveryAddress();
+
+        if ($DeliveryAddress->getId() === 0) {
+            $customerId = $Order->getCustomer()->getId();
+            $Customer   = QUI::getUsers()->get($customerId);
+
+            $deliveryAddressId = $Customer->getAttribute('quiqqer.delivery.address');
+
+            if (!empty($deliveryAddressId)) {
+                try {
+                    $DeliveryAddress   = $Customer->getAddress($deliveryAddressId);
+                    $ErpDeliveryAddres = new QUI\ERP\Address(
+                        \json_decode($DeliveryAddress->toJSON(), true),
+                        $Order->getCustomer()
+                    );
+
+                    $Order->setDeliveryAddress($ErpDeliveryAddres);
+                    $Order->save(QUI::getUsers()->getSystemUser());
+                } catch (\Exception $Exception) {
+                    QUI\System\Log::writeException($Exception);
+                }
+            }
+        }
+    }
+
     /**
      * @param QUI\ERP\Order\Controls\OrderProcess\CustomerData $CustomerData
      *