billingly 0.1.8 → 0.1.9

data/app/models/billingly/base_customer.rb

@@ -119,7 +119,7 @@ module Billingly
 
       subscriptions.build.tap do |new|
         [:payable_upfront, :description, :periodicity,
-         :amount, :grace_period].each do |k|
+         :amount, :grace_period, :signup_price].each do |k|
           new[k] = plan[k]
         end
         new.plan = plan if plan.is_a?(Billingly::Plan)
@@ -138,6 +138,7 @@ module Billingly
       code = Billingly::SpecialPlanCode.find_by_code(code_string)
       return if code.nil?
       return if code.redeemed?
+      credit_payment(code.bonus_amount) if code.bonus_amount
       subscribe_to_plan(code.plan)
       code.update_attributes(customer: self, redeemed_on: Time.now)
     end

data/app/models/billingly/base_subscription.rb

@@ -95,6 +95,16 @@ module Billingly
       not is_trial_expiring_on.nil?
     end
 
+    # Some subscriptions have a setup fee, or an initial discount.
+    # For billingly, this is considered a signup_price. If set, then the first invoice
+    # to be generated for this subscription will be for the amount specified in signup_price
+    # instead of {#amount}
+    #
+    # A signup_price can also be specified on a {Billingly::Plan Plan} and will be copied
+    # over to the subscription when subscribing to it.
+    # @property signup_price
+    # @return [BigDecimal]
+
     # Invoices will be generated before their due_date, as soon as possible,
     # but not sooner than GENERATE_AHEAD days.
     GENERATE_AHEAD = 3.days
@@ -108,6 +118,8 @@ module Billingly
     # The invoice generation process should run frequently, at least on a daily basis.
     # It will create invoices some time before they are due, to give customers a chance
     # to pay and settle them.
+    # If there is any {#signup_price} then the first invoice will be for that amount
+    # instead of the regular amount.
     # This method is idempotent, if an upcoming invoice for a subscription already exists,
     # it does not create yet another one.
     def generate_next_invoice
@@ -118,7 +130,9 @@ module Billingly
       due_on = (payable_upfront ? from : to) + grace_period
       return if GENERATE_AHEAD.from_now < from
 
-      invoice = invoices.create!(customer: customer, amount: amount,
+      payable_amount = (invoices.empty? && signup_price) ? signup_price : amount
+      
+      invoice = invoices.create!(customer: customer, amount: payable_amount,
         due_on: due_on, period_start: from, period_end: to)
       invoice.charge
       return invoice

data/app/models/billingly/special_plan_code.rb

@@ -11,7 +11,7 @@ class Billingly::SpecialPlanCode < ActiveRecord::Base
   validates :plan, presence: true
   validates :code, presence: true
   
-  attr_accessible :plan, :code, :customer, :redeemed_on
+  attr_accessible :plan, :code, :customer, :redeemed_on, :bonus_amount
   
   # !@attribute [r] redeemed?
   # @return [Boolean] Whether this code has been redeemed or not
@@ -36,9 +36,9 @@ class Billingly::SpecialPlanCode < ActiveRecord::Base
   # with pre-existing codes.
   # @param plan [Plan] The plan to generate the codes for.
   # @param how_many [Integer] How many new codes to issue.
-  def self.generate_for_plan(plan, how_many)
+  def self.generate_for_plan(plan, how_many, bonus_amount = nil)
     generate_ean_13_codes(how_many).collect do |code|
-      self.create!(code: code, plan: plan)
+      self.create!(code: code, plan: plan, bonus_amount: bonus_amount)
     end
   end
   

data/lib/billingly/version.rb

@@ -1,3 +1,3 @@
 module Billingly
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/generators/templates/create_billingly_tables.rb

@@ -51,6 +51,7 @@ class CreateBillinglyTables < ActiveRecord::Migration
       t.datetime 'notified_trial_will_expire_on'
       t.datetime 'notified_trial_expired_on'
       t.references :plan
+      t.decimal :signup_price, precision: 11, scale: 2
       t.timestamps
     end
     
@@ -61,12 +62,14 @@ class CreateBillinglyTables < ActiveRecord::Migration
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false # 9.99
       t.boolean 'payable_upfront', null: false
       t.string 'grace_period', null: false
+      t.integer 'signup_price'
       t.boolean 'hidden_on'
       t.timestamps
     end
     
     create_table :billingly_special_plan_codes do |t|
       t.references :plan, null: false
+      t.decimal :bonus_amount, precision: 11, scale: 2
       t.string :code
       t.references :customer
       t.datetime :redeemed_on

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billingly
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70254701290620 !ruby/object:Gem::Requirement
+  requirement: &70111324776440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254701290620
+  version_requirements: *70111324776440
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
-  requirement: &70254701289380 !ruby/object:Gem::Requirement
+  requirement: &70111324775900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254701289380
+  version_requirements: *70111324775900
 - !ruby/object:Gem::Dependency
   name: has_duration
-  requirement: &70254701288520 !ruby/object:Gem::Requirement
+  requirement: &70111324775360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254701288520
+  version_requirements: *70111324775360
 - !ruby/object:Gem::Dependency
   name: ean13
-  requirement: &70254701287420 !ruby/object:Gem::Requirement
+  requirement: &70111324774840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254701287420
+  version_requirements: *70111324774840
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70254701286240 !ruby/object:Gem::Requirement
+  requirement: &70111324774320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254701286240
+  version_requirements: *70111324774320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70254701285400 !ruby/object:Gem::Requirement
+  requirement: &70111324773780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254701285400
+  version_requirements: *70111324773780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70254701284720 !ruby/object:Gem::Requirement
+  requirement: &70111324773280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254701284720
+  version_requirements: *70111324773280
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70254701284160 !ruby/object:Gem::Requirement
+  requirement: &70111324772780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254701284160
+  version_requirements: *70111324772780
 description: Rails Engine for SaaS subscription management. Manage subscriptions,
   plan changes, free trials and more!!!
 email: