billingly 0.0.0 → 0.1.1

data/app/views/billingly/subscriptions/_current_subscription.html.haml

@@ -0,0 +1,22 @@
+- unless current_customer.deactivated?
+  - if current_customer.doing_trial?
+    %p
+      You are currently on a trial period, your trial expires in
+      = current_customer.trial_days_left
+      days.
+    
+  - if subscription
+    %p
+      Your subscription is for:
+      %strong= subscription.description
+    %p
+      You are subscribed since:
+      = subscription.subscribed_on.to_date
+      
+  - else
+    %p You are not subscribed yet, please choose one of the plans below:
+
+- if current_customer.ledger[:cash]
+  %p
+    Your current balance is:
+    %strong $ #{current_customer.ledger[:cash]}

data/app/views/billingly/subscriptions/_deactivation_notice.html.haml

@@ -0,0 +1,12 @@
+- if current_customer.deactivated?
+  .alert.alert-warning
+    - if current_customer.deactivation_reason == 'trial_expired'
+      %h2 Your trial period is over
+      %p Please choose a plan to continue using the service.
+    - elsif current_customer.deactivation_reason == 'debtor'
+      %h2 Your account has been momentarily deactivated
+      %p It will be reactivated once your outstanding invoices are settled.
+    - else
+      %h2 Your account is not active.
+      %p Choose a plan below and it will be reactivated.
+      

data/app/views/billingly/subscriptions/_invoice_details.html.haml

@@ -0,0 +1,9 @@
+%dl.dl-horizontal
+  %dt From
+  %dd= invoice.period_start.to_date
+  %dt To
+  %dd= invoice.period_end.to_date
+  %dt Due Date
+  %dd= invoice.due_on.to_date
+  %dt Amount
+  %dd= invoice.amount

data/app/views/billingly/subscriptions/_invoices.html.haml

@@ -0,0 +1,30 @@
+- if @invoices.size > 0
+  %h2 Your invoices
+  %table.table.table-striped
+    %thead 
+      %tr
+        %td #
+        %td From
+        %td To
+        %td Due Date
+        %td Amount
+        %td
+    - @invoices.each do |invoice|
+      %tr.invoice
+        %td= invoice.id
+        %td= invoice.period_start.to_date
+        %td= invoice.period_end.to_date
+        %td= invoice.due_on.to_date
+        %td= "$%.2f" % invoice.amount
+        %td
+           
+          - if invoice.paid?
+            %span.label.label-success Settled
+          - elsif invoice.deleted?
+            %span.label Waived
+          - elsif invoice.due_on < Time.now
+            %span.label.label-warning Overdue
+          - else
+            %span.label.label-warning Pending
+        
+

data/app/views/billingly/subscriptions/_plans.html.haml

@@ -0,0 +1,30 @@
+.row
+  - plans.sort_by(&:amount).reverse.each do |plan|
+    .span3
+      .well.plan-container
+        %h1
+          = plan.name
+        
+        %h4 Pay $#{plan.amount.to_i} every #{plan.periodicity.inspect}
+
+        %p
+          %span.badge.badge-info #{plan.awesomeness_level} points.
+          
+        %p.description= plan.description
+
+        - if current_customer.can_subscribe_to?(plan)
+          - if current_customer.deactivated?
+            = form_tag(reactivate_subscriptions_path, :action => :post) do
+              = hidden_field_tag :plan_id, plan.id
+              = submit_tag 'Subscribe', class: 'btn btn-large btn-success',
+                  disable_with: 'subscribing'
+          - else
+            = form_tag(subscriptions_path, :action => :post) do
+              = hidden_field_tag :plan_id, plan.id
+              = submit_tag 'Subscribe', class: 'btn btn-large btn-success',
+                  disable_with: 'subscribing'
+        - elsif subscription && subscription.plan == plan
+          %button.btn.btn-large(disabled=true) Your plan
+        - else
+          %button.btn.btn-large(disabled=true) Subscribe
+

data/app/views/billingly/subscriptions/index.html.haml

@@ -0,0 +1,10 @@
+%h1 Your Subscription
+
+= render 'deactivation_notice'
+
+= render 'current_subscription', subscription: @subscription
+
+= render 'plans', plans: @plans, subscription: @subscription
+
+= render 'invoices', invoices: @invoices
+

data/app/views/billingly/subscriptions/invoice.html.haml

@@ -0,0 +1,8 @@
+.page-header
+  %h1
+    Invoice Details
+    %small for invoice ##{@invoice.id}
+
+= render 'invoice_details', invoice: @invoice
+%br
+= link_to 'Back to your subscription', subscriptions_path

data/app/views/billingly/subscriptions/new.html.erb

@@ -1 +1 @@
-placeholder!
+

data/app/views/billingly_mailer/paid_notification.html.erb

@@ -4,7 +4,7 @@
 
 <%= '-' * 70 %>
 <%=t 'billingly.invoice_number' %>: <%= '%.10i' % @invoice.id %>
-<%=t 'billingly.paid_on' %>: <%= @invoice.receipt.paid_on.to_date %>
+<%=t 'billingly.paid_on' %>: <%= @invoice.paid_on.to_date %>
 <%=t 'billingly.plan' %>: <%= @invoice.subscription.description %>
 <%=t 'billingly.amount' %>: $<%= @invoice.amount %> USD
 

data/lib/billingly/engine.rb

@@ -4,7 +4,6 @@ module Billingly
   end
 
   class Engine < Rails::Engine
-    
     # Extends the ApplicationController with all the
     # billingly before_filters and helper methods
     initializer 'billingly.app_controller' do |app|
@@ -31,7 +30,7 @@ module Billingly
           # use it in your own controllers too.
           def requires_active_customer
             if requires_customer.nil? && current_customer.deactivated?
-              redirect_to(controller: 'billingly/subscriptions', action: 'index')
+              redirect_to(subscriptions_path)
             end
           end
         end
@@ -42,4 +41,3 @@ module Billingly
   end
 end
 
-

data/lib/billingly/rails/routes.rb

@@ -1,9 +1,11 @@
 class ActionDispatch::Routing::Mapper
   def add_billingly_routes(skope=nil, controller='billingly/subscriptions')
     route = lambda do 
-      resources :subscriptions, controller: controller do
+      resources :subscriptions, controller: controller, only: [:index, :create] do
         collection do
+          match 'invoice/:invoice_id' => :invoice, as: :invoice
           post :reactivate
+          post :deactivate
         end
       end
     end

data/lib/billingly/version.rb

@@ -1,3 +1,3 @@
 module Billingly
-  VERSION = "0.0.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/billingly_mailer_views_generator.rb

@@ -0,0 +1,9 @@
+require 'rails/generators'
+
+class BillinglyMailerViewsGenerator < Rails::Generators::Base
+  self.source_root([File.expand_path("../../../app/views", __FILE__)])
+
+  def create_billingly_mailer_views
+    directory 'billingly_mailer', 'app/views/billingly_mailer'
+  end
+end

data/lib/generators/billingly_views_generator.rb

@@ -0,0 +1,9 @@
+require 'rails/generators'
+
+class BillinglyViewsGenerator < Rails::Generators::Base
+  self.source_root([File.expand_path("../../../app/views", __FILE__)])
+
+  def create_billingly_views
+    directory 'billingly', 'app/views'
+  end
+end

data/lib/generators/templates/create_billingly_tables.rb

@@ -1,15 +1,16 @@
 class CreateBillinglyTables < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :billingly_customers do |t|
       t.datetime 'deactivated_since'
+      t.string 'deactivation_reason'
       t.string 'email', null: false
     end
     
     create_table :billingly_invoices do |t|
       t.references :customer, null: false
-      t.references :receipt
       t.references :subscription
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false
+      t.datetime 'paid_on'
       t.datetime 'due_on', null: false
       t.datetime 'period_start', null: false
       t.datetime 'period_end', null: false
@@ -26,20 +27,13 @@ class CreateBillinglyTables < ActiveRecord::Migration
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false
     end
     
-    create_table :billingly_receipts do |t|
-      t.references :customer, null: false
-      t.datetime 'paid_on'
-      t.timestamps
-    end
-
-    create_table :billingly_ledger_entries do |t|
+    create_table :billingly_journal_entries do |t|
       t.references :customer, null: false
       t.string :account, null: false
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false
       t.references :subscription
       t.references :invoice
       t.references :payment
-      t.references :receipt
       t.timestamps
     end
     
@@ -48,9 +42,12 @@ class CreateBillinglyTables < ActiveRecord::Migration
       t.string 'description', null: false
       t.datetime 'subscribed_on', null: false
       t.string 'periodicity', null: false
+      t.string 'grace_period', null: false
+      t.boolean 'payable_upfront', null: false, default: false
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false
       t.datetime 'unsubscribed_on'
-      t.boolean 'payable_upfront', null: false, default: false
+      t.datetime 'is_trial_expiring_on'
+      t.references :plan
       t.timestamps
     end
     
@@ -59,13 +56,11 @@ class CreateBillinglyTables < ActiveRecord::Migration
       t.string 'description' # 50GB for 9,99 a month.
       t.string 'periodicity'
       t.decimal 'amount', precision: 11, scale: 2, default: 0.0, null: false # 9.99
-      t.boolean 'payable_upfront' # true
+      t.boolean 'payable_upfront', null: false
+      t.string 'grace_period', null: false
+      t.boolean 'hidden_on'
       t.timestamps
     end
-      
-  end
-  
-  def self.down
   end
 end
 

data/lib/tasks/billingly_tasks.rake

@@ -11,6 +11,8 @@ namespace :billingly do
     Billingly::Invoice.charge_all
     puts 'Deactivating debtors'
     Billingly::Customer.deactivate_all_debtors
+    puts 'Deactivating all expired trials'
+    Billingly::Customer.deactivate_all_expired_trials
     puts 'Sending payment receipts'
     Billingly::Invoice.notify_all_paid
     puts 'Notifying pending invoices'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billingly
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70238504847900 !ruby/object:Gem::Requirement
+  requirement: &70322875786160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70238504847900
+  version_requirements: *70322875786160
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
-  requirement: &70238504847400 !ruby/object:Gem::Requirement
+  requirement: &70322875785740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70238504847400
+  version_requirements: *70322875785740
+- !ruby/object:Gem::Dependency
+  name: has_duration
+  requirement: &70322875785280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70322875785280
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70238504846940 !ruby/object:Gem::Requirement
+  requirement: &70322875784860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238504846940
+  version_requirements: *70322875784860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70238504846520 !ruby/object:Gem::Requirement
+  requirement: &70322875784440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238504846520
+  version_requirements: *70322875784440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70238504846080 !ruby/object:Gem::Requirement
+  requirement: &70322875784020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238504846080
+  version_requirements: *70322875784020
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70238504845640 !ruby/object:Gem::Requirement
+  requirement: &70322875783600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,9 +87,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238504845640
-description: Engine for subscriptions billing - still alpha - contact me if you want
-  to use it
+  version_requirements: *70322875783600
+description: Rails Engine for SaaS subscription management. Manage subscriptions,
+  plan changes, free trials and more!!!
 email:
 - nubis@woobiz.com.ar
 executables: []
@@ -87,17 +98,27 @@ extra_rdoc_files: []
 files:
 - app/controllers/billingly/subscriptions_controller.rb
 - app/mailers/billingly_mailer.rb
+- app/models/billingly/base_customer.rb
+- app/models/billingly/base_plan.rb
+- 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/views/billingly/subscriptions/_current_subscription.html.haml
+- app/views/billingly/subscriptions/_deactivation_notice.html.haml
+- app/views/billingly/subscriptions/_invoice_details.html.haml
+- app/views/billingly/subscriptions/_invoices.html.haml
+- app/views/billingly/subscriptions/_plans.html.haml
 - app/views/billingly/subscriptions/create.html.erb
-- app/views/billingly/subscriptions/index.html.erb
+- app/views/billingly/subscriptions/index.html.haml
+- app/views/billingly/subscriptions/invoice.html.haml
 - app/views/billingly/subscriptions/new.html.erb
 - app/views/billingly_mailer/overdue_notification.html.erb
 - app/views/billingly_mailer/paid_notification.html.erb
@@ -109,13 +130,16 @@ files:
 - lib/billingly/rails/routes.rb
 - lib/billingly/version.rb
 - lib/billingly.rb
+- lib/generators/billingly_mailer_views_generator.rb
 - lib/generators/billingly_migration_generator.rb
+- lib/generators/billingly_views_generator.rb
 - lib/generators/templates/create_billingly_tables.rb
 - lib/tasks/billingly_tasks.rake
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
-homepage: ''
+- README.md
+- TUTORIAL.rdoc
+homepage: http://billing.ly
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -138,6 +162,6 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Engine for subscriptions billing - still alpha - contact me if you want to
-  use it
+summary: Rails Engine for SaaS subscription management
 test_files: []
+has_rdoc: