caboose-cms 0.8.78 → 0.8.79

data/app/models/caboose/core_plugin.rb

@@ -20,8 +20,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'smtp'              , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'              , 'view')
     item['children'] << { 'id' => 'social'            , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'            , 'view')
     item['children'] << { 'id' => 'store'             , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'             , 'view') if site.use_store == true
-    item['children'] << { 'id' => 'users'             , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'             , 'view')
-    item['children'] << { 'id' => 'usersubscriptions' , 'text' => 'User Subscriptions'  , 'href' => '/admin/user-subscriptions' , 'modal' => false } if user.is_allowed('usersubscriptions' , 'view')
+    item['children'] << { 'id' => 'users'             , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'             , 'view')    
     item['children'] << { 'id' => 'subscriptions'     , 'text' => 'Subscriptions'       , 'href' => '/admin/subscriptions'      , 'modal' => false } if user.is_allowed('subscriptions'     , 'view')
     item['children'] << { 'id' => 'variables'         , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'          , 'view')    
     nav << item if item['children'].count > 0

data/app/models/caboose/line_item.rb

@@ -4,6 +4,7 @@ module Caboose
     
     belongs_to :variant
     belongs_to :invoice
+    belongs_to :subscription
     belongs_to :invoice_package, :class_name => 'InvoicePackage'
     belongs_to :parent, :class_name => 'LineItem', :foreign_key => 'parent_id'
     has_many :children, :class_name => 'LineItem', :foreign_key => 'parent_id'
@@ -25,7 +26,7 @@ module Caboose
       :gift_message          ,
       :gift_wrap             ,
       :hide_prices           ,
-      :user_subscription_id  ,            
+      :subscription_id       ,            
       :date_starts           ,
       :date_ends
     

data/app/models/caboose/schema.rb

@@ -87,7 +87,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :amount_discounted     ,
         :auth_code             ,                
         :date_shipped          ,                        
-        :decremented           
+        :decremented           ,
+        :user_subscription_id
       ],        
       #Caboose::PageCache => [:block],
       #Caboose::RetargetingConfig => [:fb_pixels_function],
@@ -341,7 +342,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :gift_message          , :text     ],
         [ :gift_wrap             , :boolean   , { :default => false }],
         [ :hide_prices           , :boolean   , { :default => false }],
-        [ :user_subscription_id  , :integer  ],            
+        [ :subscription_id       , :integer  ],            
         [ :date_starts           , :date     ],
         [ :date_ends             , :date     ]
       ],
@@ -436,6 +437,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_address_id   , :integer  ],
         [ :billing_address_id    , :integer  ],
         [ :notes                 , :text     ],
+        [ :customer_notes        , :text     ],
         [ :status                , :string   ],
         [ :payment_terms         , :string   ],
         [ :date_created          , :datetime ],
@@ -828,19 +830,12 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_taxable                   , :boolean ],
         [ :allow_instore_pickup              , :boolean  , { :default => false }]        
       ],  
-      Caboose::Subscription => [
-        [ :site_id             , :integer ],
-        [ :name                , :string  ],
-        [ :description         , :text    ],
-        [ :variant_id          , :integer ],
-        [ :interval            , :string  ],
-        [ :prorate             , :boolean  , { :default => false }],
-        [ :prorate_method      , :string  ],        
-        [ :prorate_flat_amount , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :prorate_function    , :text    ],
-        [ :start_on_day        , :boolean  , { :default => false }],
-        [ :start_day           , :integer ],
-        [ :start_month         , :integer ]       
+      Caboose::Subscription => [      
+        [ :variant_id  , :integer ],
+        [ :user_id          , :integer ],
+        [ :date_started     , :date    ],
+        [ :date_started_full, :date    ],
+        [ :status           , :string  ]
       ],
       Caboose::User => [
         [ :site_id                      , :integer    ],
@@ -874,59 +869,61 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :card_brand                   , :string     ],  
         [ :card_exp_month               , :integer    ],
         [ :card_exp_year                , :integer    ]
-      ],
-      Caboose::UserSubscription => [
-        [ :subscription_id  , :integer ],
-        [ :user_id          , :integer ],
-        [ :date_started     , :date    ],
-        [ :date_started_full, :date    ],
-        [ :status           , :string  ]
-      ],
+      ],      
       Caboose::Variant => [
-        [ :product_id                    , :integer  ],
-        [ :alternate_id                  , :string   ],
-        [ :sku                           , :string   ],
-        [ :barcode                       , :string   ],
-        [ :cost                          , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :price                         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
-        [ :sale_price                    , :decimal   , { :precision => 8, :scale => 2 }],
-        [ :date_sale_starts              , :datetime ],
-        [ :date_sale_ends                , :datetime ],
-        [ :date_sale_end                 , :datetime ],        
-        [ :clearance                     , :boolean   , { :default => false }],
-        [ :clearance_price               , :decimal   , { :precision => 8, :scale => 2 }],
-        [ :available                     , :boolean   , { :default => true  }],
-        [ :quantity_in_stock             , :integer   , { :default => 0     }],        
-        [ :ignore_quantity               , :boolean   , { :default => false }],
-        [ :allow_backorder               , :boolean   , { :default => false }],
-        [ :weight                        , :decimal  ],
-        [ :length                        , :decimal  ],
-        [ :width                         , :decimal  ],
-        [ :height                        , :decimal  ],
-        [ :volume                        , :decimal  ],
-        [ :cylinder                      , :boolean   , { :default => false }],
-        [ :option1                       , :string   ],
-        [ :option2                       , :string   ],
-        [ :option3                       , :string   ],        
-        [ :option1_media_id              , :integer  ],
-        [ :option2_media_id              , :integer  ],
-        [ :option3_media_id              , :integer  ],
-        [ :requires_shipping             , :boolean   , { :default => true  }],
-        [ :taxable                       , :boolean   , { :default => true  }],        
-        [ :shipping_unit_value           , :numeric  ],
-        [ :flat_rate_shipping            , :boolean   , { :default => false }],
-        [ :flat_rate_shipping_package_id , :integer  ],
-        [ :flat_rate_shipping_method_id  , :integer  ],
-        [ :flat_rate_shipping_single     , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],
-        [ :flat_rate_shipping_combined   , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],      
-        [ :status                        , :string   ],
-        [ :option1_sort_order            , :integer   , { :default => 0 }],
-        [ :option2_sort_order            , :integer   , { :default => 0 }],
-        [ :option3_sort_order            , :integer   , { :default => 0 }],
-        [ :sort_order                    , :integer   , { :default => 0 }],
-        [ :downloadable                  , :boolean   , { :default => false }],
-        [ :download_path                 , :string   ],
-        [ :is_bundle                     , :boolean   , { :default => false }]
+        [ :product_id                       , :integer  ],
+        [ :alternate_id                     , :string   ],
+        [ :sku                              , :string   ],
+        [ :barcode                          , :string   ],
+        [ :cost                             , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :price                            , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :sale_price                       , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :date_sale_starts                 , :datetime ],
+        [ :date_sale_ends                   , :datetime ],
+        [ :date_sale_end                    , :datetime ],        
+        [ :clearance                        , :boolean   , { :default => false }],
+        [ :clearance_price                  , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :available                        , :boolean   , { :default => true  }],
+        [ :quantity_in_stock                , :integer   , { :default => 0     }],        
+        [ :ignore_quantity                  , :boolean   , { :default => false }],
+        [ :allow_backorder                  , :boolean   , { :default => false }],
+        [ :weight                           , :decimal  ],
+        [ :length                           , :decimal  ],
+        [ :width                            , :decimal  ],
+        [ :height                           , :decimal  ],
+        [ :volume                           , :decimal  ],
+        [ :cylinder                         , :boolean   , { :default => false }],
+        [ :option1                          , :string   ],
+        [ :option2                          , :string   ],
+        [ :option3                          , :string   ],        
+        [ :option1_media_id                 , :integer  ],
+        [ :option2_media_id                 , :integer  ],
+        [ :option3_media_id                 , :integer  ],
+        [ :requires_shipping                , :boolean   , { :default => true  }],
+        [ :taxable                          , :boolean   , { :default => true  }],        
+        [ :shipping_unit_value              , :numeric  ],
+        [ :flat_rate_shipping               , :boolean   , { :default => false }],
+        [ :flat_rate_shipping_package_id    , :integer  ],
+        [ :flat_rate_shipping_method_id     , :integer  ],
+        [ :flat_rate_shipping_single        , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],
+        [ :flat_rate_shipping_combined      , :decimal   , { :precision => 8, :scale => 2, :default => 0.0 }],      
+        [ :status                           , :string   ],
+        [ :option1_sort_order               , :integer   , { :default => 0 }],
+        [ :option2_sort_order               , :integer   , { :default => 0 }],
+        [ :option3_sort_order               , :integer   , { :default => 0 }],
+        [ :sort_order                       , :integer   , { :default => 0 }],
+        [ :downloadable                     , :boolean   , { :default => false }],
+        [ :download_path                    , :string   ],
+        [ :is_bundle                        , :boolean   , { :default => false }],
+        [ :is_subscription                  , :boolean   , { :default => false }],
+        [ :subscription_interval            , :string  ],
+        [ :subscription_prorate             , :boolean  , { :default => false }],
+        [ :subscription_prorate_method      , :string  ],        
+        [ :subscription_prorate_flat_amount , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :subscription_prorate_function    , :text    ],
+        [ :subscription_start_on_day        , :boolean  , { :default => false }],
+        [ :subscription_start_day           , :integer ],
+        [ :subscription_start_month         , :integer ]
       ],
       Caboose::VariantChild => [
         [ :parent_id    , :integer ],

data/app/models/caboose/subscription.rb

@@ -4,29 +4,139 @@ module Caboose
     self.table_name  = 'store_subscriptions'
     self.primary_key = 'id'
 
-    belongs_to :site
     belongs_to :variant
-    has_many :user_subscriptions
-    attr_accessible :id    ,      
-      :site_id             ,
-      :name                ,
-      :description         ,
-      :variant_id          ,
-      :interval            ,
-      :prorate             ,
-      :prorate_method      ,
-      :prorate_flat_amount ,
-      :prorate_function    ,
-      :start_on_day        ,
-      :start_day           ,
-      :start_month
+    belongs_to :user
+    has_many :line_items
+    attr_accessible :id  ,
+      :variant_id        ,
+      :user_id           ,
+      :date_started      ,
+      :date_started_full ,
+      :status
+      
+    STATUS_ACTIVE   = 'active'
+    STATUS_INACTIVE = 'inactive'
 
-    INTERVAL_MONTHLY = 'monthly'
-    INTERVAL_YEARLY  = 'yearly'
+    def calculate_date_started_full
+      
+      v = self.variant
+      if !v.subscription_start_on_day
+        self.date_started_full = self.date_started
+        self.save
+      end
+            
+      d = nil
+      if v.subscription_interval == Variant::SUBSCRIPTION_INTERVAL_YEARLY        
+        d = Date.new(self.date_started.year, v.subscription_start_month, v.subscription_start_day)
+        d = d + 1.year if d < self.date_started        
+      elsif v.subscription_interval == Variant::SUBSCRIPTION_INTERVAL_MONTHLY        
+        d = Date.new(self.date_started.year, v.subscription_start_month, v.subscription_start_day)
+        d = d + 1.month if d < self.date_started                
+      end
+      self.date_started_full = d
+      self.save
+      
+    end
     
-    PRORATE_METHOD_FLAT       = 'flat'
-    PRORATE_METHOD_PERCENTAGE = 'percentage'
-    PRORATE_METHOD_CUSTOM     = 'custom'
+    def custom_prorate          
+      return eval(self.variant.subscription_prorate_function)    
+    end
+              
+    # Verify invoices exist for the entire subscription period up until today
+    def create_invoices
+      
+      self.calculate_date_started_full if self.date_started_full.nil?
+      
+      v  = self.variant
+      interval = case v.subscription_interval
+        when Variant::SUBSCRIPTION_INTERVAL_MONTHLY then 1.month
+        when Variant::SUBSCRIPTION_INTERVAL_YEARLY  then 1.year
+      end      
+      sc = v.product.site.store_config      
+      unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
+      
+      # Special case if the subscription starts on specific day
+      if v.subscription_start_on_day && (Date.today > self.date_started_full)
+        li = self.line_items.where("date_starts = ? date_ends = ?", self.date_started, self.date_started_full - 1.day).first
+        if li.nil?
+          prorated_unit_price = unit_price + 0.00          
+          if v.subscription_prorate             
+            prorated_unit_price = case v.subscription_prorate_method
+              when Variant::SUBSCRIPTION_PRORATE_METHOD_FLAT       then v.subscription_prorate_flat_amount
+              when Variant::SUBSCRIPTION_PRORATE_METHOD_PERCENTAGE then unit_price * ((self.date_started_full - self.date_started).to_f / ((self.date_started_full + interval) - self.date_started_full).to_f)
+              when Variant::SUBSCRIPTION_PRORATE_METHOD_CUSTOM     then self.custom_prorate                                            
+            end
+          end
+          invoice = Caboose::Invoice.create(        
+            :site_id          => v.product.site_id,
+            :status           => Caboose::Invoice::STATUS_PENDING,
+            :financial_status => Caboose::Invoice::STATUS_PENDING,
+            :date_created     => DateTime.now,                                    
+            :payment_terms    => sc.default_payment_terms,
+            :invoice_number   => sc.next_invoice_number
+          )          
+          LineItem.create(
+            :invoice_id       => invoice.id,
+            :variant_id       => v.id,
+            :quantity         => 1,
+            :unit_price       => prorated_unit_price,
+            :subtotal         => prorated_unit_price,
+            :status           => 'pending',
+            :subscription_id  => self.id,            
+            :date_starts      => d,
+            :date_ends        => d + interval - 1.day
+          )
+          invoice.calculate
+          invoice.save                    
+        end
+      end        
+
+      d2 = self.date_started_full + 1.day - 1.day
+      while d2 <= Date.today do
+        d2 = d2 + interval
+      end
+      d  = self.date_started + 1.day - 1.day
+      while d <= d2 do
+        # See if an invoice has already been created for today      
+        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          => v.product.site_id,
+            :customer_id      => self.user_id,
+            :status           => Caboose::Invoice::STATUS_PENDING,
+            :financial_status => Caboose::Invoice::STATUS_PENDING,
+            :date_created     => DateTime.now,                                    
+            :payment_terms    => sc.default_payment_terms,
+            :invoice_number   => sc.next_invoice_number
+          )          
+          LineItem.create(
+            :invoice_id       => invoice.id,
+            :variant_id       => v.id,
+            :quantity         => 1,
+            :unit_price       => unit_price,
+            :subtotal         => unit_price,
+            :status           => 'pending',
+            :subscription_id  => self.id,            
+            :date_starts      => d,
+            :date_ends        => d + interval - 1.day
+          )
+          invoice.calculate
+          invoice.save                    
+        end
+        d = d + interval
+      end        
+      return true      
+    end
+    
+    #===========================================================================
+    # Static methods
+    #===========================================================================
+    
+    def Subscription.create_invoices
+      Subscription.where(:status => Subscription::STATUS_ACTIVE).all.each do |s|
+        s.create_invoices
+      end
+    end
 
   end
 end

data/app/models/caboose/variant.rb

@@ -65,7 +65,27 @@ module Caboose
       :sort_order,      
       :downloadable,
       :download_path,
-      :is_bundle
+      :is_bundle,
+      :is_subscription,
+      :subscription_interval            ,
+      :subscription_prorate             ,
+      :subscription_prorate_method      ,
+      :subscription_prorate_flat_amount ,
+      :subscription_prorate_function    ,
+      :subscription_start_on_day        ,
+      :subscription_start_day           ,
+      :subscription_start_month
+      
+    STATUS_ACTIVE   = 'Active'
+    STATUS_INACTIVE = 'Inactive'
+    STATUS_DELETED  = 'Deleted'
+    
+    SUBSCRIPTION_INTERVAL_MONTHLY = 'monthly'
+    SUBSCRIPTION_INTERVAL_YEARLY  = 'yearly'
+    
+    SUBSCRIPTION_PRORATE_METHOD_FLAT       = 'flat'
+    SUBSCRIPTION_PRORATE_METHOD_PERCENTAGE = 'percentage'
+    SUBSCRIPTION_PRORATE_METHOD_CUSTOM     = 'custom'
     
     after_initialize do |v|
       v.price       = 0.00 if v.price.nil?

data/app/views/caboose/invoices/admin_edit.html.erb

@@ -1,13 +1,20 @@
 
-<input type='hidden' name='invoice_id'    id='invoice_id'     value='<%= @invoice.id %>' />
-
-<h1>Edit Invoice #<%= @invoice.id %></h1>
+<% if @edituser %>
+  <%= render :partial => 'caboose/users/admin_header' %>
+<% else %>
+  <h1>Edit Invoice #<%= @invoice.id %></h1>
+<% end %>
 
+<input type='hidden' name='invoice_id'    id='invoice_id'     value='<%= @invoice.id %>' />
 <div id='overview_table'></div>
 <div id='invoice_table'></div>
 <div id='message'></div>
 <div id='controls'></div>
 
+<% if @edituser %>
+  <%= render :partial => 'caboose/users/admin_footer' %>
+<% end %>
+
 <!--
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/invoices';" />
@@ -46,6 +53,7 @@ $(document).ready(function() {
 <% content_for :caboose_css do %>
 <style type='text/css'>
 
+table.subscription_dates td,
 table.shipping_address td,
 table.billing_address td {
   padding: 0 !important; 

data/app/views/caboose/invoices/admin_index.html.erb

@@ -1,4 +1,9 @@
-<h1>Invoices</h1>
+
+<% if @edituser %>
+  <%= render :partial => 'caboose/users/admin_header' %>
+<% else %>
+  <h1>Invoices</h1>
+<% end %>
 
 <style type='text/css'>
 #search_form_wrapper { margin-bottom: 10px; position: absolute; top:0; right: 0; }
@@ -14,16 +19,20 @@
 <form action='/admin/invoices' method='get' id='search_form' style='display: none;'>
   <p><input type='text' name='id'           placeholder='Invoice ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>
   <p><input type='text' name='invoice_number' placeholder='Invoice Number' value="<%= @pager.params['invoice_number'] %>" style='width: 100px;' /></p>
-  <p><select name='customer_id'>
-      <optgroup label='Status' style='width: 100px'>
-        <option value=''>-- All customers --</option>        
-        <% @customers.each do |c| %>
-          <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>>
-            <%= c.first_name.blank? && c.last_name.blank? ? c.username : "#{c.last_name}, #{c.first_name}" %>
-          </option>
-        <% end %>
-      </optgroup>
-    </select></p>
+  <% if @edituser.nil? %>
+    <p><select name='customer_id'>
+        <optgroup label='Status' style='width: 100px'>
+          <option value=''>-- All customers --</option>        
+          <% @customers.each do |c| %>
+            <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>>
+              <%= c.first_name.blank? && c.last_name.blank? ? c.username : "#{c.last_name}, #{c.first_name}" %>
+            </option>
+          <% end %>
+        </optgroup>
+      </select></p>
+  <% end %>
+  <p><input type='text' name='total_gte' placeholder='Total Min' value="<%= @pager.params['total_gte'] %>" style='width: 100px;' /></p>
+  <p><input type='text' name='total_lte' placeholder='Total Max' value="<%= @pager.params['total_lte'] %>" style='width: 100px;' /></p>
   <p><select name='status'>
       <optgroup label='Status'>
         <option value=''>-- All statuses --</option>
@@ -35,7 +44,7 @@
     </select></p>  
   <p>
     <input type='submit' value='Search' />
-    <input type='button' value='Clear' onclick="window.location='/admin/invoices';" />
+    <input type='button' value='Clear' onclick="window.location='/admin<%= @edituser ? "/users/#{@edituser.id}" : '' %>/invoices';" />
   </p>
 </form>
 
@@ -53,7 +62,7 @@
   		%>
     </tr>
   <% @invoices.each do |invoice| %>
-    <tr onclick="window.location='/admin/invoices/<%= invoice.id %>';">
+    <tr onclick="window.location='/admin<%= @edituser ? "/users/#{@edituser.id}" : '' %>/invoices/<%= invoice.id %>';">
       <td><%= raw invoice.id %></td>
       <td><%= raw invoice.invoice_number %></td>
       <td>
@@ -78,6 +87,10 @@
   <p>There are no invoices right now.</p>
 <% end %>
 
+<% if @edituser %>
+  <%= render :partial => 'caboose/users/admin_footer' %>
+<% end %>
+
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 var modal = false;