Merge branch 'master' into license

config/routes.rb

@@ -65,10 +65,12 @@ scope "(:locale)", locale: /en|mm/ do
       post "payment/:payment_method" => "payment#create"
       put "payment/:id" => "payment#update"
       resources :receipt, only: [:create, :show] #generate receipt, show receipt
-
     end
 
-
+    namespace :origami do
+      post "check_in/:dining_id" => "check_in_process#check_in_process"
+      post "request_time" => "check_in_process#request_time"
+    end
   end
 
   #--------- Cashier ------------#
@@ -199,7 +201,8 @@ scope "(:locale)", locale: /en|mm/ do
     post 'select_sale_item' => 'product_commissions#select_sale_item', as: 'select_sale_item'
     post 'select_commissioner' => 'product_commissions#set_commissioner_to_sale_item', as: 'select_commissioner'
 
-
+    #check_in
+    post '/check_in' => "check_in_process#check_in_process"
 
   end
 
@@ -336,6 +339,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :orders
     resources :credit_notes
     resources :bookings
+    resources :shift_sales
 
     get "/sales/:sale_id/manual_complete_sale" => "manual_sales#manual_complete_sale", :as => "manual_complete_sale"
     get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"