X-Git-Url: https://irasnyder.com/gitweb/?a=blobdiff_plain;f=app%2Fmodels%2Fvideo.rb;h=52344e13d590b03755698cf8eb6dbafa60909643;hb=01114330b962728805d3c43f2f1a1423f2bd66b3;hp=1f391143aff1b8158a184d426c2e79a1af26c07f;hpb=9b264f25255cc0e7cca3169d99905f590c8be578;p=cs356-p2-videostore.git

diff --git a/app/models/video.rb b/app/models/video.rb
index 1f39114..52344e1 100644
--- a/app/models/video.rb
+++ b/app/models/video.rb
@@ -7,14 +7,25 @@ class Video < Rentable
   validates_presence_of :media
 
   def calculated_price
-    # FIXME: generate this based on day of week, newrelase
-    return 11
+    # FIXME: generate this based on day of week, newrelease
+    day_of_week = Time.now.to_date.wday
+    base_fee = VideoPolicy.find_by_day(day_of_week).fee
+
+    # Check for newrelease
+    newrelease_fee = newrelease ? VideoPolicy.find_by_day(8).fee : 0.00
+
+    return base_fee + newrelease_fee
   end
 
   def due_date
     # FIXME: generate this based on the day of week, newrelease
     # NOTE: a Date.wday will tell you the day of week (0-6, meaning Sunday-Saturday)
-    return Time.now.advance(:days => 2).to_date
+    day_of_week = Time.now.to_date.wday
+    base_period = VideoPolicy.find_by_day(day_of_week).period
+    newrelease_period = newrelease ? VideoPolicy.find_by_day(8).period : 0
+
+    period = base_period + newrelease_period
+    return Time.now.advance(:days => period).to_date
   end
 
   protected