Merge pull request #302 from alma/develop

Release 3.1.6
alma · Feb 5, 2024 · 2208c57 · 2208c57
2 parents cafca6e + b1903d3
commit 2208c57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.1.6
+
+- fix: Pay Now without inpage PS 1.5 / 1.6
+- fix: ensure library is not invoked in CLI mode
+
 ## v3.1.5
 
 - fix: Add verification of number on type in amount field for refund

diff --git a/alma/alma.php b/alma/alma.php
@@ -30,7 +30,7 @@
 
 class Alma extends PaymentModule
 {
-    const VERSION = '3.1.5';
+    const VERSION = '3.1.6';
 
     public $_path;
     public $local_path;
@@ -65,7 +65,7 @@ public function __construct()
     {
         $this->name = 'alma';
         $this->tab = 'payments_gateways';
-        $this->version = '3.1.5';
+        $this->version = '3.1.6';
         $this->author = 'Alma';
         $this->need_instance = false;
         $this->bootstrap = true;

diff --git a/alma/controllers/hook/DisplayPaymentHookController.php b/alma/controllers/hook/DisplayPaymentHookController.php
@@ -133,7 +133,6 @@ public function run($params)
             if ($isPayNow) {
                 $paymentOption['text'] = SettingsCustomFieldsHelper::getPayNowButtonTitleByLang($idLang);
                 $paymentOption['desc'] = SettingsCustomFieldsHelper::getPayNowButtonDescriptionByLang($idLang);
-                $paymentOption['isInPageEnabled'] = true;
             }
             $paymentOptions[$key] = $paymentOption;
             $sortOptions[$key] = $feePlans->$key->order;

diff --git a/alma/lib/smarty.php b/alma/lib/smarty.php
@@ -25,7 +25,7 @@
     exit;
 }
 
-if (class_exists('\Context')) {
+if (class_exists('\Context') && PHP_SAPI != 'cli') {
     $smarty = \Context::getContext()->smarty;
 
     /**