billing 0.0.4b → 0.0.4c

data/test/fixtures/billing/charges.yml

@@ -5,11 +5,11 @@
 # below each fixture, per the syntax in the comments below
 #
 one:
-  account: one
+  bill: one
   price_cents: 100
   price_currency: USD
  
 two:
-  account: one
+  bill: one
   price_cents: 200
   price_currency: USD

data/test/fixtures/billing/modifiers.yml

@@ -5,11 +5,11 @@
 # below each fixture, per the syntax in the comments below
 #
 one:
-  account: one
+  bill: one
   percent_ratio: 1.0
  
 two:
-  account: one
+  bill: one
   charge: one
   fixed_value_cents: 100
   fixed_value_currency: 'USD'

data/test/fixtures/billing/payments.yml

@@ -5,14 +5,14 @@
 # below each fixture, per the syntax in the comments below
 #
 one:
-  account: one
+  bill: one
   value_cents: 100
   value_currency: USD
   payment_type: one
   type: Billing::PaymentWithType
  
 two:
-  account: one
+  bill: one
   value_cents: 200
   value_currency: USD
   payment_type: one

data/test/models/billing/bill_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+module Billing
+  class BillTest < ActiveSupport::TestCase
+    setup do
+      @bill = billing_bills(:one)
+      @bill.charges.each(&:save!) #update values
+      @bill.save! # force summary calculation
+    end
+    
+    test "summaries" do
+      assert_equal '4 USD'.to_money, @bill.charges_sum
+      assert_equal '5 USD'.to_money, @bill.surcharges_sum
+      assert_equal '0 USD'.to_money, @bill.discounts_sum
+      assert_equal '3 USD'.to_money, @bill.payments_sum
+      assert_equal '8 USD'.to_money, @bill.total
+      assert_equal '-5 USD'.to_money, @bill.balance
+    end
+    
+    test "charge" do
+      charge = @bill.charge 3
+      assert_difference "@bill.charges.count" do
+        assert @bill.save!
+      end
+      assert charge.persisted?
+      assert_equal '14 USD'.to_money, @bill.total # ((1+1) + 2 + 3) + 100%
+    end
+   
+    test "discount" do
+      discount = @bill.modify(-1.00, charge: billing_charges(:two))
+      c = billing_charges(:two)
+      assert_difference "@bill.modifiers.count" do
+        assert @bill.save
+      end
+      assert discount.try(:persisted?)
+      p @bill.discounts_sum
+      p @bill.surcharges_sum
+      assert_equal '6 USD'.to_money, @bill.total  # ((1+1) + (2-1)) + 100%
+    end
+=begin
+    test "surcharge" do
+      surcharge = @bill.modify(1.00, charge: billing_charges(:two))
+      assert surcharge.try(:persisted?)
+      assert_equal '8 USD'.to_money, @bill.total
+    end
+    
+    test "pay" do
+      payment = @bill.pay billing_payment_types(:one)
+      assert @bill.balance.zero?, @bill.errors.full_messages.join(', ')
+      assert_equal '7 USD'.to_money, @bill.payments_sum
+    end
+    
+    test "validate positive total" do
+      assert @bill.save
+      @bill.modify(-500)
+      assert @bill.errors.messages[:total]
+      assert_raise ActiveRecord::RecordInvalid do
+        @bill.save!
+      end
+    end
+    
+    test "bill with payments should have origin" do
+      assert @bill.origin
+      assert @bill.payments.any?
+      @bill.origin = nil
+      assert_equal false, @bill.save
+      assert @bill.errors.messages[:origin]
+    end
+    
+    test "autofin" do
+      assert @bill.pay billing_payment_types(:one)
+      assert @bill.finalized_at
+    end
+=end
+  end
+end

data/test/models/billing/charge_test.rb

@@ -6,12 +6,19 @@ module Billing
       @charge = billing_charges(:one)
     end
     
-    test "args_to_attributes class method" do
-      assert_equal Billing::Charge.args(1), { price: '1 USD'.to_money }
-      assert_equal Billing::Charge.args("1"), { price: '1 USD'.to_money }
-      assert_equal Billing::Charge.args("1 EUR"), { price: '1 EUR'.to_money }
-      assert_equal Billing::Charge.args(1, price_currency: 'USD'), { price: '1 USD'.to_money, price_currency: 'USD' }
-      assert_equal Billing::Charge.args(price: 10, price_currency: 'EUR'), { price: 10, price_currency: 'EUR' }
+    test "wild class method" do
+      assert_equal Billing::Charge.new(Billing::Charge.wild(1)).price, '1 USD'.to_money
+      assert_equal Billing::Charge.new(Billing::Charge.wild("1")).price, '1 USD'.to_money
+      assert_equal Billing::Charge.new(Billing::Charge.wild("1EUR")).price, '1 EUR'.to_money
+      assert_equal Billing::Charge.new(Billing::Charge.wild('1', price_currency: 'EUR')).price, '1 EUR'.to_money
+      assert_equal Billing::Charge.new(Billing::Charge.wild(price: 10, price_currency: 'EUR')).price, '10 EUR'.to_money
+    end
+    
+    test "string protocol" do
+      charge = Billing::Charge.new Billing::Charge.wild("2.5*3.5##{billing_plus(:one).id}@#{billing_tax_groups(:one).id}+1.5%/Umbrella")
+      assert_equal charge.price, '3.5 USD'.to_money
+      assert_equal charge.name, 'Umbrella'
+      #p charge
     end
   end
 end

data/test/models/billing/modifier_test.rb

@@ -22,10 +22,10 @@ module Billing
       assert mod.errors[:charge]
     end
     
-    test "allow only one global account modifier" do
+    test "allow only one global bill modifier" do
       mod = billing_modifiers(:two).dup
       assert_equal false, mod.save
-      assert mod.errors[:account]
+      assert mod.errors[:bill]
     end
     
   end

data/test/models/billing/payment_test.rb

@@ -4,7 +4,7 @@ module Billing
   class PaymentTest < ActiveSupport::TestCase
     setup do
       @payment = billing_payments(:one)
-      @account = @payment.account
+      @bill = @payment.bill
     end
     
     # test "args_to_attributes class method" do
@@ -16,27 +16,27 @@ module Billing
     # end
     
     test "create" do
-      assert_equal 'Billing::PaymentWithType', @account.origin_payment_model
-      assert @account.payments.create(type: 'Billing::PaymentWithType', value: 1, payment_type_id: @payment.payment_type_id).persisted?, "Can't create payment"
+      assert_equal 'Billing::PaymentWithType', @bill.origin_payment_model
+      assert @bill.payments.create(type: 'Billing::PaymentWithType', value: 1, payment_type_id: @payment.payment_type_id).persisted?, "Can't create payment"
     end
     
-    test "should be instance of account's origin_payment_model" do
-      payment = @account.payments.new(type: 'Billing::Payment', value: 1, payment_type_id: @payment.payment_type_id)
+    test "should be instance of bill's origin_payment_model" do
+      payment = @bill.payments.new(type: 'Billing::Payment', value: 1, payment_type_id: @payment.payment_type_id)
       assert !payment.save
-      assert payment.errors.messages[:account]
+      assert payment.errors.messages[:bill]
     end
     
-    test "should have same fiscal flag as other account payments" do
-      payment = @account.payments.new(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:fiscal).id)
+    test "should have same fiscal flag as other bill payments" do
+      payment = @bill.payments.new(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:fiscal).id)
       assert !payment.save
-      assert payment.errors.messages[:account]
+      assert payment.errors.messages[:bill]
     end
     
     test "should be single cash payments" do
-      @account.payments.create!(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:cash).id)
-      payment = @account.payments.new(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:cash).id)
+      @bill.payments.create!(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:cash).id)
+      payment = @bill.payments.new(type: 'Billing::PaymentWithType', value: 1, payment_type_id: billing_payment_types(:cash).id)
       assert !payment.save
-      assert payment.errors.messages[:account]
+      assert payment.errors.messages[:bill]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.4b
+  version: 0.0.4c
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides billing accounts for an ActiveRecord model
+description: Provides billing for an ActiveRecord model
 email:
 - email@data.bg
 executables: []
@@ -76,26 +76,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/billing/accounts.js
-- app/assets/javascripts/billing/application.js
-- app/assets/javascripts/billing/charges.js
-- app/assets/javascripts/billing/modifiers.js
-- app/assets/stylesheets/billing/accounts.css
-- app/assets/stylesheets/billing/application.css
-- app/assets/stylesheets/billing/charges.css
-- app/assets/stylesheets/billing/modifiers.css
-- app/assets/stylesheets/billing/payments.css
-- app/controllers/billing/accounts_controller.rb
-- app/controllers/billing/application_controller.rb
-- app/controllers/billing/charges_controller.rb
-- app/controllers/billing/modifiers_controller.rb
-- app/controllers/billing/payments_controller.rb
-- app/helpers/billing/accounts_helper.rb
-- app/helpers/billing/application_helper.rb
-- app/helpers/billing/charges_helper.rb
-- app/helpers/billing/modifiers_helper.rb
-- app/helpers/billing/payments_helper.rb
-- app/models/billing/account.rb
+- app/models/billing/bill.rb
 - app/models/billing/charge.rb
 - app/models/billing/department.rb
 - app/models/billing/modifier.rb
@@ -113,15 +94,9 @@ files:
 - app/models/billing/report.rb
 - app/models/billing/tax_group.rb
 - app/models/billing/version.rb
-- app/models/concerns/billing/account_item.rb
-- app/views/billing/accounts/index.html.erb
-- app/views/billing/accounts/new.html.erb
-- app/views/billing/accounts/show.html.erb
-- app/views/billing/application/index.html.erb
-- app/views/billing/charges/new.html.erb
-- app/views/billing/modifiers/new.html.erb
-- app/views/billing/payments/new.html.erb
-- app/views/layouts/billing/application.html.erb
+- app/models/concerns/billing/bill_item.rb
+- app/models/concerns/billing/bill_text_parser.rb
+- config/initializers/money.rb
 - config/initializers/paper_trail.rb
 - config/routes.rb
 - db/migrate/20140717180443_create_billing_accounts.rb
@@ -168,19 +143,17 @@ files:
 - db/migrate/20140729083408_add_number_to_billing_account.rb
 - db/migrate/20140729180849_add_deleted_at_to_billing_modifier.rb
 - db/migrate/20140729182146_add_deleted_at_to_billing_account.rb
+- db/migrate/20140803073707_rename_billing_account_to_bill.rb
+- db/migrate/20140804065726_add_qty_to_billing_charge.rb
+- db/migrate/20140804070517_add_tax_ratio_to_billing_charge.rb
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb
-- lib/billing/mapping.rb
-- lib/billing/routes.rb
 - lib/billing/version.rb
+- lib/collection_proxy_wild.rb
 - lib/tasks/billing.rake
 - lib/tasks/billing_tasks.rake
 - test/billing_test.rb
-- test/controllers/billing/accounts_controller_test.rb
-- test/controllers/billing/charges_controller_test.rb
-- test/controllers/billing/modifiers_controller_test.rb
-- test/controllers/billing/payments_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -249,7 +222,7 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/efaa0abeb4ad44b0ef8df996631f3997
 - test/dummy/tmp/cache/assets/test/sprockets/f393277b28dd79320611f18a379dbea7
 - test/dummy/tmp/cache/assets/test/sprockets/fbf1489a0c3d66a329f070c10cd77a03
-- test/fixtures/billing/accounts.yml
+- test/fixtures/billing/bills.yml
 - test/fixtures/billing/charges.yml
 - test/fixtures/billing/departments.yml
 - test/fixtures/billing/modifiers.yml
@@ -261,12 +234,7 @@ files:
 - test/fixtures/billing/profiles.yml
 - test/fixtures/billing/tax_groups.yml
 - test/fixtures/profiles.yml
-- test/helpers/billing/accounts_helper_test.rb
-- test/helpers/billing/charges_helper_test.rb
-- test/helpers/billing/modifiers_helper_test.rb
-- test/helpers/billing/payments_helper_test.rb
-- test/integration/navigation_test.rb
-- test/models/billing/account_test.rb
+- test/models/billing/bill_test.rb
 - test/models/billing/charge_test.rb
 - test/models/billing/department_test.rb
 - test/models/billing/modifier_test.rb
@@ -308,19 +276,15 @@ test_files:
 - test/fixtures/billing/origins.yml
 - test/fixtures/billing/plus.yml
 - test/fixtures/billing/payments.yml
+- test/fixtures/billing/bills.yml
 - test/fixtures/billing/charges.yml
 - test/fixtures/billing/departments.yml
 - test/fixtures/billing/modifiers.yml
 - test/fixtures/billing/profiles.yml
 - test/fixtures/billing/operators.yml
-- test/fixtures/billing/accounts.yml
 - test/fixtures/billing/tax_groups.yml
 - test/fixtures/profiles.yml
 - test/test_helper.rb
-- test/controllers/billing/payments_controller_test.rb
-- test/controllers/billing/modifiers_controller_test.rb
-- test/controllers/billing/accounts_controller_test.rb
-- test/controllers/billing/charges_controller_test.rb
 - test/dummy/tmp/cache/assets/test/sprockets/6d34e4addaf3495d1d96306d164feb97
 - test/dummy/tmp/cache/assets/test/sprockets/efaa0abeb4ad44b0ef8df996631f3997
 - test/dummy/tmp/cache/assets/test/sprockets/e62907e54633a2adb53c33c1f59b79bf
@@ -389,14 +353,9 @@ test_files:
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/Rakefile
-- test/helpers/billing/accounts_helper_test.rb
-- test/helpers/billing/payments_helper_test.rb
-- test/helpers/billing/modifiers_helper_test.rb
-- test/helpers/billing/charges_helper_test.rb
-- test/integration/navigation_test.rb
 - test/models/billing/tax_group_test.rb
-- test/models/billing/account_test.rb
 - test/models/billing/plu_test.rb
+- test/models/billing/bill_test.rb
 - test/models/billing/department_test.rb
 - test/models/billing/payment_test.rb
 - test/models/billing/operator_test.rb

data/app/assets/javascripts/billing/accounts.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/billing/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/app/assets/javascripts/billing/charges.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/billing/modifiers.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/billing/accounts.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/app/assets/stylesheets/billing/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/assets/stylesheets/billing/charges.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/app/assets/stylesheets/billing/modifiers.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/app/assets/stylesheets/billing/payments.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/app/controllers/billing/accounts_controller.rb

@@ -1,29 +0,0 @@
-require_dependency "billing/application_controller"
-
-module Billing
-  class AccountsController < ApplicationController
-    before_action :set_account, except: [:index, :new, :create]
-    
-    def index
-      @accounts = billable.billing_accounts
-    end
-    
-    def new
-      @account = billable.billing_accounts.new
-    end
-    
-    def create
-      @account = billable.billing_accounts.new
-      if @account.save
-        redirect_to @account
-      else
-        render action: :new
-      end
-    end
-    
-    private
-      def set_account
-        @account = billable.billing_accounts.find(params[:id]) 
-      end
-  end
-end