From 0909cdfda1a9350f1057c183a3fb4ce279de7f78 Mon Sep 17 00:00:00 2001
From: Ivan Pugach <ivan.pugach@ext.mondu.ai>
Date: Thu, 18 Apr 2024 00:40:57 +0300
Subject: [PATCH] PT-1377: Confirmation Emails are not sent and Admin cannot
 log after installing Mondu Plugin 2.3.5

---
 Plugin/AddTemplateVariable.php | 19 +++++++++++--------
 composer.json                  |  2 +-
 etc/module.xml                 |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Plugin/AddTemplateVariable.php b/Plugin/AddTemplateVariable.php
index 0e6b311..a68c22b 100644
--- a/Plugin/AddTemplateVariable.php
+++ b/Plugin/AddTemplateVariable.php
@@ -38,9 +38,9 @@ class AddTemplateVariable
     private ScopeConfigInterface $scopeConfig;
 
     /**
-     * @param  MonduLogger           $monduLogger
-     * @param  MonduFileLogger       $monduFileLogger
-     * @param  ScopeConfigInterface  $scopeConfig
+     * @param  MonduLogger          $monduLogger
+     * @param  MonduFileLogger      $monduFileLogger
+     * @param  ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         MonduLogger $monduLogger,
@@ -53,8 +53,8 @@ public function __construct(
     }
 
     /**
-     * @param  \Magento\Email\Model\Template  $subject
-     * @param  array                          $vars
+     * @param  \Magento\Email\Model\Template $subject
+     * @param  array                         $vars
      *
      * @return array[]
      */
@@ -62,7 +62,10 @@ public function beforeSetVars(
         \Magento\Email\Model\Template $subject,
         array $vars
     ) {
-        if (!$vars['order'] || !$vars['order']->getMonduReferenceId()) {
+        if (
+            !isset($vars['order']) ||
+            !$vars['order']->getMonduReferenceId()
+        ) {
             return [$vars];
         }
 
@@ -102,7 +105,7 @@ public function beforeSetVars(
     }
 
     /**
-     * @param $invoiceDetails
+     * @param $invoiceData
      *
      * @return string
      */
@@ -132,7 +135,7 @@ protected function getInvoiceDetails($invoiceData): string
      *
      * @return string
      */
-    protected function getPayLaterViaBankTransferDetails($invoiceData)
+    protected function getPayLaterViaBankTransferDetails($invoiceData): string
     {
         $invoiceDetails = __('This invoice is created in accordance with the terms and conditions of <strong>%1</strong> modified by <strong>Mondu GmbH</strong> payment terms. Please pay to the following account:', $invoiceData['merchant_company_name']) . '<br/>';
 
diff --git a/composer.json b/composer.json
index 37e0939..74cb3f7 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "mondu_gmbh/magento2-payment",
   "description": "Mondu payment method for magento 2",
   "type": "magento2-module",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "license": [
     "MIT"
   ],
diff --git a/etc/module.xml b/etc/module.xml
index d85e248..c94b525 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Mondu_Mondu" setup_version="2.3.4">
+    <module name="Mondu_Mondu" setup_version="2.3.6">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>