erp_invoicing 3.0.2 → 3.0.3

data/app/models/billing_account.rb

@@ -1,8 +1,8 @@
 class BillingAccount < ActiveRecord::Base
   has_relational_dynamic_attributes
   acts_as_financial_txn_account
-  
 
+  belongs_to :calculate_balance_strategy_type
   has_many :invoices, :dependent => :destroy do
     def by_invoice_date
       order('invoice_date desc')
@@ -22,13 +22,21 @@ class BillingAccount < ActiveRecord::Base
   end
   has_one  :recurring_payment, :dependent => :destroy
 
+  def self.find_by_account_number(account_number)
+    self.includes(:financial_txn_account).where(:financial_txn_accounts => {:account_number => account_number.to_s}).first
+  end
+
   def has_recurring_payment_enabled?
     !self.recurring_payment.nil? and self.recurring_payment.enabled
   end
 
   def has_payments?(status)
     selected_payment_applications = self.get_payment_applications(status)
-    !(selected_payment_applications.nil? or selected_payment_applications.empty?) 
+    !(selected_payment_applications.nil? or selected_payment_applications.empty?)
+  end
+
+  def all_documents
+    (self.invoices.collect(&:document) | self.documents).flatten
   end
 
   def get_payment_applications(status=:all)
@@ -48,12 +56,27 @@ class BillingAccount < ActiveRecord::Base
     selected_payment_applications
   end
 
+  def calculate_balance
+    unless self.calculate_balance_strategy_type.nil?
+      case self.calculate_balance_strategy_type.internal_identifier
+        when 'invoices_and_payments'
+          (self.invoices.balance.amount - self.total_payments)
+        when 'payments'
+          (self.balance - self.total_payments)
+        else
+          self.balance
+      end
+    else
+      self.balance
+    end
+  end
+
   def has_outstanding_balance?
     (outstanding_balance > 0)
   end
 
   def outstanding_balance
-    (balance - total_pending_payments)
+    (calculate_balance - total_pending_payments)
   end
 
   def total_pending_payments
@@ -66,8 +89,8 @@ class BillingAccount < ActiveRecord::Base
 
   #payment due is determined by last invoice
   def payment_due
-    if self.calculate_balance and !self.invoices.empty?
-      self.invoices.by_invoice_date.last.payment_due
+    if !self.calculate_balance_strategy_type.nil? and self.calculate_balance_strategy_type.iid == 'invoices_and_payments' and !self.invoices.empty?
+      self.current_invoice.payment_due
     else
       self.financial_txn_account.payment_due.amount
     end
@@ -87,6 +110,23 @@ class BillingAccount < ActiveRecord::Base
     self.financial_txn_account.payment_due.save
   end
 
+  def balance
+    self.financial_txn_account.balance.amount
+  end
+
+  def balance=(amount, currency=Currency.usd)
+    if amount.is_a?(Array)
+      currency = amount.last
+      amount = amount.first
+    end
+    if self.financial_txn_account.balance
+      self.financial_txn_account.balance.amount = amount
+    else
+      self.financial_txn_account.balance = Money.create(:amount => amount, :currency => currency)
+    end
+    self.financial_txn_account.balance.save
+  end
+
   def billing_date
     unless self.invoices.empty?
       current_invoice.invoice_date
@@ -117,28 +157,6 @@ class BillingAccount < ActiveRecord::Base
     end
   end
 
-  #override balance to use invoices is calculate_balance is set to true
-  def balance
-    if self.calculate_balance
-      self.invoices.balance
-    else
-      (self.financial_txn_account.balance.amount - self.total_payments)
-    end
-  end
-
-  def balance=(amount, currency=Currency.usd)
-    if amount.is_a?(Array)
-      currency = amount.last
-      amount = amount.first
-    end
-    if self.financial_txn_account.balance
-      self.financial_txn_account.balance.amount = amount
-    else
-      self.financial_txn_account.balance = Money.create(:amount => amount, :currency => currency)
-    end
-    self.financial_txn_account.balance.save
-  end
-
   def current_invoice
     self.invoices.by_invoice_date.last
   end
@@ -164,7 +182,7 @@ class BillingAccount < ActiveRecord::Base
 
     unless primary_party.billing_phone_number.nil? or !previous_cmm_evt.nil?
       message = SMS_NOTIFICATION_MESSAGE.gsub('payment_due',self.payment_due.to_s)
-      
+
 
       # get cmm event purpose type
       sms_purpose = CommEvtPurposeType.find_by_internal_identifier('sms_notification')

data/app/models/calculate_balance_strategy_type.rb

@@ -0,0 +1,11 @@
+class CalculateBalanceStrategyType < ActiveRecord::Base
+  has_many :billing_accounts
+
+  def self.find_by_iid(iid)
+    self.find_by_internal_identifier(iid)
+  end
+
+  def iid
+    self.internal_identifier
+  end
+end

data/app/models/invoice.rb

@@ -4,6 +4,8 @@ class Invoice < ActiveRecord::Base
   belongs_to  :billing_account
   belongs_to	:invoice_type
   belongs_to  :invoice_payment_strategy_type
+  belongs_to  :balance, :class_name => "Money", :foreign_key => 'balance_id', :dependent => :destroy
+  belongs_to  :calculate_balance_strategy_type
   has_many    :invoice_payment_term_sets, :dependent => :destroy
   has_many    :payment_applications, :as => :payment_applied_to, :dependent => :destroy do
     def successful
@@ -52,8 +54,20 @@ class Invoice < ActiveRecord::Base
     selected_payment_applications
   end
 
-  def balance
-    (self.payment_due - self.total_payments)
+  def calculate_balance
+    unless self.calculate_balance_strategy_type.nil?
+      case self.calculate_balance_strategy_type.internal_identifier
+        when 'invoice_items_and_payments'
+          (self.items.all.sum(&:total_amount) - self.total_payments)
+        when 'payments'
+          (self.balance - self.total_payments)
+        else
+          self.balance
+      end
+    else
+      self.balance
+    end
+
   end
 
   def payment_due

data/app/models/payment_application.rb

@@ -1,11 +1,51 @@
 class PaymentApplication < ActiveRecord::Base
-  
-  belongs_to  :financial_txn, :dependent => :destroy
-  belongs_to  :payment_applied_to, :polymorphic => true
-  belongs_to  :money, :foreign_key => 'applied_money_amount_id', :dependent => :destroy
+
+  belongs_to :financial_txn, :dependent => :destroy
+  belongs_to :payment_applied_to, :polymorphic => true
+  belongs_to :money, :foreign_key => 'applied_money_amount_id', :dependent => :destroy
+
+  before_destroy :unapply_payment
 
   def is_pending?
     (self.financial_txn.is_scheduled? or self.financial_txn.is_pending?) unless self.financial_txn.nil?
   end
-  
+
+  def apply_payment
+    #check the calculate balance strategy, if it includes payments then do nothing
+    #if it doesn't include payments then update the balance on the model
+    unless self.payment_applied_to.calculate_balance_strategy_type.nil?
+      unless self.payment_applied_to.calculate_balance_strategy_type.iid =~ /payment/
+        update_applied_to_balance(:debit)
+      end
+    else
+      update_applied_to_balance(:debit)
+    end
+  end
+
+  def unapply_payment
+    #check the calculate balance strategy, if it includes payments then do nothing
+    #if it doesn't include payments then update the balance on the model
+    unless self.payment_applied_to.calculate_balance_strategy_type.nil?
+      unless self.payment_applied_to.calculate_balance_strategy_type.iid =~ /payment/
+        update_applied_to_balance(:credit)
+      end
+    else
+      update_applied_to_balance(:credit)
+    end
+  end
+
+  private
+
+  def update_applied_to_balance(type)
+    #check if payment_applied_to model has a balance= method
+    if self.payment_applied_to.respond_to?(:balance=)
+      if type == :debit
+        self.payment_applied_to.balance = self.payment_applied_to.balance - self.money.amount
+      else
+        self.payment_applied_to.balance = self.payment_applied_to.balance + self.money.amount
+      end
+      self.payment_applied_to.save
+    end
+  end
+
 end

data/db/data_migrations/20120605154637_add_calculate_balance_strategy_types.rb

@@ -0,0 +1,20 @@
+class AddCalculateBalanceStrategyTypes
+  
+  def self.up
+    [
+        ['Calculate with invoices and payments', 'invoices_and_payments'],
+        ['Calculate with payments', 'payments'],
+        ['Calculate with invoices items and payments', 'invoice_items_and_payments']
+    ].each do |item|
+      CalculateBalanceStrategyType.create(:description => item[0], :internal_identifier => item[1])
+    end
+
+  end
+  
+  def self.down
+    ['invoices_and_payments','payments', 'invoice_items_and_payments'].each do |iid|
+      CalculateBalanceStrategyType.destroy_all("internal_identifier = #{iid}")
+    end
+  end
+
+end

data/db/migrate/20120605144227_create_calcuate_balance_strategy_type.rb

@@ -0,0 +1,18 @@
+class CreateCalcuateBalanceStrategyType < ActiveRecord::Migration
+  def up
+    unless table_exists?(:calculate_balance_strategy_types)
+      create_table :calculate_balance_strategy_types do |t|
+        t.string :internal_identifier
+        t.string :description
+
+        t.timestamps
+      end
+    end
+  end
+
+  def down
+    if table_exists?(:calculate_balance_strategy_types)
+      drop_table  calculate_balance_strategy_types
+    end
+  end
+end

data/db/migrate/20120605144900_add_calculate_balance_strategy_to_billing_account.rb

@@ -0,0 +1,7 @@
+class AddCalculateBalanceStrategyToBillingAccount < ActiveRecord::Migration
+  def change
+    add_column :billing_accounts, :calculate_balance_strategy_type_id, :integer
+
+    add_index :billing_accounts, :calculate_balance_strategy_type_id
+  end
+end

data/db/migrate/20120605150425_add_balance_to_invoice.rb

@@ -0,0 +1,9 @@
+class AddBalanceToInvoice < ActiveRecord::Migration
+  def change
+    add_column :invoices, :balance_id, :integer
+    add_column :invoices, :calculate_balance_strategy_type_id, :integer
+
+    add_index   :invoices, :balance_id
+    add_index   :invoices, :calculate_balance_strategy_type_id
+  end
+end

data/lib/erp_invoicing/version.rb

@@ -2,7 +2,7 @@ module ErpInvoicing
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_invoicing
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_inventory
-  requirement: &2160818020 !ruby/object:Gem::Requirement
+  requirement: &2152724880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160818020
+  version_requirements: *2152724880
 - !ruby/object:Gem::Dependency
   name: erp_work_effort
-  requirement: &2160817520 !ruby/object:Gem::Requirement
+  requirement: &2152723880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160817520
+  version_requirements: *2152723880
 - !ruby/object:Gem::Dependency
   name: erp_commerce
-  requirement: &2160817060 !ruby/object:Gem::Requirement
+  requirement: &2152722720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160817060
+  version_requirements: *2152722720
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &2160832980 !ruby/object:Gem::Requirement
+  requirement: &2152721260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2160832980
+  version_requirements: *2152721260
 description: ErpInvoicing adds models and services to the CompassAE core to handle
   invoicing and billing functions. It includes extensions to the core ERP classes
   for accounts and things that are 'billable' (products, work efforts), and additional
@@ -90,6 +90,7 @@ files:
 - app/controllers/erp_invoicing/sms_controller.rb
 - app/helpers/erp_invoicing/application_helper.rb
 - app/models/billing_account.rb
+- app/models/calculate_balance_strategy_type.rb
 - app/models/extensions/document.rb
 - app/models/extensions/financial_txn.rb
 - app/models/extensions/financial_txn_account.rb
@@ -113,9 +114,13 @@ files:
 - db/data_migrations/20111121153349_create_bill_pay_organizer_application.rb
 - db/data_migrations/20120118181839_create_invoice_management_desktop_application.rb
 - db/data_migrations/20120229174322_add_billpay_widget.rb
+- db/data_migrations/20120605154637_add_calculate_balance_strategy_types.rb
 - db/migrate/20111121000000_invoicing_services.rb
 - db/migrate/20120228184317_add_text_to_pay_to_recurring_payments.rb
 - db/migrate/20120301155722_add_billing_date_to_billing_account.rb
+- db/migrate/20120605144227_create_calcuate_balance_strategy_type.rb
+- db/migrate/20120605144900_add_calculate_balance_strategy_to_billing_account.rb
+- db/migrate/20120605150425_add_balance_to_invoice.rb
 - lib/erp_invoicing/engine.rb
 - lib/erp_invoicing/version.rb
 - lib/erp_invoicing.rb