From be45998ebedb4c58a254cbc69b07851a90875587 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 8 Nov 2021 10:17:49 +1100
Subject: [PATCH] Fixes for invitation 404 messaging

---
 .../ClientPortal/InvitationController.php            |  5 ++++-
 app/Http/Controllers/HostedMigrationController.php   |  8 ++++++++
 app/Http/Middleware/SetInviteDb.php                  |  2 +-
 app/Jobs/Company/CompanyImport.php                   | 12 ++++++------
 app/Mail/Admin/ClientPaymentFailureObject.php        |  4 ++++
 app/PaymentDrivers/MolliePaymentDriver.php           |  2 +-
 routes/api.php                                       |  1 +
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index bf72b36a0c84..750af7ee433a 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -80,7 +80,10 @@ class InvitationController extends Controller
                                          $query->where('is_deleted',0);
                                     })
                                     ->with('contact.client')
-                                    ->firstOrFail();
+                                    ->first();
+
+        if(!$invitation)
+            return abort(404,'The resource is no longer available.');
 
         /* Return early if we have the correct client_hash embedded */
         $client_contact = $invitation->contact;
diff --git a/app/Http/Controllers/HostedMigrationController.php b/app/Http/Controllers/HostedMigrationController.php
index 7415dca2395b..13ee636115d8 100644
--- a/app/Http/Controllers/HostedMigrationController.php
+++ b/app/Http/Controllers/HostedMigrationController.php
@@ -49,4 +49,12 @@ class HostedMigrationController extends Controller
 
     }
 
+    public function confirmForwarding(Request $request)
+    {
+        if($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret'))
+            return;
+
+        
+    }
+
 }
\ No newline at end of file
diff --git a/app/Http/Middleware/SetInviteDb.php b/app/Http/Middleware/SetInviteDb.php
index a165fda3a4fa..4b8e8cdcbfe9 100644
--- a/app/Http/Middleware/SetInviteDb.php
+++ b/app/Http/Middleware/SetInviteDb.php
@@ -74,7 +74,7 @@ class SetInviteDb
             if (request()->json) {
                 return response()->json($error, 403);
             } else {
-                abort(404,'I could not find the database for this object.');
+                abort(404,'I could not find this resource.');
             }
         }
 
diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 33c11acaa65b..605614b36367 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -338,14 +338,14 @@ class CompanyImport implements ShouldQueue
 
                 if($this->account->plan == 'enterprise'){
 
-                    $total_import_users = count($backup_users_emails);
+                    // $total_import_users = count($backup_users_emails);
 
-                    $account_plan_num_user = $this->account->num_users;
+                    // $account_plan_num_user = $this->account->num_users;
 
-                    if($total_import_users > $account_plan_num_user){
-                        $this->message = "Total user count ({$total_import_users}) greater than your plan allows ({$account_plan_num_user})";
-                        $this->pre_flight_checks_pass = false;
-                    }
+                    // if($total_import_users > $account_plan_num_user){
+                    //     $this->message = "Total user count ({$total_import_users}) greater than your plan allows ({$account_plan_num_user})";
+                    //     $this->pre_flight_checks_pass = false;
+                    // }
 
                 }
             }
diff --git a/app/Mail/Admin/ClientPaymentFailureObject.php b/app/Mail/Admin/ClientPaymentFailureObject.php
index df13ad8a5049..6e4a734f5b1c 100644
--- a/app/Mail/Admin/ClientPaymentFailureObject.php
+++ b/app/Mail/Admin/ClientPaymentFailureObject.php
@@ -56,6 +56,10 @@ class ClientPaymentFailureObject
 
     public function build()
     {
+        if(!$this->payment_hash){
+            nlog("no payment has for failure notification - ClientPaymentFailureObject");
+            return;
+        }
 
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
diff --git a/app/PaymentDrivers/MolliePaymentDriver.php b/app/PaymentDrivers/MolliePaymentDriver.php
index 8ec71a6d2a18..4b991a057a86 100644
--- a/app/PaymentDrivers/MolliePaymentDriver.php
+++ b/app/PaymentDrivers/MolliePaymentDriver.php
@@ -304,7 +304,7 @@ class MolliePaymentDriver extends BaseDriver
         try {
             $payment = $this->gateway->payments->get($request->id);
 
-            $record = Payment::where('transaction_reference', $payment->id)->firstOrFail();
+            $record = Payment::withTrashed()->where('transaction_reference', $request->id)->firstOrFail();
             $record->status_id = $codes[$payment->status];
             $record->save();
 
diff --git a/routes/api.php b/routes/api.php
index 0e2f9d4760cf..6dd956d0b5a6 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -220,5 +220,6 @@ Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware
 Route::get('token_hash_router', 'OneTimeTokenController@router');
 Route::get('webcron', 'WebCronController@index');
 Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest');
+Route::post('api/v1/confirm_forwarding', 'HostedMigrationController@confirmForwarding')->middleware('guest');
 
 Route::fallback('BaseController@notFound');