billing 0.0.3 → 0.0.4a

data/test/fixtures/billing/accounts.yml

@@ -6,6 +6,8 @@
 #
 one:
   billable: one(Profile)
+  origin: one
 
 two:
   billable: one(Profile)
+  origin:

data/test/fixtures/billing/departments.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: Group1
+  tax_group: one
+  type: 
+
+two:
+  name: Group2
+  tax_group: two
+  type: 

data/test/fixtures/billing/modifiers.yml

@@ -10,5 +10,6 @@ one:
  
 two:
   account: one
+  charge: one
   fixed_value_cents: 100
   fixed_value_currency: 'USD'

data/test/fixtures/billing/operators.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  master_id: 1
+  name: MyString
+  type: 
+
+two:
+  master_id: 1
+  name: MyString
+  type: 

data/test/fixtures/billing/origins.yml

@@ -2,6 +2,8 @@
 
 one:
   name: MyString
+  payment_model: Billing::PaymentWithType
 
 two:
   name: MyString
+  payment_model: Billing::PaymentWithType

data/test/fixtures/billing/payment_types.yml

@@ -9,3 +9,19 @@ two:
   name: MyString
   cash: false
   fiscal: false
+
+cash:
+  name: Cash
+  cash: true
+  fiscal: false
+
+fiscal: 
+  name: Fiscal
+  cash: true
+  fiscal: true
+  
+card:
+  name: Card
+  cash: false
+  fiscal: true
+  

data/test/fixtures/billing/payments.yml

@@ -8,8 +8,12 @@ one:
   account: one
   value_cents: 100
   value_currency: USD
+  payment_type: one
+  type: Billing::PaymentWithType
  
 two:
   account: one
   value_cents: 200
-  value_currency: USD
+  value_currency: USD
+  payment_type: one
+  type: Billing::PaymentWithType

data/test/models/billing/account_test.rb

@@ -9,19 +9,19 @@ module Billing
     
     test "charge" do
       charge = @account.charge 3
-      assert charge.persisted?
+      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)
-      assert discount.persisted?
+      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)
-      assert surcharge.persisted?
+      surcharge = @account.modify(1.00, charge: billing_charges(:two))
+      assert surcharge.try(:persisted?)
       assert_equal '8 USD'.to_money, @account.total
     end
     
@@ -34,10 +34,23 @@ module Billing
     test "validate positive total" do
       assert @account.save
       @account.modify(-500)
-      assert @account.errors[:total]
+      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/department_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Billing
+  class DepartmentTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

data/test/models/billing/modifier_test.rb

@@ -15,5 +15,18 @@ module Billing
       # assert_equal Billing::Modifier.args_to_attributes(1, percent_ration: 0.01 ), { fixed_value: '1 USD'.to_money, percent: 0.01 }
       # assert_equal Billing::Modifier.args_to_attributes(percent_ration: 0.01), { percent_ratio: 0.01 }
     # end
+    
+    test "allow only one modifier per charge" do
+      mod = billing_modifiers(:two).dup
+      assert_equal false, mod.save
+      assert mod.errors[:charge]
+    end
+    
+    test "allow only one global account modifier" do
+      mod = billing_modifiers(:two).dup
+      assert_equal false, mod.save
+      assert mod.errors[:account]
+    end
+    
   end
 end

data/test/models/billing/operator_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Billing
+  class OperatorTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

data/test/models/billing/payment_test.rb

@@ -4,6 +4,7 @@ module Billing
   class PaymentTest < ActiveSupport::TestCase
     setup do
       @payment = billing_payments(:one)
+      @account = @payment.account
     end
     
     # test "args_to_attributes class method" do
@@ -13,5 +14,29 @@ module Billing
       # assert_equal Billing::Payment.args_to_attributes(billing_payment_type(:one)), { payment_type_id: payment_type.id }
       # assert_equal Billing::Payment.args_to_attributes(payment_type_id: 2, value: 0.23), { payment_type_id: 2, value: 0.23 }
     # 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"
+    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)
+      assert !payment.save
+      assert payment.errors.messages[:account]
+    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)
+      assert !payment.save
+      assert payment.errors.messages[:account]
+    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)
+      assert !payment.save
+      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.3
+  version: 0.0.4a
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,6 @@ files:
 - app/assets/javascripts/billing/application.js
 - app/assets/javascripts/billing/charges.js
 - app/assets/javascripts/billing/modifiers.js
-- app/assets/javascripts/billing/payments.js
 - app/assets/stylesheets/billing/accounts.css
 - app/assets/stylesheets/billing/application.css
 - app/assets/stylesheets/billing/charges.css
@@ -83,17 +96,24 @@ files:
 - app/helpers/billing/modifiers_helper.rb
 - app/helpers/billing/payments_helper.rb
 - app/models/billing/account.rb
-- app/models/billing/account_item.rb
 - app/models/billing/charge.rb
+- app/models/billing/department.rb
 - app/models/billing/modifier.rb
 - app/models/billing/modifier_items.rb
+- app/models/billing/operator.rb
 - app/models/billing/origin.rb
 - app/models/billing/payment.rb
+- app/models/billing/payment_external.rb
 - app/models/billing/payment_type.rb
+- app/models/billing/payment_type_fiscal_driver_mapping.rb
 - app/models/billing/payment_with_type.rb
+- app/models/billing/paypal_express.rb
 - app/models/billing/plu.rb
 - app/models/billing/profile.rb
+- 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
@@ -102,6 +122,7 @@ files:
 - 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
 - db/migrate/20140717181134_create_billing_charges.rb
@@ -118,6 +139,35 @@ files:
 - db/migrate/20140719110412_add_surcharges_sum_to_billing_account.rb
 - db/migrate/20140720110811_add_type_to_billing_payment.rb
 - db/migrate/20140720132559_add_type_to_billing_payment_type.rb
+- db/migrate/20140721172932_create_billing_operators.rb
+- db/migrate/20140721173106_create_billing_departments.rb
+- db/migrate/20140722160242_change_table_base_billing_tax_group.rb
+- db/migrate/20140722160258_change_table_base_billing_operator.rb
+- db/migrate/20140722160529_change_table_base_billing_payment_type.rb
+- db/migrate/20140722160902_change_table_base_billing_departments.rb
+- db/migrate/20140722161743_change_table_base_billing_plus.rb
+- db/migrate/20140722162315_change_table_base_billing_origins.rb
+- db/migrate/20140724173527_add_origin_to_billing_account.rb
+- db/migrate/20140724173917_remove_origin_and_fiscal_defice_from_billing_payment.rb
+- db/migrate/20140725122914_add_status_to_billing_payment.rb
+- db/migrate/20140725142525_eqalize_schemas_billing_charge.rb
+- db/migrate/20140725143734_eqalize_schemas_billing_department.rb
+- db/migrate/20140725145640_eqalize_schemas_billing_closure.rb
+- db/migrate/20140725145953_eqalize_schemas_billing_operators.rb
+- db/migrate/20140725150329_eqalize_schemas_billing_origin.rb
+- db/migrate/20140725151522_eqalize_schemas_billing_payment_type.rb
+- db/migrate/20140725152125_eqalize_schemas_billing_payment.rb
+- db/migrate/20140725153215_eqalize_schemas_billing_version.rb
+- db/migrate/20140725153658_eqalize_schemas_billing_pt_fp_mapping.rb
+- db/migrate/20140725164847_add_extface_job_to_billing_account.rb
+- db/migrate/20140726163220_rename_closure_to_billing_report.rb
+- db/migrate/20140726165718_remove_closure_from_billing_account.rb
+- db/migrate/20140726170002_add_report_to_billing_account.rb
+- db/migrate/20140728110230_add_autofin_and_finalized_at_to_billing_account.rb
+- db/migrate/20140729083050_add_name_to_billing_account.rb
+- 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
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb
@@ -201,7 +251,9 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/fbf1489a0c3d66a329f070c10cd77a03
 - test/fixtures/billing/accounts.yml
 - test/fixtures/billing/charges.yml
+- test/fixtures/billing/departments.yml
 - test/fixtures/billing/modifiers.yml
+- test/fixtures/billing/operators.yml
 - test/fixtures/billing/origins.yml
 - test/fixtures/billing/payment_types.yml
 - test/fixtures/billing/payments.yml
@@ -216,7 +268,9 @@ files:
 - 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
+- test/models/billing/operator_test.rb
 - test/models/billing/origin_test.rb
 - test/models/billing/payment_test.rb
 - test/models/billing/payment_type_test.rb
@@ -239,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -255,8 +309,10 @@ test_files:
 - test/fixtures/billing/plus.yml
 - test/fixtures/billing/payments.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
@@ -341,7 +397,9 @@ test_files:
 - test/models/billing/tax_group_test.rb
 - test/models/billing/account_test.rb
 - test/models/billing/plu_test.rb
+- test/models/billing/department_test.rb
 - test/models/billing/payment_test.rb
+- test/models/billing/operator_test.rb
 - test/models/billing/origin_test.rb
 - test/models/billing/profile_test.rb
 - test/models/billing/payment_type_test.rb

data/app/assets/javascripts/billing/payments.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.