Release 6.1.2

wallee-payment · Apr 26, 2024 · 10e4fd8 · 10e4fd8
1 parent 1476e57
commit 10e4fd8
Show file tree

Hide file tree

Showing 43 changed files with 464 additions and 468 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 6.1.2
+- Fixed redirect to confirmation page after reload
+
 # 6.1.1
 - Fixed deprecated OrderNotFoundException
 

diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,14 +1,14 @@
+# 6.1.2
+- Die Weiterleitung zur Bestätigungsseite nach dem Neuladen wurde behoben
+
 # 6.1.1
 - Fixed deprecated OrderNotFoundException
 
-# 6.1.0
+# 5.0.8
 - Checkout-Probleme nach dem Deaktivieren/Aktivieren des Plugins behoben
 - Plugin-Deinstallationsaktion behoben
 - Die E-Mail-Funktion für die Rechnungszahlungsmethode beim Versand der Bestellung wurde korrigiert
 
-# 6.0.0
-- Unterstützung von Shopware 6.6
-
 # 5.0.7
 - Fix für Rückerstattungen, wenn ein Rabattcode verwendet wird
 

diff --git a/README.md b/README.md
@@ -3,22 +3,13 @@
 Wallee Payment for Shopware 6
 =============================
 
-The Wallee Payment plugin wraps around the Wallee API. This library facilitates your interaction with various services such as transactions.
-Please note that this plugin is for versions 6.5 and 6.6. For the 6.4 plugin please visit [our Shopware 6.4 plugin](https://github.com/wallee-payment/shopware-6-4).
+The Wallee Payment plugin wraps around the Wallee API. This library facilitates your interaction with various services such as transactions. Please not this plugin is for version 6.5.
+For the 6.4 plugin please visit https://github.com/wallee-payment/shopware-6-4
 
 ## Requirements
 
-- Shopware 6.5.x or Shopware 6.6.x. See table below.
-- PHP minimum version supported by the each shop version.
-
-## Supported versions
-
-___________________________________________________________________________________
-| Shopware 6 version            | Plugin major version   | Supported until        |
-|-------------------------------|------------------------|------------------------|
-| Shopware 6.6.x                | 6.x                    | Further notice         |
-| Shopware 6.5.x                | 5.x                    | October 2024           |
------------------------------------------------------------------------------------
+- PHP 7.4 - 8.2
+- Shopware 6.5.x
 
 ## Installation
 
@@ -71,8 +62,8 @@ tail -f var/log/wallee_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/6.1.1/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.wallee.com/wallee-payment/shopware-6/6.1.2/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/shopware-6/blob/master/LICENSE.txt) for more information.
+Please see the [license file](https://github.com/wallee-payment/shopware-6/blob/master/LICENSE.txt) for more information.
diff --git a/bin/release.php b/bin/release.php
diff --git a/composer.json b/composer.json
@@ -1,62 +1,66 @@
 {
-  "authors": [
-	{
-	  "homepage": "https://www.wallee.com",
-	  "name": "wallee"
-	}
-  ],
-  "autoload": {
-	"psr-4": {
-	  "WalleePayment\\": "src/"
-	}
-  },
-  "conflict": {
-	"shopware/administration": "<6.6.0.0,>=7",
-	"shopware/storefront": "<6.6.0.0,>=7"
-  },
-  "description": "Wallee integration for Shopware 6",
-  "extra": {
-	"copyright": "(c) by wallee",
-	"description": {
-	  "de-DE": "Wallee integration für Shopware 6",
-	  "en-GB": "Wallee integration for Shopware 6",
-	  "fr-FR": "Intégration de Wallee pour Shopware 6",
-      "it-IT": "Integrazione Wallee per Shopware"
-	},
-	"label": {
-	  "de-DE": "Wallee Produkte für Shopware 6",
-	  "en-GB": "Wallee Products for Shopware 6",
-	  "fr-FR": "Wallee Produits for Shopware 6",
-	  "it-IT": "Wallee Prodotti per Shopware 6"
-	},
-	"manufacturerLink": {
-	  "de-DE": "https://www.wallee.com",
-	  "en-GB": "https://www.wallee.com",
-	  "fr-FR": "https://www.wallee.com",
-      "it-IT": "https://www.wallee.com"
-	},
-	"supportLink": {
-	  "de-DE": "https://app-wallee.com/space/select?target=/support",
-	  "en-GB": "https://app-wallee.com/space/select?target=/support",
-	  "fr-FR": "https://app-wallee.com/space/select?target=/support",
-      "it-IT": "https://app-wallee.com/space/select?target=/support"
-	},
-	"shopware-plugin-class": "WalleePayment\\WalleePayment"
-  },
-  "homepage": "https://www.wallee.com/",
-  "keywords": [
-	"wallee",
-	"payment",
-	"php",
-	"shopware"
-  ],
-  "license": "Apache-2.0",
-  "name": "wallee/shopware-6",
-  "require": {
-	"ext-curl": "*",
-	"ext-json": "*",
-	"ext-mbstring": "*",
-	"php": ">=8.2"
-  },
-  "type": "shopware-platform-plugin"
-}
+    "authors": [
+        {
+            "homepage": "https://www.wallee.com",
+            "name": "wallee"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "WalleePayment\\": "src/"
+        }
+    },
+    "conflict": {
+        "shopware/administration": "<6.4.2.1,>=7",
+        "shopware/storefront": "<6.4.2.1,>=7"
+    },
+    "description": "Wallee integration for Shopware 6",
+    "extra": {
+        "copyright": "(c) by wallee",
+        "description": {
+            "de-DE": "Wallee integration f\u00fcr Shopware 6",
+            "en-GB": "Wallee integration for Shopware 6",
+            "fr-FR": "Int\u00e9gration de Wallee pour Shopware 6",
+            "it-IT": "Integrazione Wallee per Shopware"
+        },
+        "label": {
+            "de-DE": "Wallee Produkte f\u00fcr Shopware 6",
+            "en-GB": "Wallee Products for Shopware 6",
+            "fr-FR": "Wallee Produits for Shopware 6",
+            "it-IT": "Wallee Prodotti per Shopware 6"
+        },
+        "manufacturerLink": {
+            "de-DE": "https://www.wallee.com",
+            "en-GB": "https://www.wallee.com",
+            "fr-FR": "https://www.wallee.com",
+            "it-IT": "https://www.wallee.com"
+        },
+        "supportLink": {
+            "de-DE": "https://app-wallee.com/space/select?target=/support",
+            "en-GB": "https://app-wallee.com/space/select?target=/support",
+            "fr-FR": "https://app-wallee.com/space/select?target=/support",
+            "it-IT": "https://app-wallee.com/space/select?target=/support"
+        },
+        "shopware-plugin-class": "WalleePayment\\WalleePayment"
+    },
+    "homepage": "https://www.wallee.com/",
+    "keywords": [
+        "wallee",
+        "payment",
+        "php",
+        "shopware"
+    ],
+    "license": "Apache-2.0",
+    "name": "wallee/shopware-6",
+    "require": {
+        "ext-curl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "php": ">=7.4",
+        "shopware/core": "6.5.*",
+        "shopware/storefront": "6.5.*",
+        "wallee/sdk": "4.0.2"
+    },
+    "type": "shopware-platform-plugin",
+    "version": "6.1.2"
+}
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<meta name="keywords" value="wallee, Shopware, Shopware Plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Shopware 6 plugin that enables processing payments with wallee.">		
-		<link rel="canonical" href="https://plugin-documentation.weareplanet.com/weareplanet/opencart-3.0/1.0.57/docs/en/documentation.html" />
+		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/shopware-6/master/WalleePayment/docs/en/documentation.html" />
 		<title>wallee Shopware 6 Documentation</title>
 		<link href="assets/monokai-sublime.css" rel="stylesheet" />
 		<link href="assets/base.css" rel="stylesheet" />
@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/6.1.1/">
+		<a href="https://github.com/wallee-payment/shopware-6/releases/tag/6.1.2/">
 			Source
 		</a>
 	</li>

diff --git a/src/Core/Api/Configuration/Controller/ConfigurationController.php b/src/Core/Api/Configuration/Controller/ConfigurationController.php
@@ -5,7 +5,7 @@
 use Psr\Log\LoggerInterface;
 use Shopware\Core\{
 	Framework\Context,
-    Framework\Log\Package,};
+	Framework\Routing\Annotation\RouteScope,};
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\{
 	HttpFoundation\JsonResponse,
@@ -26,9 +26,8 @@
  * This class handles web calls that are made via the WalleePayment settings page.
  *
  * @package WalleePayment\Core\Api\Config\Controller
+ * @Route(defaults={"_routeScope"={"api"}})
  */
-#[Package('system-settings')]
-#[Route(defaults: ['_routeScope' => ['api']])]
 class ConfigurationController extends AbstractController {
 
 	/**
@@ -101,10 +100,12 @@ public function setLogger(LoggerInterface $logger): void
 	 * @param \Shopware\Core\Framework\Context          $context
 	 * @return \Symfony\Component\HttpFoundation\JsonResponse
 	 *
+	 * @Route(
+	 *     "/api/_action/wallee/configuration/set-wallee-as-sales-channel-payment-default",
+	 *     name="api.action.wallee.configuration.set-wallee-as-sales-channel-payment-default",
+	 *     methods={"POST"}
+	 *     )
 	 */
-    #[Route("/api/_action/wallee/configuration/set-wallee-as-sales-channel-payment-default",
-    	name: "api.action.wallee.configuration.set-wallee-as-sales-channel-payment-default",
-        methods: ['POST'])]
 	public function setWalleeAsSalesChannelPaymentDefault(Request $request, Context $context): JsonResponse
 	{
 		$salesChannelId = $request->request->get('salesChannelId');
@@ -123,10 +124,12 @@ public function setWalleeAsSalesChannelPaymentDefault(Request $request, Context
 	 * @throws \Wallee\Sdk\Http\ConnectionException
 	 * @throws \Wallee\Sdk\VersioningException
 	 *
+	 * @Route(
+	 *     "/api/_action/wallee/configuration/register-web-hooks",
+	 *     name="api.action.wallee.configuration.register-web-hooks",
+	 *     methods={"POST"}
+	 *   )
 	 */
-    #[Route("/api/_action/wallee/configuration/register-web-hooks",
-        name: "api.action.wallee.configuration.register-web-hooks",
-        methods: ['POST'])]
 	public function registerWebHooks(Request $request): JsonResponse
 	{
 		$settings = $this->settingsService->getSettings();
@@ -154,10 +157,12 @@ public function registerWebHooks(Request $request): JsonResponse
 	 * @throws \Wallee\Sdk\Http\ConnectionException
 	 * @throws \Wallee\Sdk\VersioningException
 	 *
+	 * @Route(
+	 *     "/api/_action/wallee/configuration/check-api-connection",
+	 *     name="api.action.wallee.configuration.check-api-connection",
+	 *     methods={"POST"}
+	 *   )
 	 */
-    #[Route("/api/_action/wallee/configuration/check-api-connection",
-        name: "api.action.wallee.configuration.check-api-connection",
-        methods: ['POST'])]
 	public function checkApiConnection(Request $request): JsonResponse
 	{
 		$spaceId = (int)$request->request->getInt('spaceId');
@@ -186,10 +191,12 @@ public function checkApiConnection(Request $request): JsonResponse
 	 * @param \Shopware\Core\Framework\Context          $context
 	 * @return \Symfony\Component\HttpFoundation\JsonResponse
 	 *
+	 * @Route(
+	 *     "/api/_action/wallee/configuration/synchronize-payment-method-configuration",
+	 *     name="api.action.wallee.configuration.synchronize-payment-method-configuration",
+	 *     methods={"POST"}
+	 *   )
 	 */
-    #[Route("/api/_action/wallee/configuration/synchronize-payment-method-configuration",
-        name: "api.action.wallee.configuration.synchronize-payment-method-configuration",
-        methods: ['POST'])]
 	public function synchronizePaymentMethodConfiguration(Request $request, Context $context): JsonResponse
 	{
 		$settings = $this->settingsService->getSettings();
@@ -221,10 +228,12 @@ public function synchronizePaymentMethodConfiguration(Request $request, Context
 	 * @param \Shopware\Core\Framework\Context $context
 	 * @return \Symfony\Component\HttpFoundation\JsonResponse
 	 *
+	 * @Route(
+	 *     "/api/_action/wallee/configuration/install-order-delivery-states",
+	 *     name="api.action.wallee.configuration.install-order-delivery-states",
+	 *     methods={"POST"}
+	 *   )
 	 */
-    #[Route("/api/_action/wallee/configuration/install-order-delivery-states",
-        name: "api.action.wallee.configuration.install-order-delivery-states",
-        methods: ['POST'])]
 	public function installOrderDeliveryStates(Context $context): JsonResponse
 	{
 		/**

diff --git a/src/Core/Api/OrderDeliveryState/Command/OrderDeliveryStateCommand.php b/src/Core/Api/OrderDeliveryState/Command/OrderDeliveryStateCommand.php
@@ -6,7 +6,6 @@
 use Shopware\Core\Framework\Context;
 use Symfony\Component\{
 	Console\Command\Command,
-    Console\Attribute\AsCommand,
 	Console\Input\InputInterface,
 	Console\Output\OutputInterface};
 use WalleePayment\Core\Api\OrderDeliveryState\Service\OrderDeliveryStateService;
@@ -16,9 +15,13 @@
  *
  * @package WalleePayment\Core\Api\OrderDeliveryState\Command
  */
-#[AsCommand(name: 'wallee:order-delivery-states:install')]
 class OrderDeliveryStateCommand extends Command {
 
+	/**
+	 * @var string
+	 */
+	protected static $defaultName = 'wallee:order-delivery-states:install';
+
 	/**
 	 * @var \WalleePayment\Core\Api\OrderDeliveryState\Service\OrderDeliveryStateService
 	 */
@@ -31,7 +34,7 @@ class OrderDeliveryStateCommand extends Command {
 	 */
 	public function __construct(OrderDeliveryStateService $orderDeliveryStateService)
 	{
-		parent::__construct();
+		parent::__construct(self::$defaultName);
 		$this->orderDeliveryStateService = $orderDeliveryStateService;
 	}
 
@@ -56,4 +59,4 @@ protected function configure()
 			 ->setHelp('This command installs WalleePayment extra delivery states.');
 	}
 
-}
+}