Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/application_controller.rb

@@ -30,7 +30,9 @@ class ApplicationController < ActionController::Base
   end
 
   def current_login_employee
-    @employee = Employee.find_by_token_session(session[:session_token])
+    if (!session[:session_token].nil?)
+      @employee = Employee.find_by_token_session(session[:session_token])
+    end
   end
 
   private

app/controllers/home_controller.rb

@@ -1,10 +1,30 @@
 class HomeController < ApplicationController
-  skip_before_action :authenticate, only: [:index, :create, :destroy]
+  skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
 
   def index
+    @employees = Employee.all.order("name asc")
     @login_form = LoginForm.new()
   end
 
+  def show
+    @login_form = LoginForm.new()
+    @login_form.emp_id = params[:emp_id]
+  end
+
+  def update
+    @login_form = LoginForm.new()
+    @login_form.emp_id = params[:emp_id]
+    @login_form.password = params[:login_form][:password]
+    @employee = Employee.login(@login_form.emp_id, @login_form.password)
+
+    if @employee != nil
+      session[:session_token] = @employee.token_session
+      redirect_to origami_root_path
+    else
+      render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!"
+    end
+  end
+
   def create
     @login_form = LoginForm.new()
     @login_form.emp_id = params[:login_form][:emp_id]
@@ -27,9 +47,9 @@ class HomeController < ApplicationController
       else
          render :index
       end
-    else 
+    else
       redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
-    end 
+    end
 
   end
 

app/controllers/oqs/home_controller.rb

@@ -117,7 +117,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status}")
+    .where("assigned_order_items.delivery_status = #{status}  AND odt.price <> 0")
     .group("assigned_order_items.assigned_order_item_id")
   end
 end

app/controllers/origami/orders_controller.rb

@@ -8,8 +8,10 @@ class Origami::OrdersController < BaseOrigamiController
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
-      sale = Sale.find(sale_order.sale_id)
-      @sale_status = sale.sale_status
+      unless sale_order.sale_id.nil?
+        sale = Sale.find(sale_order.sale_id)
+        @sale_status = sale.sale_status
+      end
     end
   end
 end