Merge pull request #30 from SolidCharity/TP-20200608-FixVisitorLinkEx…

…ternalUrl Tp 20200608 fix visitor link external url
SolidCharity · Jun 8, 2020 · 7ce2134 · 7ce2134
2 parents 4ecadb2 + 46c9071
commit 7ce2134
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 56 deletions.
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -31,11 +31,18 @@ public function index(Request $request)
         $participants = \App\Participant::where('tenant_id', $tenant_id)->get();
         $tenant = \DB::table('tenants')->where('id', $tenant_id)->first();
 
-        $visitor_link = $request->getSchemeAndHttpHost();
-        // this is not a single instance installation
-        if (\DB::table('users')->where('tenant_id', "=", 1)->count() == 0)
+        if (!empty($tenant->external_url))
         {
-            $visitor_link .= "/?uuid=".$tenant->uuid;
+            $visitor_link = $tenant->external_url;
+        }
+        else
+        {
+            $visitor_link = $request->getSchemeAndHttpHost();
+            // this is not a single instance installation
+            if (\DB::table('users')->where('tenant_id', "=", 1)->count() == 0)
+            {
+                $visitor_link .= "/?uuid=".$tenant->uuid;
+            }
         }
 
         $churchname = $tenant->name;

diff --git a/package-lock.json b/package-lock.json