pacioli 0.0.16 → 0.0.17

data/lib/pacioli/party.rb

@@ -28,8 +28,12 @@ module Pacioli
       debits.sum(&:amount) - credits.sum(&:amount)
     end
 
-    def balance_at(date=Time.now)
-      debits.before(date).sum(&:amount) - credits.before(date).sum(&:amount)
+    def balance_at(date=Time.now, t_id=nil)
+      if t_id.nil?
+        debits.before(date).sum(&:amount) - credits.before(date).sum(&:amount)
+      else
+        debits.before(date).sum(&:amount) - credits.before(date).sum(&:amount)
+      end
     end
 
     def statement_between_dates(start_date, end_date=Time.now)
@@ -39,11 +43,23 @@ module Pacioli
 
       temp_array << {description: "Opening Balance", date: start_date, credit_amount: "", debit_amount: "", balance: balance_at(start_date)}
 
-      temp_array << transactions.between(start_date, end_date).map(&:to_hash)
+      #temp_array << transactions.between(start_date, end_date).map(&:to_hash)
+      running_balance = balance_at(start_date)
+
+      temp_array << transactions.between(start_date, end_date).map do |transaction|
+        if transaction.credit?
+          running_balance += transaction.amount
+          {description: transaction.journal_entry.description, date: transaction.dated, credit_amount: transaction.amount, debit_amount: "", balance: running_balance}
+        else
+          running_balance -= transaction.amount
+          {description: transaction.journal_entry.description, date: transaction.dated, debit_amount: transaction.amount, credit_amount: "", balance: running_balance}
+        end
+      end
 
       temp_array << {description: "Closing Balance", date: end_date, credit_amount: "", debit_amount: "", balance: balance_at(end_date)}
 
       temp_array.flatten
     end
+
   end
 end

data/lib/pacioli/version.rb

@@ -1,3 +1,3 @@
 module Pacioli
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pacioli
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000Z
+date: 2013-05-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70218031110540 !ruby/object:Gem::Requirement
+  requirement: &70124552565000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218031110540
+  version_requirements: *70124552565000
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70218031110040 !ruby/object:Gem::Requirement
+  requirement: &70124552564500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218031110040
+  version_requirements: *70124552564500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70218031109620 !ruby/object:Gem::Requirement
+  requirement: &70124552564080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218031109620
+  version_requirements: *70124552564080
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70218031109080 !ruby/object:Gem::Requirement
+  requirement: &70124552563540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70218031109080
+  version_requirements: *70124552563540
 description: A double-entry bookkeeping system for Ruby on Rails
 email:
 - jeffmess@gmail.com