Release 6.1.3

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 6.1.3
+- Solvency check support for Powerpay and MF Group Invoice payment methods
+- Improved handling of abandoned transactions
+
 # 6.1.2
 - Fixed redirect to confirmation page after reload
 

CHANGELOG_de-DE.md

@@ -1,14 +1,21 @@
+# 6.1.3
+- Unterstützung der Bonitätsprüfung für die Zahlungsmethoden Powerpay und MF Group Invoice
+- Verbesserte Handhabung abgebrochener Transaktionen
+
 # 6.1.2
 - Die Weiterleitung zur Bestätigungsseite nach dem Neuladen wurde behoben
 
 # 6.1.1
 - Fixed deprecated OrderNotFoundException
 
-# 5.0.8
+# 6.1.0
 - 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
 

README.md

@@ -3,13 +3,22 @@
 PostFinanceCheckout Payment for Shopware 6
 =============================
 
-The PostFinanceCheckout Payment plugin wraps around the PostFinanceCheckout 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/pfpayments/shopware-6-4
+The PostFinanceCheckout Payment plugin wraps around the PostFinanceCheckout 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/pfpayments/shopware-6-4).
 
 ## Requirements
 
-- PHP 7.4 - 8.2
-- Shopware 6.5.x
+- 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           |
+-----------------------------------------------------------------------------------
 
 ## Installation
 
@@ -62,8 +71,8 @@ tail -f var/log/postfinancecheckout_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/5.0.9/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/6.1.3/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/shopware-6/blob/master/LICENSE.txt) for more information.
+Please see the [license file](https://github.com/pfpayments/shopware-6/blob/master/LICENSE.txt) for more information.

composer.json

@@ -11,8 +11,8 @@
         }
     },
     "conflict": {
-        "shopware/administration": "<6.4.2.1,>=7",
-        "shopware/storefront": "<6.4.2.1,>=7"
+        "shopware/administration": "<6.6.0.0,>=7",
+        "shopware/storefront": "<6.6.0.0,>=7"
     },
     "description": "PostFinanceCheckout integration for Shopware 6",
     "extra": {
@@ -56,11 +56,11 @@
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "php": ">=7.4",
-        "shopware/core": "6.5.*",
-        "shopware/storefront": "6.5.*",
+        "php": ">=8.2",
+        "shopware/core": "6.6.*",
+        "shopware/storefront": "6.6.*",
         "postfinancecheckout/sdk": "4.0.2"
     },
     "type": "shopware-platform-plugin",
-    "version": "5.0.9"
+    "version": "6.1.3"
 }

docs/en/documentation.html

@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/shopware-6/releases/tag/5.0.9/">
+		<a href="https://github.com/pfpayments/shopware-6/releases/tag/6.1.3/">
 			Source
 		</a>
 	</li>

src/Core/Api/Configuration/Controller/ConfigurationController.php

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

src/Core/Api/OrderDeliveryState/Command/OrderDeliveryStateCommand.php

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

src/Core/Api/PaymentMethodConfiguration/Command/PaymentMethodConfigurationCommand.php

@@ -6,6 +6,7 @@
 use Shopware\Core\Framework\Context;
 use Symfony\Component\{
 	Console\Command\Command,
+    Console\Attribute\AsCommand,
 	Console\Input\InputInterface,
 	Console\Output\OutputInterface};
 use PostFinanceCheckoutPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService;
@@ -15,13 +16,9 @@
  *
  * @package PostFinanceCheckoutPayment\Core\Api\PaymentMethodConfiguration\Command
  */
+#[AsCommand(name: 'postfinancecheckout:payment-method:configuration')]
 class PaymentMethodConfigurationCommand extends Command {
 
-	/**
-	 * @var string
-	 */
-	protected static $defaultName = 'postfinancecheckout:payment-method:configuration';
-
 	/**
 	 * @var \PostFinanceCheckoutPayment\Core\Api\PaymentMethodConfiguration\Service\PaymentMethodConfigurationService
 	 */
@@ -34,7 +31,7 @@ class PaymentMethodConfigurationCommand extends Command {
 	 */
 	public function __construct(PaymentMethodConfigurationService $paymentMethodConfigurationService)
 	{
-		parent::__construct(self::$defaultName);
+		parent::__construct();
 		$this->paymentMethodConfigurationService = $paymentMethodConfigurationService;
 	}
 
@@ -62,4 +59,4 @@ protected function configure()
 			 ->setHelp('This command fetches PostFinanceCheckoutPayment space available payment methods.');
 	}
 
-}
+}

src/Core/Api/PaymentMethodConfiguration/Command/PaymentMethodDefaultCommand.php

@@ -6,6 +6,7 @@
 use Shopware\Core\Framework\Context;
 use Symfony\Component\{
 	Console\Command\Command,
+    Console\Attribute\AsCommand,
 	Console\Input\InputInterface,
 	Console\Output\OutputInterface};
 use PostFinanceCheckoutPayment\Core\Util\PaymentMethodUtil;
@@ -15,13 +16,9 @@
  *
  * @package PostFinanceCheckoutPayment\Core\Api\PaymentMethodConfiguration\Command
  */
+#[AsCommand(name: 'postfinancecheckout:payment-method:default')]
 class PaymentMethodDefaultCommand extends Command {
 
-	/**
-	 * @var string
-	 */
-	protected static $defaultName = 'postfinancecheckout:payment-method:default';
-
 	/**
 	 * @var \PostFinanceCheckoutPayment\Core\Util\PaymentMethodUtil
 	 */
@@ -34,7 +31,7 @@ class PaymentMethodDefaultCommand extends Command {
 	 */
 	public function __construct(PaymentMethodUtil $paymentMethodUtil)
 	{
-		parent::__construct(self::$defaultName);
+		parent::__construct();
 		$this->paymentMethodUtil = $paymentMethodUtil;
 	}
 
@@ -61,4 +58,4 @@ protected function configure()
 			 ->setHelp('This command updates PostFinanceCheckoutPayment as default payment method for all SalesChannels.');
 	}
 
-}
+}

src/Core/Api/Refund/Controller/RefundController.php

@@ -4,7 +4,7 @@
 
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\Routing\Annotation\RouteScope;
+use Shopware\Core\Framework\Log\Package;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\{
 	HttpFoundation\Request,
@@ -20,8 +20,9 @@
  *
  * @package PostFinanceCheckoutPayment\Core\Api\Refund\Controller
  *
- * @Route(defaults={"_routeScope"={"api"}})
  */
+#[Package('sales-channel')]
+#[Route(defaults: ['_routeScope' => ['api']])]
 class RefundController extends AbstractController {
 
 	/**
@@ -69,12 +70,10 @@ public function setLogger(LoggerInterface $logger): void
 	 * @throws \PostFinanceCheckout\Sdk\ApiException
 	 * @throws \PostFinanceCheckout\Sdk\Http\ConnectionException
 	 * @throws \PostFinanceCheckout\Sdk\VersioningException
-	 * @Route(
-	 *     "/api/_action/postfinancecheckout/refund/create-refund/",
-	 *     name="api.action.postfinancecheckout.refund.create-refund",
-	 *     methods={"POST"}
-	 *     )
 	 */
+    #[Route("/api/_action/postfinancecheckout/refund/create-refund/",
+    	name: "api.action.postfinancecheckout.refund.create-refund",
+        methods: ['POST'])]
 	public function createRefund(Request $request, Context $context): Response
 	{
 		$salesChannelId   = $request->request->get('salesChannelId');
@@ -98,12 +97,10 @@ public function createRefund(Request $request, Context $context): Response
 	 * @throws \PostFinanceCheckout\Sdk\ApiException
 	 * @throws \PostFinanceCheckout\Sdk\Http\ConnectionException
 	 * @throws \PostFinanceCheckout\Sdk\VersioningException
-	 * @Route(
-	 *     "/api/_action/postfinancecheckout/refund/create-refund-by-amount/",
-	 *     name="api.action.postfinancecheckout.refund.create.refund.by.amount",
-	 *     methods={"POST"}
-	 *     )
 	 */
+    #[Route("/api/_action/postfinancecheckout/refund/create-refund-by-amount/",
+    	name: "api.action.postfinancecheckout.refund.create.refund.by.amount",
+        methods: ['POST'])]
 	public function createRefundByAmount(Request $request, Context $context): Response
 	{
 		$salesChannelId   = $request->request->get('salesChannelId');
@@ -118,4 +115,4 @@ public function createRefundByAmount(Request $request, Context $context): Respon
 
 		return new Response(null, Response::HTTP_NO_CONTENT);
 	}
-}
+}