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

config/initializers/assets.rb

@@ -37,7 +37,7 @@ Rails.application.config.assets.precompile += %w( CRM.js )
 # --- Image Uploader ----
 Rails.application.config.assets.precompile += %w( fileinput.min.js )
 
-# --- Customer/ Customer - Crm ----
+# --- Add order/ Add order - Crm ----
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
@@ -53,4 +53,9 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( order_reservation.css )
+Rails.application.config.assets.precompile += %w( order_reservation.js )
+
+
 

config/locales/en.yml

@@ -75,6 +75,10 @@ en:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
 
   views:
     btn:

config/locales/mm.yml

@@ -70,6 +70,10 @@ mm:
   dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
   
   views:
     btn:       

config/routes.rb

@@ -268,6 +268,9 @@ scope "(:locale)", locale: /en|mm/ do
 
     #order and reservation
     resources :order_reservation
+    get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
+    post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
+    post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
   end
 
   #--------- Waiter/Ordering Station ------------#