From 5579317e1dbbf3e645402b782fc6a435982f72dc Mon Sep 17 00:00:00 2001
From: Edgaras <edgaras.tkacenka@wallee.com>
Date: Mon, 23 Aug 2021 14:32:18 +0300
Subject: [PATCH] Release 4.0.7

---
 CHANGELOG.md                                           | 3 +++
 CHANGELOG_de-DE.md                                     | 3 +++
 README.md                                              | 2 +-
 composer.json                                          | 6 +++---
 docs/en/documentation.html                             | 2 +-
 src/Core/Api/WebHooks/Controller/WebHookController.php | 8 ++++----
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbd9a8c..241834c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 4.0.7
+- Fix Transaction Rollback error on unsupported languages
+
 # 4.0.6
 - Fix for delivery state change error
 
diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
index 1dc7422..fa4ab58 100644
--- a/CHANGELOG_de-DE.md
+++ b/CHANGELOG_de-DE.md
@@ -1,3 +1,6 @@
+# 4.0.7
+- Behebung des Transaktions-Rollback-Fehlers in nicht unterstützten Sprachen
+
 # 4.0.6
 - Fehler beim Ändern des Lieferstatus behoben
 
diff --git a/README.md b/README.md
index d7c5017..6d5026f 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ tail -f var/log/wallee_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/4.0.6/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/4.0.7/docs/en/documentation.html)
 
 ## License
 
diff --git a/composer.json b/composer.json
index 553ac39..a20e37b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,8 +11,8 @@
         }
     },
     "conflict": {
-        "shopware/administration": "<6.4,>=7",
-        "shopware/storefront": "<6.4,>=7"
+        "shopware/administration": "<6.4.2.1,>=7",
+        "shopware/storefront": "<6.4.2.1,>=7"
     },
     "description": "Wallee integration for Shopware 6",
     "extra": {
@@ -54,5 +54,5 @@
         "wallee/sdk": "3.0.1"
     },
     "type": "shopware-platform-plugin",
-    "version": "4.0.6"
+    "version": "4.0.7"
 }
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index a5730fd..aaf5721 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/4.0.6/">
+		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/4.0.7/">
 			Source
 		</a>
 	</li>
diff --git a/src/Core/Api/WebHooks/Controller/WebHookController.php b/src/Core/Api/WebHooks/Controller/WebHookController.php
index f2be578..0b6eeeb 100644
--- a/src/Core/Api/WebHooks/Controller/WebHookController.php
+++ b/src/Core/Api/WebHooks/Controller/WebHookController.php
@@ -340,8 +340,8 @@ private function getTotalRefundedAmount(int $transactionId, Context $context): f
 	 */
 	private function executeLocked(string $orderId, Context $context, callable $operation)
 	{
-		$this->connection->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
-		$this->connection->beginTransaction();
+		//$this->connection->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
+		//$this->connection->beginTransaction();
 		try {
 
 			$data = [
@@ -359,10 +359,10 @@ private function executeLocked(string $orderId, Context $context, callable $oper
 
 			$result = $operation();
 
-			$this->connection->commit();
+			//$this->connection->commit();
 			return $result;
 		} catch (\Exception $exception) {
-			$this->connection->rollBack();
+			//$this->connection->rollBack();
 			throw $exception;
 		}
 	}