has_accounts 0.3.0 → 0.4.0

data/app/models/booking.rb

@@ -3,10 +3,31 @@ class Booking < ActiveRecord::Base
   validates_presence_of :debit_account, :credit_account, :title, :amount, :value_date
   validates_time :value_date
 
-  # Associations
+  # Account
   belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
   belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
 
+  def direct_account
+    return nil unless reference
+    
+    return reference.direct_account if reference.respond_to? :direct_account
+  end
+  
+  def contra_account(account = nil)
+    # Derive from direct_account if available
+    account ||= direct_account
+
+    return unless account
+
+    if debit_account == account
+      return credit_account
+    elsif credit_account == account
+      return debit_account
+    else
+      return nil
+    end
+  end
+  
   # Scoping
   default_scope order('value_date, id')
 

data/app/models/booking.rb~

@@ -43,7 +43,7 @@ class Booking < ActiveRecord::Base
     rescue ArgumentError
     end
     
-    where("title LIKE :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
+    where("title LIKE :text OR remarks = :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
   }
   
   # Returns array of all years we have bookings for

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"