fixes token being seen as already used when not completing order

pimcore · Sep 1, 2023 · 08b4e57 · 08b4e57
1 parent ace8119
commit 08b4e57
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/OrderManager/V7/OrderManager.php b/src/OrderManager/V7/OrderManager.php
@@ -294,6 +294,9 @@ public function recreateOrder(CartInterface $cart): AbstractOrder
         $sourceOrder = $this->getOrderFromCart($cart);
 
         if ($sourceOrder) {
+            $tokens = $sourceOrder->getVoucherTokens();
+            $tokenVersionNote = '';
+
             //create new order object
             $tempOrdernumber = $this->createOrderNumber();
             $order = $this->getNewOrderObject();
@@ -307,10 +310,21 @@ public function recreateOrder(CartInterface $cart): AbstractOrder
             $order->setOrderdate(new Carbon());
             $order->setCartId($sourceOrder->getCartId());
 
+            if ($tokens) {
+                $tokenVersionNote = ' Token previously added but removed: ';
+                foreach ($tokens as $token) {
+                    $this->voucherService->removeAppliedTokenFromOrder($token, $sourceOrder);
+                    $this->voucherService->applyToken($token->getToken(), $cart, $order);
+                    $tokenVersionNote .= '"' . $token->getToken() . '"';
+                }
+            }
+
             $order->save(['versionNote' => 'OrderManager::recreateOrder.']);
 
             $sourceOrder->setSuccessorOrder($order);
-            $sourceOrder->save(['versionNote' => 'OrderManager::recreateOrder - save successor order.']);
+            $sourceOrder->save([
+                'versionNote' => 'OrderManager::recreateOrder - save successor order.'. $tokenVersionNote
+            ]);
         }
 
         return $this->getOrCreateOrderFromCart($cart);