Bug Fixes and Style Improvements

Author: goxr3plus

app/models/line_item.rb

@@ -1,7 +1,7 @@
 class LineItem < ApplicationRecord
   belongs_to :product
   belongs_to :cart
-  belongs_to :order
+  # belongs_to :order
 
   # LOGIC
   def total_price

app/models/product.rb

@@ -1,6 +1,6 @@
 class Product < ApplicationRecord
   mount_uploader :picture, ProductPictureUploader
-  # has_many :line_items, dependent: :destroy
+  has_many :line_items, dependent: :destroy
 
   def self.search(search)
     where('name LIKE ?', "%#{search}%")

app/views/orders/index.html.erb

@@ -1,23 +1,23 @@
 <div class="center jumbotron">
-  <h2>Orders</h2>
+  <h2>
+    <% if params[:search].nil? || params[:search].empty?  %>
+      All Orders (<%= @orders.count %>)
+    <%else %>
+      Found => [
+      <%= pluralize(@orders.count, " ] Order") %>
+    <%end %>
+  </h2>
 </div>
 
-<!-- <div class="input-group" id="adv-search">
-  <%= form_tag(orders_path, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: "Search by user email..." , class: "form-control" %>
-  <%= submit_tag "Search" , class: "form_submit" , type: "button"%>
-<% end %>
-</div> -->
-
 <% @orders.each do |order| %>
 
-<% if @current_user.admin? %>
+  <% if @current_user.admin? %>
 
-  <%= render 'order' , :order => order%>
+    <%= render 'order' , :order => order%>
 
-  <% elsif order.user_id == @current_user.id %>
+    <% elsif order.user_id == @current_user.id %>
 
-    <%= render 'order' , :order => order%>
+      <%= render 'order' , :order => order%>
 
-  <%end%>
-<% end %>
+    <%end%>
+  <% end %>

app/views/shared/_products.html.erb

@@ -1,38 +1,39 @@
-<!-- Search Bar -->
-<div class="input-group" id="adv-search">
-  <%= form_tag(root_url, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
-  <%= submit_tag "Search" , class: "form_submit"%>
-<% end %>
 <!-- <input type="text" class="form-control" placeholder="Search...."/> <div class="input-group-btn"> <div class="btn-group" role="group"> <div class="dropdown dropdown-lg"> -->
 <!-- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <span class="caret"></span></button> <div class="dropdown-menu dropdown-menu-right" role="menu"> <form class="form-horizontal"
 role="form"> <div class="form-group"> <label for="filter">Filter by</label> <select class="form-control"> <option value="0">Featured</option> <option value="1">Most popular</option> <option value="2" selected="selected">Top rated</option> <option
 value="3">Most commented</option> </select> </div> <div class="form-group"> <label for="contain">Top Seller</label> <input class="form-control" type="text"/> </div> <div class="form-group"> <label for="contain">Contains the words</label> <input
 class="form-control" type="text"/> </div> <button type="submit" class="btn btn-primary"> <span class="glyphicon glyphicon-search" aria-hidden="true"></span></button> </form> </div> -->
 <!-- </div> <button type="button" class="btn btn-primary"> <span class="glyphicon glyphicon-search" aria-hidden="true"></span></button> </div> </div> -->
-</div>
-
-<%= will_paginate @products %>
-
-<div>
-  <!-- Only Admin is allowed to create new products -->
-  <% if logged_in? && current_user.admin? %>
-  <%= link_to new_product_path , class: "btn btn-success" , style: "margin-top:15px;" do %>
-  <i class="glyphicon glyphicon-plus" style="color:black;"></i>
-  Create New Product (Admin)
-  <%end %>
-  <% end %>
 
+<div class="center jumbotron">
   <h2>
-    <% if params[:search].nil? || params[:search].empty? %>
-      All Products (<%= @products.count %>)
+    <% if params[:search].nil? || params[:search].empty?  %>
+      All Orders (<%= @products.count %>)
     <%else %>
       Found => [
-      <%= pluralize(@products.count, " ] Products") %>
+      <%= pluralize(@products.count, " ] Product") %>
     <%end %>
   </h2>
+
+  <!-- Search Bar -->
+  <div class="input-group" id="adv-search">
+    <%= form_tag(root_url, :method => "get", id: "search-form") do %>
+    <%= text_field_tag :search, params[:search], placeholder: "Search..." , class: "form-control" %>
+    <%= submit_tag "Search" , class: "form_submit"%>
+  <% end %>
 </div>
 
+<!-- Only Admin is allowed to create new products -->
+<% if logged_in? && current_user.admin? %>
+  <%= link_to new_product_path , class: "btn btn-success" , style: "margin-top:15px;" do %>
+  <i class="glyphicon glyphicon-plus" style="color:black;"></i>
+  Create New Product (Admin)
+<%end %>
+<% end %>
+</div>
+
+<%= will_paginate @products %>
+
 
 <ul class="users">
 <% if @products.present? %>
@@ -47,9 +48,10 @@ class="form-control" type="text"/> </div> <button type="submit" class="btn btn-p
 
   <% else %>
     <p>
-      <br /><br /><hr />
-      There are no products containing the term(s)
-      => [ <strong><%= params[:search] %></strong> ] .
+      <br/><br/><hr/>
+      There are no products containing the term(s) => [
+      <strong><%= params[:search] %></strong>
+      ] .
 
     </p>
   <% end %>

app/views/users/index.html.erb

@@ -1,20 +1,21 @@
 <% provide(:title, 'All users') %>
-
-  <h1>
+  <div class="center jumbotron">
+  <h2>
     <% if params[:search].nil? || params[:search].empty?  %>
       All users (<%= @users.count %>)
     <%else %>
       Found => [
       <%= pluralize(@users.count, " ] user") %>
     <%end %>
-  </h1>
+  </h2>
 
   <div class="input-group" id="adv-search">
     <%= form_tag(users_path, :method => "get", id: "search-form") do %>
     <%= text_field_tag :search, params[:search], placeholder: "Search by user name..." , class: "form-control" %>
     <%= submit_tag "Search" , class: "form_submit"%>
   <% end %>
 </div>
+</div>
 
 <%= will_paginate %>