Fixed some bugs

Author: goxr3plus

app/controllers/orders_controller.rb

@@ -2,11 +2,11 @@ class OrdersController < ApplicationController
   before_action :logged_in_user, only: %i[index show new create]
 
   def index
-    # @orders = Order.all
+    @orders = Order.all
     if params[:search]
       @orders = Order.search(params[:search]).order('created_at ASC').paginate(page: params[:page], per_page: 5)
     else
-      @orders = Order.all.order('created_at ASC').paginate(page: params[:page], per_page: 5)
+      @orders = @orders.order('created_at ASC').paginate(page: params[:page], per_page: 5)
     end
   end
 

app/controllers/static_pages_controller.rb

@@ -5,11 +5,11 @@ def home
       @feed_items = current_user.feed.paginate(page: params[:page], per_page: 6)
       @current_user = current_user
     end
-    # @products = Product.all.paginate(page: params[:page], per_page: 5)
+    @products = Product.all
     if params[:search]
       @products = Product.search(params[:search]).order('created_at ASC').paginate(page: params[:page], per_page: 5)
     else
-      @products = Product.all.order('created_at ASC').paginate(page: params[:page], per_page: 5)
+      @products = @products.order('created_at ASC').paginate(page: params[:page], per_page: 5)
     end
   end
 

app/controllers/users_controller.rb

@@ -4,11 +4,11 @@ class UsersController < ApplicationController
   before_action :admin_user, only: :destroy
 
   def index
-    # @users = User.where(activated: true).paginate(page: params[:page], per_page: 6)
+    @users = User.where(activated: true) #.paginate(page: params[:page], per_page: 6)
     if params[:search]
       @users = User.search(params[:search]).order('created_at ASC').paginate(page: params[:page], per_page: 5)
     else
-      @users = User.all.order('created_at ASC').paginate(page: params[:page], per_page: 5)
+      @users = @users.order('created_at ASC').paginate(page: params[:page], per_page: 5)
     end
   end
 

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/user.rb

@@ -1,6 +1,6 @@
 class User < ApplicationRecord
-  has_many :orders , dependent: :destroy
-  has_many :microposts , dependent: :destroy
+  has_many :orders, dependent: :destroy
+  has_many :microposts, dependent: :destroy
   attr_accessor :remember_token, :activation_token, :reset_token
   before_save { email.downcase! }
   # before_save :downcase_email
@@ -76,11 +76,11 @@ def password_reset_expired?
   # Defines a proto-feed.
   # See "Following users" for the full implementation.
   def feed
-    Micropost.where("user_id = ?", id)
+    Micropost.where('user_id = ?', id)
   end
 
   def self.search(search)
-    where('name LIKE ?', "%#{search}%")
+    where('name LIKE ? AND activated = ?', "%#{search}%", true)
   end
 
   private