Added service categories and a yearly report.

Author: Mario Basic

app/Category.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App;
+
+use App\Service;
+use Illuminate\Database\Eloquent\Model;
+
+class Category extends Model
+{
+    protected $fillable = ['name'];
+
+    /**
+     * Get services which belong to this category.
+     *
+     * @return [type]
+     */
+    public function services()
+    {
+        return $this->hasMany(Service::class);
+    }
+}

app/Http/Controllers/Api/CategoryController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\Category;
+
+class CategoryController extends Controller
+{
+    public function store(Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|string|max:255'
+        ]);
+
+        $category = Category::create([
+            'name' => $request->get('name')
+        ]);
+
+        return $category->toArray();
+    }
+}

app/Http/Controllers/CategoryController.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Category;
+use App\Http\Requests;
+
+class CategoryController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $categories = Category::orderBy('name')
+            ->with(['services'])
+            ->get();
+
+        return view('categories.index')->with(compact('categories'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return view('categories.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|string|max:255',
+        ]);
+
+        $category = Category::create([
+            'name' => $request->get('name'),
+        ]);
+
+        flash()->success('Category created!');
+
+        return redirect()->route('categories.index');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $category = Category::findOrFail($id);
+
+        return view('categories.edit')->with(compact('category'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $category = Category::findOrFail($id);
+
+        $this->validate($request, [
+            'name' => 'required|string|max:255',
+        ]);
+
+        $category->update([
+            'name' => $request->get('name'),
+        ]);
+
+        flash()->success('Category Updated!');
+
+        return redirect()->route('categories.edit', $category->id);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        $category = Category::findOrFail($id);
+        $category->delete();
+
+        flash()->success('Category Deleted!');
+
+        return redirect()->route('categories.index');
+    }
+}

app/Http/Controllers/HomeController.php

@@ -5,6 +5,9 @@
 use App\Occurrence;
 use App\Http\Requests;
 use Illuminate\Http\Request;
+use App\Service;
+use App\Client;
+use App\Category;
 
 class HomeController extends Controller
 {
@@ -49,4 +52,33 @@ public function index()
 
         return view('home')->with(compact('occurrences', 'upcomingOccurrences'));
     }
+
+    public function report()
+    {
+        $services = Service::orderBy('month')
+            ->orderBy('day')
+            ->where('active', 1)
+            ->with(['client', 'category'])
+            ->get();
+
+        $clients = Client::orderBy('name')
+            ->whereHas('services', function($query) {
+                $query->where('active', 1);
+            })
+            ->with(['services' => function($query) {
+                $query->where('active', 1);
+            }])
+            ->get();
+
+        $categories = Category::orderBy('name')
+            ->whereHas('services', function($query) {
+                $query->where('active', 1);
+            })
+            ->with(['services' => function($query) {
+                $query->where('active', 1);
+            }])
+            ->get();
+
+        return view('report')->with(compact('services', 'clients', 'categories'));
+    }
 }

app/Http/Controllers/ServiceController.php

@@ -8,6 +8,7 @@
 use Illuminate\Http\Request;
 use App\Events\ServiceWasCreated;
 use App\Events\ServiceWasUpdated;
+use App\Category;
 
 class ServiceController extends Controller
 {
@@ -18,7 +19,10 @@ class ServiceController extends Controller
      */
     public function index()
     {
-        $services = Service::orderBy('month')->orderBy('day')->with(['client'])->get();
+        $services = Service::orderBy('month')
+            ->orderBy('day')
+            ->with(['client', 'category'])
+            ->get();
 
         return view('services.index')->with(compact('services'));
     }
@@ -36,8 +40,9 @@ public function create()
             'eur' => 'EUR',
         ];
         $clients = Client::orderBy('name')->pluck('name', 'id')->toArray();
+        $categories = Category::orderBy('name')->pluck('name', 'id')->toArray();
 
-        return view('services.create')->with(compact('currencies', 'clients'));
+        return view('services.create')->with(compact('currencies', 'clients', 'categories'));
     }
 
     /**
@@ -57,10 +62,12 @@ public function store(Request $request)
             'currency' => 'required|in:hrk,usd,eur',
             'exchange_rate' => 'required|numeric|min:0',
             'active' => 'boolean',
-            'client_id' => 'required|exists:clients,id'
+            'client_id' => 'required|exists:clients,id',
+            'category_id' => 'required|exists:categories,id'
         ]);
 
         $client = Client::find($request->get('client_id'));
+        $category = Category::find($request->get('category_id'));
 
         $service = new Service;
         $service->title = $request->get('title');
@@ -72,6 +79,7 @@ public function store(Request $request)
         $service->exchange_rate = $request->get('exchange_rate');
         $service->active = $request->get('active', false);
         $service->client()->associate($client);
+        $service->category()->associate($category);
         $service->save();
 
         event(new ServiceWasCreated($service));
@@ -96,8 +104,9 @@ public function edit($id)
             'eur' => 'EUR',
         ];
         $clients = Client::orderBy('name')->pluck('name', 'id')->toArray();
+        $categories = Category::orderBy('name')->pluck('name', 'id')->toArray();
 
-        return view('services.edit')->with(compact('service', 'currencies', 'clients'));
+        return view('services.edit')->with(compact('service', 'currencies', 'clients', 'categories'));
     }
 
     /**
@@ -120,7 +129,8 @@ public function update(Request $request, $id)
             'currency' => 'required|in:hrk,usd,eur',
             'exchange_rate' => 'required|numeric|min:0',
             'active' => 'boolean',
-            'client_id' => 'required|exists:clients,id'
+            'client_id' => 'required|exists:clients,id',
+            'category_id' => 'required|exists:categories,id'
         ]);
 
         $service->update([
@@ -136,6 +146,8 @@ public function update(Request $request, $id)
 
         $client = Client::find($request->get('client_id'));
         $service->client()->associate($client);
+        $category = Category::find($request->get('category_id'));
+        $service->category()->associate($category);
         $service->save();
 
         event(new ServiceWasUpdated($service));

app/Http/api_routes.php

@@ -2,6 +2,9 @@
 
 Route::group(['prefix' => 'api/v1', 'middleware' => 'auth:api'], function () {
     Route::get('quote', 'QuoteController@getQuote');
+
+    Route::post('categories', 'CategoryController@store');
+
     Route::get('occurrences/{occurrence}/offer', 'OccurrenceController@toggleOffer');
     Route::get('occurrences/{occurrence}/payment', 'OccurrenceController@togglePayment');
     Route::get('occurrences/{occurrence}/receipt', 'OccurrenceController@toggleReceipt');

app/Http/routes.php

@@ -14,8 +14,12 @@
 Route::group(['middleware' => 'auth'], function () {
     Route::get('/', 'HomeController@index');
 
+    Route::get('report', 'HomeController@report');
+
     Route::resource('clients', 'ClientController');
 
+    Route::resource('categories', 'CategoryController');
+
     Route::resource('services', 'ServiceController');
 });
 

app/Service.php

@@ -3,6 +3,7 @@
 namespace App;
 
 use App\Client;
+use App\Category;
 use App\Occurrence;
 use Illuminate\Database\Eloquent\Model;
 use Collective\Html\Eloquent\FormAccessible;
@@ -23,6 +24,16 @@ public function client()
         return $this->belongsTo(Client::class);
     }
 
+    /**
+     * To which category does this service belong.
+     *
+     * @return [type]
+     */
+    public function category()
+    {
+        return $this->belongsTo(Category::class);
+    }
+
     /**
      * One per year would be perfect. :)
      *

database/migrations/2016_07_16_212605_create_categories_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('categories', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->timestamps();
+        });
+
+        Schema::table('services', function(Blueprint $table) {
+            $table->integer('category_id')->unsigned()->nullable();
+            $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('services', function(Blueprint $table) {
+            $table->dropColumn('category_id');
+            $table->dropForeign(['category_id']);
+        });
+
+        Schema::drop('categories');
+    }
+}

package.json

@@ -11,6 +11,7 @@
     "bootstrap": "^3.3.6",
     "bootstrap-less": "^3.3.8",
     "font-awesome": "^4.6.3",
-    "jquery": "^3.1.0"
+    "jquery": "^3.1.0",
+    "selectize": "^0.12.2"
   }
 }