ledger_accountable 0.0.7.pre → 0.0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f3873cdd4caaaaa4c8f344219e844ee8ef97283fa00fadd21a9e8859c64f2c
-  data.tar.gz: 34cea07b1a0ddd62b0b1287431e4c2269851c9b1a437dbe8e29372699a08553c
+  metadata.gz: 1276ff12e3d9530cc0828b419d62138ce14291afe0265be521ae41bbe938a629
+  data.tar.gz: 9895169c6b508de3060d4b0289093332a6df38cb68814a6e822410689579fbed
 SHA512:
-  metadata.gz: f13c5e378ea3c65ef9f917043d027b0f8ffc17179644ad29619874f8697e767ae6a5ea22db777cc6461474c83c9ef854dc7e4cd0f24d098398ffcd7b2f6711e8
-  data.tar.gz: ef5abc2f95dbae36a2a300c5ba7d1d28f4b137f4e0e87e2159c8cc4d5abe79bf64e5c4bc78909c2f12d5d1ebf24cba3cc5e32ef89a707c1133f4e34775b812b8
+  metadata.gz: 91c8da55c86246f96deb68a530dd94d17249f495cfc3b370e8837418144417c71ea12ef335a6dbd53dacbf67a721455991cd8b67d1f56b9058865653c644ce12
+  data.tar.gz: 1b43cf14d6dfbaca1453e64ab1ddd5cf2a5564dd8de76c82d33f5b94a259759cd266d8e7e5e9031c0d3c489fc42bc31891ab0ddc37e27fda952bf3c9a162dcf1

data/lib/generators/ledger_accountable/templates/ledger_entry.rb

@@ -14,6 +14,9 @@ class LedgerEntry < ActiveRecord::Base
   validates :amount_cents, presence: true
   validates :entry_type, presence: true
 
+  scope :debits, -> { where(transaction_type: :debit) }
+  scope :credits, -> { where(transaction_type: :credit) }
+
   def to_itemized_s(line_type = :line)
     I18n.t! "#{TRANSLATION_PREFIX}.#{ledger_item_type.constantize.model_name.param_key}.#{line_type}",
             metadata.symbolize_keys

data/lib/ledger_accountable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LedgerAccountable
-  VERSION = "0.0.7.pre".freeze
+  VERSION = "0.0.8.pre".freeze
 end

data/lib/ledger_accountable.rb

@@ -162,7 +162,6 @@ module LedgerAccountable
             "LedgerAccountable model '#{model_name}' specified #{self.class.ledger_amount_attribute} for track_ledger :amount, but does not implement #{self.class.ledger_amount_attribute}"
     end
 
-    ledger_amount_multiplier = self.class.transaction_type == :credit ? 1 : -1
     ledger_amount_multiplier * (send(self.class.ledger_amount_attribute) || 0)
   end
 
@@ -170,7 +169,8 @@ module LedgerAccountable
   # stored on the LedgerAccountable object
   def net_ledger_amount
     if self.class.ledger_net_amount_method
-      send(self.class.ledger_net_amount_method)
+      net_amount_result = send(self.class.ledger_net_amount_method)
+      ledger_amount_multiplier * net_amount_result
     else
       unless attribute_method?(self.class.ledger_amount_attribute.to_s)
         # if a method is provided to compute ledger_amount,
@@ -179,9 +179,9 @@ LedgerAccountable model '#{model_name}' appears to use a method for track_ledger
 but did not provide an option for :net_amount. This can lead to unexpected ledger entry amounts when modifying #{model_name}.
 "
       end
-      previous_ledger_amount = attribute_was(self.class.ledger_amount_attribute)
-      ledger_amount_multiplier = self.class.transaction_type == :credit ? 1 : -1
-      ledger_amount_multiplier * (ledger_amount - (previous_ledger_amount || 0))
+
+      previous_ledger_amount = ledger_amount_multiplier * attribute_was(self.class.ledger_amount_attribute)
+      ledger_amount - (previous_ledger_amount || 0)
     end
   end
 
@@ -353,6 +353,10 @@ but did not provide an option for :net_amount. This can lead to unexpected ledge
     end
   end
 
+  def ledger_amount_multiplier
+    self.class.transaction_type == :credit ? 1 : -1
+  end
+
   # An overrideable method to determine if the object should be persisted in the ledger
   #
   # For example, payments should not be recorded in a ledger until they're finalized

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_accountable
 version: !ruby/object:Gem::Version
-  version: 0.0.7.pre
+  version: 0.0.8.pre
 platform: ruby
 authors:
 - Brendan Maclean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord