Adding subscription functionality to payment plugin version 1.5.5

.gitignore

@@ -5,10 +5,6 @@
 .DS_Store
 /tests/Cypress/package-lock.json
 
-src/Resources/app/administration/node_modules
-
 src/Resources/app/storefront/dist/
-src/Resources/app/storefront/node_modules
 
-src/Resources/public/administration/css/
 src/Resources/public/administration/js/

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "kiener/mollie-payments-plugin",
   "description": "Mollie Payments",
-  "version": "v1.5.7",
+  "version": "v1.5.5",
   "type": "shopware-platform-plugin",
   "license": "MIT",
   "authors": [
@@ -57,7 +57,7 @@
     "shopware/administration": "<6,>=7"
   },
   "require": {
-    "mollie/mollie-api-php": "^2.39"
+    "mollie/mollie-api-php": "^2.37"
   },
   "require-dev": {
     "shopware/core": "*",

src/Compatibility/Storefront/Route/PaymentMethodRoute/Voucher/HideVoucherPaymentMethodRoute62.php

@@ -9,7 +9,6 @@
 use Shopware\Core\Checkout\Payment\SalesChannel\AbstractPaymentMethodRoute;
 use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 
 
@@ -22,25 +21,24 @@ class HideVoucherPaymentMethodRoute62 extends AbstractPaymentMethodRoute
     private $corePaymentMethodRoute;
 
     /**
-     * @var VoucherService
+     * @var CartService
      */
-    private $voucherService;
+    private $cartService;
 
     /**
-     * @var Container
+     * @var VoucherService
      */
-    private $container;
-
+    private $voucherService;
 
     /**
      * @param AbstractPaymentMethodRoute $corePaymentMethodRoute
-     * @param Container $container
+     * @param CartService $cartService
      * @param VoucherService $voucherService
      */
-    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, Container $container, VoucherService $voucherService)
+    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, CartService $cartService, VoucherService $voucherService)
     {
         $this->corePaymentMethodRoute = $corePaymentMethodRoute;
-        $this->container = $container;
+        $this->cartService = $cartService;
         $this->voucherService = $voucherService;
     }
 
@@ -67,8 +65,7 @@ public function load(Request $request, SalesChannelContext $context): PaymentMet
     {
         $originalData = $this->corePaymentMethodRoute->load($request, $context);
 
-        $cartService = $this->getCartServiceLazy();
-        $cart = $cartService->getCart($context->getToken(), $context);
+        $cart = $this->cartService->getCart($context->getToken(), $context);
 
         $voucherPermitted = (bool)$cart->getData()->get(VoucherCartCollector::VOUCHER_PERMITTED);
 
@@ -91,22 +88,4 @@ public function load(Request $request, SalesChannelContext $context): PaymentMet
         return $originalData;
     }
 
-    /**
-     * We have to use lazy loading for this. Otherwise there are plugin compatibilities
-     * with a circular reference...even though XML looks fine.
-     *
-     * @return CartService
-     * @throws \Exception
-     */
-    private function getCartServiceLazy(): CartService
-    {
-        $service = $this->container->get('Shopware\Core\Checkout\Cart\SalesChannel\CartService');
-
-        if (!$service instanceof CartService) {
-            throw new \Exception('CartService of Shopware not found!');
-        }
-
-        return $service;
-    }
-
 }

src/Compatibility/Storefront/Route/PaymentMethodRoute/Voucher/HideVoucherPaymentMethodRoute63.php

@@ -8,7 +8,6 @@
 use Shopware\Core\Checkout\Payment\SalesChannel\AbstractPaymentMethodRoute;
 use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 
 
@@ -21,25 +20,24 @@ class HideVoucherPaymentMethodRoute63 extends AbstractPaymentMethodRoute
     private $corePaymentMethodRoute;
 
     /**
-     * @var VoucherService
+     * @var CartService
      */
-    private $voucherService;
+    private $cartService;
 
     /**
-     * @var Container
+     * @var VoucherService
      */
-    private $container;
-
+    private $voucherService;
 
     /**
      * @param AbstractPaymentMethodRoute $corePaymentMethodRoute
-     * @param Container $container
+     * @param CartService $cartService
      * @param VoucherService $voucherService
      */
-    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, Container $container, VoucherService $voucherService)
+    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, CartService $cartService, VoucherService $voucherService)
     {
         $this->corePaymentMethodRoute = $corePaymentMethodRoute;
-        $this->container = $container;
+        $this->cartService = $cartService;
         $this->voucherService = $voucherService;
     }
 
@@ -61,8 +59,7 @@ public function load(Request $request, SalesChannelContext $context): PaymentMet
     {
         $originalData = $this->corePaymentMethodRoute->load($request, $context);
 
-        $cartService = $this->getCartServiceLazy();
-        $cart = $cartService->getCart($context->getToken(), $context);
+        $cart = $this->cartService->getCart($context->getToken(), $context);
 
         $voucherPermitted = (bool)$cart->getData()->get(VoucherCartCollector::VOUCHER_PERMITTED);
 
@@ -85,22 +82,4 @@ public function load(Request $request, SalesChannelContext $context): PaymentMet
         return $originalData;
     }
 
-    /**
-     * We have to use lazy loading for this. Otherwise there are plugin compatibilities
-     * with a circular reference...even though XML looks fine.
-     *
-     * @return CartService
-     * @throws \Exception
-     */
-    private function getCartServiceLazy(): CartService
-    {
-        $service = $this->container->get('Shopware\Core\Checkout\Cart\SalesChannel\CartService');
-
-        if (!$service instanceof CartService) {
-            throw new \Exception('CartService of Shopware not found!');
-        }
-
-        return $service;
-    }
-
 }

src/Compatibility/Storefront/Route/PaymentMethodRoute/Voucher/HideVoucherPaymentMethodRoute64.php

@@ -9,7 +9,6 @@
 use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 
 
@@ -22,25 +21,24 @@ class HideVoucherPaymentMethodRoute64 extends AbstractPaymentMethodRoute
     private $corePaymentMethodRoute;
 
     /**
-     * @var VoucherService
+     * @var CartService
      */
-    private $voucherService;
+    private $cartService;
 
     /**
-     * @var Container
+     * @var VoucherService
      */
-    private $container;
-
+    private $voucherService;
 
     /**
      * @param AbstractPaymentMethodRoute $corePaymentMethodRoute
-     * @param Container $container
+     * @param CartService $cartService
      * @param VoucherService $voucherService
      */
-    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, Container $container, VoucherService $voucherService)
+    public function __construct(AbstractPaymentMethodRoute $corePaymentMethodRoute, CartService $cartService, VoucherService $voucherService)
     {
         $this->corePaymentMethodRoute = $corePaymentMethodRoute;
-        $this->container = $container;
+        $this->cartService = $cartService;
         $this->voucherService = $voucherService;
     }
 
@@ -63,8 +61,8 @@ public function load(Request $request, SalesChannelContext $context, Criteria $c
     {
         $originalData = $this->corePaymentMethodRoute->load($request, $context, $criteria);
 
-        $cartService = $this->getCartServiceLazy();
-        $cart = $cartService->getCart($context->getToken(), $context);
+        $cart = $this->cartService->getCart($context->getToken(), $context);
+
 
         $voucherPermitted = (bool)$cart->getData()->get(VoucherCartCollector::VOUCHER_PERMITTED);
 
@@ -87,22 +85,4 @@ public function load(Request $request, SalesChannelContext $context, Criteria $c
         return $originalData;
     }
 
-    /**
-     * We have to use lazy loading for this. Otherwise there are plugin compatibilities
-     * with a circular reference...even though XML looks fine.
-     *
-     * @return CartService
-     * @throws \Exception
-     */
-    private function getCartServiceLazy(): CartService
-    {
-        $service = $this->container->get('Shopware\Core\Checkout\Cart\SalesChannel\CartService');
-
-        if (!$service instanceof CartService) {
-            throw new \Exception('CartService of Shopware not found!');
-        }
-
-        return $service;
-    }
-
 }

src/Controller/Api/SubscriptionController.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Controller\Api;
+
+use Shopware\Core\Framework\Routing\Annotation\RouteScope;
+use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
+use Shopware\Core\Framework\Context;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Annotation\Route;
+use Kiener\MolliePayments\Service\Subscription\CancelSubscriptionsService;
+
+class SubscriptionController extends AbstractController
+{
+    /**
+     * @var CancelSubscriptionsService
+     */
+    private CancelSubscriptionsService $cancelSubscriptionsService;
+
+    /**
+     * Creates a new instance of the onboarding controller.
+     *
+     * @param CancelSubscriptionsService $cancelSubscriptionsService
+     */
+    public function __construct(CancelSubscriptionsService $cancelSubscriptionsService)
+    {
+        $this->cancelSubscriptionsService = $cancelSubscriptionsService;
+    }
+
+    /**
+     * @RouteScope(scopes={"api"})
+     * @Route("/api/_action/mollie/subscription/cancel",
+     *         defaults={"auth_enabled"=true}, name="api.action.mollie.subscription.cancel", methods={"POST"})
+     *
+     * @param RequestDataBag $data
+     * @param Context $context
+     * @return JsonResponse
+     */
+    public function cancel(RequestDataBag $data, Context $context): JsonResponse
+    {
+        return $this->cancelSubscriptionsService->cancelSubscriptions(
+            $data->get('id'),
+            $data->get('customerId'),
+            $data->get('salesChannelId')
+        );
+    }
+}

src/Core/Content/SubscriptionToProduct/SubscriptionToProductCollection.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Core\Content\SubscriptionToProduct;
+
+use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection;
+
+/**
+ * @method void                                   add(SubscriptionToProductEntity $entity)
+ * @method void                                   set(string $key, SubscriptionToProductEntity $entity)
+ * @method SubscriptionToProductEntity[]     getIterator()
+ * @method SubscriptionToProductEntity[]     getElements()
+ * @method SubscriptionToProductEntity|null  get(string $key)
+ * @method SubscriptionToProductEntity|null  first()
+ * @method SubscriptionToProductEntity|null  last()
+ */
+class SubscriptionToProductCollection extends EntityCollection
+{
+    /**
+     * @return string
+     */
+    protected function getExpectedClass(): string
+    {
+        return SubscriptionToProductEntity::class;
+    }
+}