From 7261f047d1d3b91d9874da4b54f49b912917f86c Mon Sep 17 00:00:00 2001
From: Kamil Balwierz <kamil.balwierz@tpay.com>
Date: Tue, 2 Jun 2026 16:45:46 +0200
Subject: [PATCH 1/5] Payment retry features

---
 CHANGELOG.MD                                  |  8 ++
 Controller/Adminhtml/Order/Reminder.php       | 78 +++++++++++++++++
 Model/Config/Source/EmailTemplate.php         | 17 ++++
 Model/TpayPayment.php                         |  2 +
 Plugin/AddSendReminderButtonInOrderView.php   | 40 +++++++++
 Service/ReminderService.php                   | 84 +++++++++++++++++++
 Service/TpayService.php                       |  5 +-
 Setup/Patch/Data/InstallOrderStatus.php       | 49 +++++++++++
 ViewModel/Order/Button.php                    | 44 ++++++++++
 etc/acl.xml                                   | 19 +++++
 etc/adminhtml/di.xml                          | 15 ++++
 etc/adminhtml/routes.xml                      | 17 ++++
 etc/adminhtml/system.xml                      |  4 +
 etc/config.xml                                |  3 +
 etc/email_templates.xml                       | 10 +++
 i18n/pl_PL.csv                                | 12 +++
 .../email/payment_reminder_email.html         | 18 ++++
 view/frontend/layout/sales_order_view.xml     | 14 ++++
 view/frontend/templates/button.phtml          | 16 ++++
 19 files changed, 453 insertions(+), 2 deletions(-)
 create mode 100644 Controller/Adminhtml/Order/Reminder.php
 create mode 100644 Model/Config/Source/EmailTemplate.php
 create mode 100644 Plugin/AddSendReminderButtonInOrderView.php
 create mode 100644 Service/ReminderService.php
 create mode 100644 Setup/Patch/Data/InstallOrderStatus.php
 create mode 100644 ViewModel/Order/Button.php
 create mode 100644 etc/acl.xml
 create mode 100644 etc/adminhtml/di.xml
 create mode 100644 etc/adminhtml/routes.xml
 create mode 100644 etc/email_templates.xml
 create mode 100644 view/frontend/email/payment_reminder_email.html
 create mode 100644 view/frontend/layout/sales_order_view.xml
 create mode 100644 view/frontend/templates/button.phtml

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index e3519bd..8625eb8 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.8.0
+
+### Added
+
+- New order status `pending_payment_tpay` assigned to newly created orders with Tpay payment methods.
+- Ability to click "Pay with Tpay" in customer order details view (for orders in status `pending_payment_tpay`)
+- Ability to send payment reminders from adminhtml order details view (for orders in status `pending_payment_tpay`)
+
 ## 2.7.0
 
 ### Added
diff --git a/Controller/Adminhtml/Order/Reminder.php b/Controller/Adminhtml/Order/Reminder.php
new file mode 100644
index 0000000..6d7d4d7
--- /dev/null
+++ b/Controller/Adminhtml/Order/Reminder.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tpay\Magento2\Controller\Adminhtml\Order;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Sales\Model\OrderRepository;
+use Throwable;
+use Tpay\Magento2\Model\TpayPayment;
+use Tpay\Magento2\Service\ReminderService;
+
+class Reminder extends Action
+{
+    /** @var ReminderService */
+    private $reminderService;
+
+    /** @var OrderRepository */
+    private $orderRepository;
+
+    public function __construct(
+        Context $context,
+        ReminderService $reminderService,
+        OrderRepository $orderRepository,
+    ) {
+        parent::__construct($context);
+        $this->reminderService = $reminderService;
+        $this->orderRepository = $orderRepository;
+    }
+
+    public function execute()
+    {
+        $order = $this->orderRepository->get($this->getRequest()->getParam('order_id'));
+
+        if (TpayPayment::ORDER_STATUS_PENDING !== $order->getStatus()) {
+            $this->messageManager->addErrorMessage(__('Reminder allowed only for pending payments.'));
+
+            return $this->redirectBack();
+        }
+
+        $payment = $order->getPayment();
+        if (null === $payment) {
+            $this->messageManager->addErrorMessage(__('No payment found for this order.'));
+
+            return $this->redirectBack();
+        }
+
+        $info = $payment->getAdditionalInformation();
+        if (empty($info['transaction_url'])) {
+            $this->messageManager->addErrorMessage(__('Payment does not contain transaction url.'));
+
+            return $this->redirectBack();
+        }
+
+        try {
+            if ($this->reminderService->reminder($order)) {
+                $this->messageManager->addSuccessMessage(__('Reminder has been sent.'));
+
+                return $this->redirectBack();
+            }
+        } catch (Throwable $exception) {
+            $this->messageManager->addErrorMessage($exception->getMessage());
+        }
+
+        $this->messageManager->addErrorMessage(__('Problem during sending reminder.'));
+
+        return $this->redirectBack();
+    }
+
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Tpay_Magento2::send_reminder');
+    }
+
+    private function redirectBack()
+    {
+        return $this->resultRedirectFactory->create()->setPath('sales/order/view', ['order_id' => $this->getRequest()->getParam('order_id')]);
+    }
+}
diff --git a/Model/Config/Source/EmailTemplate.php b/Model/Config/Source/EmailTemplate.php
new file mode 100644
index 0000000..0da6a6d
--- /dev/null
+++ b/Model/Config/Source/EmailTemplate.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tpay\Magento2\Model\Config\Source;
+
+class EmailTemplate extends \Magento\Config\Model\Config\Source\Email\Template
+{
+    public function getPath()
+    {
+        $path = parent::getPath();
+        $path = explode('/', $path);
+        if ('payment' !== $path[0]) {
+            $path[0] = 'payment';
+        }
+
+        return implode('/', $path);
+    }
+}
diff --git a/Model/TpayPayment.php b/Model/TpayPayment.php
index 033538e..8701ff5 100755
--- a/Model/TpayPayment.php
+++ b/Model/TpayPayment.php
@@ -38,6 +38,8 @@ class TpayPayment extends Adapter implements TpayInterface
 {
     use FieldsValidator;
 
+    public const ORDER_STATUS_PENDING = 'pending_payment_tpay';
+
     protected $code;
     protected $title;
     protected $_isGateway = true;
diff --git a/Plugin/AddSendReminderButtonInOrderView.php b/Plugin/AddSendReminderButtonInOrderView.php
new file mode 100644
index 0000000..4adbc2b
--- /dev/null
+++ b/Plugin/AddSendReminderButtonInOrderView.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tpay\Magento2\Plugin;
+
+use Magento\Sales\Block\Adminhtml\Order\View;
+use Tpay\Magento2\Model\TpayPayment;
+
+class AddSendReminderButtonInOrderView
+{
+    public function beforeSetLayout(View $subject)
+    {
+        if (!$subject->getAuthorization()->isAllowed('Tpay_Magento2::send_reminder')) {
+            return;
+        }
+        $order = $subject->getOrder();
+        if (null === $order) {
+            return;
+        }
+        if (TpayPayment::ORDER_STATUS_PENDING !== $order->getStatus()) {
+            return;
+        }
+        $payment = $order->getPayment();
+        if (null === $payment) {
+            return;
+        }
+        $info = $payment->getAdditionalInformation();
+        if (empty($info['transaction_url'])) {
+            return;
+        }
+
+        $subject->addButton(
+            'send_tpay_reminder',
+            [
+                'label' => __('Send Payment Reminder'),
+                'onclick' => "setLocation('".$subject->getUrl('tpay/order/reminder')."')",
+                'class' => 'secondary',
+            ]
+        );
+    }
+}
diff --git a/Service/ReminderService.php b/Service/ReminderService.php
new file mode 100644
index 0000000..f6244be
--- /dev/null
+++ b/Service/ReminderService.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tpay\Magento2\Service;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class ReminderService
+{
+    /** @var TransportBuilder */
+    private $transportBuilder;
+
+    /** @var StateInterface */
+    private $inlineTranslation;
+
+    /** @var OrderRepositoryInterface */
+    private $orderRepository;
+
+    /** @var ScopeConfigInterface */
+    private $scopeConfig;
+
+    public function __construct(
+        TransportBuilder $transportBuilder,
+        StateInterface $inlineTranslation,
+        OrderRepositoryInterface $orderRepository,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->transportBuilder = $transportBuilder;
+        $this->inlineTranslation = $inlineTranslation;
+        $this->orderRepository = $orderRepository;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    public function reminder(OrderInterface $order)
+    {
+        $payment = $order->getPayment();
+        if (null === $payment) {
+            return false;
+        }
+        $info = $payment->getAdditionalInformation();
+        if (null === $info) {
+            return false;
+        }
+        if (empty($info['transaction_url'])) {
+            return false;
+        }
+        $paymentUrl = $info['transaction_url'];
+
+        $this->inlineTranslation->suspend();
+
+        $templateId = $this->scopeConfig->getValue('payment/tpaycom_magento2basic/sale_settings/payment_remind_email_template', ScopeInterface::SCOPE_STORE, $order->getStoreId());
+        if (empty($templateId)) {
+            $templateId = 'payment_tpaycom_magento2basic_sale_settings_payment_remind_email_template';
+        }
+
+        $transport = $this->transportBuilder
+            ->setTemplateIdentifier($templateId)
+            ->setTemplateOptions([
+                'area' => Area::AREA_FRONTEND,
+                'store' => $order->getStoreId(),
+            ])
+            ->setTemplateVars([
+                'paymentUrl' => $paymentUrl,
+                'order' => $order->getIncrementId(),
+                'name' => $order->getCustomerName(),
+            ])
+            ->setFromByScope('general', $order->getStoreId())
+            ->addTo($order->getCustomerEmail(), $order->getCustomerName())
+            ->getTransport();
+
+        $transport->sendMessage();
+        $this->inlineTranslation->resume();
+
+        $order->addCommentToStatusHistory(__('Payment reminder sent'));
+        $this->orderRepository->save($order);
+
+        return true;
+    }
+}
diff --git a/Service/TpayService.php b/Service/TpayService.php
index 055b377..0d73cad 100644
--- a/Service/TpayService.php
+++ b/Service/TpayService.php
@@ -12,6 +12,7 @@
 use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\Service\InvoiceService;
 use Tpay\Magento2\Helper\OrderResolver;
+use Tpay\Magento2\Model\TpayPayment;
 
 class TpayService
 {
@@ -48,7 +49,7 @@ public function setOrderStatePendingPayment(string $orderId, bool $sendEmail): O
             ->setBaseTotalPaid(0.00)
             ->setBaseTotalDue($order->getBaseGrandTotal())
             ->setState(Order::STATE_PENDING_PAYMENT)
-            ->addStatusToHistory(true);
+            ->addStatusToHistory(TpayPayment::ORDER_STATUS_PENDING);
 
         $order->setSendEmail($sendEmail);
         $this->orderRepository->save($order);
@@ -60,7 +61,7 @@ public function addCommentToHistory($orderId, $comment)
     {
         /** @var Order $order */
         $order = $this->orderResolver->getOrderByIncrementId($orderId);
-        $order->addStatusToHistory($order->getState(), $comment);
+        $order->addStatusToHistory($order->getStatus(), $comment);
         $this->orderRepository->save($order);
     }
 
diff --git a/Setup/Patch/Data/InstallOrderStatus.php b/Setup/Patch/Data/InstallOrderStatus.php
new file mode 100644
index 0000000..b034155
--- /dev/null
+++ b/Setup/Patch/Data/InstallOrderStatus.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Tpay\Magento2\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Tpay\Magento2\Model\TpayPayment;
+
+class InstallOrderStatus implements DataPatchInterface
+{
+    /** @var \Magento\Framework\Setup\ModuleDataSetupInterface */
+    private $moduleDataSetup;
+
+    public function __construct(
+        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup,
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    public function getAliases()
+    {
+        return [];
+    }
+
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->insert(
+            $this->moduleDataSetup->getTable('sales_order_status'),
+            [
+                'status' => TpayPayment::ORDER_STATUS_PENDING,
+                'label' => __('Pending Payment with Tpay'),
+            ]
+        );
+
+        $this->moduleDataSetup->getConnection()->insert(
+            $this->moduleDataSetup->getTable('sales_order_status_state'),
+            [
+                'status' => TpayPayment::ORDER_STATUS_PENDING,
+                'state' => 'pending_payment',
+                'is_default' => 0,
+                'visible_on_front' => 1,
+            ]
+        );
+    }
+}
diff --git a/ViewModel/Order/Button.php b/ViewModel/Order/Button.php
new file mode 100644
index 0000000..bb62e8d
--- /dev/null
+++ b/ViewModel/Order/Button.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tpay\Magento2\ViewModel\Order;
+
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Tpay\Magento2\Model\TpayPayment;
+
+class Button implements ArgumentInterface
+{
+    /** @var Registry */
+    private $registry;
+
+    public function __construct(Registry $registry)
+    {
+        $this->registry = $registry;
+    }
+
+    public function shouldShowButton(): bool
+    {
+        if (TpayPayment::ORDER_STATUS_PENDING !== $this->getOrder()->getStatus()) {
+            return false;
+        }
+
+        return !empty($this->getPaymentUrl());
+    }
+
+    public function getPaymentUrl(): ?string
+    {
+        $payment = $this->getOrder()->getPayment();
+        if (null === $payment) {
+            return null;
+        }
+        $info = $payment->getAdditionalInformation();
+
+        return $info['transaction_url'] ?? null;
+    }
+
+    private function getOrder(): OrderInterface
+    {
+        return $this->registry->registry('current_order');
+    }
+}
diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 0000000..a281b44
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Sales::sales">
+                    <resource id="Magento_Sales::sales_operation">
+                        <resource id="Magento_Sales::sales_order">
+                            <resource id="Magento_Sales::actions" title="Actions">
+                                <resource id="Tpay_Magento2::send_reminder" title="Send Tpay Payment Reminder" translate="title" sortOrder="180"/>
+                            </resource>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 0000000..159da90
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?><!--
+ /**
+ * tpay_com DI definitions
+ *
+ * @category    payment gateway
+ * @package     Tpaycom_Magento2.3
+ * @author      Tpay.com
+ * @copyright   (https://tpay.com)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Sales\Block\Adminhtml\Order\View">
+        <plugin name="tpay_add_send_reminder_button_in_order_view" type="Tpay\Magento2\Plugin\AddSendReminderButtonInOrderView"/>
+    </type>
+</config>
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
new file mode 100644
index 0000000..bdd0f79
--- /dev/null
+++ b/etc/adminhtml/routes.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ *
+ * @category    payment gateway
+ * @package     Tpaycom_Magento2.3
+ * @author      Tpay.com
+ * @copyright   (https://tpay.com)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="tpay" frontName="tpay">
+            <module name="Tpay_Magento2" />
+        </route>
+    </router>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index c0b8f5e..3be21c3 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -183,6 +183,10 @@
                         <comment>If you use other currencies visible on the website and pay in PLN, turn it on/off</comment>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
+                    <field id="payment_remind_email_template" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Template for payment reminder emails</label>
+                        <source_model>\Tpay\Magento2\Model\Config\Source\EmailTemplate</source_model>
+                    </field>
                 </group>
                 <group id="cancel" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Automatic order cancellation</label>
diff --git a/etc/config.xml b/etc/config.xml
index ad9e4ad..fe7e7f8 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -31,6 +31,9 @@
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
             </Tpay_Magento2>
             <tpaycom_magento2basic>
+<!--                <sale_settings>-->
+<!--                    <payment_remind_email_template>payment_tpaycom_magento2basic_sale_settings_payment_remind_email_template</payment_remind_email_template>-->
+<!--                </sale_settings>-->
                 <cancel>
                     <days>30</days>
                 </cancel>
diff --git a/etc/email_templates.xml b/etc/email_templates.xml
new file mode 100644
index 0000000..55bbbdd
--- /dev/null
+++ b/etc/email_templates.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="payment_tpaycom_magento2basic_sale_settings_payment_remind_email_template"
+              label="Tpay payment reminder email"
+              file="payment_reminder_email.html"
+              type="html"
+              module="Tpay_Magento2"
+              area="frontend"/>
+</config>
diff --git a/i18n/pl_PL.csv b/i18n/pl_PL.csv
index f178c0e..24df616 100644
--- a/i18n/pl_PL.csv
+++ b/i18n/pl_PL.csv
@@ -98,3 +98,15 @@
 "Pay with Tpay!","Zapłać za zakupy z Tpay!"
 "Confirm payment in Your banking application.","Potwierdź płatność w aplikacji mobilnej swojego banku."
 "A private client IP (%1) was detected. Please verify proxy or reverse proxy configuration, otherwise card payments may be rejected by anti-fraud mechanisms.","Wykryto prywatny adres IP klienta (%1). Sprawdź konfigurację proxy lub reverse proxy, ponieważ płatności kartowe mogą być odrzucane przez mechanizmy antyfraudowe."
+"Pending Payment with Tpay","Oczekuje na płatność z Tpay"
+"Pay with Tpay","Opłać z Tpay"
+"Send Payment Reminder","Wyślij przypomnienie o płatności"
+"Template for payment reminder emails","Szablon wiadomości email z przypomnieniem o płatności"
+"Hello, %name","Witaj, %name"
+"Your order %order has not been paid yet.","Twoje zamówienie %order nie zostało jeszcze opłacone."
+"Use link below to finalise Your payment","Uzyj linku poniżej aby dokończyć płatność"
+"Reminder allowed only for pending payments.","Nie można wysłać ponaglenia dla opłaconego zamówienia."
+"No payment found for this order.","Wskazane zamówienie nie posiada danych płatności."
+"Payment does not contain transaction url.","Dla wskazanej płatności nie wygnerowano linku płatności."
+"Reminder has been sent.","Ponaglenie zostało wysłane."
+"Problem during sending reminder.","Nie udało się wysłać ponaglenia."
diff --git a/view/frontend/email/payment_reminder_email.html b/view/frontend/email/payment_reminder_email.html
new file mode 100644
index 0000000..0d485ac
--- /dev/null
+++ b/view/frontend/email/payment_reminder_email.html
@@ -0,0 +1,18 @@
+<!--@subject Payment reminder @-->
+<!--@vars {
+"var name":"Customer Name",
+"var order":"Order Increment ID",
+"var paymentUrl":"Payment URL"
+} @-->
+{{template config_path="design/email/header_template"}}
+
+<p>{{trans "Hello, %name" name=$name}}</p>
+
+<p>
+    {{trans "Your order %order has not been paid yet." order=$order}}
+    {{trans "Use link below to finalise Your payment"}}
+</p>
+
+<a href="{{var paymentUrl}}">{{trans "Pay with Tpay"}}</a>
+
+{{template config_path="design/email/footer_template"}}
diff --git a/view/frontend/layout/sales_order_view.xml b/view/frontend/layout/sales_order_view.xml
new file mode 100644
index 0000000..27714cf
--- /dev/null
+++ b/view/frontend/layout/sales_order_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="sales.order.info.buttons">
+            <block name="sales.order.info.buttons.tpay" template="Tpay_Magento2::button.phtml" cacheable="false">
+                <arguments>
+                    <argument name="view_model" xsi:type="object">Tpay\Magento2\ViewModel\Order\Button</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/templates/button.phtml b/view/frontend/templates/button.phtml
new file mode 100644
index 0000000..ccd89fd
--- /dev/null
+++ b/view/frontend/templates/button.phtml
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/** @var $viewModel \Tpay\Magento2\ViewModel\Order\Button */
+/** @var $block \Magento\Framework\View\Element\Template */
+/** @var $escaper \Magento\Framework\Escaper */
+
+$viewModel = $block->getViewModel();
+?>
+
+<?php if ($viewModel->shouldShowButton() && $viewModel->getPaymentUrl()) : ?>
+    <a href="<?= $escaper->escapeHtmlAttr($viewModel->getPaymentUrl()) ?>" class="action">
+        <span><?= $escaper->escapeHtml(__('Pay with Tpay')) ?></span>
+    </a>
+<?php endif; ?>

From 5f3b6f774dd1176847d3fa83d653a934bddf1307 Mon Sep 17 00:00:00 2001
From: Kamil Balwierz <kamil.balwierz@tpay.com>
Date: Wed, 3 Jun 2026 07:53:02 +0200
Subject: [PATCH 2/5] Code style fixes

---
 Controller/Adminhtml/Order/Reminder.php | 1 +
 Setup/Patch/Data/InstallOrderStatus.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Controller/Adminhtml/Order/Reminder.php b/Controller/Adminhtml/Order/Reminder.php
index 6d7d4d7..7716fb3 100644
--- a/Controller/Adminhtml/Order/Reminder.php
+++ b/Controller/Adminhtml/Order/Reminder.php
@@ -66,6 +66,7 @@ public function execute()
         return $this->redirectBack();
     }
 
+    // phpcs:ignore
     protected function _isAllowed()
     {
         return $this->_authorization->isAllowed('Tpay_Magento2::send_reminder');
diff --git a/Setup/Patch/Data/InstallOrderStatus.php b/Setup/Patch/Data/InstallOrderStatus.php
index b034155..9f1c0c5 100644
--- a/Setup/Patch/Data/InstallOrderStatus.php
+++ b/Setup/Patch/Data/InstallOrderStatus.php
@@ -45,5 +45,7 @@ public function apply()
                 'visible_on_front' => 1,
             ]
         );
+
+        return $this;
     }
 }

From 31d2c6efdfb4a325d92256c47738d39ca5188952 Mon Sep 17 00:00:00 2001
From: Kamil Balwierz <kamil.balwierz@tpay.com>
Date: Wed, 3 Jun 2026 08:05:27 +0200
Subject: [PATCH 3/5] Missing translations

---
 etc/adminhtml/system.xml | 1 +
 etc/config.xml           | 3 ---
 i18n/pl_PL.csv           | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 3be21c3..9c96839 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -186,6 +186,7 @@
                     <field id="payment_remind_email_template" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Template for payment reminder emails</label>
                         <source_model>\Tpay\Magento2\Model\Config\Source\EmailTemplate</source_model>
+                        <comment>Emails can be sent manually from order details view given order staus is Pending Payment Tpay</comment>
                     </field>
                 </group>
                 <group id="cancel" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/config.xml b/etc/config.xml
index fe7e7f8..ad9e4ad 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -31,9 +31,6 @@
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
             </Tpay_Magento2>
             <tpaycom_magento2basic>
-<!--                <sale_settings>-->
-<!--                    <payment_remind_email_template>payment_tpaycom_magento2basic_sale_settings_payment_remind_email_template</payment_remind_email_template>-->
-<!--                </sale_settings>-->
                 <cancel>
                     <days>30</days>
                 </cancel>
diff --git a/i18n/pl_PL.csv b/i18n/pl_PL.csv
index 24df616..72a2ff1 100644
--- a/i18n/pl_PL.csv
+++ b/i18n/pl_PL.csv
@@ -110,3 +110,7 @@
 "Payment does not contain transaction url.","Dla wskazanej płatności nie wygnerowano linku płatności."
 "Reminder has been sent.","Ponaglenie zostało wysłane."
 "Problem during sending reminder.","Nie udało się wysłać ponaglenia."
+"Send Tpay Payment Reminder","Wysyłanie przypominień o płatnóści Tpay"
+"Emails can be sent manually from order details view given order staus is Pending Payment Tpay","Powiadomienie może zostać wysłane manualnie z ekranu szczegółów zamówienia dla zamówień w statusie Oczekuje na płatnośc z Tpay"
+"Tpay payment reminder email","Tpay przypomnienie o płatności"
+"Payment reminder sent","Wysłano ponaglenie płatności"

From 702908fb46ffa438cfa72703b83e7a029da4154f Mon Sep 17 00:00:00 2001
From: Kamil Balwierz <kamil.balwierz@tpay.com>
Date: Wed, 3 Jun 2026 10:03:33 +0200
Subject: [PATCH 4/5] stubs

---
 .dev-tools/stubs/BackendAction.stub | 266 ++++++++++++++++++++++++++++
 .dev-tools/stubs/EmailTemplate.stub |  65 +++++++
 .dev-tools/stubs/OrderView.stub     | 169 ++++++++++++++++++
 phpstan.neon                        |   3 +
 4 files changed, 503 insertions(+)
 create mode 100644 .dev-tools/stubs/BackendAction.stub
 create mode 100644 .dev-tools/stubs/EmailTemplate.stub
 create mode 100644 .dev-tools/stubs/OrderView.stub

diff --git a/.dev-tools/stubs/BackendAction.stub b/.dev-tools/stubs/BackendAction.stub
new file mode 100644
index 0000000..1e23d81
--- /dev/null
+++ b/.dev-tools/stubs/BackendAction.stub
@@ -0,0 +1,266 @@
+<?php
+declare(strict_types=1);
+
+namespace Magento\Backend\App;
+
+use Magento\Framework\App\Action\AbstractAction;
+
+/**
+ * All Backend Controllers (Adminhtml) inherit from this abstract class.
+ */
+abstract class Action extends AbstractAction
+{
+    /**
+     * Authorization level of a basic admin session
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::admin';
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    protected $_authorization;
+
+    /**
+     * @var \Magento\Backend\Model\Auth
+     */
+    protected $_auth;
+
+    /**
+     * @var \Magento\Backend\Helper\Data
+     */
+    protected $_helper;
+
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    protected $_backendUrl;
+
+    /**
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
+     */
+    protected $_formKeyValidator;
+
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    protected $_localeResolver;
+
+    /**
+     * @var bool
+     */
+    protected $_canUseBaseUrl;
+
+    /**
+     * @var \Magento\Backend\Model\Session
+     */
+    protected $_session;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     */
+    public function __construct(\Magento\Backend\App\Action\Context $context)
+    {
+        parent::__construct($context);
+        $this->_authorization = $context->getAuthorization();
+        $this->_auth = $context->getAuth();
+        $this->_helper = $context->getHelper();
+        $this->_backendUrl = $context->getBackendUrl();
+        $this->_formKeyValidator = $context->getFormKeyValidator();
+        $this->_localeResolver = $context->getLocaleResolver();
+        $this->_canUseBaseUrl = $context->getCanUseBaseUrl();
+        $this->_session = $context->getSession();
+    }
+
+    /**
+     * Determine if current user is allowed to access this controller action.
+     *
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed(static::ADMIN_RESOURCE);
+    }
+
+    /**
+     * Populate the layout menu item as active
+     *
+     * @param string $menuId
+     * @return $this
+     */
+    protected function _setActiveMenu($menuId)
+    {
+        return $this;
+    }
+
+    /**
+     * Generate crumbs for layout block
+     *
+     * @param string $label
+     * @param string $title
+     * @param string|null $link
+     * @return $this
+     */
+    protected function _addBreadcrumb($label, $title, $link = null)
+    {
+        return $this;
+    }
+}
+
+namespace Magento\Backend\App\Action;
+
+/**
+ * Shared context container passed into Backend Actions via Dependency Injection.
+ */
+class Context extends \Magento\Framework\App\Action\Context
+{
+    /**
+     * @return \Magento\Framework\AuthorizationInterface
+     */
+    public function getAuthorization() {}
+
+    /**
+     * @return \Magento\Backend\Model\Auth
+     */
+    public function getAuth() {}
+
+    /**
+     * @return \Magento\Backend\Helper\Data
+     */
+    public function getHelper() {}
+
+    /**
+     * @return \Magento\Backend\Model\UrlInterface
+     */
+    public function getBackendUrl() {}
+
+    /**
+     * @return \Magento\Framework\Data\Form\FormKey\Validator
+     */
+    public function getFormKeyValidator() {}
+
+    /**
+     * @return \Magento\Framework\Locale\ResolverInterface
+     */
+    public function getLocaleResolver() {}
+
+    /**
+     * @return bool
+     */
+    public function getCanUseBaseUrl() {}
+
+    /**
+     * @return \Magento\Backend\Model\Session
+     */
+    public function getSession() {}
+}
+
+namespace Magento\Framework\App\Action;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Underlying Framework action hierarchy
+ */
+abstract class AbstractAction implements ActionInterface
+{
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $_request;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface
+     */
+    protected $_response;
+
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory
+     */
+    protected $resultFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    protected $messageManager;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     */
+    public function __construct(\Magento\Framework\App\Action\Context $context)
+    {
+        $this->_request = $context->getRequest();
+        $this->_response = $context->getResponse();
+        $this->resultFactory = $context->getResultFactory();
+        $this->resultRedirectFactory = $context->getResultRedirectFactory();
+        $this->messageManager = $context->getMessageManager();
+    }
+
+    /**
+     * @return \Magento\Framework\App\RequestInterface
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+}
+
+namespace Magento\Framework\App;
+
+/**
+ * Core execution interface for Magento controllers.
+ */
+interface ActionInterface
+{
+    /**
+     * Execute action based on request and return result
+     *
+     * @return \Magento\Framework\Controller\ResultInterface|\Magento\Framework\App\ResponseInterface
+     */
+    public function execute();
+}
+
+namespace Magento\Framework\App\Action;
+
+/**
+ * Core Action Context definition
+ */
+class Context
+{
+    /**
+     * @return \Magento\Framework\App\RequestInterface
+     */
+    public function getRequest() {}
+
+    /**
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function getResponse() {}
+
+    /**
+     * @return \Magento\Framework\Controller\ResultFactory
+     */
+    public function getResultFactory() {}
+
+    /**
+     * @return \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    public function getResultRedirectFactory() {}
+
+    /**
+     * @return \Magento\Framework\Message\ManagerInterface
+     */
+    public function getMessageManager() {}
+}
diff --git a/.dev-tools/stubs/EmailTemplate.stub b/.dev-tools/stubs/EmailTemplate.stub
new file mode 100644
index 0000000..726878c
--- /dev/null
+++ b/.dev-tools/stubs/EmailTemplate.stub
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Source\Email;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Source model providing lists of transactional email templates for configuration dropdowns.
+ */
+class Template implements OptionSourceInterface
+{
+    /**
+     * @var \Magento\Email\Model\ResourceModel\Template\CollectionFactory
+     */
+    protected $_templatesFactory;
+
+    /**
+     * @var \Magento\Email\Model\Template\Config
+     */
+    protected $_emailConfig;
+
+    /**
+     * @param \Magento\Email\Model\ResourceModel\Template\CollectionFactory $templatesFactory
+     * @param \Magento\Email\Model\Template\Config $emailConfig
+     */
+    public function __construct(
+        \Magento\Email\Model\ResourceModel\Template\CollectionFactory $templatesFactory,
+        \Magento\Email\Model\Template\Config $emailConfig
+    ) {
+        $this->_templatesFactory = $templatesFactory;
+        $this->_emailConfig = $emailConfig;
+    }
+
+/** @return string */
+public function getPath()
+{}
+
+    /**
+     * Return array of options as key-value pairs for dropdown fields.
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 'string_template_id', 'label' => 'Template Label']
+        ];
+    }
+}
+
+namespace Magento\Framework\Data;
+
+/**
+ * Core interface required for any UI component or adminhtml system config source model.
+ */
+interface OptionSourceInterface
+{
+    /**
+     * Return array of options as a multi-dimensional array containing value and label keys.
+     *
+     * @return array
+     */
+    public function toOptionArray();
+}
diff --git a/.dev-tools/stubs/OrderView.stub b/.dev-tools/stubs/OrderView.stub
new file mode 100644
index 0000000..52f13d4
--- /dev/null
+++ b/.dev-tools/stubs/OrderView.stub
@@ -0,0 +1,169 @@
+<?php
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order;
+
+use Magento\Backend\Block\Widget\Form\Container;
+
+/**
+ * Adminhtml sales order view block
+ */
+class View extends Container
+{
+    /**
+     * Core registry
+     *
+     * @var \Magento\Framework\Registry
+     */
+    protected $_coreRegistry = null;
+
+    /**
+     * @var \Magento\Sales\Helper\Reorder
+     */
+    protected $_reorderHelper = null;
+
+    /**
+     * @param \Magento\Backend\Block\Widget\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Sales\Helper\Reorder $reorderHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Widget\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Sales\Helper\Reorder $reorderHelper,
+        array $data = []
+    ) {
+        $this->_coreRegistry = $registry;
+        $this->_reorderHelper = $reorderHelper;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Retrieve order model object
+     *
+     * @return \Magento\Sales\Model\Order
+     */
+    public function getOrder() {}
+
+    /**
+     * Retrieve Order Identifier
+     *
+     * @return int
+     */
+    public function getOrderId() {}
+
+    /**
+     * Get URL for back button
+     *
+     * @return string
+     */
+    public function getBackUrl() {}
+
+    /**
+     * Get URL for edit button
+     *
+     * @return string
+     */
+    public function getEditUrl() {}
+
+    /**
+     * Get URL for email sending
+     *
+     * @return string
+     */
+    public function getEmailUrl() {}
+
+    /**
+     * Get URL for cancellation
+     *
+     * @return string
+     */
+    public function getCancelUrl() {}
+
+    /**
+     * Get URL for hold
+     *
+     * @return string
+     */
+    public function getHoldUrl() {}
+
+    /**
+     * Get URL for unhold
+     *
+     * @return string
+     */
+    public function getUnholdUrl() {}
+
+    /**
+     * Get URL for shipping
+     *
+     * @return string
+     */
+    public function getShipUrl() {}
+
+    /**
+     * Get URL for comment saving
+     *
+     * @return string
+     */
+    public function getReviewPaymentUrl() {}
+}
+
+namespace Magento\Backend\Block\Widget;
+
+/**
+ * Context class passed to Backend Widgets via Dependency Injection.
+ */
+class Context extends \Magento\Framework\View\Element\Template\Context
+{
+    /**
+     * @return \Magento\Framework\AuthorizationInterface
+     */
+    public function getAuthorization() {}
+
+    /**
+     * @return \Magento\Framework\Math\Random
+     */
+    public function MathRandom() {}
+
+    /**
+     * @return \Magento\Backend\Model\Session
+     */
+    public function getBackendSession() {}
+
+    /**
+     * @return \Magento\Backend\Model\UrlInterface
+     */
+    public function getUrlBuilder() {}
+}
+
+namespace Magento\Backend\Block\Widget;
+
+/**
+ * Base container abstract class for Adminhtml form and view containers.
+ */
+abstract class Container extends \Magento\Backend\Block\Widget
+{
+    /**
+     * Internal constructor
+     *
+     * @return void
+     */
+    protected function _construct() {}
+
+    /**
+     * Get back button URL
+     *
+     * @return string
+     */
+    public function getBackUrl() {}
+
+    /**
+     * Check whether button can be displayed
+     *
+     * @param string $id
+     * @return bool
+     */
+    protected function _isAllowedAction($id) {}
+}
diff --git a/phpstan.neon b/phpstan.neon
index c0d7b36..ae09b99 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,6 +7,9 @@ parameters:
     - ./.dev-tools/
   scanFiles:
     - ./.dev-tools/stubs/magentoAutogenerated.stub
+    - ./.dev-tools/stubs/BackendAction.stub
+    - ./.dev-tools/stubs/EmailTemplate.stub
+    - ./.dev-tools/stubs/OrderView.stub
     - ./.dev-tools/stubs/ArgumentInterface.stub
     - ./.dev-tools/stubs/Session.stub
     - ./.dev-tools/stubs/FormKey.stub

From a7dabab39c59b17c180811586bf06837ce5bdc71 Mon Sep 17 00:00:00 2001
From: Kamil Balwierz <kamil.balwierz@tpay.com>
Date: Wed, 3 Jun 2026 10:22:29 +0200
Subject: [PATCH 5/5] documentation

---
 Model/Config/Source/EmailTemplate.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Model/Config/Source/EmailTemplate.php b/Model/Config/Source/EmailTemplate.php
index 0da6a6d..9784a59 100644
--- a/Model/Config/Source/EmailTemplate.php
+++ b/Model/Config/Source/EmailTemplate.php
@@ -4,6 +4,15 @@
 
 class EmailTemplate extends \Magento\Config\Model\Config\Source\Email\Template
 {
+    /**
+     * This method is overrided because "merchant location" selector dynamically
+     * changes first part of path (eg. payment_us, payment_other) based on
+     * selected country - making internals of base logic Email Template Source
+     * fail to find default email template based on exact match of configuration
+     * option path (as original value starts with payment)
+     *
+     * @return string
+     */
     public function getPath()
     {
         $path = parent::getPath();