pacioli 0.0.24 → 0.0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,11 +17,21 @@ module Pacioli
17
17
  end
18
18
 
19
19
  def debits
20
- transactions.where(type: 'Pacioli::Debit')
20
+ #transactions.where(type: 'Pacioli::Debit')
21
+ transactions.select(&:debit?)
21
22
  end
22
23
 
23
24
  def credits
24
- transactions.where(type: 'Pacioli::Credit')
25
+ #transactions.where(type: 'Pacioli::Credit')
26
+ transactions.select(&:credit?)
27
+ end
28
+
29
+ def debits_before(date)
30
+ debits.select {|debit| debit.dated < date}
31
+ end
32
+
33
+ def credits_before(date)
34
+ credits.select {|credit| credit.dated < date}
25
35
  end
26
36
 
27
37
  def balance
@@ -30,9 +40,9 @@ module Pacioli
30
40
 
31
41
  def balance_at(date=Time.now, t_id=nil)
32
42
  if t_id.nil?
33
- debits.before(date.end_of_day).sum(&:amount) - credits.before(date.end_of_day).sum(&:amount)
43
+ debits_before(date.end_of_day).sum(&:amount) - credits_before(date.end_of_day).sum(&:amount)
34
44
  else
35
- debits.before(date.end_of_day).sum(&:amount) - credits.before(date.end_of_day).sum(&:amount)
45
+ debits_before(date.end_of_day).sum(&:amount) - credits_before(date.end_of_day).sum(&:amount)
36
46
  end
37
47
  end
38
48
 
@@ -41,7 +51,7 @@ module Pacioli
41
51
 
42
52
  temp_array = []
43
53
 
44
- opening_balance = debits.before(start_date.beginning_of_day).sum(&:amount) - credits.before(start_date.beginning_of_day).sum(&:amount)
54
+ opening_balance = debits_before(start_date.beginning_of_day).sum(&:amount) - credits_before(start_date.beginning_of_day).sum(&:amount)
45
55
 
46
56
  temp_array << {description: "Opening Balance", date: start_date, credit_amount: "", debit_amount: "", balance: opening_balance}
47
57
 
@@ -1,3 +1,3 @@
1
1
  module Pacioli
2
- VERSION = "0.0.24"
2
+ VERSION = "0.0.25"
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 24
9
- version: 0.0.24
8
+ - 25
9
+ version: 0.0.25
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jeffrey van Aswegen
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - ">="
145
145
  - !ruby/object:Gem::Version
146
- hash: -3667679331752578579
146
+ hash: 126084501359836884
147
147
  segments:
148
148
  - 0
149
149
  version: "0"
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
152
152
  requirements:
153
153
  - - ">="
154
154
  - !ruby/object:Gem::Version
155
- hash: -3667679331752578579
155
+ hash: 126084501359836884
156
156
  segments:
157
157
  - 0
158
158
  version: "0"