Hoang Phuc Do · @phucdh · Trong Huu Nguyen · Hoang Phuc Do · Trong Huu Nguyen · Hoang Phuc Do
--- a/app/views/orders/_product_item.html.erb 0 → 100644
+++ b/app/views/orders/_product_item.html.erb 0 → 100644
+<tr>
+  <td class="product-image-td"></td>
+  <td class="product-name-td">
+    <h2 class="product-name">
+      <%= link_to product_item.product.title, product_url(product_item.product) %>
+    </h2>
+  </td>
+  <td><%= number_to_currency(product_item.product.price) %></td>
+  <td><%= product_item.quantity %></td>
+  <td><%= number_to_currency(product_item.product.price * product_item.quantity) %></td>
--- a/app/views/orders/_order.html.erb 0 → 100644
+++ b/app/views/orders/_order.html.erb 0 → 100644
+    </thead>
+  </table>
+
+  <div class="cart-table-wrap">
+    <table class="cart-table">
+      <thead>
+      <tr>
+        <th></th>
+        <th>Product Name</th>
+        <th>Unit Price</th>
+        <th>Qty</th>
+        <th>Subtotal</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% order.product_items.each do |product_item| %>
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
 class CategoriesController < ApplicationController
  def show
    @category = Category.find(params[:id])
-    @products = @category.products.take(6)
+    @products = @products = @category.products.page(params[:page]).per(5)
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb

  private

+  # Never trust parameters from the scary internet, only allow the white list through.
+  def order_params
+    default_params = { order_status: Order.default_order_status }
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
 module ApplicationHelper
--- a/app/models/concerns/solr_product.rb 0 → 100644
+++ b/app/models/concerns/solr_product.rb 0 → 100644
+require 'active_support/concern'
--- a/app/models/order.rb
+++ b/app/models/order.rb
 class Order < ApplicationRecord
  has_many :product_items, dependent: :destroy
  belongs_to :user
+  enum order_status: { 'Pending' => 0, 'Done' => 1 }
+
+  validates :order_status, presence: true
+  validate :validate_pending_order, on: :create
+
+  def self.default_order_status
+    'Pending'
+  end
+
+  def validate_pending_order
--- a/app/models/order.rb
+++ b/app/models/order.rb
 class Order < ApplicationRecord
  has_many :product_items, dependent: :destroy
  belongs_to :user
+  enum order_status: { 'Pending' => 0, 'Done' => 1 }
+
+  validates :order_status, presence: true
+  validate :validate_pending_order, on: :create
+
+  def self.default_order_status
+    'Pending'
+  end
+
+  def validate_pending_order
+    errors.add(:base, 'Error') if order_status != 'Pending'
--- a/db/migrate/20170619091633_add_order_status_to_orders.rb 0 → 100644
+++ b/db/migrate/20170619091633_add_order_status_to_orders.rb 0 → 100644
+class AddOrderStatusToOrders < ActiveRecord::Migration[5.1]
+  def change
+    add_column :orders, :order_status, :integer, null: false, default: 0
--- a/db/migrate/20170623064632_add_admin_to_users.rb 0 → 100644
+++ b/db/migrate/20170623064632_add_admin_to_users.rb 0 → 100644
+class AddAdminToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :admin, :boolean, null: false, default: false
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
    end
  end

+  def user_is_admin?
+    return false unless user_signed_in?
+    unless current_user.is_admin?
+      redirect_to root_url, notice: "You don't have access to this page"
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb

  private

-  def set_order_items
-    @order_items = @cart.product_items
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def order_params
+    default_params = { status: Order.default_status }
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb

  private

-  def set_order_items
-    @order_items = @cart.product_items
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def order_params
+    default_params = { status: Order.default_status }
+    params.require(:order).permit(:status).reverse_merge(default_params)
--- a/app/models/order.rb
+++ b/app/models/order.rb
 class Order < ApplicationRecord
  has_many :product_items, dependent: :destroy
  belongs_to :user
+  enum status: { 'Pending' => 0, 'Done' => 1 }
+
+  validates :status, presence: true
+  validate :validate_status, on: :create
+
+  def self.default_status
--- a/app/models/order.rb
+++ b/app/models/order.rb
 class Order < ApplicationRecord
  has_many :product_items, dependent: :destroy
  belongs_to :user
+  enum status: { 'Pending' => 0, 'Done' => 1 }
+
+  validates :status, presence: true
+  validate :validate_status, on: :create
+
+  def self.default_status
+    'Pending'
+  end
+
+  def validate_status
+    errors.add(:order_status, 'Error') if status != 'Pending'
--- a/app/views/admin/orders.html.erb 0 → 100644
+++ b/app/views/admin/orders.html.erb 0 → 100644
+<div class="container">
+  <div class="row">
+    <div class="col-md-9 col-md-push-3 my-account">
+      <h2 class="h2 heading-primary font-weight-normal">
+        Orders
+      </h2>
+      <%= render 'admin/orders/order_table' %>
+      <div class="toolbar-bottom">
+        <div class="toolbar">
+          <div class="sorter">
+            <%= paginate @orders, theme: 'bootstrap' %>