End of day commit
This commit is contained in:
@@ -15,7 +15,7 @@ module Suppliers
|
||||
@end_time += current_supplier.night_offset.to_f.hours
|
||||
end
|
||||
@lists = List.for_supplier_created_at current_supplier, @start_time..@end_time
|
||||
@lists.include_relation(:table) # for number
|
||||
#@lists.include_relation(:table) # for number
|
||||
else
|
||||
@lists = List.for_supplier(current_supplier, page: params[:page], per_page: params[:per_page] || 25)
|
||||
end
|
||||
|
||||
@@ -15,6 +15,12 @@ module Suppliers
|
||||
end
|
||||
end
|
||||
|
||||
def cancel
|
||||
@order = current_supplier.find_order(params[:id])
|
||||
@order.cancel!
|
||||
render json: @order
|
||||
end
|
||||
|
||||
def show
|
||||
@order = current_supplier.find_order(params[:id])
|
||||
respond_to do |format|
|
||||
|
||||
Reference in New Issue
Block a user