Pull from master

config/routes.rb

@@ -78,6 +78,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
+      get "survey/:id" => "survey#index"
+      post "survey/:id" => "survey#create"
     end
 
     
@@ -417,8 +419,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
     resources :product_sale, :only => [:index, :show]
-
+    get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
+
   end
 
   # ----------- Inventory ---------------------------