brisk-bills 0.7.0 → 0.8.1

data/CHANGELOG

@@ -1,5 +1,12 @@
 == Change Log
 
+=== Release 0.8.0
+- Upgraded codebase to rails 2.3.8
+- *Greatly* Improved options in the payment to invoice mapping.
+- GUI Bugfixes! 
+- Revised the invoice approval and sending interfaces
+- Added new columns to list views
+
 === Release 0.7.0 (May 03, 2010)
 - Much improved invoice to payment mapping control.
 - Ability to unpublish more than one invoice, and to edit/delete older, already-published invoices

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+gem 'i18n', '0.4.2'
+gem 'rails', '2.3.16'
+gem 'rake', '0.8.7'
+gem 'pdf-writer', :git => 'git://github.com/metaskills/pdf-writer.git', :require => ['pdf/writer', 'pdf/simpletable']
+gem 'slimtimer4r', '0.2.4'
+gem 'money', '2.2.0'
+gem 'test-unit', '1.2.3'
+gem 'mysql2', '~> 0.2.7'
+gem 'extensions', '0.6.0'

data/Gemfile.lock

@@ -0,0 +1,55 @@
+GIT
+  remote: git://github.com/metaskills/pdf-writer.git
+  revision: 7f5bc6c9ce69c26574bbfde36ebdb9ecf06709d0
+  specs:
+    pdf-writer (1.2.3)
+      color (>= 1.4.0)
+      transaction-simple (~> 1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.16)
+      actionpack (= 2.3.16)
+    actionpack (2.3.16)
+      activesupport (= 2.3.16)
+      rack (~> 1.1.0)
+    activerecord (2.3.16)
+      activesupport (= 2.3.16)
+    activeresource (2.3.16)
+      activesupport (= 2.3.16)
+    activesupport (2.3.16)
+    color (1.4.1)
+    extensions (0.6.0)
+    hoe (3.5.0)
+      rake (>= 0.8, < 11.0)
+    i18n (0.4.2)
+    money (2.2.0)
+    mysql2 (0.2.18)
+    rack (1.1.6)
+    rails (2.3.16)
+      actionmailer (= 2.3.16)
+      actionpack (= 2.3.16)
+      activerecord (= 2.3.16)
+      activeresource (= 2.3.16)
+      activesupport (= 2.3.16)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    slimtimer4r (0.2.4)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    transaction-simple (1.4.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  extensions (= 0.6.0)
+  i18n (= 0.4.2)
+  money (= 2.2.0)
+  mysql2 (~> 0.2.7)
+  pdf-writer!
+  rails (= 2.3.16)
+  rake (= 0.8.7)
+  slimtimer4r (= 0.2.4)
+  test-unit (= 1.2.3)

data/TODO.txt

@@ -1,71 +1,61 @@
-* start using 0.7 pre on mario
+activities_with_prices:
 
-* Assign version numbers to the invoice based on the number of times an invoice is published...
-	* I don't know if we should/need-to adjust the invoice pdfs out here just yet ....
-	* Might as well put this in migration 29 while we're publishing anyways
-
-* (Install the rails-debugger on your laptop)
-
-Now for the final Controller Adjustments:
-  	* Invoice_id should be settable on the labor/materials/proposals/etc controllers. (though not the activities controller..not yet at least)
-  	* Invoice create/update Activity assignments will likely need to be adjusted...
-  		* Be sure to adjust any invoice_create tasks as well...
-  	
-  	* Keep in mind - we may need/want to update InvoicePayments and not just delete/create them (say an allocaed amount changes from $4.00 -> $3.00 on the same invoice/payment
-  	* let's start by adding a detail that shows what payments are currently allocated..
-  	* We don't need to get sart about allocating, unless there's 0 allocated payments whcih are currently assigned...
-  	* Show a warning if someone tries to commit a payment w/o allocating the full amount...
-  	* Don't forget to Add the right show-action fields too (in the payments controller)
-  	* There's should be a way in the invoices to show which payments were applied to the invoice... (perhaps on the edit detail - just a listing?)
-  		* Maybe this should be editable.... perhaps only if is_published?
-  	* THen we can add an edit...
-  	* Remove that restriction on unpublishing old invoices...
-  	* And then we need to add a complemntary field in the invoices view? Nah - but show which payments are currently assigned as a read-only...
+- Release gem as 'final'
 
-* Things might be a little awkward with out activity assignment if people are going back and editing old stuff... we should really have an activity selector...
+--- Put a beta version on mario? ... 
+
+* Use polymorphic relationship for sub activities
+  * I really don't like the way we're uing dont_validate_type_associations. ..
+  * See if we can get rid of the association_hacks while we're at it ...
 
-* We should add an unpublished Open Invoices controller ...
+* Translate the time into the local zone for the user, probably each user/client should have a zone associtation in their account.
+  *  Its already stored in UTC everywhere...
+  * We need to factor this into invoices too, I think
 
-* I'd like to see a payment identifier listed in the payments list ... (check no/cc#)
+* Rails 3.x?
 
-* Payment:::is_allocated should probably be added to a view and then list controller...
-	* Code is there - but no view supports it...
+* Plugin interface...
+  * We should DRY the interfaces for inheritance on the activities and invoices controllers (See  "TODO: Put in a plugin-helper?")
+  * I think the mountable apps is our good solution. Alongside a generator
+ 
+* Ideally we have that DraftInvoices/ "Batch Create" link to the left of Create..
 
-* We should put tax before cost in the activities with prices controller...
+* Assign version numbers to the invoice based on the number of times an invoice is published...
+  * I don't know if we should/need-to adjust the invoice pdfs out here just yet ....
 
-* WHen Assigning employees to labr_rates - the form stays open between updates and shouldnt...
+* Slimtimer-less time entry
+  * http://dhtmlx.com/docs/products/dhtmlxScheduler/index.shtml
 
-* Move_to_invoice function should allow us to Move_to '(Unassigned)', and ideally that would be a radio group
+* reocurring payments module with rake task
+	* DDC / GI / Ashbritt / Manny Kadre bills
+
+* Start using 0.9 on mario...
+
+* We may want to go through the controllers and modify the searches a bit:
+  config.columns[:clients].search_sql
+  config.search.columns = config.list.columns 
 
-* Start using 0.8-pre on mario...
 
 * Publish !!!!!
 ---------------
+* Things might be a little awkward with out activity assignment if people are going back and editing old stuff... we should really have an activity selector...
+
 * all delete confirms should go through the modal box
 
-* Probably - we should prompt on invoice update, when appropriate, whether to email the client. 
-	* Probably too, publish should be a row-action and not a form control
 * Probably - when prompted to delete an invoice, we should give the option to also remove the activities (or preserve them and leave them unsassigned)
 
-* Translate the time into the local zone for the user, probably each user/client should have a zone associtation in their account.
-	*  Its already stored in UTC everywhere...
-	* We need to factor this into invoices too, I think
-
 * Public interface
 
-* Showing the Client eventlogs as an unedutable nested list  might be nice... Hell, employee eventlogs too....
-
-* Publish !!!!!
+* Publish 1.0 !!!!!
 ---------------
-* CC payments handling built-in- not a plugin
 
-* Slimtimer-less time entry
+* Eventlogs as an unedutable nested list  might be nice... Hell, employee eventlogs too....
+  
+* CC payments handling built-in- not a plugin
 
 * Revise the site-settings interfaces...
 
-* Plugin interface...
-
-* Publish 0.9 !!!!!
+* Publish 1.1 !!!!!
 ---------------
 ---------------
 LONGER-TERM Features: (Needs re-prioritization...)
@@ -81,19 +71,9 @@ LONGER-TERM Features: (Needs re-prioritization...)
 
 * Drop the VIEW hacks and de-normalize the payments/invoices tables. Just 'cache' the irksome values in here
 
-* Better searches by using the search sql fields...
-
-* See what we decide to do long-term with our model_view hack, maybe we can run tests on both models, as well as their view_models. Just one by one... I think thats smart...
-
 Feature: Make the Search actually work the way we'd expect. Perhaps even make something mroe useful still that would let us filter records...
 
 BUG: We should probably write a plugin that better displays delete errors in the flash[:error] , invoices is a good place for that
-	* BTW - why does it show delete as an option here when we clearly can't delete some of these
-	* Also- it'd be nice to show a pretty record error in the invoices update, if you try to update the activities on a published invoice
-	* Create two invoices - both unpublished, try to delete the oldest one
-
-* Use polymorphic relationship for sub activities
-	* I really don't like the way we're uing dont_validate_type_associations. ..
 
 * The ability to create an activity from the activities & invoices/activities list would be sweet
 	* With a little pop-up that asks for the activity type?
@@ -104,8 +84,6 @@ BUG: We should probably write a plugin that better displays delete errors in the
 	* This gets a little complicated though - we have to decide if we're going to generate these warnings based on the date of the invoice, or the current situation
 	
 * The invoice issued_on date I think is rounding off to the end of the day on assignment. It should really be time sensitive.
-	
-* Better unit tests for Activity::* model. (too , make sure negative values work on whatever..)
 
 Plugins for 
    * Reimbursable scanning
@@ -114,9 +92,7 @@ Plugins for
 
 * An employee_rate_changed_last changed plugin would be super-useful at some point...
 
-Nice Features:
-	* Todo list.. maybe just a block? Call it an outstanding issues/projects
-	* Client Notes? Probably just a google docs link
+
 -------------------
 dd if=/dev/urandom bs=200 count=1 | tr -cd 'A-Za-z0-9!@#$%^&*()_+'; echo
 
@@ -125,10 +101,3 @@ GRANT ALL PRIVILEGES ON briskbills_development.* TO briskbills@localhost IDENTIF
 
 CREATE DATABASE `cusis_test`;
 GRANT ALL PRIVILEGES ON cusis_test.* TO cusis@localhost IDENTIFIED BY 'cut1ckle';
--------------------
-required gems:
- * extensions
- * pdf-writer
- * slimtimer4r
- * money
-

data/app/controllers/admin/activities_controller.rb

@@ -2,6 +2,7 @@ class Admin::ActivitiesController < ApplicationController
   include AdminLayoutHelper
   include ExtensibleObjectHelper
  
+  # TODO: Put in a helper?
   def self.activities_scaffold_config(&block)
     @activities_scaffold_configs ||= []
     @activities_scaffold_configs << block.to_proc  
@@ -13,6 +14,7 @@ class Admin::ActivitiesController < ApplicationController
 
     active_scaffold(:activity){|c| configs.each{|ac| ac.call c if ac.respond_to? :call} }
   end
+  # /TODO: Put in a helper?
   
   activities_scaffold_config do |config|
     config.label = "Activity Quick-Review"
@@ -31,15 +33,14 @@ class Admin::ActivitiesController < ApplicationController
     
     config.list.columns = [:activity, :occurred_on]
     
-    config.create.columns = config.update.columns =  [:occurred_on]
-    
+    config.create.columns = config.update.columns =  [:occurred_on]    
     config.full_list_refresh_on = [:update, :create, :destroy]
     
     # This allows us to use the for_activity_type parameter to selectively constriain fields to the appropriate record types.
     config.columns.instance_eval do    
 
       # Column selective inclusion, based on activity_type:
-      alias :add_without_activities :add
+      alias :add_without_activities :add unless self.respond_to? :add_without_activities
       
       def extend_activity_column(col)     
         def col.for_activity_type?(type); (for_activities.length == 0 or for_activities.include? type) ? true : false; end

data/app/controllers/admin/activities_with_prices_controller.rb

@@ -6,25 +6,34 @@ class Admin::ActivitiesWithPricesController < Admin::ActivitiesController
     config.label = "Invoice Activity"
     
     config.columns << [:cost, :tax]
-    config.list.columns = [:activity, :cost, :tax, :occurred_on]
+    config.list.columns = [:activity, :tax, :cost, :occurred_on]
         
-    config.action_links.add :move_to_invoice, :type => :record, :label => 'Move...', :crud_type => :update, :action => 'move_to_invoice'
-    
+    config.action_links.add(
+      :move_to_invoice, 
+      :type => :member, 
+      :label => 'Move...', 
+      :crud_type => :update, 
+      :action => 'move_to_invoice'
+    )
+
     config.columns[:cost].sort_by :sql => 'cost_in_cents'
-    config.columns[:tax].sort_by :sql => 'tax_in_cents'
-    
-    # This adjusts the order of the link so that move appears to the left, fugly:
-    config.action_links.instance_eval do
-      @set = @set.sort_by{ |l| ( l.action == "move_to_invoice" ) ? -1 : 1 }
-    end
+    config.columns[:tax].sort_by  :sql => 'tax_in_cents'
+  end
+  
+  # This adjusts the order of the link so that move appears to the left:
+  def action_links_order
+    links = active_scaffold_config.action_links
+    links.sort_by{ |l| ( l.action == "move_to_invoice" ) ? -1 : 1 }
   end
   
+  # TODO: Put in a plugin-helper?
   # We need to be sure the view is looking in the right place, this little hack should do it:
   def self.active_scaffold_paths
     super_view_path = BRISKBILLS_ROOT+'/app/views/admin/activities'
     @active_scaffold_overrides << super_view_path unless @active_scaffold_overrides.include? super_view_path
     super
   end
+  # /TODO
 
   # This is a little hackish - but it fixes would-be problems with the observation code
   @active_scaffold_observations = superclass.active_scaffold_observations
@@ -46,19 +55,24 @@ class Admin::ActivitiesWithPricesController < Admin::ActivitiesController
 
     if params.has_key? :move_to_invoice_id
       begin
-        invoice_dest = Invoice.find(params[:move_to_invoice_id].to_i)
-        activity.move_to_invoice invoice_dest
+        invoice_dest = (params[:move_to_invoice_id].empty?) ? 
+          nil :
+          Invoice.find(params[:move_to_invoice_id].to_i)
+
+        activity.move_to_invoice! invoice_dest
 
         do_list
         
-        flash[:warning]  = '%s successfully moved to "%s"' % [activity.label,invoice_dest.long_name]
+        flash[:warning]  = (invoice_dest) ? 
+          ('%s successfully moved to "%s"' % [activity.label,invoice_dest.long_name]) :
+          ('The %s was removed from this invoice.' % activity.label)
       rescue
         @errors_during_move << $!
       end
       
-      render :action => 'move_to_invoice.rjs'
+      render :action => 'move_to_invoice.js'
     else
-      render :action => 'move_to_invoice.rhtml', :layout => false
+      render :action => 'move_to_invoice.html', :layout => false
     end
   end
 

data/app/controllers/admin/client_accounting_controller.rb

@@ -2,7 +2,7 @@ class Admin::ClientAccountingController < ApplicationController
   include AdminLayoutHelper
   include ExtensibleObjectHelper
 
-  active_scaffold :client_accounting do |config|
+  active_scaffold :client do |config|
     config.label = "Accounts Ledger"
     
     config.create.link = nil
@@ -27,13 +27,12 @@ class Admin::ClientAccountingController < ApplicationController
     config.create.columns = [:company_name, :address1, :address2, :city, :state, :zip, :phone_number, :fax_number ]
     config.update.columns = [:company_name, :address1, :address2, :city, :state, :zip, :phone_number, :fax_number, :is_active]
 
-    config.nested.add_link "Invoices", [:invoices]
-    config.nested.add_link "Payments", [:payments]
-    config.nested.add_link "Labor Rates", [:employee_client_labor_rates]
-    config.nested.add_link "Transactions", [:client_financial_transactions]
-    
-    config.full_list_refresh_on = [:update, :destroy]
+    config.nested.add_link "Invoices", :invoices
+    config.nested.add_link "Payments", :payments
+    config.nested.add_link "Labor Rates", :employee_client_labor_rates
+    config.nested.add_link "Transactions", :client_financial_transactions
 
+    config.full_list_refresh_on = [:update, :destroy]
   end
   
   def self.active_scaffold_controller_for(klass)
@@ -44,6 +43,10 @@ class Admin::ClientAccountingController < ApplicationController
   def conditions_for_collection
     ['is_active = ?', true]
   end
-  
+
+  def custom_finder_options
+    {:from => 'clients_with_balances AS clients'}
+  end
+
   handle_extensions
 end

data/app/controllers/admin/client_representatives_controller.rb

@@ -8,23 +8,52 @@ class Admin::ClientRepresentativesController < ApplicationController
     config.columns = [:clients, :first_name, :last_name, :title, :cell_phone, :password, :login_enabled, :accepts_tos_version, :email_address, :notes, :created_at, :updated_at]
     
     config.columns[:clients].form_ui = :select
-    columns[:clients].sort_by :sql => 'clients.company_name'
+    config.columns[:clients].sort_by :sql => 'clients.company_name'
+    config.columns[:clients].search_sql = 'clients.company_name'
 
     config.columns[:email_address].includes = [:credential]
     config.columns[:email_address].sort_by :sql => "credentials.email_address"
+    config.columns[:email_address].search_sql = 'credentials.email_address'
+    
 
     config.columns[:title].label = 'Job Title'
 
-    config.list.columns = [:clients, :last_name, :first_name, :email_address]
+    # If someone tries a 'delete' when we're nested inside the clients controller,
+    # This ensures the habtm relationship is deleted, and not the record 
+    config.nested.shallow_delete = true
+
+    config.search.columns = config.list.columns = [:clients, :last_name, :first_name, :email_address]
     
     config.create.columns = config.update.columns = [:first_name, :last_name, :email_address, :password, :login_enabled, :title, :cell_phone, :clients, :notes]
     
     config.list.sorting = [{:clients => :asc},{:last_name => :asc},{:first_name => :asc}]
   end
 
-  # This fixes a weirdo activescaffold(?) bug in lib/nested.rb that causes a redirect loop when going from nested to list, in production mode...
-  def verify_action(options)
-    super(options) unless options[:only] == :add_existing
+  # We override this method b/c at some point in the new active_scaffold code, there was a bug
+  # that stopped this from being smart enough to recognize the :uniq on the client_representatives 
+  # association. in he new_existing action
+  def merge_conditions(*conditions)    
+
+    if (
+      params[:action].to_sym == :new_existing && 
+      params.has_key?(:parent_model) && 
+      params.has_key?(:eid)
+    )
+      parent_klass = params[:parent_model].constantize
+
+      # I'm not sure if table_name is the right method to use exactly - but it works here... 
+      parent_id = session["as:#{params[:eid]}"][:constraints][parent_klass.table_name.to_sym].to_i if parent_klass
+
+      parent_record = parent_klass.find parent_id if parent_id
+
+      existing_association_ids = parent_record.send('%s_ids' % params[:parent_column].singularize) if parent_record
+      
+      (existing_association_ids.try(:length) > 0) ? 
+        ['`client_representatives`.id NOT IN (?)', existing_association_ids] :
+        nil    
+    else
+      super(*conditions)
+    end
   end
 
   handle_extensions

data/app/controllers/admin/clients_controller.rb

@@ -17,7 +17,7 @@ class Admin::ClientsController < ApplicationController
     config.create.columns = [:company_name, :address1, :address2, :city, :state, :zip, :phone_number, :fax_number ]
     config.update.columns = [:company_name, :address1, :address2, :city, :state, :zip, :phone_number, :fax_number, :is_active]
 
-    config.nested.add_link "Representatives", [:client_representatives]
+    config.nested.add_link "Representatives", :client_representatives
     
     config.full_list_refresh_on = [:update, :destroy]
   end