From 1f5cc43ac6d9ba1e116e1fc663b2d7f78f350887 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 16:32:50 +1000
Subject: [PATCH 1/3] Update documents

---
 app/Http/Requests/Document/UpdateDocumentRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php
index 9fc24354dfa0..1ed60c349963 100644
--- a/app/Http/Requests/Document/UpdateDocumentRequest.php
+++ b/app/Http/Requests/Document/UpdateDocumentRequest.php
@@ -31,7 +31,7 @@ class UpdateDocumentRequest extends Request
     public function rules()
     {
         return [
-            'name' => 'sometimes|alpha_num'
+            'name' => 'sometimes'
         ];
     }
 

From b8070a130e034542994835f35db7a63b08163235 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 18:22:36 +1000
Subject: [PATCH 2/3] Minor fixes

---
 app/Http/Requests/Document/UpdateDocumentRequest.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php
index 1ed60c349963..ab9916a276dc 100644
--- a/app/Http/Requests/Document/UpdateDocumentRequest.php
+++ b/app/Http/Requests/Document/UpdateDocumentRequest.php
@@ -23,9 +23,12 @@ class UpdateDocumentRequest extends Request
      *
      * @return bool
      */
-    public function authorize() : bool
+    public function authorize(): bool
     {
-        return auth()->user()->can('edit', $this->document);
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        return $user->can('edit', $this->document);
     }
 
     public function rules()

From cf75b9d27301313097e9a9d31bdbb860ada95fa3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 20:31:46 +1000
Subject: [PATCH 3/3] Remove duplicate saves for company settings

---
 app/Http/Controllers/CompanyController.php |  3 ++-
 app/Jobs/Cron/RecurringInvoicesCron.php    |  1 -
 app/Utils/Traits/CompanySettingsSaver.php  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index a7900a3f173c..61777161bb11 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -412,7 +412,8 @@ class CompanyController extends BaseController
 
         $company = $this->company_repo->save($request->all(), $company);
 
-        $company->saveSettings($request->input('settings'), $company);
+        /** We save the settings in the repository - this is duplicated */
+        // $company->saveSettings($request->input('settings'), $company);
 
         if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $company, false);
diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php
index 2e1e53ee218f..edd57acf265d 100644
--- a/app/Jobs/Cron/RecurringInvoicesCron.php
+++ b/app/Jobs/Cron/RecurringInvoicesCron.php
@@ -73,7 +73,6 @@ class RecurringInvoicesCron
                 /* Special check if we should generate another invoice is the previous one is yet to be paid */
                 if ($recurring_invoice->company->stop_on_unpaid_recurring && $recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
                     nlog('Existing invoice exists, skipping');
-
                     return;
                 }
 
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index 6f0c3217df8f..4d93281140e8 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -77,6 +77,18 @@ trait CompanySettingsSaver
 
         $entity->settings = $company_settings;
 
+        if(array_key_exists('settings', $entity->getDirty())) 
+        {
+            $old_settings = $entity->getOriginal()['settings'];
+
+            if($settings->name != $old_settings->name) {
+                
+                nlog("name change {$old_settings->name} -> {$settings->name} ");
+
+            }
+        }
+        
+        
         $entity->save();
     }