fixed conflit

config/routes.rb

@@ -607,5 +607,92 @@ scope "(:locale)", locale: /en|mm/ do
 
   post '/run_teamviewer' => 'home#run_teamviewer', :defaults => { :format => 'json' }
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+#only for foodcourt
+  namespace :foodcourt do
+    root "home#index"
+
+    post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' }
+
+    get "dashboard" => "dashboard#index"
+    get "get_all_menu" => "dashboard#get_all_menu"
+    get "/table/:table_id/sale/:sale_id/:type/edit" => "sale_edit#edit"
+    get "/table/sale/:sale_id/:type/edit" => "sale_edit#edit"
+    post 'item_void' => "sale_edit#item_void"
+    post 'item_foc' => "sale_edit#item_foc"
+    post 'item_edit' => "sale_edit#item_edit"
+    post 'item_void_cancel' => "sale_edit#item_void_cancel"
+    post 'cancel_all_void' => 'sale_edit#cancel_all_void'
+    post 'apply_void' => 'sale_edit#apply_void'
+    get 'sale/:sale_id' => 'sales#show'
+    get 'order/:order_id' => "orders#show"
+
+    # Other Charges
+    get "/:sale_id/:type/other_charges" => "other_charges#index"
+    post "/:sale_id/other_charges" => "other_charges#create"
+
+    # Discount
+    get "/:id/:type/discount" => "discounts#index"
+    post "/:id/discount" => "discounts#create"
+    get "/:id/:type/remove_all_discount" => "discounts#remove_all_discount"
+    post "/:id/remove_discount_items" => "discounts#remove_discount_items"
+
+    # Discount for Member
+    post "/:id/member_discount" => "discounts#member_discount"
+
+    get "/:id/request_bills" => "request_bills#print", :as => "request_bill"
+    get '/:sale_id/reprint' => 'payments#reprint', :defaults => {:format => 'json'}
+
+    #---------Shift ---------------#
+    resources :shifts, only: [:index, :new, :create, :edit]
+    post 'close_shift' => 'shifts#update_shift'
+    get 'shift/:type/close' => 'shifts#show'
+    get 'shift/sale_summary' => 'shifts#sale_summary'
+
+    resources :cash_mgmt, only: [:new, :create]
+
+    post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
+    get 'sale/:sale_id/:type/payment' => 'payments#show'
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/cash' => 'payments#create'
+    post 'payment/paymal' => 'paymal#create'
+
+    post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'}
+
+    #---------Void --------------#
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
+
+    post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage"
+
+    #---------Add Customer --------------#
+    #resources :customers
+    get '/:sale_id/:type/customers/:dir_page', to: "customers#add_customer"
+    get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
+    post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+
+    post '/:sale_id/get_customer' => "customers#get_customer"
+    post '/:sale_id/send_account' => "customers#send_account"
+
+    get '/:id/:type/surveys', to: "surveys#new"
+    match '/:id/create_survey', to: "surveys#create", as: "create_surveys", via: [:post, :patch, :put]
+
+    get '/addorders/get_menu/:id' => "addorders#get_menu",:as => "get_menu", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
+    get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
+
+    get '/:addorders/:id' => "addorders#detail"
+    post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
+
+
+    get '/addorders/get_item_instance/:id' => "addorders#get_item_instance",:as => "get_item_instance", :defaults => { :format => 'json' }
+
+    resources :second_display #second display routes
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
+    get "food_court" => "food_court#index"
+    get "app_orders" => "orders#app_orders",:as => "app_order_by_booking"
+    post ':booking_id/:order_id/completed' => "orders#completed", :defaults => { :format => 'json' }
+  end
 end
 end