Merge pull request #187 from bold-commerce/Q1-665

Remove fulfilment status and financial status from bold_checkout_orde…
bold-commerce · Nov 24, 2023 · c4870ca · c4870ca
2 parents 7b25317 + 1bcd6c6
commit c4870ca
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 853 deletions.
diff --git a/Model/Order/OrderExtensionData.php b/Model/Order/OrderExtensionData.php
@@ -63,48 +63,6 @@ public function getPublicId(): ?string
         return $this->getData(OrderExtensionDataResource::PUBLIC_ID);
     }
 
-    /**
-     * Set order financial status.
-     *
-     * @param string|null $financialStatus
-     * @return void
-     */
-    public function setFinancialStatus(?string $financialStatus): void
-    {
-        $this->setData(OrderExtensionDataResource::FINANCIAL_STATUS, $financialStatus);
-    }
-
-    /**
-     * Retrieve financial order status.
-     *
-     * @return string|null
-     */
-    public function getFinancialStatus(): ?string
-    {
-        return $this->getData(OrderExtensionDataResource::FINANCIAL_STATUS);
-    }
-
-    /**
-     * Set order fulfillment status.
-     *
-     * @param string|null $fulfillmentStatus
-     * @return void
-     */
-    public function setFulfillmentStatus(?string $fulfillmentStatus): void
-    {
-        $this->setData(OrderExtensionDataResource::FULFILLMENT_STATUS, $fulfillmentStatus);
-    }
-
-    /**
-     * Retrieve fulfillment order status.
-     *
-     * @return string|null
-     */
-    public function getFulfillmentStatus(): ?string
-    {
-        return $this->getData(OrderExtensionDataResource::FULFILLMENT_STATUS);
-    }
-
     /**
      * Set is order using delayed payment capture.
      *

diff --git a/Model/Order/PlaceOrder/AddCommentsToOrder.php b/Model/Order/PlaceOrder/AddCommentsToOrder.php
@@ -50,7 +50,7 @@ public function addComments(
         $comments = new DataObject([]);
 
         $this->eventManager->dispatch(
-            'add_comments_to_order_save_before',
+            'bold_checkout_add_comments_to_order_before',
             [
                 'order' => $order,
                 'orderData' => $orderData,

diff --git a/Model/Order/PlaceOrder/CreateOrderFromPayload.php b/Model/Order/PlaceOrder/CreateOrderFromPayload.php
@@ -124,14 +124,13 @@ public function createOrder(OrderDataInterface $orderPayload, CartInterface $quo
         $orderExtensionData = $this->orderExtensionDataFactory->create();
         $orderExtensionData->setPublicId($orderPayload->getPublicId());
         $orderExtensionData->setOrderId((int)$magentoOrder->getId());
-        $orderExtensionData->setFulfillmentStatus($orderPayload->getFulfillmentStatus());
-        $orderExtensionData->setFinancialStatus($orderPayload->getFinancialStatus());
-
         $this->eventManager->dispatch(
             'create_order_from_payload_extension_data_save_before',
-            ['orderPayload' => $orderPayload, 'orderExtensionData' => $orderExtensionData]
+            [
+                'orderPayload' => $orderPayload,
+                'orderExtensionData' => $orderExtensionData,
+            ]
         );
-
         $this->orderExtensionDataResource->save($orderExtensionData);
 
         return $magentoOrder;

diff --git a/Model/Order/PlaceOrder/CreateOrderFromQuote.php b/Model/Order/PlaceOrder/CreateOrderFromQuote.php
@@ -25,9 +25,6 @@ class CreateOrderFromQuote
 {
     private const BROWSER_IP = 'remote_ip';
     private const ORDER_NUMBER = 'ext_order_id';
-    private const PUBLIC_ID = 'extension_attribute_public_id_public_id';
-    private const FINANCIAL_STATUS = 'extension_attribute_financial_status_financial_status';
-    private const FULFILLMENT_STATUS = 'extension_attribute_fulfillment_status_fulfillment_status';
 
     /**
      * @var CartManagementInterface
@@ -111,9 +108,6 @@ public function create(CartInterface $quote, OrderDataInterface $orderPayload):
         $orderData = [
             self::ORDER_NUMBER => $orderPayload->getOrderNumber(),
             self::BROWSER_IP => $orderPayload->getBrowserIp(),
-            self::PUBLIC_ID => $orderPayload->getPublicId(),
-            self::FINANCIAL_STATUS => $orderPayload->getFinancialStatus(),
-            self::FULFILLMENT_STATUS => $orderPayload->getFulfillmentStatus(),
         ];
         $quote->getBillingAddress()->setShouldIgnoreValidation(true);
         if (!$quote->isVirtual()) {
@@ -122,7 +116,7 @@ public function create(CartInterface $quote, OrderDataInterface $orderPayload):
         }
         $orderData = new DataObject($orderData);
         $this->eventManager->dispatch(
-            'create_order_from_quote_submit_before',
+            'bold_checkout_create_order_from_quote_submit_before',
             [
                 'quote' => $quote,
                 'orderPayload' => $orderPayload,

diff --git a/Model/Order/PlaceOrder/ProcessOrder.php b/Model/Order/PlaceOrder/ProcessOrder.php
@@ -106,9 +106,6 @@ public function process(OrderDataInterface $orderPayload): OrderInterface
             $orderPayload->getTransaction()
         );
         $this->addCommentsToOrder->addComments($order, $orderPayload);
-        $orderExtensionData->setFulfillmentStatus($orderPayload->getFulfillmentStatus());
-        $orderExtensionData->setFinancialStatus($orderPayload->getFinancialStatus());
-        $this->orderExtensionDataResource->save($orderExtensionData);
         return $order;
     }
 }
diff --git a/Model/Payment/Gateway/Service.php b/Model/Payment/Gateway/Service.php
@@ -251,16 +251,20 @@ private function keepTransactionAdditionalData(OrderInterface $order): void
      * Retrieve order public id.
      *
      * @param OrderInterface $order
-     * @return string|null
+     * @return string
+     * @throws LocalizedException
      */
-    private function getOrderPublicId(OrderInterface $order): ?string
+    private function getOrderPublicId(OrderInterface $order): string
     {
-        $publicId = $order->getExtensionAttributes()->getPublicId();
-        if (!$publicId) {
-            $orderExtensionData = $this->orderExtensionDataFactory->create();
-            $this->orderExtensionDataResource->load($orderExtensionData, $order->getId(), OrderExtensionData::ORDER_ID);
-            $publicId = $orderExtensionData->getPublicId();
+        $orderExtensionData = $this->orderExtensionDataFactory->create();
+        $this->orderExtensionDataResource->load(
+            $orderExtensionData,
+            $order->getId(),
+            OrderExtensionData::ORDER_ID
+        );
+        if (!$orderExtensionData->getPublicId()) {
+            throw new LocalizedException(__('Order public id is not set.'));
         }
-        return $publicId;
+        return $orderExtensionData->getPublicId();
     }
 }
diff --git a/Model/Payment/Gateway/Validator/ModuleEnabledValidator.php b/Model/Payment/Gateway/Validator/ModuleEnabledValidator.php
diff --git a/Model/Payment/Gateway/Validator/PublicOrderIdValidator.php b/Model/Payment/Gateway/Validator/PublicOrderIdValidator.php
diff --git a/Model/ResourceModel/Order/OrderExtensionData.php b/Model/ResourceModel/Order/OrderExtensionData.php
@@ -14,8 +14,6 @@ class OrderExtensionData extends AbstractDb
     public const ID = 'id';
     public const ORDER_ID = 'order_id';
     public const PUBLIC_ID = 'public_id';
-    public const FINANCIAL_STATUS = 'financial_status';
-    public const FULFILLMENT_STATUS = 'fulfillment_status';
     public const IS_DELAYED_CAPTURE = 'is_delayed_capture';
 
     /**

diff --git a/Observer/Category/CategoryDelete.php b/Observer/Category/CategoryDelete.php