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

app/controllers/origami/addorders_controller.rb

@@ -68,6 +68,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
     @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
         # check booking id is already completed.