Merge pull request #895 from buckaroo-it/BP-2748-giftcard-grouptransa…

…ction-canceled-in-magento BP-2748 giftcard grouptransaction canceled in magento
buckaroo-it · Jan 23, 2024 · 401503b · 401503b
2 parents 66908b3 + fc78328
commit 401503b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 96 deletions.
diff --git a/Helper/PaymentGroupTransaction.php b/Helper/PaymentGroupTransaction.php
@@ -173,7 +173,7 @@ public function getGroupTransactionItems($orderId)
         $items = array_values($collection->getItems());
 
         return array_filter($items, function ($item) {
-            return $item['amount'] - (float)$item['refunded_amount'] > 0;
+            return (float)$item['amount'] - (float)$item['refunded_amount'] > 0;
         });
     }
 

diff --git a/Observer/RestoreQuote.php b/Observer/RestoreQuote.php
@@ -141,14 +141,15 @@ public function execute(Observer $observer): void
                 ) {
                     $this->logger->addDebug(sprintf(
                         '[RESTORE_QUOTE] | [Observer] | [%s:%s] - Restore Quote | ' .
-                        'lastRealOrder: %s | previousOrderId: %s',
+                        'lastRealOrder: %s - %s| previousOrderId: %s',
                         __METHOD__,
                         __LINE__,
-                        $lastRealOrder->getIncrementId(),
+                        $lastRealOrder->getIncrementId(), $lastRealOrder->getEntityId(),
                         $previousOrderId
                     ));
 
                     $this->checkoutSession->restoreQuote();
+                    $this->checkoutSession->getQuote()->setOrigOrderId(null);
                     $this->rollbackPartialPayment($lastRealOrder->getIncrementId(), $payment);
                     $this->setOrderToCancel($previousOrderId);
                 }

diff --git a/Plugin/GiftcardUsageIncrement.php b/Plugin/GiftcardUsageIncrement.php