Merge branch 'doemal_ordering'

config/locales/en.yml

@@ -74,6 +74,7 @@ en:
   date_time: "DateTime"
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
+  order_reservation: "Order & Reservation"
 
   views:
     btn:

config/locales/mm.yml

@@ -69,6 +69,7 @@ mm:
   date_time: "ရက်စွဲအချိန်"
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
+  order_reservation: "Order & Reservation"
   
   views:
     btn:       

config/routes.rb

@@ -263,6 +263,8 @@ scope "(:locale)", locale: /en|mm/ do
 
     post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
+    #order and reservation
+    resources :order_reservation
   end
 
   #--------- Waiter/Ordering Station ------------#