mirror of
https://github.com/fspc/BikeShed-1.git
synced 2026-09-16 08:31:36 -04:00
Changing bike_status to bike_purporse
This commit is contained in:
+5
-5
@@ -1,7 +1,7 @@
|
||||
class Bike < ActiveRecord::Base
|
||||
acts_as_loggable
|
||||
attr_accessible :shop_id, :serial_number, :bike_brand_id, :bike_model_id, :color, :bike_style_id, :seat_tube_height,
|
||||
:top_tube_length, :wheel_size, :value, :bike_condition_id, :bike_status_id
|
||||
:top_tube_length, :wheel_size, :value, :bike_condition_id, :bike_purpose_id
|
||||
|
||||
has_many :transactions
|
||||
|
||||
@@ -11,7 +11,7 @@ class Bike < ActiveRecord::Base
|
||||
belongs_to :bike_model
|
||||
belongs_to :bike_style
|
||||
belongs_to :bike_condition
|
||||
belongs_to :bike_status
|
||||
belongs_to :bike_purpose
|
||||
|
||||
validates :shop_id, :presence => true, :uniqueness => true, :length => { :minimum => 3 }
|
||||
validates :serial_number, :length => { :minimum => 3 }
|
||||
@@ -24,7 +24,7 @@ class Bike < ActiveRecord::Base
|
||||
validates :wheel_size, :presence => true
|
||||
#validates :value, :presence => true
|
||||
validates :bike_condition_id, :presence => true
|
||||
validates :bike_status_id, :presence => true
|
||||
validates :bike_purpose_id, :presence => true
|
||||
|
||||
self.per_page = 15
|
||||
|
||||
@@ -46,8 +46,8 @@ class Bike < ActiveRecord::Base
|
||||
self.bike_condition
|
||||
end
|
||||
|
||||
def status
|
||||
self.bike_status
|
||||
def purpose
|
||||
self.bike_purpose
|
||||
end
|
||||
|
||||
def to_s
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
class BikePurpose < ActiveRecord::Base
|
||||
attr_accessible :purpose
|
||||
|
||||
belongs_to :bike
|
||||
|
||||
def to_s
|
||||
self.purpose
|
||||
end
|
||||
end
|
||||
@@ -1,9 +0,0 @@
|
||||
class BikeStatus < ActiveRecord::Base
|
||||
attr_accessible :status
|
||||
|
||||
belongs_to :bike
|
||||
|
||||
def to_s
|
||||
self.status
|
||||
end
|
||||
end
|
||||
+2
-2
@@ -45,7 +45,7 @@ class User < ActiveRecord::Base
|
||||
### TODO methods below probably belong somewhere else
|
||||
|
||||
def completed_build_bikes
|
||||
status_id = BikeStatus.find_by_status("BUILDBIKE").id
|
||||
purpose_id = BikePurpose.find_by_purpose("BUILDBIKE").id
|
||||
Bike.find_by_sql("
|
||||
SELECT *
|
||||
FROM bikes
|
||||
@@ -54,7 +54,7 @@ class User < ActiveRecord::Base
|
||||
FROM transactions
|
||||
WHERE customer_id = #{self.id}
|
||||
) AS transactions ON bikes.id = transactions.bike_id
|
||||
WHERE bike_status_id = #{status_id}")
|
||||
WHERE bike_purpose_id = #{purpose_id}")
|
||||
end
|
||||
|
||||
def total_credits
|
||||
|
||||
Reference in New Issue
Block a user