pacioli 0.0.22 → 0.0.23

data/lib/pacioli/party.rb

@@ -30,9 +30,9 @@ module Pacioli
 
     def balance_at(date=Time.now, t_id=nil)
       if t_id.nil?
-        debits.before(date).sum(&:amount) - credits.before(date).sum(&:amount)
+        debits.before(date.end_of_day).sum(&:amount) - credits.before(date.end_of_day).sum(&:amount)
       else
-        debits.before(date).sum(&:amount) - credits.before(date).sum(&:amount)
+        debits.before(date.end_of_day).sum(&:amount) - credits.before(date.end_of_day).sum(&:amount)
       end
     end
 
@@ -41,10 +41,13 @@ module Pacioli
 
       temp_array = []
 
-      temp_array << {description: "Opening Balance", date: start_date, credit_amount: "", debit_amount: "", balance: balance_at(start_date)}
+      opening_balance = debits.before(start_date.beginning_of_day).sum(&:amount) - credits.before(start_date.beginning_of_day).sum(&:amount)
+
+      temp_array << {description: "Opening Balance", date: start_date, credit_amount: "", debit_amount: "", balance: opening_balance}
 
       #temp_array << transactions.between(start_date, end_date).map(&:to_hash)
-      running_balance = balance_at(start_date)
+      #running_balance = balance_at(start_date)
+      running_balance = opening_balance
 
       temp_array << transactions.between(start_date, end_date).map do |transaction|
         if (!transaction.journal_entry.source_documentable.blank?) && (transaction.journal_entry.source_documentable.respond_to?(:to_s))

data/lib/pacioli/transaction.rb

@@ -5,7 +5,8 @@ module Pacioli
     belongs_to :party, foreign_key: :pacioli_party_id
 
     def self.before(date=Time.now)
-      where("dated < :q", q: date.to_time.end_of_day)
+      #where("dated < :q", q: date.to_time.end_of_day)
+      where("dated < :q", q: date.to_time)
     end
 
     def self.between(start_date, end_date)

data/lib/pacioli/version.rb

@@ -1,3 +1,3 @@
 module Pacioli
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Jeffrey van Aswegen
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2494798010326809980
+      hash: -4175151152447961544
       segments: 
       - 0
       version: "0"
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2494798010326809980
+      hash: -4175151152447961544
       segments: 
       - 0
       version: "0"