Adds DTI calculation

cdterry87 · Aug 12, 2024 · 65411e0 · 65411e0
1 parent fadf353
commit 65411e0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/app/Livewire/Home.php b/app/Livewire/Home.php
@@ -20,6 +20,8 @@ public function render()
         $monthlyIncome = auth()->user()->getMonthlyIncome();
         $biWeeklyIncome = auth()->user()->getBiWeeklyIncome();
         $weeklyIncome = auth()->user()->getWeeklyIncome();
+        $monthlyRemainder = auth()->user()->getMonthlyRemainder();
+        $dtiRatio = auth()->user()->getDtiRatio();
 
         // Get notifications
         $notifications = $this->getNotifications();
@@ -33,6 +35,8 @@ public function render()
             'monthlyIncome' => $monthlyIncome,
             'biWeeklyIncome' => $biWeeklyIncome,
             'weeklyIncome' => $weeklyIncome,
+            'monthlyRemainder' => $monthlyRemainder,
+            'dtiRatio' => $dtiRatio,
             'notifications' => $notifications,
             'incomeVsBillsChart' => $incomeVsBillsChart,
             'topCategoriesChart' => $topCategoriesChart,

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -116,4 +116,33 @@ public function getWeeklyIncome(): string
         $income = round($this->income * $this->frequency / 52, 2);
         return $this->formatCurrency($income);
     }
+
+    public function getMonthlyRemainderRaw(): float
+    {
+        $monthlyBillsTotal = $this->currentMonthBills()
+            ->select('amount')
+            ->sum('amount');
+
+        $monthlyIncome = $this->getMonthlyIncomeRaw();
+        return $monthlyIncome - $monthlyBillsTotal;
+    }
+
+    public function getMonthlyRemainder(): string
+    {
+        $monthlyRemainder = $this->getMonthlyRemainderRaw();
+
+        return $this->formatCurrency($monthlyRemainder);
+    }
+
+    public function getDtiRatio(): string
+    {
+        $monthlyBillsTotal = $this->currentMonthBills()
+            ->select('amount')
+            ->sum('amount');
+
+        $monthlyIncome = $this->getMonthlyIncomeRaw();
+        $dti = $monthlyBillsTotal / $monthlyIncome * 100;
+
+        return number_format($dti, 2) . '%';
+    }
 }
diff --git a/resources/views/livewire/home.blade.php b/resources/views/livewire/home.blade.php
@@ -30,7 +30,7 @@ class="welcome--alert"
             </x-alert>
         @endif
 
-        <div class="income-summary--container grid grid-cols-2 lg:grid-cols-4 gap-3 sm:gap-6">
+        <div class="income-summary--container grid grid-cols-2 lg:grid-cols-3 gap-3 sm:gap-6">
             <x-income-summary
                 label="Annual Income"
                 value="{{ $yearlyIncome }}"
@@ -47,6 +47,14 @@ class="welcome--alert"
                 label="Weekly Income"
                 value="{{ $weeklyIncome }}"
             />
+            <x-income-summary
+                label="Monthly Remainder"
+                value="{{ $monthlyRemainder }}"
+            />
+            <x-income-summary
+                label="Debt/Income Ratio"
+                value="{{ $dtiRatio }}"
+            />
         </div>
 
         <div class="charts--container grid grid-cols-1 md:grid-cols-2 gap-6">

diff --git a/resources/views/livewire/login.blade.php b/resources/views/livewire/login.blade.php
@@ -29,7 +29,7 @@ class="flex flex-col gap-4 w-full"
                                 Password: <strong class="underline">password1</strong>
                             </p>
                         </div>
-                        <p class="text-xs italic">NOTE: All user settings and data are reset daily.</p>
+                        <p class="text-xs italic">NOTE: Demo user and data are reset daily.</p>
                     </div>
                 </x-alert>