Fix AltaPay callback redirect layout rendering.

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.2.3]
+### Fixed
+- Fix AltaPay callback redirect layout rendering.
+
 ## [4.2.2]
 ### Added
 - Fixed compatibility issues with PHP 8.1.

Controller/Index/Redirect.php

@@ -10,13 +10,41 @@
 namespace SDM\Altapay\Controller\Index;
 
 use Magento\Framework\App\ResponseInterface;
-use SDM\Altapay\Controller\Index;
 use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\View\LayoutFactory;
 
-class Redirect extends Index implements CsrfAwareActionInterface
+class Redirect extends Action implements CsrfAwareActionInterface
 {
+    /**
+     * @var LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @var RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * Redirect constructor.
+     * @param Context $context
+     * @param LayoutFactory $layoutFactory
+     * @param RawFactory $resultRawFactory
+     */
+    public function __construct(
+        Context $context,
+        LayoutFactory $layoutFactory,
+        RawFactory $resultRawFactory
+    ) {
+        parent::__construct($context);
+        $this->layoutFactory = $layoutFactory;
+        $this->resultRawFactory = $resultRawFactory;
+    }
 
     /**
      * Dispatch request
@@ -40,11 +68,16 @@ public function validateForCsrf(RequestInterface $request): ?bool
     {
         return true;
     }
-
     public function execute()
     {
-        $this->writeLog();
+        $layout = $this->layoutFactory->create();
+
+        $block = $layout->createBlock(\SDM\Altapay\Block\Callback\Redirect::class)
+            ->setTemplate('SDM_Altapay::callback_redirect.phtml');
+
+        $result = $this->resultRawFactory->create();
+        $result->setContents($block->toHtml());
 
-        return $this->pageFactory->create();
+        return $result;
     }
 }

Model/Handler/OrderLinesHandler.php

@@ -209,6 +209,6 @@ public function totalCompensationAmount($orderLines, $total)
             $orderLinesTotal += $orderLinePriceWithTax - ($orderLinePriceWithTax * ($orderLine->discount / 100));
         }
 
-        return round(($total - $orderLinesTotal), 3);
+        return (round($total * 100) - round($orderLinesTotal * 100)) / 100;
     }
 }

Setup/Patch/Data/MaskedPanUpdate.php

@@ -75,6 +75,6 @@ public static function getDependencies()
      */
     public static function getVersion()
     {
-        return '4.2.2';
+        return '4.2.3';
     }
 }

Test/integration-tests/cypress/e2e/PageObjects/objects.cy.js

@@ -47,7 +47,7 @@ class Order {
         }
         cy.get('#creditCardNumberInput').type('4111111111111111')
         cy.get('#emonth').select('12')
-        cy.get('#eyear').select('2025')
+        cy.get('#eyear').select('2030')
         cy.get('#cvcInput').type('123')
         cy.get('#cardholderNameInput').type('testname')
         cy.get('body').then(($p) => {
@@ -139,7 +139,7 @@ class Order {
             cy.get('._active > .payment-method-content > :nth-child(5) > div.primary > .action').click().wait(3000)
             cy.get('#creditCardNumberInput').type('4111111111111111')
             cy.get('#emonth').type('01')
-            cy.get('#eyear').type('2023')
+            cy.get('#eyear').type('2030')
             cy.get('#cvcInput').type('123')
             cy.get('#cardholderNameInput').type('testname')
             cy.get('#pensioCreditCardPaymentSubmitButton').click().wait(6000)

Test/integration-tests/cypress/e2e/examples/payment.cy.js

@@ -96,7 +96,7 @@ describe('Payments', function () {
                             cy.visit(payment_link)
                             cy.get('#creditCardNumberInput').type('4111111111111111')
                             cy.get('#emonth').select('12')
-                            cy.get('#eyear').select('2025')
+                            cy.get('#eyear').select('2030')
                             cy.get('#cvcInput').type('123')
                             cy.get('#cardholderNameInput').type('testname')
                             cy.get('#pensioCreditCardPaymentSubmitButton').click().wait(3000)

Test/integration-tests/max/cypress/e2e/PageObjects/objects.cy.js

@@ -44,7 +44,7 @@ class Order {
         }
         cy.get('#creditCardNumberInput').type('4111111111111111')
         cy.get('#emonth').select('12')
-        cy.get('#eyear').select('2025')
+        cy.get('#eyear').select('2030')
         cy.get('#cvcInput').type('123')
         cy.get('#cardholderNameInput').type('testname')
         cy.get('body').then(($p) => {

Test/integration-tests/max/cypress/e2e/examples/payment.cy.js

@@ -96,7 +96,7 @@ describe('Payments', function () {
                             cy.visit(payment_link)
                             cy.get('#creditCardNumberInput').type('4111111111111111')
                             cy.get('#emonth').select('12')
-                            cy.get('#eyear').select('2025')
+                            cy.get('#eyear').select('2030')
                             cy.get('#cvcInput').type('123')
                             cy.get('#cardholderNameInput').type('testname')
                             cy.get('#pensioCreditCardPaymentSubmitButton').click().wait(3000)