NTR: add auto redirect again

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/Storefront/POS/PosControllerBase.php

@@ -15,8 +15,8 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\RouterInterface;
 
 class PosControllerBase extends StorefrontController
 {
@@ -166,10 +166,12 @@ public function statusAction(SalesChannelContext $context, string $orderId, stri
             );
         }
 
+        $isSuccess = MolliePaymentStatus::isApprovedStatus($molliePayment->status);
+
         return new JsonResponse([
             'ready' => $ready,
             'redirectUrl' => $url,
-            'status' => $status
+            'success' => $isSuccess
         ]);
     }
 }

src/MolliePayments.php

@@ -6,6 +6,7 @@
 use Kiener\MolliePayments\Compatibility\DependencyLoader;
 use Kiener\MolliePayments\Components\Installer\PluginInstaller;
 use Kiener\MolliePayments\Repository\CustomFieldSet\CustomFieldSetRepository;
+use Psr\Container\ContainerInterface;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\Migration\MigrationCollection;
@@ -88,10 +89,13 @@ public function install(InstallContext $context): void
     {
         parent::install($context);
 
+        /** @var ContainerInterface $container */
+        $container = $this->container;
+
         # that's the only part we use the Shopware repository directly,
         # and not our custom one, because our repositories are not yet registered in this function
         /** @var EntityRepository $shopwareRepoCustomFields */
-        $shopwareRepoCustomFields = $this->container->get('custom_field_set.repository');
+        $shopwareRepoCustomFields = $container->get('custom_field_set.repository');
 
         if ($shopwareRepoCustomFields !== null) {
             $mollieRepoCustomFields = new CustomFieldSetRepository($shopwareRepoCustomFields);
@@ -166,8 +170,11 @@ public function deactivate(DeactivateContext $context): void
      */
     private function preparePlugin(Context $context): void
     {
+        /** @var ContainerInterface $container */
+        $container = $this->container;
+
         /** @var PluginInstaller $pluginInstaller */
-        $pluginInstaller = $this->container->get(PluginInstaller::class);
+        $pluginInstaller = $container->get(PluginInstaller::class);
 
         $pluginInstaller->install($context);
     }

src/Resources/config/compatibility/controller.xml

@@ -76,6 +76,7 @@
             <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
+            <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepository"/>
             <argument type="service" id="mollie_payments.logger"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>

src/Resources/config/compatibility/controller_6.5.xml

@@ -75,6 +75,7 @@
             <argument type="service" id="Kiener\MolliePayments\Controller\Storefront\Webhook\NotificationFacade"/>
             <argument type="service" id="Kiener\MolliePayments\Components\Subscription\SubscriptionManager"/>
             <argument type="service" id="Kiener\MolliePayments\Repository\Order\OrderRepository"/>
+            <argument type="service" id="Kiener\MolliePayments\Repository\OrderTransaction\OrderTransactionRepository"/>
             <argument type="service" id="mollie_payments.logger"/>
             <call method="setContainer">
                 <argument type="service" id="service_container"/>

src/Resources/views/mollie/pos/checkout.html.twig

@@ -177,36 +177,40 @@
 </style>
 
 
-
 <div class="mollie-content js-mollie-content">
     <div class="mollie-info-container js-info-loading m-info-show">
         <div class="mollie-headline-container">
-            <div class="mollie-headline">
-                <span>Terminal name</span>
+            <div class="mollie-headline"> 
                 <h2 class="m-headline loading">Follow the instructions on the terminal</h2>
                 <h2 class="m-headline success" style="display:none">Your payment was successful!</h2>
                 <h2 class="m-headline failed" style="display:none">Your payment was not successful!</h2>
                 <p class="failed" style="display:none">No money has been debited from the debit card</p>
                 <a href="#" title="Return to website" id="returnButton" class="m-button" style="display:none">
                     Return to website
-                    <svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M17.17 32.92l9.17-9.17-9.17-9.17 2.83-2.83 12 12-12 12z"/><path d="M0-.25h48v48h-48z" fill="none"/></svg>
+                    <svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M17.17 32.92l9.17-9.17-9.17-9.17 2.83-2.83 12 12-12 12z"/>
+                        <path d="M0-.25h48v48h-48z" fill="none"/>
+                    </svg>
                 </a>
             </div>
             {% if changeStatusUrl %}
                 <a href="{{ changeStatusUrl }}" title="Change Status in Test Mode" target="_blank" id="statusChange" class="m-button">
                     Change Status in Test Mode
-                    <svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="M17.17 32.92l9.17-9.17-9.17-9.17 2.83-2.83 12 12-12 12z"/><path d="M0-.25h48v48h-48z" fill="none"/></svg>
+                    <svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M17.17 32.92l9.17-9.17-9.17-9.17 2.83-2.83 12 12-12 12z"/>
+                        <path d="M0-.25h48v48h-48z" fill="none"/>
+                    </svg>
                 </a>
             {% endif %}
         </div>
         <div class="mollie-image-container loading">
-            <img srcset="{{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/img/pos/loading.png', 'asset') }}" alt="Mollie" />
+            <img srcset="{{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/loading.png', 'asset') }}" alt="Mollie"/>
         </div>
         <div class="mollie-image-container success" style="display:none">
-            <img srcset="{{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/img/pos/success.png', 'asset') }}" alt="Mollie" />
+            <img srcset="{{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/success.png', 'asset') }}" alt="Mollie"/>
         </div>
         <div class="mollie-image-container failed" style="display:none">
-            <img srcset="{{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/img/pos/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/img/pos/failed.png', 'asset') }}" alt="Mollie" />
+            <img srcset="{{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 2x {{ asset('bundles/molliepayments/static/[email protected]', 'asset') }} 3x" src="{{ asset('bundles/molliepayments/static/failed.png', 'asset') }}" alt="Mollie"/>
         </div>
     </div>
 </div>
@@ -219,39 +223,44 @@
     const successElements = Array.from(document.getElementsByClassName('success'));
     const failedElements = Array.from(document.getElementsByClassName('failed'));
 
-    function handleResponse(response){
-        console.log(response.target.response);
+    function handleResponse(response) {
+
         const json = JSON.parse(response.target.response);
 
         if (json.ready) {
             clearInterval(interval);
-            if(statusChangeButton !== null){
+
+            if (statusChangeButton !== null) {
                 statusChangeButton.style.display = 'none';
             }
-            loadingElements.forEach(function(element){
+
+            loadingElements.forEach(function (element) {
                 element.style.display = 'none';
             });
+
             returnButton.style.display = 'block';
-            returnButton.href= json.redirectUrl;
-            if(json.status === 'open' || json.status === 'paid'){
-                successElements.forEach(function(element){
+            returnButton.href = json.redirectUrl;
+
+            if (json.success) {
+                successElements.forEach(function (element) {
                     element.style.display = 'block';
                 });
-            }else{
-                failedElements.forEach(function(element){
+            } else {
+                failedElements.forEach(function (element) {
                     element.style.display = 'block';
                 });
             }
 
+            window.location.href = json.redirectUrl;
         }
     }
+
     function requestStatus() {
         const xhr = new XMLHttpRequest();
         xhr.open('GET', '/mollie/pos/{{ swOrderId }}/{{ molliePaymentId }}/status');
         xhr.setRequestHeader('Content-Type', 'application/json');
 
         xhr.onload = handleResponse;
-
         xhr.onerror = handleResponse;
 
         xhr.send();

tests/Cypress/cypress/e2e/storefront/payment-methods/pos.cy.js

@@ -65,7 +65,7 @@ describe('POS Terminals', () => {
                 shopware.prepareDomainChange();
                 checkout.placeOrderOnConfirm();
 
-                cy.contains('waiting for payment');
+                cy.contains('Follow the instructions on the terminal');
             })
         })
     })