lk | bikes with voided applications show up in the available for freecyclery list

This commit is contained in:
Louis Knapp
2016-07-30 21:46:04 -05:00
parent cc00aec5ad
commit 6119733ad7
3 changed files with 11 additions and 5 deletions
+6 -2
View File
@@ -42,8 +42,12 @@ class Bike < ActiveRecord::Base
end
def self.available_for_freecyclery
assigned_bikes = Client.all.includes(:bike).select{|c| !c.bike_id.nil?}.map(&:bike)
all_freecyclery_bikes = Bike.where(purpose: FREECYCLERY).order(log_number: :desc)
assigned_bikes = Client
.where("application_voided != ? or application_voided is null", true)
.includes(:bike)
.select{|c| !c.bike_id.nil?}.map(&:bike)
all_freecyclery_bikes = Bike.where(purpose: FREECYCLERY)
.order(log_number: :desc)
all_freecyclery_bikes - assigned_bikes
end