billingly 0.1.4 → 0.1.5

data/app/models/billingly/base_customer.rb

@@ -289,5 +289,15 @@ module Billingly
       return false if debtor?
       return true
     end
+    
+    # Some customers do not want to be bothered via email, which is understandable.
+    # You can override this method to decide which customers should never be emailed
+    # with invoices, receipts or when their trial is over.
+    #
+    # It is false by default, this means all of your customers will be emailed.
+    # @return [Boolean] whether this customer opted out from receiving emails.
+    def do_not_email?
+      false
+    end
   end
 end

data/app/models/billingly/base_subscription.rb

@@ -155,6 +155,7 @@ module Billingly
       return unless trial?
       return unless terminated? && unsubscribed_because == 'trial_expired'
       return unless notified_trial_expired_on.nil?
+      return if customer.do_not_email?
       Billingly::Mailer.trial_expired_notification(self).deliver!
       update_attribute(:notified_trial_expired_on, Time.now)
       return self

data/app/models/billingly/invoice.rb

@@ -59,6 +59,7 @@ module Billingly
       return unless notified_pending_on.nil?
       return if paid?
       return if deleted?
+      return if customer.do_not_email?
       return if due_on > subscription.grace_period.from_now
       Billingly::Mailer.pending_notification(self).deliver!
       update_attribute(:notified_pending_on, Time.now)
@@ -69,6 +70,7 @@ module Billingly
       return if paid?
       return if deleted?
       return if due_on > Time.now
+      return if customer.do_not_email?
       Billingly::Mailer.overdue_notification(self).deliver!
       update_attribute(:notified_overdue_on, Time.now)
     end
@@ -77,6 +79,7 @@ module Billingly
       return unless paid?
       return unless notified_paid_on.nil?
       return if deleted?
+      return if customer.do_not_email?
       Billingly::Mailer.paid_notification(self).deliver!
       update_attribute(:notified_paid_on, Time.now)
     end

data/app/views/billingly/mailer/overdue_notification.html.erb

@@ -1,6 +1,6 @@
 <%=t 'billingly.make_sure_to_pay' %>
 
-<%=t 'billingly.you_can_reactivate_your_account_by_visiting' %> http://payments_page
+<%=t 'billingly.you_can_reactivate_your_account_by_visiting' %> <%= url_for subscriptions_path %>
 
 ----- <%=t 'billingly.your_overdue_invoice_is_detailed_below' %> -----
 

data/app/views/billingly/mailer/paid_notification.html.erb

@@ -2,7 +2,8 @@
 
 <%=t 'billingly.receipt_text' %>
 
-<%= '-' * 70 %>
+<hr/>
+
 <%=t 'billingly.invoice_number' %>: <%= '%.10i' % @invoice.id %>
 <%=t 'billingly.paid_on' %>: <%= @invoice.paid_on.to_date %>
 <%=t 'billingly.plan' %>: <%= @invoice.subscription.description %>

data/app/views/billingly/mailer/pending_notification.html.erb

@@ -13,5 +13,5 @@
 
 <%= '%-55s%15s' % [t('billingly.you_should_pay'), "$#{@invoice.amount - @cash} USD"] %>
 
-<%=t 'billingly.you_can_pay_this_invoice_by_visiting' %> http://payments_page
+<%=t 'billingly.you_can_pay_this_invoice_by_visiting' %> <%= link_to(subscriptions_url, subscriptions_url) %>
 

data/lib/billingly/version.rb

@@ -1,3 +1,3 @@
 module Billingly
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billingly
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70310037569740 !ruby/object:Gem::Requirement
+  requirement: &70208173997740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70310037569740
+  version_requirements: *70208173997740
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
-  requirement: &70310037569280 !ruby/object:Gem::Requirement
+  requirement: &70208173997260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310037569280
+  version_requirements: *70208173997260
 - !ruby/object:Gem::Dependency
   name: has_duration
-  requirement: &70310037568740 !ruby/object:Gem::Requirement
+  requirement: &70208173996740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310037568740
+  version_requirements: *70208173996740
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70310037568220 !ruby/object:Gem::Requirement
+  requirement: &70208173996260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037568220
+  version_requirements: *70208173996260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70310037608420 !ruby/object:Gem::Requirement
+  requirement: &70208174030440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037608420
+  version_requirements: *70208174030440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70310037607540 !ruby/object:Gem::Requirement
+  requirement: &70208174028660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037607540
+  version_requirements: *70208174028660
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70310037607120 !ruby/object:Gem::Requirement
+  requirement: &70208174028200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310037607120
+  version_requirements: *70208174028200
 description: Rails Engine for SaaS subscription management. Manage subscriptions,
   plan changes, free trials and more!!!
 email:
@@ -104,22 +104,16 @@ files:
 - app/models/billingly/base_subscription.rb
 - app/models/billingly/customer.rb
 - app/models/billingly/invoice.rb
-- app/models/billingly/invoice_item.rb
 - app/models/billingly/journal_entry.rb
-- app/models/billingly/ledger_entry.rb
-- app/models/billingly/one_time_charge.rb
 - app/models/billingly/payment.rb
 - app/models/billingly/plan.rb
-- app/models/billingly/receipt.rb
 - app/models/billingly/subscription.rb
 - app/models/billingly/tasks.rb
 - app/views/billingly/mailer/overdue_notification.html.erb
 - app/views/billingly/mailer/paid_notification.html.erb
 - app/views/billingly/mailer/pending_notification.html.erb
-- app/views/billingly/mailer/pending_notification.plain.erb
-- app/views/billingly/mailer/pending_notification.text.erb
-- app/views/billingly/mailer/task_results.text.erb
-- app/views/billingly/mailer/trial_expired_notification.text.erb
+- app/views/billingly/mailer/task_results.html.erb
+- app/views/billingly/mailer/trial_expired_notification.html.erb
 - app/views/billingly/subscriptions/_current_subscription.html.haml
 - app/views/billingly/subscriptions/_deactivation_notice.html.haml
 - app/views/billingly/subscriptions/_invoice_details.html.haml
@@ -145,18 +139,18 @@ files:
 - TUTORIAL.rdoc
 homepage: http://billing.ly
 licenses: []
-post_install_message: ! "    Add the following migration:\n    \n    class CreateBillinglyTables
-  < ActiveRecord::Migration\n      def up\n        add_column :billingly_subscriptions,
-  :notified_trial_will_expire_on, :datetime\n        add_column :billingly_subscriptions,
-  :notified_trial_expired_on, :datetime\n        add_column :billingly_subscriptions,
-  :unsubscribed_because, :string\n        \n        Billingly::Subscription.where('unsubscribed_on
-  IS NOT NULL').find_each do |s|\n          # Notice: You should pre-populate unsubscribed
-  because\n          # with an appropriate value for each terminated subscription.\n
-  \         # \n          reason = if s == s.customer.subscriptions.last && s.customer.deactivation_reason\n
-  \           s.deactivation_reason\n          elsif s.trial? && s.is_trial_expiring_on
-  <= s.unsubscribed_on\n            'trial_expired'\n          else\n            'changed_subscription'\n
-  \         end\n          s.update_attribute(unsubscribed_because: reason)\n        end\n
-  \     end\n      \n      def down\n        remove_column :billingly_subscriptions,
+post_install_message: ! "    If migrating from before 0.1.1 (unlikely), add the following
+  migration:\n    \n    class UpdateSubscriptionFields < ActiveRecord::Migration\n
+  \     def up\n        add_column :billingly_subscriptions, :notified_trial_will_expire_on,
+  :datetime\n        add_column :billingly_subscriptions, :notified_trial_expired_on,
+  :datetime\n        add_column :billingly_subscriptions, :unsubscribed_because, :string\n
+  \       \n        Billingly::Subscription.where('unsubscribed_on IS NOT NULL').find_each
+  do |s|\n          # Notice: You should pre-populate unsubscribed because\n          #
+  with an appropriate value for each terminated subscription.\n          # \n          reason
+  = if s == s.customer.subscriptions.last && s.customer.deactivation_reason\n            s.deactivation_reason\n
+  \         elsif s.trial? && s.is_trial_expiring_on <= s.unsubscribed_on\n            'trial_expired'\n
+  \         else\n            'changed_subscription'\n          end\n          s.update_attribute(unsubscribed_because:
+  reason)\n        end\n      end\n      \n      def down\n        remove_column :billingly_subscriptions,
   :notified_trial_will_expire_on\n        remove_column :billingly_subscriptions,
   :notified_trial_expired_on\n        remove_column :billingly_subscriptions, :unsubscribed_because\n
   \     end\n    end\n"

data/app/models/billingly/invoice_item.rb

@@ -1,4 +0,0 @@
-module Billingly
-  class InvoiceItem < ActiveRecord::Base
-  end
-end

data/app/models/billingly/ledger_entry.rb

@@ -1,15 +0,0 @@
-module Billingly
-  class JournalEntry < ActiveRecord::Base
-    belongs_to :customer
-    belongs_to :invoice
-    belongs_to :payment
-    belongs_to :subscription
-
-    validates :amount, presence: true
-    validates :customer, presence: true
-    validates :account, presence: true, inclusion: %w(paid cash spent)
-    
-    attr_accessible :customer, :account, :invoice, :payment, :subscription, :amount 
-    
-  end
-end

data/app/models/billingly/one_time_charge.rb

@@ -1,5 +0,0 @@
-module Billingly
-  class OneTimeCharge < ActiveRecord::Base
-    attr_accessible :charge_on, :amount, :description
-  end
-end

data/app/models/billingly/receipt.rb

@@ -1,9 +0,0 @@
-module Billingly
-  class Receipt < ActiveRecord::Base
-    belongs_to :customer
-    has_one :invoice
-    has_many :ledger_entries
-
-    attr_accessible :customer, :paid_on
-  end
-end

data/app/views/billingly/mailer/pending_notification.plain.erb

@@ -1,17 +0,0 @@
-<%=t 'billingly.invoice_number' %>: <%= '%.10i' % @invoice.id %>
-
-<%=t 'billingly.due_date' %>: <%= @invoice.due_on.to_date %>
-
-<%= "#{t('billingly.covering_from')} #{@invoice.period_start.to_date} #{t('billingly.until')} #{@invoice.period_end.to_date}" %>
-
-<%=t 'billingly.detail' %>
-<%= '-' * 70 %>
-<%= '%-55s%15s' % [@invoice.subscription.description, "$#{@invoice.amount} USD"] %>
-<% if @cash > 0 %>
-<%= '%-55s%15s' % [t('billingly.balance_in_your_favour'), "-$#{@cash} USD"] %>
-<% end %>
-
-<%= '%-55s%15s' % [t('billingly.you_should_pay'), "$#{@invoice.amount - @cash} USD"] %>
-
-<%=t 'billingly.you_can_pay_this_invoice_by_visiting' %> http://payments_page
-

data/app/views/billingly/mailer/pending_notification.text.erb

@@ -1,17 +0,0 @@
-<%=t 'billingly.invoice_number' %>: <%= '%.10i' % @invoice.id %>
-
-<%=t 'billingly.due_date' %>: <%= @invoice.due_on.to_date %>
-
-<%= "#{t('billingly.covering_from')} #{@invoice.period_start.to_date} #{t('billingly.until')} #{@invoice.period_end.to_date}" %>
-
-<%=t 'billingly.detail' %>
-<%= '-' * 70 %>
-<%= '%-55s%15s' % [@invoice.subscription.description, "$#{@invoice.amount} USD"] %>
-<% if @cash > 0 %>
-<%= '%-55s%15s' % [t('billingly.balance_in_your_favour'), "-$#{@cash} USD"] %>
-<% end %>
-
-<%= '%-55s%15s' % [t('billingly.you_should_pay'), "$#{@invoice.amount - @cash} USD"] %>
-
-<%=t 'billingly.you_can_pay_this_invoice_by_visiting' %> http://payments_page
-