Merge branch 'v5-develop' into v5-stable

app/Http/Controllers/SelfUpdateController.php

@@ -102,7 +102,7 @@ class SelfUpdateController extends BaseController
         nlog('Extracting zip');
 
         //clean up old snappdf installations
-        $this->cleanOldSnapChromeBinaries();
+        //$this->cleanOldSnapChromeBinaries();
 
         $zipFile = new \PhpZip\ZipFile();
 

app/Models/ClientContact.php

@@ -17,6 +17,7 @@ use App\Jobs\Mail\NinjaMailerObject;
 use App\Mail\ClientContact\ClientContactResetPasswordObject;
 use App\Models\Presenters\ClientContactPresenter;
 use App\Notifications\ClientContactResetPassword;
+use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -257,8 +258,33 @@ class ClientContact extends Authenticatable implements HasLocalePreference
      */
     public function getLoginLink()
     {
-        $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
+        // $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
 
+        // return $domain.'/client/key_login/'.$this->contact_key;
+
+        if (Ninja::isHosted()) {
+            $domain = $this->company->domain();
+        } else {
+            $domain = config('ninja.app_url');
+        }
+
+        switch ($this->company->portal_mode) {
+            case 'subdomain':
                 return $domain.'/client/key_login/'.$this->contact_key;
+                break;
+            case 'iframe':
+                return $domain.'/client/key_login/'.$this->contact_key;
+                //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key;
+                break;
+            case 'domain':
+                return $domain.'/client/key_login/'.$this->contact_key;
+                break;
+
+            default:
+                return '';
+                break;
+        }
+
+
     }
 }

public/flutter_service_worker.js

@@ -4,9 +4,9 @@ const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
   "favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"main.dart.js": "816eb6e0aa8c1f38ca5f0ddcd2e9a73b",
+"main.dart.js": "284cb064303ead96ba3479bfebd29d06",
 "favicon.ico": "51636d3a390451561744c42188ccd628",
-"/": "0c9743ec646dd75ba43a367a96d6868d",
+"/": "94e51cb94d703239a16eb20a46a53cfa",
 "flutter.js": "f85e6fb278b0fd20c349186fb46ae36d",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
 "canvaskit/canvaskit.js": "2bc454a691c631b07a9307ac4ca47797",
@@ -299,7 +299,7 @@ const RESOURCES = {
 "assets/assets/google_fonts/Roboto-Regular.ttf": "8a36205bd9b83e03af0591a004bc97f4",
 "assets/fonts/MaterialIcons-Regular.otf": "95db9098c58fd6db106f1116bae85a0b",
 "assets/NOTICES": "1a34e70168d56fad075adfb4bdbb20eb",
-"version.json": "674c2b7791134c91ed5f7bc241b11d8d",
+"version.json": "fe3b943c516fb905ec25a31e0878c315",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed"
 };

public/version.json

@@ -1 +1 @@
-{"app_name":"invoiceninja_flutter","version":"5.0.95","build_number":"95","package_name":"invoiceninja_flutter"}
+{"app_name":"invoiceninja_flutter","version":"5.0.97","build_number":"97","package_name":"invoiceninja_flutter"}