From 7b56164747ce5b2b89d747c132bb28247177b949 Mon Sep 17 00:00:00 2001
From: vilgefortzz <greghause123@gmail.com>
Date: Mon, 19 Jun 2017 17:09:00 +0200
Subject: [PATCH] Simple recommendation system was added based on the 6
 products with the best average rating. Final touches and improvements

---
 config/debugbar.php                           |  2 +-
 ...017_03_05_184755_create_products_table.php |  1 -
 resources/views/admin/orders/orders.blade.php |  6 +-
 resources/views/main_page.blade.php           | 68 +++++++++----------
 routes/web.php                                |  5 +-
 5 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/config/debugbar.php b/config/debugbar.php
index b343d32..b52053d 100644
--- a/config/debugbar.php
+++ b/config/debugbar.php
@@ -12,7 +12,7 @@
      |
      */
 
-    'enabled' => true,
+    'enabled' => false,
 
     /*
      |--------------------------------------------------------------------------
diff --git a/database/migrations/2017_03_05_184755_create_products_table.php b/database/migrations/2017_03_05_184755_create_products_table.php
index 861c724..7f953d3 100644
--- a/database/migrations/2017_03_05_184755_create_products_table.php
+++ b/database/migrations/2017_03_05_184755_create_products_table.php
@@ -23,7 +23,6 @@ public function up()
             $table->integer('number_of_ratings')->unsigned()->nullable();
             $table->float('ratings_sum')->unsigned()->nullable();
             $table->float('average_rating')->unsigned()->nullable();
-            $table->boolean('recommended')->default(false);
             $table->timestamps();
 
             $table->integer('subcategory_id')->index()->unsigned();
diff --git a/resources/views/admin/orders/orders.blade.php b/resources/views/admin/orders/orders.blade.php
index 185b93b..e980a49 100644
--- a/resources/views/admin/orders/orders.blade.php
+++ b/resources/views/admin/orders/orders.blade.php
@@ -51,7 +51,7 @@
                                         <label for="order_status_{{$order->id}}" class="control-label">Change status<span class="glyphicon glyphicon-triangle-top"></span></label>
                                     </form>
                                 </div>
-                                <span><strong>Made by: </strong></span>{{ $order->user->username }}
+                                <span><strong>Made by: </strong></span>{{ $order->first_name }} {{ $order->last_name }}
                                 <br>
                                 <a id="order_{{$order->id}}" href="#" class="orders"><small>See order details</small></a>
 
@@ -74,7 +74,9 @@
                                     <br>
                                     <strong><span class="glyphicon glyphicon-credit-card"></span>Payment method: </strong>{{ $order->payment->name }}
                                     <br>
-                                    <strong><span class="glyphicon glyphicon-gift"></span>Discount for having account: </strong>${{ $order->user->discount }}
+                                    @if($order->user)
+                                        <strong><span class="glyphicon glyphicon-gift"></span>Discount for having account: </strong>${{ $order->user->discount }}
+                                    @endif
                                     <hr>
                                     <strong><span class="glyphicon glyphicon-usd"></span>Total paid: </strong>${{number_format($order->total_paid, 2, '.', '')}}
                                     <br><br>
diff --git a/resources/views/main_page.blade.php b/resources/views/main_page.blade.php
index 3350de4..ad3675f 100644
--- a/resources/views/main_page.blade.php
+++ b/resources/views/main_page.blade.php
@@ -61,47 +61,45 @@
         {{--Horizontal line--}}
         <hr>
 
-        @if(count($recommendedProducts) > 0)
-            <div id="recommended_products_section">
-                <!-- Recommended products slider-->
-                <div class="row" style="margin-top: 30px; margin-bottom: 30px">
-                    <div class="col-xs-12 col-sm-12 col-md-12">
-                        <div class="carousel carousel-showmanymoveone slide" id="itemslider">
-                            <div class="carousel-inner">
-
-                                @foreach($recommendedProducts as $recommendedProduct)
-                                    @if($recommendedProducts->first() == $recommendedProduct)
-                                        <div class="item active">
-                                            <div class="col-xs-12 col-sm-6 col-md-2">
-                                                <a href="{{ url('/products/'.$recommendedProduct->id) }}"><img src="{{$recommendedProduct->path_to_thumbnail}}" class="img-responsive center-block"></a>
-                                                <h4 class="text-center">{{$recommendedProduct->name}}</h4>
-                                                <h5 class="text-center" style="color: darkred">${{$recommendedProduct->price}}</h5>
-                                            </div>
+        <div id="recommended_products_section">
+            <!-- Recommended products slider-->
+            <div class="row" style="margin-top: 30px; margin-bottom: 30px">
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                    <div class="carousel carousel-showmanymoveone slide" id="itemslider">
+                        <div class="carousel-inner">
+
+                            @foreach($recommendedProducts as $recommendedProduct)
+                                @if($recommendedProducts->first() == $recommendedProduct)
+                                    <div class="item active">
+                                        <div class="col-xs-12 col-sm-6 col-md-2">
+                                            <a href="{{ url('/products/'.$recommendedProduct->id) }}"><img src="{{$recommendedProduct->path_to_thumbnail}}" class="img-responsive center-block"></a>
+                                            <h4 class="text-center">{{$recommendedProduct->name}}</h4>
+                                            <h5 class="text-center" style="color: darkred">${{$recommendedProduct->price}}</h5>
                                         </div>
-                                    @else
-                                        <div class="item">
-                                            <div class="col-xs-12 col-sm-6 col-md-2">
-                                                <a href="{{ url('/products/'.$recommendedProduct->id) }}"><img src="{{$recommendedProduct->path_to_thumbnail}}" class="img-responsive center-block"></a>
-                                                <h4 class="text-center">{{$recommendedProduct->name}}</h4>
-                                                <h5 class="text-center" style="color: darkred">${{$recommendedProduct->price}}</h5>
-                                            </div>
+                                    </div>
+                                @else
+                                    <div class="item">
+                                        <div class="col-xs-12 col-sm-6 col-md-2">
+                                            <a href="{{ url('/products/'.$recommendedProduct->id) }}"><img src="{{$recommendedProduct->path_to_thumbnail}}" class="img-responsive center-block"></a>
+                                            <h4 class="text-center">{{$recommendedProduct->name}}</h4>
+                                            <h5 class="text-center" style="color: darkred">${{$recommendedProduct->price}}</h5>
                                         </div>
-                                    @endif
-                                @endforeach
-                            </div>
-
-                            <div id="slider-control">
-                                <a class="left carousel-control" href="#itemslider" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a>
-                                <a class="right carousel-control" href="#itemslider" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
-                            </div>
+                                    </div>
+                                @endif
+                            @endforeach
+                        </div>
+
+                        <div id="slider-control">
+                            <a class="left carousel-control" href="#itemslider" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a>
+                            <a class="right carousel-control" href="#itemslider" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
                         </div>
                     </div>
                 </div>
-
-                {{--Horizontal line--}}
-                <hr>
             </div>
-        @endif
+
+            {{--Horizontal line--}}
+            <hr>
+        </div>
     </div>
 
     {{-- AJAX scripts--}}
diff --git a/routes/web.php b/routes/web.php
index f76b6b2..f03761f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,9 +16,10 @@
     $categories = \App\Category::all();
 
     /*
-     * Recommended products - collection
+     * Recommended products - sorted by average rating descending and taken 6 best products
      */
-    $recommendedProducts = \App\Product::all()->where('recommended', true);
+    $products = \App\Product::orderBy('average_rating', 'desc')->get();
+    $recommendedProducts = $products->take(6);
 
     return view('main_page', compact('categories', 'recommendedProducts'));
 });