From 8d9a022ec17608d984ded4387f5c9376cf6148af Mon Sep 17 00:00:00 2001
From: "tomas.jasulaitis@invertus.eu" <tomas.jasulaitis@invertus.eu>
Date: Tue, 15 Dec 2020 15:22:12 +0200
Subject: [PATCH 1/2] 4.1.3 - MOL-360 - Admin order page icon fix

---
 src/Presenter/OrderListActionBuilder.php      | 21 +++++++------------
 ...icon-container.tpl => order-list-icon.tpl} |  3 ++-
 .../hook/admin/order-list-save-label-icon.tpl | 15 -------------
 3 files changed, 10 insertions(+), 29 deletions(-)
 rename views/templates/hook/admin/{order-list-icon-container.tpl => order-list-icon.tpl} (67%)
 delete mode 100644 views/templates/hook/admin/order-list-save-label-icon.tpl

diff --git a/src/Presenter/OrderListActionBuilder.php b/src/Presenter/OrderListActionBuilder.php
index 605dd75ce..b36d5ef2f 100644
--- a/src/Presenter/OrderListActionBuilder.php
+++ b/src/Presenter/OrderListActionBuilder.php
@@ -53,22 +53,17 @@ public function __construct(Mollie $mollie)
 
     public function buildOrderPaymentResendButton(Smarty_Data $smarty, $orderId)
     {
-        $smarty->assign('idOrder', $orderId);
-
-        $smarty->assign(
-            'message',
-            $this->mollie->l('You will resend email with payment link to the customer', self::FILE_NAME)
-        );
-        $icon = $this->mollie->display(
-            $this->mollie->getLocalPath(),
-            'views/templates/hook/admin/order-list-save-label-icon.tpl'
-        );
-
-        $smarty->assign('icon', $icon);
+        $smarty->assign([
+            'idOrder' => (int) $orderId,
+            'message' => $this->mollie->l(
+                'You will resend email with payment link to the customer',
+                self::FILE_NAME
+            ),
+        ]);
 
         return $this->mollie->display(
             $this->mollie->getLocalPath(),
-            'views/templates/hook/admin/order-list-icon-container.tpl'
+            'views/templates/hook/admin/order-list-icon.tpl'
         );
     }
 }
diff --git a/views/templates/hook/admin/order-list-icon-container.tpl b/views/templates/hook/admin/order-list-icon.tpl
similarity index 67%
rename from views/templates/hook/admin/order-list-icon-container.tpl
rename to views/templates/hook/admin/order-list-icon.tpl
index 8386558ce..e2d5f1d87 100644
--- a/views/templates/hook/admin/order-list-icon-container.tpl
+++ b/views/templates/hook/admin/order-list-icon.tpl
@@ -11,5 +11,6 @@
  *}
 
 <div class="mollie-icon-container" data-id-order="{$idOrder|intval}">
-    {$icon|escape:'html':'UTF-8'}
+    <i class="icon-send-mail-mollie resend-payment-mail-mollie" data-id-order="{$idOrder|intval}"></i>
+    <div class="mollie-message-container">{$message|escape:'html':'UTF-8'}</div>
 </div>
diff --git a/views/templates/hook/admin/order-list-save-label-icon.tpl b/views/templates/hook/admin/order-list-save-label-icon.tpl
deleted file mode 100644
index 2082a55c0..000000000
--- a/views/templates/hook/admin/order-list-save-label-icon.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{*
- * NOTICE OF LICENSE
- *
- * @author    INVERTUS, UAB www.invertus.eu <support@invertus.eu>
- * @copyright Copyright (c) permanent, INVERTUS, UAB
- * @license   Addons PrestaShop license limitation
- * @see       /LICENSE
- *
- * International Registered Trademark & Property of INVERTUS, UAB
- *
- *}
-
-<i class="icon-send-mail-mollie resend-payment-mail-mollie" data-id-order="{$idOrder|intval}"></i>
-
-<div class="mollie-message-container">{$message|escape:'html':'UTF-8'}</div>

From 68707ebdf2dc46352bd56c81d2e0188fc152674a Mon Sep 17 00:00:00 2001
From: "tomas.jasulaitis@invertus.eu" <tomas.jasulaitis@invertus.eu>
Date: Tue, 15 Dec 2020 15:25:03 +0200
Subject: [PATCH 2/2] Version upgrade

---
 mollie.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mollie.php b/mollie.php
index 19653f9b3..a094fd6e5 100644
--- a/mollie.php
+++ b/mollie.php
@@ -96,7 +96,7 @@ public function __construct()
     {
         $this->name = 'mollie';
         $this->tab = 'payments_gateways';
-        $this->version = '4.1.2';
+        $this->version = '4.1.3';
         $this->author = 'Mollie B.V.';
         $this->need_instance = 1;
         $this->bootstrap = true;