brisk-bills 0.6.0 → 0.7.0

data/test/unit/invoice_test.rb

@@ -11,30 +11,29 @@ class InvoiceTest < ActiveSupport::TestCase
     @activity_types = ActivityType.find :all
   end
 
-  def test_only_newest_invoice_can_be_unpublished
+  def ensure_old_invoices_can_be_unpublished
     client = Factory.create_client
     
     # Once they're published they cant be unpublished unless they're the newest invoice...
     invoices = [
-      Factory.generate_invoice(100.00, :issued_on => (DateTime.now << 4), :is_published => true ),
-      Factory.generate_invoice(200.00, :issued_on => (DateTime.now << 3), :is_published => true ),
-      Factory.generate_invoice(300.00, :issued_on => (DateTime.now << 2), :is_published => true ),
-      Factory.generate_invoice(400.00, :issued_on => (DateTime.now << 1), :is_published => true )
+      Factory.generate_invoice( client, 100.00, :issued_on => (DateTime.now << 4) ),
+      Factory.generate_invoice( client, 200.00, :issued_on => (DateTime.now << 3) ),
+      Factory.generate_invoice( client, 300.00, :issued_on => (DateTime.now << 2) ),
+      Factory.generate_invoice( client, 400.00, :issued_on => (DateTime.now << 1) )
     ]
 
     invoices[0...2].each do |inv|
-      assert_raise(ActiveRecord::RecordInvalid) {set_published inv, false}
+      assert_nothing_raised(ActiveRecord::RecordInvalid) {set_published inv, false}
     end
 
     assert_nothing_raised { set_published invoices[3], false }
-    
   end
 
   def test_ensure_client_cant_be_changed
     client = Factory.create_client
     client2 = Factory.create_client :company_name => 'Client 2, Inc.'
     
-    invoice = Factory.generate_invoice 100.00, :client => client
+    invoice = Factory.generate_invoice client,  100.00
     
     assert_raise(ActiveRecord::RecordInvalid) do 
       invoice.client = client2
@@ -52,7 +51,7 @@ class InvoiceTest < ActiveSupport::TestCase
       :paid_on => (DateTime.now << 1)
     ) 
 
-    inv = Factory.generate_invoice 1000.00, :issued_on => (DateTime.now >> 12)
+    inv = Factory.generate_invoice client,  1000.00, :issued_on => (DateTime.now >> 12), :is_published => false
     
     # Change payment, save:
     assert_nothing_raised do
@@ -126,8 +125,17 @@ class InvoiceTest < ActiveSupport::TestCase
       Factory.create_adjustment.activity.id
     ]
 
-    assert_nothing_raised { invoice = Invoice.create! :client => client, :issued_on => (DateTime.now+1), :activity_types => @activity_types }
-    
+    assert_nothing_raised do
+      issued_on = (DateTime.now+1)
+
+      invoice = Invoice.create!(
+        :client => client, 
+        :issued_on => issued_on, 
+        :activity_types => @activity_types,
+        :activities => Invoice.recommended_activities_for(client, issued_on, @activity_types)
+      )
+    end
+
     # Make sure the right activities were included:
     assert_equal 4, invoice.activities.length
     invoice.activities.each { |a| assert_equal true, valid_activities.include?(a.id) }
@@ -155,10 +163,12 @@ class InvoiceTest < ActiveSupport::TestCase
     invoice = nil
     
     assert_nothing_raised do
+      issued_on = DateTime.now
       invoice = Invoice.create!(
         :client => client, 
-        :issued_on => DateTime.now,
-        :activity_types => @activity_types 
+        :issued_on => issued_on,
+        :activity_types => @activity_types,
+        :activities => Invoice.recommended_activities_for(client, issued_on, @activity_types)
       )
 
       invoice.is_published = true
@@ -167,7 +177,7 @@ class InvoiceTest < ActiveSupport::TestCase
     
     # Make sure they can't destroy:
     assert_equal false, invoice.destroy
-    
+
     # Make sure they can't update:
     invoice.comments = "This shouldn't be retained!"
     assert_raise(ActiveRecord::RecordInvalid) { invoice.save! }
@@ -221,7 +231,14 @@ class InvoiceTest < ActiveSupport::TestCase
     ]
     
     invoice = nil
-    assert_nothing_raised { invoice = Invoice.create! :client => client, :issued_on => present_date, :activity_types => @activity_types  }
+    assert_nothing_raised do
+      invoice = Invoice.create!( 
+        :client => client, 
+        :issued_on => present_date,
+        :activity_types => @activity_types,
+        :activities => Invoice.recommended_activities_for(client, present_date, @activity_types)
+      )
+    end
     
     # Make sure the right activities were included:
     assert_equal 4, invoice.activities(true).size
@@ -234,6 +251,7 @@ class InvoiceTest < ActiveSupport::TestCase
     # Now let's set to the way future:
     assert_nothing_raised do
       invoice.issued_on = present_date >> 2
+      invoice.activities = invoice.recommended_activities
       invoice.save!
     end
     
@@ -247,6 +265,7 @@ class InvoiceTest < ActiveSupport::TestCase
     # Now let's set back to present:
     assert_nothing_raised do
       invoice.issued_on = present_date
+      invoice.activities = invoice.recommended_activities
       invoice.save!
     end
     
@@ -259,22 +278,6 @@ class InvoiceTest < ActiveSupport::TestCase
     end
     
   end
-
-  def test_invoice_deletes_only_if_recent    
-    invoice_time = Time.new
-    
-    invoices = [20,40,80,160,320,640,1280].collect do |amt| 
-      invoice_time += 1.weeks
-      Factory.generate_invoice amt, :issued_on => invoice_time
-    end
-
-    while invoices.length > 0
-      0.upto(invoices.length-2)  { |i| assert_equal false, invoices[i].destroy }
-    
-      assert_not_equal false, invoices.delete_at(invoices.length-1).destroy
-    end
-    
-  end
   
   def test_activity_type_inclusions
     client = Factory.create_client
@@ -284,7 +287,7 @@ class InvoiceTest < ActiveSupport::TestCase
     a_type_map = HashWithIndifferentAccess.new
     @activity_types.each{|at| a_type_map[at.label.downcase] = at }
     
-    # First, let's Make sure this includion feature actually works during a create
+    # First, let's Make sure this inclusion feature actually works during a create
     present_date = DateTime.now
     past_date    = (present_date << 1)
     
@@ -305,7 +308,8 @@ class InvoiceTest < ActiveSupport::TestCase
       invoice = Invoice.create!(
         :client => client, 
         :issued_on => present_date, 
-        :activity_types => [ a_type_map[:material], a_type_map[:labor] ]
+        :activity_types => [ a_type_map[:material], a_type_map[:labor] ],
+        :activities => Invoice.recommended_activities_for(client, present_date, [ a_type_map[:material], a_type_map[:labor] ])
       )
     end
 
@@ -321,6 +325,7 @@ class InvoiceTest < ActiveSupport::TestCase
     # Let's remove a type and see if this works the way it should:
     assert_nothing_raised do
       invoice.activity_types.delete a_type_map[:material]
+      invoice.activities = invoice.recommended_activities
       invoice.save!
       
       # We have to expire the cache here....
@@ -339,6 +344,7 @@ class InvoiceTest < ActiveSupport::TestCase
     # Now let's add the rest of the types, and see if it works the way it should:
     assert_nothing_raised do
       invoice.activity_types.push a_type_map[:material], a_type_map[:proposal]
+      invoice.activities = invoice.recommended_activities
       invoice.save!
       
       # We have to expire the cache here....
@@ -388,15 +394,18 @@ class InvoiceTest < ActiveSupport::TestCase
 
     subactivities = [labor, material, proposal, adjustment]
     
+    present_date = DateTime.now
+    
     invoice_src = Invoice.create!(
       :client => client_src, 
-      :issued_on => DateTime.now,
-      :activity_types => @activity_types 
+      :issued_on => present_date,
+      :activity_types => @activity_types,
+      :activities => Invoice.recommended_activities_for(client_src, present_date, @activity_types)
     )
 
     invoice_dest = Invoice.create!(
       :client => client_dest, 
-      :issued_on => DateTime.now
+      :issued_on => present_date
     )
     
     subactivities.each do |activity_type|
@@ -416,6 +425,8 @@ class InvoiceTest < ActiveSupport::TestCase
       end
     end
 
+    invoice_dest.activities(true)
+    
     assert_equal 2448.99, invoice_dest.amount
     
     assert_equal 2448.99, (invoice_dest.sub_total+invoice_dest.taxes_total)
@@ -432,6 +443,8 @@ class InvoiceTest < ActiveSupport::TestCase
     assert_equal invoice_src.id, labor.activity.invoice_id
     assert_equal client_src.id, labor.activity.client_id
 
+    invoice_dest.activities(true)
+    
     assert_equal 2447.0, invoice_dest.amount
     
     assert_equal 2447.0, (invoice_dest.sub_total+invoice_dest.taxes_total)

data/test/unit/payment_test.rb

@@ -9,9 +9,9 @@ class PaymentTest < ActiveSupport::TestCase
     client = Factory.create_client
 
     invoices = []
-    
+
     [1200.00, 400, 99.99, 1500.99, 430.01].each do |amt| 
-      inv =  Factory.generate_invoice(amt)
+      inv =  Factory.generate_invoice client, amt
       
       assert_equal amt, inv.amount # THis was a weird bug we were having so I put this here...
       
@@ -23,7 +23,7 @@ class PaymentTest < ActiveSupport::TestCase
     payments = []
     
     [1200.00, 400.00, 99.99, 0.99, 1500, 400.0, 30.01].each do |amt|
-      payments << Factory.generate_payment(amt)
+      payments << Factory.generate_payment( client, amt)
     end
     
     assert_equal 0.to_money, client.balance
@@ -31,23 +31,23 @@ class PaymentTest < ActiveSupport::TestCase
     payments.delete_at(1).destroy
     
     assert_equal 400.00.to_money, client.balance
+
+    invoices.each_index { |i| assert_equal( ((i == 1) ? false : true), invoices[i].is_paid?(true) ) }
     
-    invoices.each_index { |i| assert_equal( ((i == 1) ? false : true), invoices[i].is_paid? ) }
-    
-    payments << Factory.generate_payment(174.00)
-    payments << Factory.generate_payment(15.00)
-    payments << Factory.generate_payment(10.00)
-    payments << Factory.generate_payment(201.00)
+    payments << Factory.generate_payment( client, 174.00)
+    payments << Factory.generate_payment( client, 15.00)
+    payments << Factory.generate_payment( client, 10.00)
+    payments << Factory.generate_payment( client, 201.00)
     
     assert_equal 0.0.to_money, client.balance
     
     assert_equal true, invoices[1].is_paid?
     
-    payments << Factory.generate_payment(300.20)
+    payments << Factory.generate_payment( client, 300.20)
     
     assert_equal -300.20.to_money, client.balance
 
-    invoices << Factory.generate_invoice(300.20)
+    invoices << Factory.generate_invoice( client, 300.20)
     
     assert_equal 0.to_money, client.balance
   end
@@ -55,64 +55,68 @@ class PaymentTest < ActiveSupport::TestCase
   def test_invoice_allocates_payment_credits
     client = Factory.create_client
 
-    Factory.generate_payment 230.00
-    Factory.generate_payment 70.00
+    Factory.generate_payment client,  230.00
+    Factory.generate_payment client,  70.00
     
-    invoice_one = Factory.generate_invoice 290.00, :is_published => true
+    invoice_one = Factory.generate_invoice client,  290.00
 
     assert_equal true, invoice_one.is_paid? 
     assert_equal -10.00, client.balance
     
-    Factory.generate_payment 200.00
+    Factory.generate_payment client,  200.00
     
-    invoice_two = Factory.generate_invoice 220.00, :is_published => true
+    invoice_two = Factory.generate_invoice client,  220.00
 
     assert_equal false, invoice_two.is_paid?
     assert_equal 10.00, client.balance
     
-    Factory.generate_payment 10.00
+    Factory.generate_payment client,  10.00
     
     assert_equal true, invoice_two.is_paid?
     assert_equal 0.00, client.balance
     
-    Factory.generate_payment 300.00
+    Factory.generate_payment client,  300.00
     
-    invoice_three = Factory.generate_invoice 300.00, :is_published => true
+    invoice_three = Factory.generate_invoice client,  300.00
     
     assert_equal true, invoice_three.is_paid?
     assert_equal 0.00, client.balance
   end
 
   def test_invoice_paid_on
+    client = Factory.create_client
+    
     payment_one_on =  sanitize_time(Time.now - 3.months)
     payment_two_on =  sanitize_time(Time.now - 2.months)
     payment_three_on =  sanitize_time(Time.now - 2.months)
-    
-    Factory.generate_payment 200.00, :paid_on => payment_one_on
 
-    invoice = Factory.generate_invoice 600.00, :issued_on => payment_two_on,  :is_published => true
+    payment_one = Factory.generate_payment client,  201.00, :paid_on => payment_one_on
+
+    invoice = Factory.generate_invoice client,  601.00, :issued_on => payment_two_on,  :is_published => true
     
-    payment_two = Factory.generate_payment 200.00, :paid_on => payment_two_on
-    Factory.generate_payment 200.00, :paid_on => payment_three_on
+    payment_two = Factory.generate_payment client,  200.00, :paid_on => payment_two_on
+    payment_three = Factory.generate_payment client,  200.00, :paid_on => payment_three_on
 
-    assert_equal true, invoice.is_paid?
+    assert_equal true, invoice.is_paid?(true)
     assert_equal payment_two_on, invoice.paid_on
     
     payment_two.destroy
     
-    assert_equal false, invoice.is_paid?
+    assert_equal false, invoice.is_paid?(true)
     assert_equal nil, invoice.paid_on
   end
   
   def test_whacko_payment_deletes
+    client = Factory.create_client
+    
     running_time = sanitize_time(Time.now - 1.years)
     
     payments = []
     invoices = []
     
     [2,4,8,16,32,64,128,256,512,1024].each do |amt|
-      invoice = Factory.generate_invoice( amt, :issued_on => (running_time += 2.weeks) )
-      payments << Factory.generate_payment( amt, :paid_on => (running_time += 2.weeks) )
+      invoice = Factory.generate_invoice( client, amt, :issued_on => (running_time += 2.weeks) )
+      payments << Factory.generate_payment( client,  amt, :paid_on => (running_time += 2.weeks) )
       
       assert_equal running_time, invoice.paid_on
       invoices << invoice
@@ -126,9 +130,9 @@ class PaymentTest < ActiveSupport::TestCase
 
     [1,3,5,7,9].each do |i|
       running_time += 2.weeks
-      payments << Factory.generate_payment( invoices[i].amount, :paid_on => running_time )
+      payments << Factory.generate_payment( client,  invoices[i].amount, :paid_on => running_time )
 
-      assert_equal true, invoices[i].is_paid?
+      assert_equal true, invoices[i].is_paid?(true)
       assert_equal running_time, invoices[i].paid_on
     end
     
@@ -138,7 +142,7 @@ class PaymentTest < ActiveSupport::TestCase
     
     assert_equal 682.to_money, Factory.create_client.balance
     
-    Factory.generate_payment 682, :paid_on => (running_time += 2.weeks) 
+    Factory.generate_payment client,  682, :paid_on => (running_time += 2.weeks) 
     
     [0,2,4,6,8].each { |i| assert_equal running_time, invoices[i].paid_on }
     

data/vendor/plugins/active_scaffold_full_refresh/lib/active_scaffold_full_refresh.rb

@@ -9,7 +9,7 @@ module ActiveScaffoldFullRefresh
       if successful?
         do_list unless @records
       
-        render(:update) do |page| 
+        render(:update) do |page|
           page.replace_html active_scaffold_content_id, :partial => 'list', :layout => false
           
           if on_action == :create
@@ -21,7 +21,9 @@ module ActiveScaffoldFullRefresh
           end
         end
       else
-        render :action => "#{on_action}.html.erb", :layout => false
+        render(:update) do |page|
+          page.replace_html element_form_id(:action => :update), :partial => 'update_form', :layout => false
+        end
       end
 
     else

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: brisk-bills
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Chris DeRose, DeRose Technologies, Inc.
@@ -9,79 +14,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -04:00
+date: 2010-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: extensions
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: pdf-writer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 8
         version: 1.1.8
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: slimtimer4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 4
         version: 0.2.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: money
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mysql
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 7
         version: "2.7"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id007
 description: A full-featured, rails-based system for basic accounting, with a particular focus on invoicing and automatic bill generation.
 email: cderose@derosetechnologies.com
 executables: 
@@ -246,6 +278,7 @@ files:
 - db/migrate/026_create_st_settings.rb
 - db/migrate/027_create_sessions.rb
 - db/migrate/028_money_to_cents.rb
+- db/migrate/029_invoices_with_totals_view_adjustment.rb
 - db/schema.rb
 - INSTALL
 - lib/brisk-bills/initializer.rb
@@ -309,6 +342,7 @@ files:
 - public/javascripts/effects.js
 - public/javascripts/modalbox.js
 - public/javascripts/prototype.js
+- public/javascripts/prototype.js-1.6.0.3
 - public/javascripts/scriptaculous.js
 - public/javascripts/shadedborder.js
 - public/javascripts/slider.js
@@ -638,18 +672,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: brisk-bills
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A full-featured, rails-based system for basic accounting, with a particular focus on invoicing and automatic bill generation.