Fix date nil

mbulat · Jan 26, 2013 · b93333e · b93333e
1 parent 1da65de
commit b93333e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/models/plutus/account.rb b/app/models/plutus/account.rb
@@ -42,10 +42,14 @@ class Account < ActiveRecord::Base
     validates_uniqueness_of :name
 
     def credits_by_date(start_date = "1900-01-01", end_date = Date.today + 15.days)
+      end_date = Date.today + 15.days if end_date.nil?
+      start_date = "1900-01-01" if start_date.nil?
       credit_amounts.includes(:transaction).where("plutus_transactions.date >= '#{start_date}' AND DATE( plutus_transactions.date) <= '#{end_date.to_s}'")
     end
 
     def debits_by_date(start_date = "1900-01-01", end_date = Date.today + 15.days)
+      end_date = Date.today + 15.days if end_date.nil?
+      start_date = "1900-01-01" if start_date.nil?
       debit_amounts.includes(:transaction).where("plutus_transactions.date >= '#{start_date}' AND DATE( plutus_transactions.date ) <= '#{end_date.to_s}'")
     end