brisk-bills 0.7.0 → 0.8.1

data/app/helpers/admin/is_active_column_helper.rb

@@ -1,7 +1,7 @@
 module Admin::IsActiveColumnHelper
 
   # This is for the Client and Employees controller itself:
-  def is_active_form_column(record, input_name)
+  def is_active_form_column(record, options)
     input_id = 'record_is_active'
 
     confirm_prompt = 
@@ -14,7 +14,7 @@ module Admin::IsActiveColumnHelper
     modalbox_params = { :title => 'Confirm De-activation', :width => 300}
 
     select_tag(
-      input_name, 
+      options[:name], 
       options_for_select( [ ["Yes", 'true'], ["No", 'false'] ], record.is_active.to_s ),
       :id => input_id
     )+

data/app/helpers/admin/labors_helper.rb

@@ -2,7 +2,18 @@ module Admin::LaborsHelper
   include ExtensibleObjectHelper
   include Admin::ActivityTypeFieldHelper
   
-  def duration_column(record)
+  alias :activity_labor_tax_column :tax_column
+  alias :activity_labor_cost_column :cost_column
+  
+  alias :activity_labor_occurred_on_form_column :occurred_on_form_column
+  alias :activity_labor_client_form_column :client_form_column
+  alias :activity_labor_cost_form_column :cost_form_column
+  
+  alias :activity_labor_tax_form_column :tax_form_column
+  alias :activity_labor_comments_form_column :comments_form_column 
+  
+  
+  def activity_labor_duration_column(record)
     h record.friendly_duration
   end
 

data/app/helpers/admin/labors_helper/slimtimer_helper.rb

@@ -1,6 +1,6 @@
 module Admin::LaborsHelper
   
-  def slimtimer_task_form_column(record, input_name)
+  def activity_labor_slimtimer_task_form_column(record, options)
     begin
       slimtimer_task_name = @record.slimtimer_time_entry.slimtimer_task.name
     rescue

data/app/helpers/admin/materials_helper.rb

@@ -2,4 +2,15 @@ module Admin::MaterialsHelper
   include ::Admin::ActivityTypeFieldHelper
   include ::Admin::ActivityTaxFieldHelper
   
+  alias :activity_material_tax_column :tax_column
+  alias :activity_material_cost_column :cost_column
+  
+  alias :activity_material_occurred_on_form_column :occurred_on_form_column
+  alias :activity_material_client_form_column :client_form_column
+  alias :activity_material_cost_form_column :cost_form_column
+  
+  alias :activity_material_tax_form_column :tax_form_column
+  alias :activity_material_comments_form_column :comments_form_column 
+  
+  alias :activity_material_apply_tax_form_column :apply_tax_form_column
 end

data/app/helpers/admin/payments_helper.rb

@@ -1,47 +1,222 @@
 module Admin::PaymentsHelper
   include Admin::IsActiveColumnHelper
   
-  def amount_column(record)
+  def payment_is_allocated_column(record)
+    record.is_allocated? ? 'Yes' : 'No'
+  end
+  
+  def payment_amount_column(record)
     h_money record.amount
   end
+  
+  def payment_client_form_column(record, options)
+    (record.new_record?) ?
+      select_tag(
+        "record[client][id]", 
+        options_for_select(
+          [["- select -", nil]]+Client.find(:all, :order => 'company_name ASC').collect{|c| [c.company_name, c.id] },
+          record.client_id
+        ), 
+        options_for_column('client')
+      ) :
+      span_field(h(record.client.company_name))
+  end
+  
+  def payment_paid_on_form_column(record, options)
+    (record.new_record?) ?
+      input(:record, :paid_on, options_for_column('paid_on')) :
+      span_field(h(record.paid_on.strftime('%m/%d/%y %I:%M %p')))
+  end
 
-  def payment_method_identifier_form_column(record, input_name)
-    text_field_tag(
-      input_name, 
-      record.payment_method_identifier, 
-      options_for_column('payment_method_identifier').merge({:size => 30})
-    )
+  def payment_amount_form_column(record, options)
+    (record.new_record?) ?
+      text_field_tag(
+        options[:name], 
+        record.amount, 
+        options_for_column('amount').merge( {:size => 8, :class=>'text-input' } )
+      ) :
+      span_field(h_money(record.amount)) 
+  end
+
+  def payment_payment_method_form_column(record, options)
+    (record.new_record?) ?
+      select_tag(
+        "record[payment_method][id]", 
+        options_for_select(
+          [["- select -", nil]]+PaymentMethod.find(:all, :order => 'name ASC').collect{|pm| [pm.name, pm.id] },
+          record.payment_method_id
+        ), 
+        options_for_column('payment_method')
+      ) :
+      span_field(h(record.payment_method.name))
   end
 
-  def amount_unallocated_form_column(record, input_name)
-    '<span class="active-scaffold_detail_value" id="record_amount_unallocated_%s">%s</span>' % [record.id, '(Enter a Payment Amount)']
+  def payment_payment_method_identifier_form_column(record, options)
+    (record.new_record?) ?
+      text_field_tag(
+        options[:name], 
+        record.payment_method_identifier, 
+        options_for_column('payment_method_identifier').merge( {:size => 30, :class=>'text-input' } )
+      )+span_field(t(:payment_method_identifier_description), :class => "description") :
+      span_field(h(record.payment_method_identifier)) 
+  end
+
+  def payment_amount_unallocated_form_column(record, options)
+    span_field(
+      (record.amount) ? h_money(record.amount_unallocated) : t(:enter_a_payment_amount),
+      :id => ('record_amount_unallocated_%s' % record.id)
+    )
   end
   
-  def invoice_assignments_column(record)
+  def payment_assignments_column(record)
     record.invoice_assignments.collect{|ia| 
       '%s to Invoice %d' % [ia.amount.format, ia.invoice.id   ]
     }.join ', '
   end
   
-  def invoice_assignment_form_column(record, input_name)
-#    list_i = nil
-#    
-#    Client.find(:all, :order => 'company_name ASC').in_groups_of((Client.count(:all).to_f/3).ceil, false).collect{ |group|
-#      '<ul class="checkbox-list">'+
-#        group.collect{ |client|
-#          list_i = (list_i) ? list_i+1 : 0
-#          chk_name = "%s[%d][id]" % [input_name, client.id]
-#          
-#          '<li>%s<label for="%s[%d][id]">%s</label></li>' % [ 
-#            check_box_tag(chk_name, client.id, record.client_ids.include?(client.id) ), 
-#            chk_name,
-#            list_i,
-#            client.company_name
-#          ]
-#        }.join+
-#      '</ul>'
-#    }.join
-    '<div id="record_invoice_assignment_%s">%s</div>' % [record.id, '<span class="active-scaffold_detail_value">(Choose a Client)</span>']
+  def payment_invoice_assignments_column(record)
+    record.invoice_assignments.collect{ |asgn|
+      '%s to (Invoice %d)' % [asgn.amount.format, asgn.invoice_id  ]
+    }.join ', '
   end
+  
+  def payment_assignments_form_column(record, options = nil)
+    content_tag(:div, :id => 'record_invoice_assignment_%s' % record.id ) do
+      if record.client
+        
+        # First, we show the easy, upaid invoices. These should always be visible:
+        show_invoices = record.client.unpaid_invoices.to_a
+        
+        # Now - we add any additional invoices that might be around from existing assignments (the case for an edit...)
+        record.invoice_assignments.each do |inv_asgn|
+          show_invoices << inv_asgn.invoice unless show_invoices.find{|show_inv| show_inv.id == inv_asgn.invoice_id}
+        end
+
+        # And now let's sort everything by the id
+        show_invoices = show_invoices.sort!{|a,b| a.id <=> b.id }
+          
+        if show_invoices.length > 0
+          
+          assignment_observation = @active_scaffold_observations.find{|o| o[:action] == :on_assignment_observation}.dup
+          
+          assignment_observation[:fields] += show_invoices.collect{ |inv|
+            'invoice_assignments_%d_amount' % inv.id
+          }
+
+          # This is a look-up map that will tell us the field values to use below:
+          inv_assignments = record.invoice_assignments.inject({}){|ret,ia| ret.merge({ia.invoice_id => ia.amount}) }
+
+          content_tag(:ul, :class => 'invoice_assignment_inputs') do
+            show_invoices.collect{|inv|
+              col_name = 'invoice_assignments_%d_amount' % inv.id
+              
+              assignment_amount = nil
+              assignment_amount = (inv_assignments.has_key? inv.id) ? inv_assignments[inv.id] : '0.00' if record.amount
 
+              '<li>%s%s %s</li>' % [
+                text_field_tag( 
+                    'record[invoice_assignments][%d][amount]' % inv.id, 
+                    assignment_amount, 
+                    :size  => 8, 
+                    :class => 'text-input',
+                    :id    => options_for_column(col_name)[:id]
+                ),
+                active_scaffold_observe_field(col_name,assignment_observation),
+                t(
+                  :invoice_outstanding_details,
+                  :inv_id => inv.id, 
+                  :issued_on => h(inv.issued_on.strftime('%m/%d/%y')),
+                  :amount_outstanding => span_field(
+                    h_money(invoice_amount_outstanding_for(inv, record.id,inv_assignments[inv.id])),
+                    :id => ('%s_outstanding' % options_for_column(col_name)[:id])
+                  )
+                )
+              ]
+            }.join
+          end
+        else
+          span_field t(:no_outstanding_invoices_for_account)
+        end
+      else
+        span_field t(:choose_a_client)
+      end  
+    end
+
+  end
+
+  # This keeps our rjs files a little DRY-er
+  def amount_field_id
+    "record_amount_%s" % @record.id
+  end
+
+  # This keeps our rjs files a little DRY-er
+  def amount_unallocated_field_id
+    "record_amount_unallocated_%s" % @record.id  
+  end
+  
+  # All this craziness exists to show a modal dialog asking the user to confirm any payment that isn't fully allocated.
+  def submit_tag(*args)
+    if (/\A(?:#{as_(:update)}|#{as_(:create)})\Z/.match args[0])
+      action = args[0] == as_(:update) ? :update : :create 
+      
+      button_to_function( 
+        args[0], 
+        "amt_unalloc = $$('#record_amount_unallocated_%s span');
+        if (amt_unalloc.length > 0 && amt_unalloc.first().innerHTML != '%s') {
+          show_modal_after_close(%s,%s);
+        } else {
+          $('%s').onsubmit();
+        }" % [
+          @record.id,
+          Money.new(0).format,
+          render(:file => 'admin/payments/commit_payment_warning.html.erb', :layout => false, :locals => {:action => action}).to_json,
+          {:title => 'Are you sure you wish to save?', :width => 600}.to_json,
+          element_form_id(:action => action)
+        ],
+        args[1]
+      )
+    else
+      super(*args)
+    end
+  end
+
+  private
+  
+  # This method is a little weird. But, its used in a couple places to determine what the amount oustanding
+  # is for an invoice, after the provided payment_id has been removied, and after the provided amount
+  # has been applied. Its not as efficient as I'd like. But, it works
+  def invoice_amount_outstanding_for(invoice, payment_id, amount = nil)
+    invoice.amount-(
+      invoice.payment_assignments.to_a.reject{|ip| 
+        payment_id == ip.payment_id
+      }.inject(Money.new(0)){|ret, ip| 
+        ret+ip.amount
+      }+(
+        (amount) ? amount : Money.new(0)
+      )
+    )
+  end
+  
+  def span_field(content, options = {})
+    content_tag(
+      :span, 
+      content, 
+      {:class => 'active-scaffold_detail_value' }.merge(options)
+    )    
+  end
+
+  # We write this as an overide on the default behavior. Nothing needs to change in the case that this is a
+  # new record. But, if we're editing, a number of our input fields aren't on the page. For this
+  # case, we need to not query these for their value
+  def active_scaffold_observe_field(col_name, observation) 
+    unless @record.new_record?
+      # We won't be observing anything if its one of these columns
+      return %{} if /\A(?:client|amount)\Z/.match col_name
+      
+      # Its an amount column. For these, just remove the $F reference to the removed fields
+      ["client", "amount"].each{ |f| observation[:fields].delete f}
+    end
+    
+    super col_name, observation
+  end
 end

data/app/helpers/admin/proposals_helper.rb

@@ -1,3 +1,13 @@
 module Admin::ProposalsHelper
   include Admin::ActivityTypeFieldHelper
+  
+  alias :activity_proposal_tax_column :tax_column
+  alias :activity_proposal_cost_column :cost_column
+  
+  alias :activity_proposal_occurred_on_form_column :occurred_on_form_column
+  alias :activity_proposal_client_form_column :client_form_column
+  alias :activity_proposal_cost_form_column :cost_form_column
+  
+  alias :activity_proposal_tax_form_column :tax_form_column
+  alias :activity_proposal_comments_form_column :comments_form_column 
 end

data/app/helpers/admin/settings_helper.rb

@@ -1,7 +1,7 @@
 module Admin::SettingsHelper
   
   %w(description keyname label).each do |col|
-    define_method('%s_form_column' % col) { |record, input_name| h record.send(col) }
+    define_method('setting_%s_form_column' % col) { |record, input_name| h record.send(col) }
   end
   
   

data/app/helpers/admin_layout_helper.rb

@@ -54,7 +54,8 @@ module AdminLayoutHelper
       end
 
       admin.item 'Accounts Ledger', controller_url("Admin/Client_Accounting") do |accounting|
-        accounting.item 'Invoices', controller_url("Admin/Invoices")
+        accounting.item 'All Invoices', controller_url("Admin/Invoices")
+        accounting.item 'Draft Invoices', controller_url("Admin/draft_invoices")
         accounting.item 'Payments', controller_url("Admin/Payments")
       end
 
@@ -74,17 +75,13 @@ module AdminLayoutHelper
     url_for :controller => for_controller, :only_path => true
   end
 
-  def index_with_admin_helper
-    redirect_to :action => :list
-  end
-
   def self.append_features(base)
     super
     
     base.class_eval do
       layout 'admin'
       
-      alias :index :index_with_admin_helper
+      
     end
   end
 

data/app/helpers/authentication_helper.rb

@@ -39,15 +39,12 @@ module AuthenticationHelper
   def welcome_form_box(name, &block)
     logo_w=120
 
-    concat(
-      '%s<div id="%s_welcome" class="welcome_box clearfix"><h1>%s</h1>%s' % [ 
-        image_tag('brisk-bills-logo.gif', :size => '%dx%d' % [logo_w, 300.to_f/316*logo_w], :alt => "Brisk Bills"),
-        name.underscore, 
-        h(name), 
-        image_tag('login-form-spinner.gif', :size => '32x32', :style => 'visibility: hidden', :id => 'loading_indicator') 
-      ],
-      block.binding
-    )
+    concat('%s<div id="%s_welcome" class="welcome_box clearfix"><h1>%s</h1>%s' % [ 
+      image_tag('brisk-bills-logo.gif', :size => '%dx%d' % [logo_w, 300.to_f/316*logo_w], :alt => "Brisk Bills"),
+      name.underscore, 
+      h(name), 
+      image_tag('login-form-spinner.gif', :size => '32x32', :style => 'visibility: hidden', :id => 'loading_indicator') 
+    ])
     form_remote_tag(
       {
       :url => url_for(:action => params[:action]), 
@@ -55,7 +52,7 @@ module AuthenticationHelper
       },
       &block
     )
-    concat '</div>', block.binding
+    concat('</div>')
   end
 
 end

data/app/helpers/money_model_helper.rb

@@ -5,7 +5,6 @@ module MoneyModelHelper
     super
     
     base.class_eval do
-      super
       
       # This prevents a NoMethodError: undefined method `amount_before_type_cast' error when validations kick-in
       def method_missing(symbol, *params)
@@ -18,4 +17,4 @@ module MoneyModelHelper
       
     end
   end
-end
+end

data/app/models/activity.rb

@@ -81,28 +81,38 @@ class Activity < ActiveRecord::Base
   end
   
   def authorized_for?(options)
+    return true unless options.try(:[],:action)
+    
     case options[:action].to_s
-      when /^(update|destroy)$/
+      when /^(edit|delete)$/
         (is_published?) ? false : true
       else
         true
     end
   end
   
-  def move_to_invoice(dest)        
+  def move_to_invoice!(dest)        
     dest_invoice = (dest.class == Integer) ? Invoice.find(dest) : dest
 
     raise StandardError, "Can't move an already-published activity." if is_published?
-    raise StandardError, "Can't move an activity to an already published invoice." if dest_invoice.is_published?
+    raise StandardError, "Can't move an activity to an already published invoice." if dest_invoice.try(:is_published?)
 
-    self.invoice_id = dest_invoice.id
-    self.client_id = dest_invoice.client_id
-    
+    if dest_invoice.nil?
+      self.invoice_id =  nil
+
+      # OMG - this took me forever to figure out. It *seems* there's some bug in rails 2.3.8 that's 
+      # causing this not to update from the above statement, when we're setting the association to nil
+      # Weirder still - this only happens when transactions are enabled. (Such as when we're in test:units!)
+      @changed_attributes["invoice_id"] = nil
+    else
+      self.invoice_id = (dest_invoice.nil?) ? nil : dest_invoice.id
+      self.client_id = dest_invoice.client_id
+    end
 
     @dont_validate_type_associations = true
     save!
     @dont_validate_type_associations = false
   end
-  
+ 
   handle_extensions
 end