From 2509ca52289560c588a8e1d61bfe4f7bd4e423c0 Mon Sep 17 00:00:00 2001
From: Marija <marija.ivic@logeecom.com>
Date: Thu, 29 Feb 2024 10:38:32 +0100
Subject: [PATCH 1/2] Add compatibility with PHP 7.4

CS-5145
---
 Services/BusinessLogic/Utility/SeQuraTranslationProvider.php  | 3 +--
 composer.json                                                 | 2 +-
 composer.lock                                                 | 4 ++--
 .../web/js/view/payment/method-renderer/sequra-payment.js     | 4 ++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Services/BusinessLogic/Utility/SeQuraTranslationProvider.php b/Services/BusinessLogic/Utility/SeQuraTranslationProvider.php
index 620a9c5..17c7714 100644
--- a/Services/BusinessLogic/Utility/SeQuraTranslationProvider.php
+++ b/Services/BusinessLogic/Utility/SeQuraTranslationProvider.php
@@ -40,8 +40,7 @@ public function __construct(Reader $moduleDirReader, Csv $csv, Session $session)
      */
     public function translate(string $text, ...$arguments): Phrase
     {
-        $locale = $this->session->getUser() ?
-            $this->session->getUser()->getInterfaceLocale() : null;
+        $locale = ($user = $this->session->getUser()) ? $user->getInterfaceLocale(): null;
         if ($locale && !self::$englishTranslation) {
             $filePath = $this->moduleDirReader->getModuleDir('i18n', 'Sequra_Core') . '/' . $locale . '.csv';
             if (!file_exists($filePath)) {
diff --git a/composer.json b/composer.json
index 0dd21c9..e478923 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "sequra/integration-core": "v1.0.11",
         "ext-json": "*"
     },
diff --git a/composer.lock b/composer.lock
index e1d9075..b8d1053 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "faf7305667d1102b6c913c54662fc14f",
+    "content-hash": "a1e52d2dfd7feee97c92f6bfcc64538f",
     "packages": [
         {
             "name": "sequra/integration-core",
@@ -615,7 +615,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "ext-json": "*"
     },
     "platform-dev": [],
diff --git a/view/frontend/web/js/view/payment/method-renderer/sequra-payment.js b/view/frontend/web/js/view/payment/method-renderer/sequra-payment.js
index f467de6..9d9da74 100644
--- a/view/frontend/web/js/view/payment/method-renderer/sequra-payment.js
+++ b/view/frontend/web/js/view/payment/method-renderer/sequra-payment.js
@@ -237,6 +237,10 @@ define([
         },
 
         loadSeQuraScript: function () {
+            if (!window.checkoutConfig.payment.sequra_payment.widget_settings.hasOwnProperty('merchant')) {
+                return;
+            }
+
             if (typeof Sequra === "undefined") {
                 let products = [];
                 window.checkoutConfig.payment.sequra_payment.widget_settings.products.forEach((product) => {

From af39ed3bd62d1b73db16428bec36d91b1f47ca9e Mon Sep 17 00:00:00 2001
From: Marija <marija.ivic@logeecom.com>
Date: Wed, 6 Mar 2024 13:36:01 +0100
Subject: [PATCH 2/2] Change platform field from integration_version to
 plugin_version

CS-5171
---
 Model/Api/Builders/CreateOrderRequestBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/Api/Builders/CreateOrderRequestBuilder.php b/Model/Api/Builders/CreateOrderRequestBuilder.php
index 766981f..ce7190f 100644
--- a/Model/Api/Builders/CreateOrderRequestBuilder.php
+++ b/Model/Api/Builders/CreateOrderRequestBuilder.php
@@ -459,7 +459,7 @@ private function getPlatform(): array
         return [
             'name' => 'magento2',
             'version' => $this->productMetadata->getVersion(),
-            'integration_version' => $this->moduleResource->getDbVersion('Sequra_Core'),
+            'plugin_version' => $this->moduleResource->getDbVersion('Sequra_Core'),
             'uname' => php_uname(),
             'db_name' => !empty($connectionData['model']) ? $connectionData['model'] : 'mysql',
             'db_version' => $this->sqlVersionProvider->getSqlVersion(),