Services are now displayed by month. Added upcoming month to overview.

Author: Mario Basic

app/Http/Controllers/HomeController.php

@@ -27,6 +27,22 @@ public function index()
             $query->where('active', 1);
         })->with(['service.client'])->get();
 
-        return view('home')->with(compact('occurrences'));
+        if($currentMonth + 1 <= 12){
+            $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 . '-%');
+            })
+            // Return only occurrences that belong to services that are active
+            ->whereHas('service', function($query) {
+                $query->where('active', 1);
+            })->with(['service.client'])->get();
+        }
+        else {
+            $upcomingOccurrences = [];
+        }
+
+
+        return view('home')->with(compact('occurrences', 'upcomingOccurrences'));
     }
 }

app/Http/Controllers/ServiceController.php

@@ -55,7 +55,7 @@ public function store(Request $request)
             'day' => 'required|integer|min:1|max:31',
             'cost' => 'required|regex:/([0-9],)+[0-9]{2,}/|min:0',
             'currency' => 'required|in:hrk,usd,eur',
-            'exchange_rate' => 'required|regex:/([0-9],)+[0-9]{2,}/|min:0',
+            'exchange_rate' => 'required|numeric|min:0',
             'active' => 'boolean',
             'client_id' => 'required|exists:clients,id'
         ]);
@@ -69,7 +69,7 @@ public function store(Request $request)
         $service->day = $request->get('day');
         $service->cost = convert_integer($request->get('cost'));
         $service->currency = $request->get('currency');
-        $service->exchange_rate = str_replace(',', '.', $request->get('exchange_rate'));
+        $service->exchange_rate = $request->get('exchange_rate');
         $service->active = $request->get('active', false);
         $service->client()->associate($client);
         $service->save();
@@ -118,7 +118,7 @@ public function update(Request $request, $id)
             'day' => 'required|integer|min:1|max:31',
             'cost' => 'required|regex:/([0-9],)+[0-9]{2,}/|min:0',
             'currency' => 'required|in:hrk,usd,eur',
-            'exchange_rate' => 'required|regex:/([0-9],)+[0-9]{2,}/|min:0',
+            'exchange_rate' => 'required|numeric|min:0',
             'active' => 'boolean',
             'client_id' => 'required|exists:clients,id'
         ]);
@@ -130,7 +130,7 @@ public function update(Request $request, $id)
             'day' => $request->get('day'),
             'cost' => convert_integer($request->get('cost')),
             'currency' => $request->get('currency'),
-            'exchange_rate' => str_replace(',', '.', $request->get('exchange_rate')),
+            'exchange_rate' => $request->get('exchange_rate'),
             'active' => $request->get('active', false),
         ]);
 

public/build/js/all.js.map

@@ -1,4 +1,4 @@
 {
   "css/app.css": "css/app-b139bf95a1.css",
-  "js/app.js": "js/app-6a274cc27f.js"
+  "js/app.js": "js/app-953d76804f.js"
 }

public/build/js/app-6a274cc27f.js public/build/js/app-953d76804f.jspublic/build/js/app-6a274cc27f.js renamed to public/build/js/app-953d76804f.js

@@ -28,7 +28,6 @@ $('#currency').on('change', function() {
         },
         method: 'GET',
         success: function (data) {
-            data = data.replace('.', ',');
             $('#exchange_rate').val(data);
         }
     });

public/build/js/app.js.map

@@ -13,9 +13,22 @@
             ])
         </div>
     </div>
+    @if(count($occurrences) > 0)
     <div class="row">
         <div class="col-md-12">
-            <h2>This month</h2>
+            <?php
+                $usd_sum = 0;
+                foreach($occurrences as $occurrence) {
+                    $usd_sum+= ($occurrence->service->cost / 100) * $occurrence->service->exchange_rate;
+                }
+                $usd_sum = ceil($usd_sum);
+            ?>
+            <h2>
+                This month
+                <small class="pull-right" style="margin-top: 15px;">
+                    TOTAL {{ number_format($usd_sum, 2, ',', '.') }} USD
+                </small>
+            </h2>
             <div class="table-responsive">
                 <table class="table">
                     <tr>
@@ -40,10 +53,53 @@
                     @endforeach
                 </table>
             </div>
-            @if(count($occurrences) == 0)
-                <p class="lead">Nothing to bill this month :/</p>
-            @endif
         </div>
     </div>
+    @else
+        <p class="lead">Nothing to bill this month :/</p>
+    @endif
+    @if(count($upcomingOccurrences) > 0)
+    <div class="row">
+        <div class="col-md-12">
+            <?php
+                $usd_sum = 0;
+                foreach($upcomingOccurrences as $occurrence) {
+                    $usd_sum+= ($occurrence->service->cost / 100) * $occurrence->service->exchange_rate;
+                }
+                $usd_sum = ceil($usd_sum);
+            ?>
+            <h2>
+                Upcoming month
+                <small class="pull-right" style="margin-top: 15px;">
+                    TOTAL {{ number_format($usd_sum, 2, ',', '.') }} USD
+                </small>
+            </h2>
+            <div class="table-responsive">
+                <table class="table">
+                    <tr>
+                        <th>Date</th>
+                        <th>Service</th>
+                        <th>Client</th>
+                        <th>Cost</th>
+                        <th>Offer sent</th>
+                        <th>Payment received</th>
+                        <th>Receipt sent</th>
+                    </tr>
+                    @foreach($upcomingOccurrences as $occurrence)
+                        <tr>
+                            <td>{{ $occurrence->occurs_at->format('d.m.Y') }}</td>
+                            <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>
+                        </tr>
+                    @endforeach
+                </table>
+            </div>
+        </div>
+    </div>
+    @endif
 </div>
 @endsection