From 26877f905f8cf37b96bf4a607fad648affc3d08b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 Jan 2024 08:25:28 +1100
Subject: [PATCH] Fixes for quotes

---
 app/Http/Controllers/QuoteController.php   |  3 +--
 app/Jobs/Product/UpdateOrCreateProduct.php |  7 +++++--
 app/Models/Quote.php                       | 12 ++++++------
 app/Services/Quote/MarkSent.php            |  1 -
 app/Transformers/QuoteTransformer.php      |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index ce4a08280afd..b2af3a1b560e 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -399,8 +399,7 @@ class QuoteController extends BaseController
 
         $quote->service()
               ->triggeredActions($request);
-        //   ->deletePdf();
-
+        
         event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($quote);
diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php
index 553944715b3a..702e8c33c0f4 100644
--- a/app/Jobs/Product/UpdateOrCreateProduct.php
+++ b/app/Jobs/Product/UpdateOrCreateProduct.php
@@ -69,8 +69,11 @@ class UpdateOrCreateProduct implements ShouldQueue
          * we do NOT update the product details this short block we
          * check for the presence of a task_id and/or expense_id
          */
-        $expense_count = count(array_column((array) $this->products, 'expense_id'));
-        $task_count = count(array_column((array) $this->products, 'task_id'));
+        // $expense_count = count(array_column((array) $this->products, 'expense_id'));
+        // $task_count = count(array_column((array) $this->products, 'task_id'));
+
+        $task_count = implode("", array_column((array) $this->products, 'task_id'));
+        $expense_count = implode("", array_column((array) $this->products, 'expense_id'));
 
         if ($task_count >= 1 || $expense_count >= 1) {
             return;
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 07a59c8b97cd..85cad251c9b6 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -44,7 +44,7 @@ use Laracasts\Presenter\PresentableTrait;
  * @property string|null $po_number
  * @property string|null $date
  * @property string|null $last_sent_date
- * @property string|null $due_date
+ * @property string|null|Carbon $due_date
  * @property string|null $next_send_date
  * @property bool $is_deleted
  * @property object|null $line_items
@@ -164,7 +164,7 @@ class Quote extends BaseModel
 
     protected $casts = [
         // 'date' => 'date:Y-m-d',
-        // 'due_date' => 'date:Y-m-d',
+        'due_date' => 'date:Y-m-d',
         // 'partial_due_date' => 'date:Y-m-d',
         'line_items' => 'object',
         'backup' => 'object',
@@ -195,10 +195,10 @@ class Quote extends BaseModel
         return $this->dateMutator($value);
     }
 
-    public function getDueDateAttribute($value)
-    {
-        return $this->dateMutator($value);
-    }
+    // public function getDueDateAttribute($value)
+    // {
+    //     return $this->dateMutator($value);
+    // }
 
     public function getPartialDueDateAttribute($value)
     {
diff --git a/app/Services/Quote/MarkSent.php b/app/Services/Quote/MarkSent.php
index 7c9c441ed4ec..f8d1c76d6ba7 100644
--- a/app/Services/Quote/MarkSent.php
+++ b/app/Services/Quote/MarkSent.php
@@ -42,7 +42,6 @@ class MarkSent
              ->service()
              ->setStatus(Quote::STATUS_SENT)
              ->applyNumber()
-            //  ->deletePdf()
              ->save();
 
         event(new QuoteWasMarkedSent($this->quote, $this->quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
diff --git a/app/Transformers/QuoteTransformer.php b/app/Transformers/QuoteTransformer.php
index 649b9995e24c..2ace322178da 100644
--- a/app/Transformers/QuoteTransformer.php
+++ b/app/Transformers/QuoteTransformer.php
@@ -111,7 +111,7 @@ class QuoteTransformer extends EntityTransformer
             'reminder2_sent' => $quote->reminder2_sent ?: '',
             'reminder3_sent' => $quote->reminder3_sent ?: '',
             'reminder_last_sent' => $quote->reminder_last_sent ?: '',
-            'due_date' => $quote->due_date ?: '',
+            'due_date' => $quote->due_date ? $quote->due_date->format('Y-m-d') : '',
             'terms' => $quote->terms ?: '',
             'public_notes' => $quote->public_notes ?: '',
             'private_notes' => $quote->private_notes ?: '',