fixed conflix after pull split bill

This commit is contained in:
Aung Myo
2018-02-19 14:21:26 +06:30
24 changed files with 977 additions and 275 deletions

View File

@@ -205,7 +205,7 @@ scope "(:locale)", locale: /en|mm/ do
post '/:sale_id/get_customer' => "customers#get_customer"
get '/:id/:type/surveys', to: "surveys#new"
post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
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' }
@@ -238,6 +238,8 @@ scope "(:locale)", locale: /en|mm/ do
get '/room/:dining_id/split_bills' => 'split_bill#index'
post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
post '/split_bills/surveys', to: 'surveys#create_survey'
end
#--------- Waiter/Ordering Station ------------#