CC-13972 - Fixed multistore product reservation. (#8444)

CC-13972 - Fixed multistore product reservation.
spryker · Jul 15, 2021 · b57810e · b57810e
1 parent 3426456
commit b57810e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/Spryker/Zed/Oms/Business/Reader/ReservationReader.php b/src/Spryker/Zed/Oms/Business/Reader/ReservationReader.php
@@ -183,9 +183,8 @@ public function getOmsReservedProductQuantity(ReservationRequestTransfer $reserv
     public function sumReservedProductQuantities(ReservationRequestTransfer $reservationRequestTransfer): Decimal
     {
         $reservedStates = $this->getOmsReservedStateCollection();
+        $reservationRequestTransfer->setReservedStates($reservedStates);
 
-        $reservationRequestTransfer->setReservedStates($reservedStates)
-            ->setStore($this->storeFacade->getCurrentStore());
         $salesOrderItemStateAggregationTransfers = $this->aggregateReservations($reservationRequestTransfer);
 
         return $this->calculateReservationQuantity(

diff --git a/src/Spryker/Zed/Oms/Business/Util/Reservation.php b/src/Spryker/Zed/Oms/Business/Util/Reservation.php
@@ -106,15 +106,21 @@ public function updateReservationQuantity($sku)
      */
     public function updateReservation(ReservationRequestTransfer $reservationRequestTransfer): void
     {
-        $reservationQuantity = $this->reservationReader->sumReservedProductQuantities($reservationRequestTransfer);
         $currentStoreTransfer = $this->storeFacade->getCurrentStore();
-        $reservationRequestTransfer->setReservationQuantity($reservationQuantity)
-            ->setStore($currentStoreTransfer);
+        $reservationRequestTransfer->setStore($currentStoreTransfer);
+
+        $reservationQuantity = $this->reservationReader->sumReservedProductQuantities($reservationRequestTransfer);
+        $reservationRequestTransfer->setReservationQuantity($reservationQuantity);
+
         $this->writeReservation($reservationRequestTransfer);
 
         foreach ($currentStoreTransfer->getStoresWithSharedPersistence() as $storeName) {
             $storeTransfer = $this->storeFacade->getStoreByName($storeName);
             $reservationRequestTransfer->setStore($storeTransfer);
+
+            $reservationQuantity = $this->reservationReader->sumReservedProductQuantities($reservationRequestTransfer);
+            $reservationRequestTransfer->setReservationQuantity($reservationQuantity);
+
             $this->writeReservation($reservationRequestTransfer);
         }
 

diff --git a/tests/SprykerTest/Zed/Oms/Business/Reader/ReservationReaderTest.php b/tests/SprykerTest/Zed/Oms/Business/Reader/ReservationReaderTest.php
@@ -78,8 +78,10 @@ public function testSumReservedProductQuantitiesShouldSumAllItemsInReservedState
             $totalQuantity += $orderItem->getQuantity();
         }
 
+        $currentStore = $this->getStoreFacade()->getCurrentStore();
         $reservationRequestTransfer = (new ReservationRequestTransfer())
-            ->setSku($itemSku);
+            ->setSku($itemSku)
+            ->setStore($currentStore);
 
         $reservationReader = (new OmsBusinessFactory())->createReservationReader();
         $reservedSubprocessItemStateEntity = $this->tester->haveOmsOrderItemStateEntity(static::RESERVED_SUBPROCESS_ITEM_STATE);