Finished Orders

Author: goxr3plus

app/controllers/orders_controller.rb

@@ -50,21 +50,21 @@ def create
 
   def destroy
     @order = Order.find(params[:id])
-    flash[:info] = 'Found product to destroy'
-    # @order.destroy
-    # respond_to do |format|
-    #   format.html { redirect_to orders_path, notice: 'Order was successfully destroyed.' }
-    #   format.json { head :no_content }
-    #   flash[:info] = 'Order was successfully destroyed.'
-    # end
+    @order.destroy
+    respond_to do |format|
+      format.html { redirect_to orders_path }
+      format.json { head :no_content }
+      flash[:info] = 'Order was successfully destroyed.'
+    end
   end
 
   def edit
     @order = Order.find(params[:id])
   end
 
   def update
-     @order = Order.update(order_params)
+     @order = Order.find(params[:id])
+     @order.update(order_params)
      redirect_to orders_path
   end
 

app/models/order.rb

@@ -1,5 +1,6 @@
 class Order < ApplicationRecord
   has_many :line_items, dependent: :destroy
+  belongs_to :user
 
   # LOGIC
   def sub_total

app/models/user.rb

@@ -1,6 +1,7 @@
 class User < ApplicationRecord
   has_many :orders, dependent: :destroy
   has_many :microposts, dependent: :destroy
+  has_many :order, dependent: :destroy
   attr_accessor :remember_token, :activation_token, :reset_token
   before_save { email.downcase! }
   # before_save :downcase_email

app/views/layouts/_header.html.erb

@@ -39,7 +39,9 @@
           |
           <i class="glyphicon glyphicon-eye-open" style="color:firebrick"></i>
           Orders
-          <span class="badge badge-pill badge-warning"><%= @current_user.orders.count %></span>
+          <span class="badge badge-pill badge-warning">
+            (<%= @current_user.orders.count %>) Admin / (<%= Order.count%>) Total
+          </span>
           <b class="caret"></b>
         <% end %>
 

app/views/orders/index.html.erb

@@ -1,7 +1,12 @@
 <div class="center jumbotron">
   <h2>
     <% if params[:search].blank? %>
-      All Orders (<%= @orders.count %>)
+
+      <%if current_user.admin? %>
+        ADMIN --- All Orders (<%= @orders.count %>)
+      <%else%>
+        USER --- All Orders (<%= @current_user.orders.count %>)
+      <%end%>
     <%else %>
       Found => [
       <%= pluralize(@orders.count, " ] Order") %>