Merge pull request #59 from devmount/bugs/fix-monthly-income-widget

Fix monthly income widget
devmount · Aug 21, 2024 · d9432d1 · d9432d1
2 parents 77982c5 + baa715c
commit d9432d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/Filament/Widgets/MonthlyIncomeChart.php b/app/Filament/Widgets/MonthlyIncomeChart.php
@@ -33,7 +33,7 @@ protected function getData(): array
             ->oldest('paid_at')
             ->get();
         $taxes = Expense::whereNotNull('expended_at')
-            ->whereIn('category', ['vat', 'tax'])
+            ->whereIn('category', ExpenseCategory::taxCategories())
             ->oldest('expended_at')
             ->get();
         $period = Carbon::parse($invoices[0]->paid_at)->startOfYear()->yearsUntil(now()->addYear());
@@ -51,12 +51,11 @@ protected function getData(): array
                     };
                 }
             }
-            foreach ($taxes as $obj) {
-                if (
-                    CarbonPeriod::create($date, $period[$i+1])->contains(Carbon::parse($obj->expended_at)->subYear()) &&
-                    $this->filter === 'net'
-                ) {
-                    $invoiceData[$i] -= $obj->net;
+            if ($this->filter === 'net') {
+                foreach ($taxes as $obj) {
+                    if (CarbonPeriod::create($date, $period[$i+1])->contains(Carbon::parse($obj->expended_at))) {
+                        $invoiceData[$i] -= $obj->net;
+                    }
                 }
             }
             $invoiceData[$i] = round($invoiceData[$i]/($i == count($period)-2 ? now()->month : 12), 2);

diff --git a/app/Filament/Widgets/SalesChart.php b/app/Filament/Widgets/SalesChart.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Widgets;
 
+use App\Enums\ExpenseCategory;
 use App\Models\Expense;
 use App\Models\Invoice;
 use Carbon\Carbon;
@@ -33,11 +34,11 @@ protected function getData(): array
             ->oldest('paid_at')
             ->get();
         $expenses = Expense::whereNotNull('expended_at')
-            ->where('taxable', 1)
+            ->whereIn('category', ExpenseCategory::deliverableCategories())
             ->oldest('expended_at')
             ->get();
         $taxes = Expense::whereNotNull('expended_at')
-            ->where('taxable', 0)
+            ->whereIn('category', ExpenseCategory::taxCategories())
             ->oldest('expended_at')
             ->get();
         $period = match($this->filter) {