From dd4d5534fb6e8854f62eb49c6517616522ad76ab Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 9 Nov 2022 08:09:42 +1100
Subject: [PATCH] Minor fixes

---
 app/Http/Controllers/StripeConnectController.php              | 2 +-
 app/Jobs/Util/Import.php                                      | 3 ++-
 app/Observers/InvoiceObserver.php                             | 2 +-
 app/PaymentDrivers/GoCardlessPaymentDriver.php                | 4 ++--
 app/Services/Invoice/MarkPaid.php                             | 2 ++
 ..._06_215526_drop_html_backups_column_from_backups_table.php | 4 ++++
 database/seeders/PaymentLibrariesSeeder.php                   | 1 +
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php
index b0d0d1e04a3a..828928731cc4 100644
--- a/app/Http/Controllers/StripeConnectController.php
+++ b/app/Http/Controllers/StripeConnectController.php
@@ -54,7 +54,7 @@ class StripeConnectController extends BaseController
         if ($company_gateway) {
             $config = $company_gateway->getConfig();
 
-            if (property_exists($config, 'account_id') && strlen($config->account_id) > 1) {
+            if (property_exists($config, 'account_id') && strlen($config->account_id) > 5) {
                 return view('auth.connect.existing');
             }
         }
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 947cce5a35f1..1ed28640e4cc 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -271,7 +271,8 @@ class Import implements ShouldQueue
         }
         
         /*After a migration first some basic jobs to ensure the system is up to date*/
-        VersionCheck::dispatch();
+        if(Ninja::isSelfHost())
+            VersionCheck::dispatch();
 
         info('Completed🚀🚀🚀🚀🚀 at '.now());
 
diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php
index 0aa0c984d7ef..8844ba53610f 100644
--- a/app/Observers/InvoiceObserver.php
+++ b/app/Observers/InvoiceObserver.php
@@ -45,7 +45,7 @@ class InvoiceObserver
      * @return void
      */
     public function updated(Invoice $invoice)
-    {
+    {nlog("updated");
         $subscriptions = Webhook::where('company_id', $invoice->company_id)
                             ->where('event_id', Webhook::EVENT_UPDATE_INVOICE)
                             ->exists();
diff --git a/app/PaymentDrivers/GoCardlessPaymentDriver.php b/app/PaymentDrivers/GoCardlessPaymentDriver.php
index 0a027fd1062c..a1db5c298a48 100644
--- a/app/PaymentDrivers/GoCardlessPaymentDriver.php
+++ b/app/PaymentDrivers/GoCardlessPaymentDriver.php
@@ -288,7 +288,7 @@ class GoCardlessPaymentDriver extends BaseDriver
 
                 if(!$hash){
                     nlog("GoCardless: couldn't find a hash, need to abort => Billing Request => " . $event['links']['billing_request']);
-                    return; 
+                    return response()->json([], 200);
                 }
 
                 $this->go_cardless->setPaymentHash($hash);
@@ -328,7 +328,7 @@ class GoCardlessPaymentDriver extends BaseDriver
                     //return early if nothing to do
                     if($invoices->count() == 0){
                         nlog("GoCardless: Could not harvest any invoices - probably all paid!!");
-                        return; 
+                        return response()->json([], 200);
                     }
 
                     $this->processSuccessfulPayment($payment);
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index 31b6f04a8402..b692144f4044 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -143,6 +143,8 @@ class MarkPaid extends AbstractService
 
         // TransactionLog::dispatch(TransactionEvent::INVOICE_MARK_PAID, $transaction, $this->invoice->company->db);
 
+        event('eloquent.updated: App\Models\Invoice', $this->invoice);
+        
         return $this->invoice;
     }
 
diff --git a/database/migrations/2022_11_06_215526_drop_html_backups_column_from_backups_table.php b/database/migrations/2022_11_06_215526_drop_html_backups_column_from_backups_table.php
index d1644199b309..9f35d53dddce 100644
--- a/database/migrations/2022_11_06_215526_drop_html_backups_column_from_backups_table.php
+++ b/database/migrations/2022_11_06_215526_drop_html_backups_column_from_backups_table.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Models\Gateway;
+use App\Utils\Ninja;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -29,6 +31,8 @@ return new class extends Migration
         Schema::table('bank_integrations', function (Blueprint $table) {
             $table->boolean('auto_sync')->default(false);
         });
+
+
     }
 
     /**
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index b32ab17fb719..a62240ed6779 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -82,6 +82,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 55, 'name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 21, 'key' => '54faab2ab6e3223dbe848b1686490baa', 'fields' => '{"name":"","text":""}'],
             ['id' => 57, 'name' => 'Square', 'provider' => 'Square', 'is_offsite' => false, 'sort_order' => 21, 'key' => '65faab2ab6e3223dbe848b1686490baz', 'fields' => '{"accessToken":"","applicationId":"","locationId":"","testMode":false}'],
             ['id' => 58, 'name' => 'Razorpay', 'provider' => 'Razorpay', 'is_offsite' => false, 'sort_order' => 21, 'key' => 'hxd6gwg3ekb9tb3v9lptgx1mqyg69zu9', 'fields' => '{"apiKey":"","apiSecret":""}'],
+            ['id' => 59, 'name' => 'Forte', 'provider' => 'Forte', 'is_offsite' => false, 'sort_order' => 21, 'key' => 'kivcvjexxvdiyqtj3mju5d6yhpeht2xs', 'fields' => '{"testMode":false,"apiLoginId":"","apiAccessId":"","secureKey":"","authOrganizationId":"","organizationId":"","locationId":""}'],
         ];
 
         foreach ($gateways as $gateway) {