Merge branch 'master' into menu_sync

config/routes.rb

@@ -140,6 +140,7 @@ Rails.application.routes.draw do
     post 'payment/visa' => "visa#create"
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
+    post 'payment/voucher' => 'voucher_payments#create'
 
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
@@ -148,6 +149,7 @@ Rails.application.routes.draw do
     get 'sale/:sale_id/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
     get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/void' => 'void#overall_void'
@@ -201,6 +203,8 @@ Rails.application.routes.draw do
     # Pass assigned_order_item_id
     get 'print/print/:id', to: "print#print"
     get 'print/print_order_summary/:id', to: "print#print_order_summary"
+
+    get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs"
     #dashboard
     #
   end
@@ -256,9 +260,13 @@ Rails.application.routes.draw do
     #zones
     resources :zones do
       #tables
-      resources :tables
+      resources :tables do
+        resources :dining_charges
+      end
       #rooms
-      resources :rooms
+      resources :rooms do
+        resources :dining_charges
+      end
     end
 
   end