From 64269c5fc059546d48c9bfe033f09c3a8c299624 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 27 Sep 2021 21:55:48 +1000
Subject: [PATCH] Update PHP7.4

---
 app/Models/Account.php           | 7 ++++++-
 app/Models/Traits/Inviteable.php | 4 +++-
 composer.json                    | 8 ++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index f702fd1c9319..ea97b297c9cf 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1123,7 +1123,12 @@ class Account extends Eloquent
         Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
         Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
 
-        $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+        //php 7.3
+        // $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+        //php 7.4
+        $currencyId = ($client && $client->currency_id) ? $client->currency_id : ($this->currency_id ?: DEFAULT_CURRENCY);
+
+        // $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
         $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
 
         Session::put(SESSION_CURRENCY, $currencyId);
diff --git a/app/Models/Traits/Inviteable.php b/app/Models/Traits/Inviteable.php
index fc82845a3f9d..763140a0e922 100644
--- a/app/Models/Traits/Inviteable.php
+++ b/app/Models/Traits/Inviteable.php
@@ -74,7 +74,9 @@ trait Inviteable
             }
         }
 
-        return $hasValue ? implode($parts, '<br/>') : false;
+        return $hasValue ? implode('<br/>', $parts) : false;
+
+        // return $hasValue ? implode($parts, '<br/>') : false;
     }
 
     /**
diff --git a/composer.json b/composer.json
index 24173dce5599..a9353c4488d1 100644
--- a/composer.json
+++ b/composer.json
@@ -68,11 +68,11 @@
         "league/fractal": "0.13.*",
         "lokielse/omnipay-alipay": "~1.4",
         "maatwebsite/excel": "dev-carbon#8b17952",
-        "mashape/unirest-php": "^3.0",
+        "mashape/unirest-php": "^3.0.5",
         "meebio/omnipay-creditcall": "dev-master",
         "meebio/omnipay-secure-trading": "dev-master",
         "mfauveau/omnipay-pacnet": "~2.0",
-        "mpdf/mpdf": "7.1.7",
+        "mpdf/mpdf": "^8.0",
         "nesbot/carbon": "^2.0",
         "nwidart/laravel-modules": "2.0.*",
         "omnipay/authorizenet": "dev-solution-id as 2.5.0",
@@ -206,6 +206,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/tainmar/Laravel-Excel"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/loverg-c/unirest-php"
         }
     ]
 }