caboose-cms 0.8.59 → 0.8.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8854c5eb4ae1dee3f1374f0fb4d2a62068aa9760
-  data.tar.gz: b2d414cfa6f72c0fd78cafcea2de5cd26345031e
+  metadata.gz: f5c5ba850878fe90aaad10b85a49a22fb7ac6315
+  data.tar.gz: a23f403479820953621d16ba00f98fe3d850525e
 SHA512:
-  metadata.gz: 31d8ad0c0727e6e7fac55698f42936be2edc61195ffc7cff9697578a754a283b32029db0cf10d7ad47ce5b2b817ea84230876306dc0a605d8fd6d25012e38917
-  data.tar.gz: 4b643e9870a550a767c6878e396204cb09e1414b4b25c821364c820cabf2573b9d0bdb6fbb29eb033548a13b54c356373087ba589b114124e70950b64031ad80
+  metadata.gz: 88908188c6d4f53c82b59e1761d477b61fe88b3040208bf53fcd5184a37af738169accf690a7d242da7e82731f9e0c8244e62da784e0d65918a23da6833a4da0
+  data.tar.gz: 648a6468d05c068df994709e6f2fb38069d9683e08c761e753773a5487e0dfdb8cecd9f0f604c7ad93ce08d265eaa2b27e42300ebe0e06e2704587e6221ff154

data/app/assets/javascripts/caboose/block_content_controller.js

@@ -63,7 +63,7 @@ BlockContentController.prototype = {
     {
       // Include the file before instantiating the controller      
       $(document).on(modal_controller + '_modal_controller_loaded', function() { that.modal = eval(new_modal_eval_string); });
-      that.mc.include_assets(js_file);      
+      that.mc.include_assets(js_file);                  
     }
     else // We're good, go ahead and instantiate
     {      

data/app/models/caboose/subscription.rb

@@ -5,6 +5,7 @@ module Caboose
     self.primary_key = 'id'
 
     belongs_to :site
+    belongs_to :variant
     has_many :user_subscriptions
     attr_accessible :id    ,      
       :site_id             ,

data/app/models/caboose/user_subscription.rb

@@ -28,10 +28,10 @@ module Caboose
       s = self.subscription
       d = nil
       if s.interval == Subscription::INTERVAL_YEARLY        
-        d = Date.parse(self.date_started.year, s.start_month, s.start_day)
+        d = Date.new(self.date_started.year, s.start_month, s.start_day)
         d = d + 1.year if d < self.date_started        
       elsif s.interval == Subscription::INTERVAL_MONTHLY        
-        d = Date.parse(self.date_started.year, self.date_started.month, s.start_day)
+        d = Date.new(self.date_started.year, s.start_month, s.start_day)
         d = d + 1.month if d < self.date_started                
       end
       self.date_started_full = d
@@ -48,7 +48,7 @@ module Caboose
       
       self.calculate_date_started_full if self.date_started_full.nil?
               
-      interval = case self.subcription.interval
+      interval = case self.subscription.interval
         when Subscription::INTERVAL_MONTHLY then 1.month
         when Subscription::INTERVAL_YEARLY  then 1.year
       end
@@ -97,12 +97,13 @@ module Caboose
         d2 = d2 + interval
       end
       d  = self.date_started + 1.day - 1.day
-      while d <= d2
+      while d <= d2 do
         # See if an invoice has already been created for today      
-        li = self.line_items.where("date_starts = ? date_ends = ?", d, d + interval - 1.day).first
+        li = self.line_items.where("date_starts = ? AND date_ends = ?", d, d + interval - 1.day).first
         if li.nil?
           invoice = Caboose::Invoice.create(        
             :site_id          => self.subscription.site_id,
+            :customer_id      => self.user_id,
             :status           => Caboose::Invoice::STATUS_PENDING,
             :financial_status => Caboose::Invoice::STATUS_PENDING,
             :date_created     => DateTime.now,                                    
@@ -123,6 +124,7 @@ module Caboose
           invoice.calculate
           invoice.save                    
         end
+        d = d + interval
       end        
       return true      
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.59'
+  VERSION = '0.8.60'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.59
+  version: 0.8.60
 platform: ruby
 authors:
 - William Barry