End of day commit
This commit is contained in:
@@ -58,15 +58,16 @@ private
|
||||
I18n.locale = params[:locale].presence.try(:to_sym) || Rails.configuration.i18n.default_locale
|
||||
end
|
||||
|
||||
def _render_with_renderer_json(resource, options)
|
||||
serializer = build_json_serializer(resource, options)
|
||||
#def _render_with_renderer_json(resource, options)
|
||||
#serializer = build_json_serializer(resource, options)
|
||||
|
||||
if serializer
|
||||
super(serializer, options)
|
||||
else
|
||||
super
|
||||
end
|
||||
end
|
||||
#binding.pry
|
||||
#if serializer
|
||||
#super(serializer, options)
|
||||
#else
|
||||
#super
|
||||
#end
|
||||
#end
|
||||
|
||||
def layout_by_resource(*args)
|
||||
#if devise_controller?
|
||||
|
||||
@@ -44,6 +44,7 @@ class UserController < Users::ApplicationController
|
||||
res[:occupied] = @table.occupied?
|
||||
res[:reserved] = @table.reserved?
|
||||
res[:supplier_closed] = @table.supplier.closed?
|
||||
res[:table] = @table.attributes
|
||||
if list.present?
|
||||
res[:other_supplier] = true if list.supplier_id != @table.supplier_id
|
||||
res[:current_table_id] = list.table_id
|
||||
|
||||
Reference in New Issue
Block a user