From 484398468ada5c1736012f5097446928efef06ac Mon Sep 17 00:00:00 2001
From: Vitalij Mik <vitalij.mik@dasistweb.de>
Date: Tue, 25 Oct 2022 11:50:53 +0200
Subject: [PATCH 1/2] Do not reset order amount on failed orders in order
 history

---
 Components/Services/BasketService.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Components/Services/BasketService.php b/Components/Services/BasketService.php
index 2227cf9a..8d0f6cea 100644
--- a/Components/Services/BasketService.php
+++ b/Components/Services/BasketService.php
@@ -165,7 +165,10 @@ public function restoreBasket($orderId)
                 }
 
                 // recalculate order
-                $order->calculateInvoiceAmount();
+                if($this->config->resetInvoiceAndShipping()){
+                    $order->calculateInvoiceAmount();
+                }
+
 
                 /** @var Status $statusCanceled */
                 $statusCanceled = Shopware()->Container()->get('models')->getRepository(
@@ -370,8 +373,12 @@ public function resetOrderDetailQuantity(Detail $orderDetail)
         $orderDetail->setQuantity(0);
 
         try {
+            $classMetaData = $this->modelManager->getClassMetadata(get_class($orderDetail));
+            $events = $classMetaData->lifecycleCallbacks;
+            $classMetaData->setLifecycleCallbacks([]);
             $this->modelManager->persist($orderDetail);
             $this->modelManager->flush($orderDetail);
+            $classMetaData->setLifecycleCallbacks($events);
         } catch (Exception $e) {
             //
         }

From 9277753ed86103561f4e7e9000f65de4bedab53c Mon Sep 17 00:00:00 2001
From: Vitalij Mik <vitalij.mik@dasistweb.de>
Date: Tue, 8 Nov 2022 08:59:59 +0100
Subject: [PATCH 2/2] Code style fix

---
 Components/Services/BasketService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Components/Services/BasketService.php b/Components/Services/BasketService.php
index 8d0f6cea..7c9ff4fc 100644
--- a/Components/Services/BasketService.php
+++ b/Components/Services/BasketService.php
@@ -165,7 +165,7 @@ public function restoreBasket($orderId)
                 }
 
                 // recalculate order
-                if($this->config->resetInvoiceAndShipping()){
+                if ($this->config->resetInvoiceAndShipping()) {
                     $order->calculateInvoiceAmount();
                 }