Small fix for upcoming month.

Author: Mario Basic

app/Http/Controllers/HomeController.php

@@ -28,10 +28,14 @@ public function index()
         })->with(['service.client'])->get();
 
         if($currentMonth + 1 <= 12){
+            $upcomingMonth = ++$currentMonth;
+            if($upcomingMonth < 10) {
+                $upcomingMonth = '0' . $upcomingMonth;
+            }
             $upcomingOccurrences = Occurrence::orderBy('occurs_at')
-            // Where occurs_at month and year is the same as current month and year
-            ->where(function($query) use($currentMonth, $currentYear) {
-                $query->where('occurs_at', 'like', $currentYear . '-' . ++$currentMonth . '-%');
+            // Where occurs_at month and year is the same as upcoming month and current year
+            ->where(function($query) use($upcomingMonth, $currentYear) {
+                $query->where('occurs_at', 'like', $currentYear . '-' . $upcomingMonth . '-%');
             })
             // Return only occurrences that belong to services that are active
             ->whereHas('service', function($query) {

resources/views/home.blade.php

@@ -103,9 +103,21 @@
                             <td>{{ $occurrence->service->title }}</td>
                             <td>{{ $occurrence->service->client->name }}</td>
                             <td>{{ $occurrence->service->formatted_cost }}</td>
-                            <td>{{ $occurrence->offer_sent }}</td>
-                            <td>{{ $occurrence->payment_received }}</td>
-                            <td>{{ $occurrence->receipt_sent }}</td>
+                            <td class="kyle-change-boolean"
+                                data-url="/api/v1/occurrences/{{ $occurrence->id }}/offer"
+                                data-state="{{ $occurrence->getFutureOfferState() }}">
+                                {{ $occurrence->offer_sent }}
+                            </td>
+                            <td class="kyle-change-boolean"
+                                data-url="/api/v1/occurrences/{{ $occurrence->id }}/payment"
+                                data-state="{{ $occurrence->getFuturePaymentState() }}">
+                                {{ $occurrence->payment_received }}
+                            </td>
+                            <td class="kyle-change-boolean"
+                                data-url="/api/v1/occurrences/{{ $occurrence->id }}/receipt"
+                                data-state="{{ $occurrence->getFutureReceiptState() }}">
+                                {{ $occurrence->receipt_sent }}
+                            </td>
                         </tr>
                     @endforeach
                 </table>