From a212c04ace16d36d063f0a678e903ffbe6cc889b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 15 May 2024 11:55:51 +1000
Subject: [PATCH] Minor fixes for filters

---
 app/Export/CSV/ProductSalesExport.php | 10 ++++++++--
 app/Filters/InvoiceFilters.php        |  8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Export/CSV/ProductSalesExport.php b/app/Export/CSV/ProductSalesExport.php
index 9a0fed92a0c8..db33e311352d 100644
--- a/app/Export/CSV/ProductSalesExport.php
+++ b/app/Export/CSV/ProductSalesExport.php
@@ -146,9 +146,15 @@ class ProductSalesExport extends BaseExport
               ->each(function ($invoice) use($product_keys) {
                   foreach ($invoice->line_items as $item) {
 
-                     if($product_keys && in_array($item->product_key, $product_keys))
+                    if($product_keys)
+                    {
+                     if(in_array($item->product_key, $product_keys))
                         $this->csv->insertOne($this->buildRow($invoice, $item));
-
+                    }
+                    else {
+                        $this->csv->insertOne($this->buildRow($invoice, $item));
+                    }
+                    
                   }
               });
 
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 906afa3acf16..5f307de3079b 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -227,7 +227,13 @@ class InvoiceFilters extends QueryFilters
         if (is_numeric($date)) {
             $date = Carbon::createFromTimestamp((int)$date);
         } else {
-            $date = Carbon::parse($date);
+
+            try{
+                $date = Carbon::parse($date);
+            }
+            catch(\Exception $e){
+                return $this->builder;
+            }
         }
 
         return $this->builder->where('date', '>=', $date);