MOL-1222: add POS payment method (#620)

* MOL-1222: Payment Method POS Terminals

* NTR: Pos layout

* NTR: hide status change

* NTR: handle response

* NTR: add auto redirect again

---------

Co-authored-by: Vitalij Mik <[email protected]>

.gitignore

@@ -15,6 +15,7 @@ src/Resources/public/administration/js/
 /tests/Cypress/cypress/results
 /src/Resources/app/administration/.stryker-tmp
 /.phpunuhi/
-/src/Resources/public/static
+/src/Resources/public/static/css
+/src/Resources/public/static/js
 /src/Resources/public/js
 /src/Resources/public/mollie-payments.js

composer.json

@@ -36,7 +36,8 @@
     "config": {
         "optimize-autoloader": true,
         "allow-plugins": {
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {
@@ -64,7 +65,7 @@
     "require": {
         "php": ">=7.4",
         "ext-curl": "*",
-        "mollie/mollie-api-php": "2.40.1"
+        "mollie/mollie-api-php": "2.61.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

makefile

@@ -47,7 +47,9 @@ clean: ## Cleans all dependencies and files
 	rm -rf ./src/Resources/app/storefront/node_modules/*
 	# ------------------------------------------------------
 	rm -rf ./src/Resources/app/storefront/dist/storefront
-	rm -rf ./src/Resources/public
+	# ------------------------------------------------------
+	rm -rf ./src/Resources/public/administration
+	rm -rf ./src/Resources/public/molllie-payments.js
 
 build: ## Installs the plugin, and builds the artifacts using the Shopware build commands.
 	php switch-composer.php prod

src/Controller/Api/Webhook/WebhookControllerBase.php

@@ -7,6 +7,7 @@
 use Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade;
 use Kiener\MolliePayments\Repository\Order\OrderRepository;
 use Kiener\MolliePayments\Repository\Order\OrderRepositoryInterface;
+use Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepositoryInterface;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionEntity;
 use Shopware\Core\Framework\Context;
@@ -39,18 +40,25 @@ class WebhookControllerBase extends AbstractController
      */
     private $logger;
 
+    /**
+     * @var OrderTransactionRepositoryInterface
+     */
+    private $repoOrderTransactions;
+
 
     /**
      * @param NotificationFacade $notificationFacade
      * @param SubscriptionManager $subscriptions
      * @param OrderRepositoryInterface $repoOrders
+     * @param OrderTransactionRepositoryInterface $repoOrderTransactions
      * @param LoggerInterface $logger
      */
-    public function __construct(NotificationFacade $notificationFacade, SubscriptionManager $subscriptions, OrderRepositoryInterface $repoOrders, LoggerInterface $logger)
+    public function __construct(NotificationFacade $notificationFacade, SubscriptionManager $subscriptions, OrderRepositoryInterface $repoOrders, OrderTransactionRepositoryInterface $repoOrderTransactions, LoggerInterface $logger)
     {
         $this->notificationFacade = $notificationFacade;
         $this->subscriptions = $subscriptions;
         $this->repoOrders = $repoOrders;
+        $this->repoOrderTransactions = $repoOrderTransactions;
         $this->logger = $logger;
     }
 
@@ -151,8 +159,7 @@ public function webhookSubscriptionAction(string $swSubscriptionId, Request $req
             }
 
             # now lets grab the latest order transaction of our new order
-            /** @var OrderTransactionEntity $latestTransaction */
-            $latestTransaction = $this->notificationFacade->getOrderTransactions($swOrder->getId(), $context)->last();
+            $latestTransaction = $this->repoOrderTransactions->getLatestOrderTransaction($swOrder->getId(), $context);
 
             # now simply redirect to the official webhook
             # that handles the full order, validates the payment and

src/Controller/StoreApi/POS/PosControllerBase.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Kiener\MolliePayments\Controller\StoreApi\POS;
+
+use Kiener\MolliePayments\Controller\StoreApi\POS\Response\StoreTerminalResponse;
+use Kiener\MolliePayments\Controller\StoreApi\POS\Response\TerminalsResponse;
+use Kiener\MolliePayments\Gateway\MollieGatewayInterface;
+use Kiener\MolliePayments\Service\CustomerService;
+use Mollie\Api\Resources\Terminal;
+use Shopware\Core\Checkout\Customer\CustomerEntity;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Shopware\Core\System\SalesChannel\StoreApiResponse;
+use Symfony\Component\Routing\Annotation\Route;
+
+class PosControllerBase
+{
+
+    /**
+     * @var CustomerService
+     */
+    private $customerService;
+
+    /**
+     * @var MollieGatewayInterface
+     */
+    private $mollieGateway;
+
+
+    /**
+     * @param CustomerService $customerService
+     * @param MollieGatewayInterface $mollieGateway
+     */
+    public function __construct(CustomerService $customerService, MollieGatewayInterface $mollieGateway)
+    {
+        $this->customerService = $customerService;
+        $this->mollieGateway = $mollieGateway;
+    }
+
+
+    /**
+     * @Route("/store-api/mollie/pos/terminals", name="store-api.mollie.pos.terminals", methods={"GET"})
+     *
+     * @param SalesChannelContext $context
+     * @return StoreApiResponse
+     */
+    public function getIssuers(SalesChannelContext $context): StoreApiResponse
+    {
+        $this->mollieGateway->switchClient($context->getSalesChannelId());
+
+        $terminalsArray = [];
+
+        $terminals = $this->mollieGateway->getPosTerminals();
+
+        foreach ($terminals as $terminal) {
+            $terminalsArray[] = [
+                'id' => $terminal->id,
+                'name' => $terminal->description,
+            ];
+        }
+
+        return new TerminalsResponse($terminalsArray);
+    }
+
+    /**
+     * @Route("/store-api/mollie/pos/store-terminal/{customerId}/{terminalID}", name="store-api.mollie.pos.store-terminal", methods={"POST"})
+     *
+     * @param string $customerId
+     * @param string $terminalID
+     * @param SalesChannelContext $context
+     * @throws \Exception
+     * @return StoreApiResponse
+     */
+    public function saveTerminalId(string $customerId, string $terminalID, SalesChannelContext $context): StoreApiResponse
+    {
+        $customer = $this->customerService->getCustomer($customerId, $context->getContext());
+
+        if (!$customer instanceof CustomerEntity) {
+            throw new \Exception('Customer with ID ' . $customerId . ' not found in Shopware');
+        }
+
+        $result = $this->customerService->setPosTerminal(
+            $customer,
+            $terminalID,
+            $context->getContext()
+        );
+
+        return new StoreTerminalResponse($result !== null);
+    }
+}

src/Controller/StoreApi/POS/Response/StoreTerminalResponse.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Kiener\MolliePayments\Controller\StoreApi\POS\Response;
+
+use Shopware\Core\Framework\Struct\ArrayStruct;
+use Shopware\Core\System\SalesChannel\StoreApiResponse;
+
+class StoreTerminalResponse extends StoreApiResponse
+{
+    /**
+     * @var ArrayStruct<mixed, mixed>
+     */
+    protected $object;
+
+    /**
+     * @param bool $success
+     */
+    public function __construct(bool $success)
+    {
+        $this->object = new ArrayStruct(
+            [
+                'success' => $success,
+            ],
+            'mollie_payments_pos_terminal_stored'
+        );
+
+        parent::__construct($this->object);
+    }
+}

src/Controller/StoreApi/POS/Response/TerminalsResponse.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Kiener\MolliePayments\Controller\StoreApi\POS\Response;
+
+use Shopware\Core\Framework\Struct\ArrayStruct;
+use Shopware\Core\System\SalesChannel\StoreApiResponse;
+
+class TerminalsResponse extends StoreApiResponse
+{
+    /**
+     * @var ArrayStruct<mixed, mixed>
+     */
+    protected $object;
+
+
+    /**
+     * @param array<mixed> $terminals
+     */
+    public function __construct(array $terminals)
+    {
+        $this->object = new ArrayStruct(
+            [
+                'terminals' => $terminals,
+            ],
+            'mollie_payments_pos_terminals'
+        );
+
+        parent::__construct($this->object);
+    }
+}

src/Controller/StoreApi/POS/Sw6/PosController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Kiener\MolliePayments\Controller\StoreApi\POS\Sw6;
+
+use Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase;
+use Shopware\Core\Framework\Routing\Annotation\RouteScope;
+
+/**
+ * @RouteScope(scopes={"store-api"})
+ */
+class PosController extends PosControllerBase
+{
+}

src/Controller/StoreApi/POS/Sw65/PosController.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Kiener\MolliePayments\Controller\StoreApi\POS\Sw65;
+
+use Kiener\MolliePayments\Controller\StoreApi\POS\PosControllerBase;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(defaults={"_routeScope"={"store-api"}})
+ */
+class PosController extends PosControllerBase
+{
+}

src/Controller/StoreApi/iDEAL/Response/IssuersResponse.php

@@ -14,13 +14,13 @@ class IssuersResponse extends StoreApiResponse
 
 
     /**
-     * @param array<mixed> $issuers
+     * @param array<mixed> $terminals
      */
-    public function __construct(array $issuers)
+    public function __construct(array $terminals)
     {
         $this->object = new ArrayStruct(
             [
-                'issuers' => $issuers,
+                'issuers' => $terminals,
             ],
             'mollie_payments_ideal_issuers'
         );