Merge branch 'master' into license

config/locales/en.yml

@@ -28,6 +28,7 @@ en:
   hourly: "Hourly"
   top: "Top"
   orders: "Orders"
+  shiftsale: "ShiftSale"
   credit: "Credit"
   bookings: "Booking"
   home: "Home"
@@ -67,6 +68,7 @@ en:
   booking_details: "Booking Details"
   inventory_definitions: "Inventory Definitions"
   sale_audits: "Sale Audits"
+  bottom: "Bottom"
 
   views:
     btn:
@@ -90,6 +92,7 @@ en:
       filter: "Filter"
       del: "DEL"
       clr: "CLR"
+      assign: "ASSIGN"
 
       print_order_summary: "Print Order Summary"
       memeber_card: "Member Card"
@@ -124,6 +127,7 @@ en:
       new_inventory_product: "NEW INVENTORY PRODUCT"
       generate_report: "GENERATE REPORT"
       exp_to_excel: "EXPORT TO EXCEL"
+      check_in: "Check In"
 
     pagination:
       first: "« First"

config/locales/mm.yml

@@ -28,6 +28,7 @@ mm:
   hourly: "နာရီအလိုက်"
   top: "အရောင်းရဆုံး"
   orders: "အော်ဒါများ"
+  shiftsale: "အော်ဒါများ"
   bookings: "အော်ဒါများ"
   credit: "အကြွေး"
   home: "မူလစာမျက်နှာ"

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"