From 5bd79c40469bab0d016148b324e683aa37c6eca0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 24 Oct 2021 19:27:12 +1100
Subject: [PATCH 1/3] Minor fixes for resolution of backup HTML documents

---
 app/Http/Controllers/ActivityController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index e6bf5ad711e6..221de5c61e75 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -15,6 +15,7 @@ use App\Http\Requests\Activity\DownloadHistoricalEntityRequest;
 use App\Models\Activity;
 use App\Transformers\ActivityTransformer;
 use App\Utils\HostedPDF\NinjaPdf;
+use App\Utils\Ninja;
 use App\Utils\PhantomJS\Phantom;
 use App\Utils\Traits\Pdf\PdfMaker;
 use Illuminate\Http\JsonResponse;
@@ -147,7 +148,12 @@ class ActivityController extends BaseController
         */
 
         if($backup && $backup->filename && Storage::disk(config('filesystems.default'))->exists($backup->filename)){ //disk
-            $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename));
+
+            if(Ninja::isHosted())
+                $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->url($backup->filename));
+            else
+                $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename));
+
         }
         elseif($backup && $backup->html_backup){ //db
             $html_backup = $backup->html_backup;

From 1dfc6eb11ad32af257192cd02b24a96c37efc495 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 24 Oct 2021 20:11:40 +1100
Subject: [PATCH 2/3] Add BECS to gateways

---
 app/Models/Gateway.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 1b52c9652726..1f60070b0acb 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -145,7 +145,9 @@ class Gateway extends StaticModel
                     GatewayType::GIROPAY => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::EPS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::BANCONTACT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                 ];
                 break;
             case 57:

From 3d319f1b1d1f79db32c80295fdcd4cc71dc2dc4c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 24 Oct 2021 20:17:57 +1100
Subject: [PATCH 3/3] Minor fixes for Contact login

---
 app/Http/Controllers/Auth/ContactLoginController.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index b6c64a4d87d2..795707d88dbe 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -40,8 +40,17 @@ class ContactLoginController extends Controller
         // if(Ninja::isHosted() && count(explode('.', request()->getHost())) == 2){
         //     $company = null;
         // }else
+        
+        $company = false;
 
-        if (strpos($request->getHost(), 'invoicing.co') !== false) {
+        if($request->has('company_key')){
+            MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
+
+            $company = Company::where('company_key', $request->input('company_key'))->first();
+
+        }
+
+        if (!$company && strpos($request->getHost(), 'invoicing.co') !== false) {
             $subdomain = explode('.', $request->getHost())[0];
 
             MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);