Merge pull request #12 from sequra/fix/php7.4-compatibility

Fix compatibilitiy with PHP 7.4 and add plugin_version to order request
sequra · Mar 6, 2024 · 2bc05fd · 2bc05fd
2 parents e472b23 + af39ed3
commit 2bc05fd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git 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(),

diff --git 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
@@ -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
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
@@ -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) => {