billing 0.0.4d → 0.0.4

data/test/fixtures/billing/charges.yml

@@ -5,11 +5,11 @@
 # below each fixture, per the syntax in the comments below
 #
 one:
-  bill: one
+  account: one
   price_cents: 100
   price_currency: USD
  
 two:
-  bill: one
+  account: 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:
-  bill: one
+  account: one
   percent_ratio: 1.0
  
 two:
-  bill: one
+  account: 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:
-  bill: one
+  account: one
   value_cents: 100
   value_currency: USD
   payment_type: one
   type: Billing::PaymentWithType
  
 two:
-  bill: one
+  account: one
   value_cents: 200
   value_currency: USD
   payment_type: one

data/test/helpers/billing/accounts_helper_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Billing
+  class AccountsHelperTest < ActionView::TestCase
+  end
+end

data/test/helpers/billing/charges_helper_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Billing
+  class ChargesHelperTest < ActionView::TestCase
+  end
+end

data/test/helpers/billing/modifiers_helper_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Billing
+  class ModifiersHelperTest < ActionView::TestCase
+  end
+end

data/test/helpers/billing/payments_helper_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Billing
+  class PaymentsHelperTest < ActionView::TestCase
+  end
+end

data/test/integration/navigation_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  fixtures :all
+
+  # test "the truth" do
+  #   assert true
+  # end
+end
+

data/test/models/billing/account_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+module Billing
+  class AccountTest < ActiveSupport::TestCase
+    setup do
+      @account = billing_accounts(:one)
+      @account.save! # force summary calculation
+    end
+    
+    test "charge" do
+      charge = @account.charge 3
+      assert charge.try(:persisted?)
+      assert_equal '13 USD'.to_money, @account.total # (1 + 3) + 100% + $1
+    end
+    
+    test "discount" do
+      discount = @account.modify(-1.00, charge: billing_charges(:two))
+      assert discount.try(:persisted?)
+      assert_equal '6 USD'.to_money, @account.total
+    end
+    
+    test "surcharge" do
+      surcharge = @account.modify(1.00, charge: billing_charges(:two))
+      assert surcharge.try(:persisted?)
+      assert_equal '8 USD'.to_money, @account.total
+    end
+    
+    test "pay" do
+      payment = @account.pay billing_payment_types(:one)
+      assert @account.balance.zero?, @account.errors.full_messages.join(', ')
+      assert_equal '7 USD'.to_money, @account.payments_sum
+    end
+    
+    test "validate positive total" do
+      assert @account.save
+      @account.modify(-500)
+      assert @account.errors.messages[:total]
+      assert_raise ActiveRecord::RecordInvalid do
+        @account.save!
+      end
+    end
+    
+    test "account with payments should have origin" do
+      assert @account.origin
+      assert @account.payments.any?
+      @account.origin = nil
+      assert_equal false, @account.save
+      assert @account.errors.messages[:origin]
+    end
+    
+    test "autofin" do
+      assert @account.pay billing_payment_types(:one)
+      assert @account.finalized_at
+    end
+  end
+end

data/test/models/billing/charge_test.rb

@@ -6,19 +6,12 @@ module Billing
       @charge = billing_charges(:one)
     end
     
-    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
+    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' }
     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 bill modifier" do
+    test "allow only one global account modifier" do
       mod = billing_modifiers(:two).dup
       assert_equal false, mod.save
-      assert mod.errors[:bill]
+      assert mod.errors[:account]
     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)
-      @bill = @payment.bill
+      @account = @payment.account
     end
     
     # test "args_to_attributes class method" do
@@ -16,27 +16,27 @@ module Billing
     # end
     
     test "create" do
-      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"
+      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"
     end
     
-    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)
+    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)
       assert !payment.save
-      assert payment.errors.messages[:bill]
+      assert payment.errors.messages[:account]
     end
     
-    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)
+    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)
       assert !payment.save
-      assert payment.errors.messages[:bill]
+      assert payment.errors.messages[:account]
     end
     
     test "should be single cash payments" do
-      @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)
+      @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)
       assert !payment.save
-      assert payment.errors.messages[:bill]
+      assert payment.errors.messages[:account]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.4d
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-07-31 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 for an ActiveRecord model
+description: Provides billing accounts for an ActiveRecord model
 email:
 - email@data.bg
 executables: []
@@ -76,7 +76,26 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/models/billing/bill.rb
+- 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/charge.rb
 - app/models/billing/department.rb
 - app/models/billing/modifier.rb
@@ -92,12 +111,17 @@ files:
 - app/models/billing/plu.rb
 - app/models/billing/profile.rb
 - app/models/billing/report.rb
-- app/models/billing/room_transfer.rb
 - app/models/billing/tax_group.rb
 - app/models/billing/version.rb
-- app/models/concerns/billing/bill_item.rb
-- app/models/concerns/billing/bill_text_parser.rb
-- config/initializers/money.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
 - config/initializers/paper_trail.rb
 - config/routes.rb
 - db/migrate/20140717180443_create_billing_accounts.rb
@@ -144,19 +168,19 @@ 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
-- db/migrate/20141001185321_add_transfer_device_to_billing_origin.rb
-- db/migrate/20141027235427_add_f_amount_to_billing_report.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
@@ -225,7 +249,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/bills.yml
+- test/fixtures/billing/accounts.yml
 - test/fixtures/billing/charges.yml
 - test/fixtures/billing/departments.yml
 - test/fixtures/billing/modifiers.yml
@@ -237,7 +261,12 @@ files:
 - test/fixtures/billing/profiles.yml
 - test/fixtures/billing/tax_groups.yml
 - test/fixtures/profiles.yml
-- test/models/billing/bill_test.rb
+- 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/charge_test.rb
 - test/models/billing/department_test.rb
 - test/models/billing/modifier_test.rb
@@ -264,9 +293,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -279,15 +308,19 @@ 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
@@ -356,9 +389,14 @@ 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/models/billing/room_transfer.rb

@@ -1,4 +0,0 @@
-module Billing
-  class RoomTransfer < Payment
-  end
-end

data/app/models/concerns/billing/bill_text_parser.rb

@@ -1,18 +0,0 @@
-module Billing
-  module BillTextParser
-
-    def parse_qty(qty_s)
-      nil
-    end
-    
-    def parse_plu(plu_s)
-      nil
-    end
-    
-    def parse_text(text)
-      #p text
-      text[1..-1] if text
-    end
-
-  end
-end

data/config/initializers/money.rb

@@ -1,67 +0,0 @@
-# encoding : utf-8
-
-MoneyRails.configure do |config|
-
-  # To set the default currency
-  #
-  # config.default_currency = :usd
-
-  # Set default bank object
-  #
-  # Example:
-  # config.default_bank = EuCentralBank.new
-
-  # Add exchange rates to current money bank object.
-  # (The conversion rate refers to one direction only)
-  #
-  # Example:
-  # config.add_rate "USD", "CAD", 1.24515
-  # config.add_rate "CAD", "USD", 0.803115
-
-  # To handle the inclusion of validations for monetized fields
-  # The default value is true
-  #
-  # config.include_validations = true
-
-  # Default ActiveRecord migration configuration values for columns:
-  #
-  # config.amount_column = { prefix: '',           # column name prefix
-  #                          postfix: '_cents',    # column name  postfix
-  #                          column_name: nil,     # full column name (overrides prefix, postfix and accessor name)
-  #                          type: :integer,       # column type
-  #                          present: true,        # column will be created
-  #                          null: false,          # other options will be treated as column options
-  #                          default: 0
-  #                        }
-  #
-  # config.currency_column = { prefix: '',
-  #                            postfix: '_currency',
-  #                            column_name: nil,
-  #                            type: :string,
-  #                            present: true,
-  #                            null: false,
-  #                            default: 'USD'
-  #                          }
-
-  # Register a custom currency
-  #
-  # Example:
-  # config.register_currency = {
-  #   :priority            => 1,
-  #   :iso_code            => "EU4",
-  #   :name                => "Euro with subunit of 4 digits",
-  #   :symbol              => "€",
-  #   :symbol_first        => true,
-  #   :subunit             => "Subcent",
-  #   :subunit_to_unit     => 10000,
-  #   :thousands_separator => ".",
-  #   :decimal_mark        => ","
-  # }
-
-  # Set money formatted output globally.
-  # Default value is nil meaning "ignore this option".
-  # Options are nil, true, false.
-  #
-  # config.no_cents_if_whole = nil
-  # config.symbol = nil
-end