fixed conflict
This commit is contained in:
@@ -13,9 +13,6 @@ module SXRestaurants
|
||||
# -- all .rb files in that directory are automatically loaded.
|
||||
config.active_record.time_zone_aware_types = [:datetime, :time]
|
||||
config.active_job.queue_adapter = :sidekiq
|
||||
|
||||
# config.generators do |g|
|
||||
# g.orm :active_record, primary_key_type: :uuid
|
||||
# end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@@ -100,7 +100,9 @@ Rails.application.routes.draw do
|
||||
|
||||
post 'update_delivery', to: "home#update_delivery_status"
|
||||
|
||||
# Pass assigned_order_item_id
|
||||
get 'print/print/:id', to: "print#print"
|
||||
get 'print/print_order_summary/:id', to: "print#print_order_summary"
|
||||
#dashboard
|
||||
#
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user