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

app/controllers/home_controller.rb

@@ -82,7 +82,7 @@ class HomeController < ApplicationController
       if !shift.nil?
         redirect_to origami_root_path
       else
-        redirect_to new_origami_shift_path
+        redirect_to dashboard_path
        end
     elsif employee.role == "cashier"
       #check if cashier has existing open cashier

app/controllers/oqs/edit_controller.rb

@@ -11,6 +11,7 @@ class Oqs::EditController < BaseOqsController
     remarks = params[:remarks]
 
     order_item = OrderItem.find(order_items_id);
+    order_item.item_order_by = current_user.name
     order_item.qty = qty_weight
     order_item.remark = remarks
     order_item.save