FIx copying data to order, use ExtensionAttributesInterface (#22) (#23)

* Fix problem with copying data from quote to sales_order on Magento 2.3.3 (#22)
* Use ExtensionAttributesInterface for setting data in quote table

Author: mstrzyzewski

Model/LastEventIdInitializer.php

@@ -52,8 +52,10 @@ private function updateLastUserIdAndLastEventId($currentUserId)
     {
         // TODO: Use EventRepositoryInterface
         $lastEvent = $this->eventStats->getLastEvent();
-        $lastEventId = $lastEvent['id'];
-        $this->configuration->setLastEventId($lastEventId);
+        if (!empty($lastEvent['id'])) {
+            $lastEventId = $lastEvent['id'];
+            $this->configuration->setLastEventId($lastEventId);
+        }
         $this->configuration->setLastUserId($currentUserId);
     }
 }

Model/OrderImporter/AbstractAction.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Model\Config as SalesConfig;
 use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Quote\Api\Data\CartExtensionFactory;
 
 abstract class AbstractAction
 {
@@ -58,6 +59,9 @@ abstract class AbstractAction
     /** @var TaxConfig */
     protected $taxConfig;
 
+    /** @var CartExtensionFactory */
+    private $cartExtensionFactory;
+
     /**
      * AbstractAction constructor.
      * @param Shipping $shipping
@@ -72,6 +76,8 @@ abstract class AbstractAction
      * @param ProductFactory $productFactory
      * @param Json $jsonSerializer
      * @param SalesConfig $salesConfig
+     * @param TaxConfig $taxConfig
+     * @param CartExtensionFactory $cartExtensionFactory
      */
     public function __construct(
         Shipping $shipping,
@@ -86,7 +92,8 @@ public function __construct(
         ProductFactory $productFactory,
         Json $jsonSerializer,
         SalesConfig $salesConfig,
-        TaxConfig $taxConfig
+        TaxConfig $taxConfig,
+        CartExtensionFactory $cartExtensionFactory
     ) {
         $this->shipping = $shipping;
         $this->payment = $payment;
@@ -101,6 +108,7 @@ public function __construct(
         $this->jsonSerializer = $jsonSerializer;
         $this->salesConfig = $salesConfig;
         $this->taxConfig = $taxConfig;
+        $this->cartExtensionFactory = $cartExtensionFactory;
     }
 
     /**
@@ -204,9 +212,14 @@ protected function processTotals(OrderInterface $order, CheckoutFormInterface $c
             ['order' => $order, 'quote' => $quote]
         );
 
-        // TODO: Use ExtensionsAttributesInterface
-        $quote->setOrderFrom($order->getOrderFrom());
-        $quote->setExternalId($order->getExternalId());
+        $cartExtension = $quote->getExtensionAttributes();
+        if ($cartExtension === null) {
+            $cartExtension = $this->cartExtensionFactory->create();
+        }
+        $cartExtension->setExternalId($order->getExternalId());
+        $cartExtension->setOrderFrom($order->getOrderFrom());
+        $quote->setExtensionAttributes($cartExtension);
+
         $quote->setAllegroShippingPrice($checkoutForm->getDelivery()->getCost()->getAmount());
 
 

Model/OrderImporter/Creator.php

@@ -22,6 +22,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Tax\Model\Config as TaxConfig;
 use Magento\Framework\Registry;
+use Magento\Quote\Api\Data\CartExtensionFactory;
 
 /**
  * Magento order creator
@@ -49,6 +50,10 @@ class Creator extends AbstractAction
     /** @var Registry */
     private $registry;
 
+    /** @var CartExtensionFactory */
+    private $cartExtensionFactory;
+
+
     /**
      * Creator constructor.
      * @param Shipping $shipping
@@ -70,6 +75,7 @@ class Creator extends AbstractAction
      * @param ScopeConfigInterface $scopeConfig
      * @param QuoteManagement $quoteManagement
      * @param Registry $registry
+     * @param CartExtensionFactory $cartExtensionFactory
      */
     public function __construct(
         Shipping $shipping,
@@ -85,6 +91,7 @@ public function __construct(
         Json $jsonSerializer,
         TaxConfig $taxConfig,
         SalesConfig $salesConfig,
+        CartExtensionFactory $cartExtensionFactory,
         ProductRepositoryInterface $productRepository,
         StoreManagerInterface $storeManager,
         Customer $customer,
@@ -105,7 +112,8 @@ public function __construct(
             $productFactory,
             $jsonSerializer,
             $salesConfig,
-            $taxConfig
+            $taxConfig,
+            $cartExtensionFactory
         );
         $this->productRepository = $productRepository;
         $this->storeManager = $storeManager;
@@ -130,9 +138,14 @@ public function execute(CheckoutFormInterface $checkoutForm)
         $quote->setStore($this->getStore());
         $quote->setStoreId($this->getStore()->getId());
 
-        // TODO use ExtensionAttributesInterface
-        $quote->setData('order_from', 'Allegro');
-        $quote->setData('external_id', $checkoutForm->getId());
+        $cartExtension = $quote->getExtensionAttributes();
+        if ($cartExtension === null) {
+            $cartExtension = $this->cartExtensionFactory->create();
+        }
+        $cartExtension->setExternalId($checkoutForm->getId());
+        $cartExtension->setOrderFrom('Allegro');
+        $quote->setExtensionAttributes($cartExtension);
+
         $quote->setAllegroShippingPrice($checkoutForm->getDelivery()->getCost()->getAmount());
 
         $this->processCustomer($quote, $checkoutForm);

Observer/CopyFieldsFromQuoteToOrderObserver.php

@@ -35,6 +35,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         /* @var \Magento\Quote\Model\Quote $quote */
         $quote = $observer->getEvent()->getData('quote');
 
+        $cartExtensions = $quote->getExtensionAttributes();
+        if ($cartExtensions) {
+            $order->setData('external_id', $cartExtensions->getExternalId());
+            $order->setData('order_from', $cartExtensions->getOrderFrom());
+        }
+
         $this->objectCopyService->copyFieldsetToTarget('sales_convert_quote', 'to_order', $quote, $order);
 
         return $this;

Plugin/UpdateShippingRatePrice.php

@@ -27,7 +27,7 @@ public function aroundCollectRates(Subject $subject, \Closure $proceed, RateRequ
 
         /** @var Quote $quote */
         $quote = reset($allItems)->getQuote();
-        if (!$quote->hasOrderFrom() || !$quote->hasExternalId() || !$quote->hasAllegroShippingPrice()) {
+        if (!$quote->getExtensionAttributes()->getOrderFrom() || !$quote->getExtensionAttributes()->getExternalId() || !$quote->hasAllegroShippingPrice()) {
             return $result;
         }