added saveOrderTo Convertim

shopsys · Oct 25, 2024 · a811985 · a811985
1 parent 4192024
commit a811985
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/Model/Order/Item/OrderItemData.php b/src/Model/Order/Item/OrderItemData.php
@@ -125,4 +125,17 @@ public function getUnitPrice(): Price
     {
         return new Price($this->unitPriceWithoutVat, $this->unitPriceWithVat);
     }
+
+    /**
+     * @return string|null
+     */
+    public function getItemUuid(): ?string
+    {
+        return match ($this->type) {
+            OrderItemTypeEnum::TYPE_PRODUCT => $this->product->getUuid(),
+            OrderItemTypeEnum::TYPE_TRANSPORT => $this->transport->getUuid(),
+            OrderItemTypeEnum::TYPE_PAYMENT => $this->payment->getUuid(),
+            default => null,
+        };
+    }
 }
diff --git a/src/Model/Order/Item/OrderItemFactory.php b/src/Model/Order/Item/OrderItemFactory.php
@@ -32,7 +32,7 @@ public function createOrderItem(
     ): OrderItem {
         $entityClassName = $this->entityNameResolver->resolve(OrderItem::class);
 
-        return new $entityClassName(
+        $orderItem = new $entityClassName(
             $order,
             $orderItemData->name,
             new Price($orderItemData->unitPriceWithoutVat, $orderItemData->unitPriceWithVat),
@@ -42,6 +42,12 @@ public function createOrderItem(
             $orderItemData->unitName,
             $orderItemData->catnum,
         );
+
+        if ($orderItemData->usePriceCalculation === false && $orderItemData->totalPriceWithVat !== null) {
+            $orderItem->setTotalPrice(new Price($orderItemData->totalPriceWithoutVat, $orderItemData->totalPriceWithVat));
+        }
+
+        return $orderItem;
     }
 
     /**

diff --git a/src/Model/Order/OrderDataFactory.php b/src/Model/Order/OrderDataFactory.php
@@ -90,7 +90,7 @@ protected function fillFromOrder(OrderData $orderData, Order $order): void
         $orderData->companyName = $order->getCompanyName();
         $orderData->companyNumber = $order->getCompanyNumber();
         $orderData->companyTaxNumber = $order->getCompanyTaxNumber();
-        $orderData->isCompanyCustomer = $order->isCompanyCustomer();
+        $orderData->isCompanyCustomer = $order->getCompanyName() !== null && $order->getCompanyNumber() !== null;
         $orderData->street = $order->getStreet();
         $orderData->city = $order->getCity();
         $orderData->postcode = $order->getPostcode();