From adab53ed972729bc961e5deae48097dc38106e56 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 18 Dec 2020 07:11:31 +1100 Subject: [PATCH] Handle restoring a deleted invoice --- app/Services/Invoice/HandleRestore.php | 3 +++ app/Transformers/ProjectTransformer.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Services/Invoice/HandleRestore.php b/app/Services/Invoice/HandleRestore.php index db7aedd9ac03..f3d7eff21a75 100644 --- a/app/Services/Invoice/HandleRestore.php +++ b/app/Services/Invoice/HandleRestore.php @@ -94,6 +94,9 @@ class HandleRestore extends AbstractService $new_invoice_number = substr($this->invoice->number, 0, $pos); + if(strlen($new_invoice_number) == 0) + $new_invoice_number = null; + try { $this->invoice->number = $new_invoice_number; $this->invoice->save(); diff --git a/app/Transformers/ProjectTransformer.php b/app/Transformers/ProjectTransformer.php index 76ac59224a10..c30d25cd9b23 100644 --- a/app/Transformers/ProjectTransformer.php +++ b/app/Transformers/ProjectTransformer.php @@ -48,7 +48,7 @@ class ProjectTransformer extends EntityTransformer 'assigned_user_id' => (string) $this->encodePrimaryKey($project->assigned_user_id), 'client_id' => (string) $this->encodePrimaryKey($project->client_id), 'name' => $project->name ?: '', - 'number' => $project->number, + 'number' => $project->number ?: '', 'created_at' => (int) $project->created_at, 'updated_at' => (int) $project->updated_at, 'archived_at' => (int) $project->deleted_at,