has_accounts 0.2.2 → 0.3.0

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

data/app/models/booking.rb~

@@ -0,0 +1,166 @@
+class Booking < ActiveRecord::Base
+  # Validation
+  validates_presence_of :debit_account, :credit_account, :title, :amount, :value_date
+  validates_time :value_date
+
+  # Associations
+  belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
+  belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
+
+  # Scoping
+  default_scope order('value_date, id')
+
+  scope :by_value_date, lambda {|value_date| where(:value_date => value_date) }
+  scope :by_value_period, lambda {|from, to| where(:value_date => (from..to)) }
+  
+  scope :by_account, lambda {|account_id|
+    { :conditions => ["debit_account_id = :account_id OR credit_account_id = :account_id", {:account_id => account_id}] }
+  } do
+    # Returns array of all booking titles.
+    def titles
+      find(:all, :group => :title).map{|booking| booking.title}
+    end
+    
+    # Statistics per booking title.
+    #
+    # The statistics are an array of hashes with keys title, count, sum, average.
+    def statistics
+      find(:all, :select => "title, count(*) AS count, sum(amount) AS sum, avg(amount) AS avg", :group => :title).map{|stat| stat.attributes}
+    end
+  end
+
+  scope :by_text, lambda {|value|
+    text   = '%' + value + '%'
+    
+    amount = value.delete("'").to_f
+    if amount == 0.0
+      amount = nil unless value.match(/^[0.]*$/)
+    end
+    
+    date   = nil
+    begin
+      date = Date.parse(value)
+    rescue ArgumentError
+    end
+    
+    where("title LIKE :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
+  def self.fiscal_years
+    with_exclusive_scope do
+      select("DISTINCT year(value_date) AS year").all.map{|booking| booking.year}
+    end
+  end
+
+  def self.scope_by_value_date(value_date)
+    scoping = self.default_scoping - [@by_value_scope]
+    
+    @by_value_scope = {:find => {:conditions => {:value_date => value_date}}}
+    scoping << @by_value_scope
+    
+    Thread.current["#{self}_scoped_methods"] = nil
+    self.default_scoping = scoping
+  end
+  
+  def self.filter(controller, &block)
+    if controller.value_date_scope
+      with_scope(:find => {:conditions => {:value_date => controller.value_date_scope}}, &block)
+    else
+      block.call
+    end
+  end
+  
+  # Standard methods
+  def to_s(format = :default)
+    case format
+    when :short
+      "%s: %s / %s CHF %s" % [
+        value_date ? value_date : '?',
+        credit_account ? credit_account.code : '?',
+        debit_account ? debit_account.code : '?',
+        amount ? "%0.2f" % amount : '?',
+      ]
+    else
+      "%s: %s an %s CHF %s, %s (%s)" % [
+        value_date ? value_date : '?',
+        credit_account ? "#{credit_account.title} (#{credit_account.code})" : '?',
+        debit_account ? "#{debit_account.title} (#{debit_account.code})" : '?',
+        amount ? "%0.2f" % amount : '?',
+        title.present? ? title : '?',
+        comments.present? ? comments : '?'
+      ]
+    end
+  end
+
+  # Helpers
+  def accounted_amount(account)
+    if credit_account == account
+      balance = -(amount)
+    elsif debit_account == account
+      balance = amount
+    else
+      return BigDecimal.new('0')
+    end
+
+    if account.is_asset_account?
+      return -(balance)
+    else
+      return balance
+    end
+  end
+
+  def amount_as_string
+    '%0.2f' % amount
+  end
+  
+  def amount_as_string=(value)
+    self.amount = value
+  end
+  
+  def rounded_amount
+    if amount.nil?
+    	return 0
+    else
+    	return (amount * 20).round / 20.0
+    end
+  end
+
+  # Templates
+  def booking_template_id
+    nil
+  end
+  
+  def booking_template_id=(value)
+  end
+  
+  # Reference
+  belongs_to :reference, :polymorphic => true
+  after_save :notify_references
+
+  # Safety net for form assignments
+  def reference_type=(value)
+    write_attribute(:reference_type, value) unless value.blank?
+  end
+
+  scope :by_reference, lambda {|value|
+    where(:reference_id => value.id, :reference_type => value.class.base_class)
+  } do
+    # TODO duplicated in Invoice
+    def direct_balance(direct_account)
+      balance = 0.0
+
+      for booking in all
+        balance += booking.accounted_amount(direct_account)
+      end
+
+      balance
+    end
+  end
+  
+  private
+  def notify_references
+    return unless reference and reference.respond_to?(:booking_saved)
+    reference.booking_saved(self)
+  end
+end

data/lib/has_accounts/model.rb

@@ -34,9 +34,16 @@ module HasAccounts
         self.class.direct_account
       end
 
-      def build_booking
-        booking_template = BookingTemplate.find_by_code(self.class.to_s.underscore + ':invoice')
+      # Build booking
+      def build_booking(params = {}, template_code = nil)
+        template_code ||= self.class.to_s.underscore + ':invoice'
+        booking_template = BookingTemplate.find_by_code(template_code)
         
+        # Prepare booking parameters
+        booking_params = {:value_date => value_date, :amount => amount}
+        booking_params.merge!(params)
+
+        # Build and assign booking
         booking = booking_template.build_booking(:value_date => value_date, :amount => amount)
         bookings << booking
         

data/lib/has_accounts/model.rb~

@@ -0,0 +1,51 @@
+module HasAccounts
+  module Model
+    extend ActiveSupport::Concern
+    
+    included do
+      class_inheritable_accessor :direct_account
+
+      has_many :bookings, :as => :reference, :dependent => :destroy do
+        # TODO: duplicated in Booking (without parameter)
+        def direct_balance(value_date = nil, direct_account = nil)
+          return BigDecimal.new('0') unless proxy_owner.direct_account
+          
+          direct_account ||= proxy_owner.direct_account
+          balance = BigDecimal.new('0')
+
+          direct_bookings = scoped
+          direct_bookings = direct_bookings.where("value_date <= ?", value_date) if value_date
+
+          for booking in direct_bookings.all
+            balance += booking.accounted_amount(direct_account)
+          end
+
+          balance
+        end
+      end
+    end
+
+    module ClassMethods
+    end
+    
+    module InstanceMethods
+      # Delegate to class
+      def direct_account
+        self.class.direct_account
+      end
+
+      def build_booking
+        booking_template = BookingTemplate.find_by_code(self.class.to_s.underscore + ':invoice')
+        
+        booking = booking_template.build_booking(:value_date => value_date, :amount => amount)
+        bookings << booking
+        
+        booking
+      end
+
+      def balance(value_date = nil)
+        bookings.direct_balance(value_date)
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +02:00
+date: 2011-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,9 @@ files:
 - app/models/booking.rb
 - app/models/account_type.rb
 - app/models/bank_account.rb
+- app/models/booking.rb~
 - lib/has_accounts.rb
+- lib/has_accounts/model.rb~
 - lib/has_accounts/class_methods.rb
 - lib/has_accounts/railtie.rb~
 - lib/has_accounts/core_ext/rounding.rb~