erp_invoicing 3.0.4 → 3.0.5

data/app/controllers/erp_invoicing/erp_app/organizer/bill_pay/accounts_controller.rb

@@ -66,7 +66,7 @@ module ErpInvoicing
             @total_payment = params[:total_payment]
 
             money = Money.create(
-              :amount => @total_payment.to_f,
+              :amount => @total_payment.to_d,
               :description => "Online Payment",
               :currency => Currency.usd
             )
@@ -79,40 +79,46 @@ module ErpInvoicing
             financial_txn.save
 
             @billing_account_payment_amts.each do |hash|
-              amount = hash[:amount].to_f rescue 0
+              amount = hash[:amount].to_d rescue 0
               if amount > 0
                 comment = (params[:short_payment_comment] and hash[:short_payment]) ? params[:short_payment_comment] : nil
                 PaymentApplication.create(
                   :financial_txn => financial_txn,
                   :payment_applied_to => hash[:billing_account],
-                  :money => Money.create(:amount => hash[:amount].to_f),
+                  :money => Money.create(:amount => amount),
                   :comment => comment
                 )
               end
             end
 
-            if financial_txn.apply_date == Date.today
-              case @payment_account.class.to_s
+            #if financial_txn.apply_date == Date.today
+            case @payment_account.class.to_s
               when "BankAccount"
                 financial_txn.txn_type = BizTxnType.ach_sale
                 financial_txn.save
-                result = @payment_account.purchase(financial_txn, ErpCommerce::Config.active_merchant_gateway_wrapper)
-                if !result[:payment].nil? and result[:payment].success
-                  @authorization_code = result[:payment].authorization_code
-                else
-                  @message = result[:message]
+                
+                if financial_txn.apply_date == Date.today
+                  result = @payment_account.purchase(financial_txn, ErpCommerce::Config.active_merchant_gateway_wrapper)
+                  if !result[:payment].nil? and result[:payment].success
+                    @authorization_code = result[:payment].authorization_code
+                  else
+                    @message = result[:message]
+                  end
                 end
               when "CreditCardAccount"
                 financial_txn.txn_type = BizTxnType.cc_sale
                 financial_txn.save
-                result = @payment_account.purchase(financial_txn, params[:cvv], ErpCommerce::Config.active_merchant_gateway_wrapper)
-                if !result[:payment].nil? and result[:payment].success
-                  @authorization_code = result[:payment].authorization_code
-                else
-                  @message = result[:message]
+                
+                if financial_txn.apply_date == Date.today
+                  result = @payment_account.purchase(financial_txn, params[:cvv], ErpCommerce::Config.active_merchant_gateway_wrapper)
+                  if !result[:payment].nil? and result[:payment].success
+                    @authorization_code = result[:payment].authorization_code
+                  else
+                    @message = result[:message]
+                  end
                 end
-              end
             end
+            
 
             if @message.nil?
               render :json => {:success => true, :message => "Payment Successful!" }
@@ -145,7 +151,7 @@ module ErpInvoicing
             billing_account_payment_amts = []
             billing_account = BillingAccount.find(params["billing_account_id"])
             amount = params[:total_payment]
-            billing_account_payment_amts << {:billing_account => billing_account, :amount => amount, :short_payment => (amount.to_f < billing_account.balance)}
+            billing_account_payment_amts << {:billing_account => billing_account, :amount => amount, :short_payment => (amount.to_d < billing_account.balance)}
 
             billing_account_payment_amts
           end

data/app/controllers/erp_invoicing/erp_app/shared/files_controller.rb

@@ -12,16 +12,16 @@ module ErpInvoicing
           clear_files
 
           result = {}
-          upload_path = request.env['HTTP_EXTRAPOSTDATA_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_EXTRAPOSTDATA_DIRECTORY']
-          name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-          data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
+          upload_path = params[:directory]
+          name = params[:name]
+          data = request.raw_post
 
           begin
             @invoice.add_file(data, File.join(base_path, name))
             result = {:success => true}
           rescue Exception=>ex
-            logger.error ex.message
-            logger.error ex.backtrace.join("\n")
+            Rails.logger.error ex.message
+            Rails.logger.error ex.backtrace.join("\n")
             result = {:success => false, :error => "Error uploading file."}
           end
 

data/app/controllers/erp_invoicing/erp_app/shared/invoices_controller.rb

@@ -129,7 +129,7 @@ module ErpInvoicing
         def create_invoice_item
           data = params[:data]
           invoice = Invoice.find(params[:invoice_id])
-          invoice_item = InvoiceItem.create(:amount => data[:amount].to_f, :quantity => data[:quantity], :item_description => data[:item_description])
+          invoice_item = InvoiceItem.create(:amount => data[:amount].to_d, :quantity => data[:quantity], :item_description => data[:item_description])
           invoice.items << invoice_item
 
           {:success => true,
@@ -146,7 +146,7 @@ module ErpInvoicing
         def update_invoice_item
           data = params[:data]
           invoice_item = InvoiceItem.find(data[:id])
-          invoice_item.amount = data[:amount].to_f
+          invoice_item.amount = data[:amount].to_d
           invoice_item.quantity = data[:quantity]
           invoice_item.item_description = data[:item_description]
           invoice_item.save

data/app/controllers/erp_invoicing/sms_controller.rb

@@ -87,7 +87,7 @@ module ErpInvoicing
       @payment_date = Date.today
       
       money = Money.create(
-        :amount => @amount.to_f,
+        :amount => @amount.to_d,
         :description => "Clicktopay Payment Applied",
         :currency => Currency.usd
       )

data/app/models/billing_account.rb

@@ -1,5 +1,4 @@
 class BillingAccount < ActiveRecord::Base
-  has_relational_dynamic_attributes
   acts_as_financial_txn_account
 
   belongs_to :calculate_balance_strategy_type
@@ -62,12 +61,13 @@ class BillingAccount < ActiveRecord::Base
         when 'invoices_and_payments'
           (self.invoices.balance.amount - self.total_payments)
         when 'payments'
-          (self.balance - self.total_payments)
+          balance_amt = (self.balance - self.total_payments)
+          balance_amt == 0 ? 0 : balance_amt.round(2)
         else
-          self.balance
+          self.balance == 0 ? 0 : self.balance.round(2)
       end
     else
-      self.balance
+      self.balance == 0 ? 0 : self.balance.round(2)
     end
   end
 
@@ -76,7 +76,8 @@ class BillingAccount < ActiveRecord::Base
   end
 
   def outstanding_balance
-    (calculate_balance - total_pending_payments)
+     outstanding_balance_amt = (calculate_balance - total_pending_payments)
+     outstanding_balance_amt == 0 ? 0 : outstanding_balance_amt.round(2)
   end
 
   def total_pending_payments

data/app/models/recurring_payment.rb

@@ -9,7 +9,7 @@ class RecurringPayment < ActiveRecord::Base
         if payment_amount < self.pay_up_to_amount
 
           money = Money.create(
-            :amount => payment_amount.to_f,
+            :amount => payment_amount.to_d,
             :description => "AutoPayment",
             :currency => Currency.usd
           )

data/db/migrate/20111121000000_invoicing_services.rb

@@ -75,9 +75,9 @@ class InvoicingServices < ActiveRecord::Migration
         #non-key columns
         t.integer    :item_seq_id
         t.string     :item_description
-        t.float      :sales_tax
-        t.float      :quantity
-        t.float      :amount
+        t.decimal    :sales_tax, :precision => 8, :scale => 2
+        t.decimal    :quantity, :precision => 8, :scale => 2
+        t.decimal    :amount, :precision => 8, :scale => 2
         
         t.timestamps
       end
@@ -151,8 +151,8 @@ class InvoicingServices < ActiveRecord::Migration
       create_table :recurring_payments do |t|
         t.references :payment_account, :polymorphic => true
         t.references :billing_account
-        t.float    :pay_up_to_amount
-        t.float    :payment_amount
+        t.decimal    :pay_up_to_amount, :precision => 8, :scale => 2
+        t.decimal    :payment_amount, :precision => 8, :scale => 2
         t.integer  :payment_day
         t.date     :from_date
         t.date     :thru_date
@@ -217,7 +217,7 @@ class InvoicingServices < ActiveRecord::Migration
         #non-key columns
         t.string :description
         t.date :pay_by
-        t.float :amount
+        t.decimal :amount, :precision => 8, :scale => 2
 
         t.timestamps
       end

data/lib/erp_invoicing/version.rb

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

data/public/javascripts/erp_app/shared/billing_accounts_grid_panel.js

@@ -42,8 +42,6 @@ Ext.define("Compass.ErpApp.Shared.BillingAccountsGridPanel",{
   addDocument : function(rec){
     var uploadWindow = new Compass.ErpApp.Shared.UploadWindow({
       standardUploadUrl:'/erp_invoicing/erp_app/shared/billing_accounts/'+rec.get('id')+'/upload_file',
-      flashUploadUrl:'/erp_invoicing/erp_app/shared/billing_accounts/'+rec.get('id')+'/upload_file',
-      xhrUploadUrl:'/erp_invoicing/erp_app/shared/billing_accounts/'+rec.get('id')+'/upload_file',
       extraPostData:{}
     });
     uploadWindow.show();
@@ -262,7 +260,7 @@ Ext.define("Compass.ErpApp.Shared.BillingAccountsGridPanel",{
         width:100,
         dataIndex: 'payment_due',
         renderer:function(v){
-          return v.toFixed(2);
+          return parseFloat(v).toFixed(2);
         },
         editor:{
           xtype:'numberfield'
@@ -273,7 +271,7 @@ Ext.define("Compass.ErpApp.Shared.BillingAccountsGridPanel",{
         width:100,
         dataIndex: 'balance',
         renderer:function(v){
-          return v.toFixed(2);
+          return parseFloat(v).toFixed(2);
         },
         editor:{
           xtype:'numberfield'

data/public/javascripts/erp_app/shared/invoices_grid_panel.js

@@ -5,8 +5,6 @@ Ext.define("Compass.ErpApp.Shared.InvoicesGridPanel",{
   addDocument : function(rec){
     var uploadWindow = new Compass.ErpApp.Shared.UploadWindow({
       standardUploadUrl:'/erp_invoicing/erp_app/shared/invoices/files/'+rec.get('id')+'/upload_file',
-      flashUploadUrl:'/erp_invoicing/erp_app/shared/invoices/files/'+rec.get('id')+'/upload_file',
-      xhrUploadUrl:'/erp_invoicing/erp_app/shared/invoices/files/'+rec.get('id')+'/upload_file',
       extraPostData:{}
     });
     uploadWindow.show();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_invoicing
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_inventory
-  requirement: &70249999417200 !ruby/object:Gem::Requirement
+  requirement: &70232070628880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249999417200
+  version_requirements: *70232070628880
 - !ruby/object:Gem::Dependency
   name: erp_work_effort
-  requirement: &70249999412520 !ruby/object:Gem::Requirement
+  requirement: &70232070628360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249999412520
+  version_requirements: *70232070628360
 - !ruby/object:Gem::Dependency
   name: erp_commerce
-  requirement: &70249999424560 !ruby/object:Gem::Requirement
+  requirement: &70232070627820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70249999424560
+  version_requirements: *70232070627820
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70249999420280 !ruby/object:Gem::Requirement
+  requirement: &70232070627200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70249999420280
+  version_requirements: *70232070627200
 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