Version bump to 1.1.1: Fixes bug that leads to a blank configuration …

…page on first-time installation
alma · May 2, 2019 · fcab9e0 · fcab9e0
1 parent 957fdc9
commit fcab9e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.1.1
+------
+
+* Fixes bug that leads to a blank configuration page on first-time installation
+
 v1.1.0
 ------
 

diff --git a/app/code/community/Alma/Installments/Helper/Data.php b/app/code/community/Alma/Installments/Helper/Data.php
@@ -44,7 +44,7 @@ public function __construct()
      */
     public function getMerchant($force = false)
     {
-        if (!$this->merchant || $force) {
+        if ($this->alma && (!$this->merchant || $force)) {
             try {
                 $this->merchant = $this->alma->merchants->me();
             } catch (\Exception $e) {

diff --git a/app/code/community/Alma/Installments/etc/config.xml b/app/code/community/Alma/Installments/etc/config.xml
@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Alma_Installments>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </Alma_Installments>
     </modules>
     <default>

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "alma/alma-installments-magento1",
     "description": "Integrates Alma Monthly Installments into Magento 1",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "require": {
         "alma/alma-php-client": "*",
         "psr/log": "^1.1"