Merge branch 'master' of https://github.com/MikeSilvis/store_engine

app/controllers/categories_controller.rb

@@ -13,8 +13,8 @@ def new
 
   def show
     @category = Category.find(params[:id])
-    @products = @category.products.where(:active => 1)
-                  .paginate(:page => params[:page])
+    @products =
+      @category.products.where(:active => 1).paginate(:page => params[:page])
     @categories = Category.all
   end
 

app/controllers/orders_controller.rb

@@ -12,7 +12,6 @@ def index
     else
       @orders = Order.where(:status_id => status.id)
     end
-
     @statuses = Status.all
     @order_count = Order.all.count
   end
@@ -60,19 +59,7 @@ def charge
 
   def status
     order = Order.find(params[:id])
-
-    if order
-      if order.status.pending?
-        order.cancel
-      elsif order.status.shipped?
-        order.return
-      elsif order.status.paid?
-        order.ship
-      end
-
-      order.save
-    end
-
+    order.next_status
     redirect_to order_path(order), :notice => 'Status has been updated'
   end
 
@@ -88,11 +75,10 @@ def track
   def my_orders
     st = params[:mq]
     if st
-      orders = current_user
-                .orders.joins(:products)
-                .where('products.name LIKE ? or products.description LIKE ?',
-                  "%#{st}%", "%#{st}%")
-                .uniq
+      orders = current_user.orders.
+                            joins(:products).where('products.name LIKE ? or
+                            products.description LIKE ?',"%#{st}%",
+                            "%#{st}%").uniq
     else
       orders = current_user.orders
     end

app/controllers/sessions_controller.rb

@@ -11,7 +11,7 @@ def create
             remember_me = false)
     if user.nil?
       @user = User.new(params[:user])
-      flash[:notice] = "You have entered an incorrect username or password"
+      flash[:error] = "You have entered an incorrect username or password"
       render 'new'
     else
        redirect_back_or_to(root_path, :notice => 'Login successful.')

app/mailers/notification.rb

@@ -1,6 +1,6 @@
 # Sends out an email
 class Notification < ActionMailer::Base
-  default from: "noreply@ehipster.herokuapp.com"
+  default :from => "noreply@ehipster.herokuapp.com"
 
   def order_email(user, order)
     @user = user

app/models/order.rb

@@ -83,6 +83,18 @@ def generate_unique_url
     self.unique_url = (0...32).map{65.+(rand(25)).chr}.join
   end
 
+  def next_status
+    next_status = {
+                     "pending" => :cancel,
+                     "shipped" => :return,
+                     "paid"    => :ship
+                  }
+    if next_status["#{self.status.name}"]                  
+      send(next_status["#{self.status.name}"])
+    end
+    self.save
+  end
+
   def cancel
     self.status = Status.find_or_create_by_name('cancelled')
     self.cancelled_at = DateTime.now

app/models/status.rb

@@ -19,5 +19,4 @@ def shipped?
   def paid?
     name == 'paid'
   end
-
 end