brisk-bills 0.7.0 → 0.8.1

data/app/views/admin/draft_invoices/batch_create.js.rjs

@@ -0,0 +1,5 @@
+form = element_form_id(:action => :batch_create)
+cancel_selector = "##{form} a.cancel".to_json
+
+page << "$$(#{cancel_selector}).first().link.close();"
+page.replace_html active_scaffold_content_id, :partial => 'list', :layout => false if @new_invoices

data/app/views/admin/invoices/confirm_publish_modal.html.erb

@@ -0,0 +1,48 @@
+<% if @record.is_published # This means we want to confirm an un-publish -%>
+  <h1>Are you sure you wish to un-publish this invoice?</h1>
+  <% if @record.payment_assignments.length > 0 -%>
+    <p>Please be aware that by un-publishing this invoice:</p>
+    <p><strong><%=h @record.name%></strong></p>
+    <p>You will be removing the following payment assignments:<p>
+    <ul>
+    <%= @record.payment_assignments.collect{|ip|
+      '<li>%s from (Payment %d)</li>' % [ip.amount.format, ip.payment_id  ] 
+    }.join %>
+    </ul>
+    <p>These payments can be re-assigned if/when you decide to re-publish this invoice.</p>
+  <% else -%>
+    <p><%=h @record.name%></p>
+    <p>This invoice currently has no payments applied to its balance, and can be safely un-published without affecting the payment register.</p>
+  <% end -%>
+<% else  # This means we want to confirm a publish  -%>
+  <h1>Would you like to email this invoice to the client?</h1>
+  <p>Shall we email this invoice:</p>
+  <p><strong><%=h @record.name%></strong></p>
+  <p>to the following recipients:</p>
+  <% if @record.client.client_representatives.length > 0 -%>
+  <ul>
+    <%= @record.client.client_representatives.find(:all, :include => [:credential]).collect{|cr| 
+    '<li>%s &lt;%s&gt;</li>' % [cr.name, cr.email_address  ] 
+    }.join %>
+  </ul>
+  <p>with the invoice included as a pdf attachment?</p>
+  <% else -%>
+    <p>(No client representatives were found)</p>
+  <% end -%>
+<% end -%>
+
+
+<% if @record.is_published %>
+  <%= toggle_published_submit 'Un-Publish...', true, :email_invoice => 1 %> 
+<% else %>
+  <%= toggle_published_submit 'Yes - send this out', true, :email_invoice => 1 %> 
+  <%= toggle_published_submit 'Nope - just publish it', false, :email_invoice => 0 %>
+<% end %>
+<span id="cancel_box"> or 
+  <%= link_to_function(
+    'Cancel & Close', 
+    "Modalbox.hide();", 
+    :title => 'Cancel & Close'
+  ) %>
+</span>
+<%= toggle_published_indicator %>

data/app/views/admin/payments/commit_payment_warning.html.erb

@@ -0,0 +1,8 @@
+<h1>This payment has not been fully allocated.</h1>
+
+<p>Are you sure you wish to commit this payment without having fully assigned its balance to an outstanding invoice(s)?</p>
+<p>
+  <%= button_to_function h("Yes, I'll assign it later"), "Modalbox.hide();$('%s').onsubmit();" % element_form_id(:action => action), :class => "MB_focusable" %>
+   or 
+  <%= link_to_function 'No, let me assign this in full', "Modalbox.hide();", :class => "MB_focusable", :title => 'No' %>
+</p>

data/app/views/admin/payments/observation_error.js.rjs

@@ -0,0 +1,28 @@
+field_id_map = @invalid_amount_columns.inject({}){|ret,column| 
+  ret.merge({column => options_for_column(column)[:id]})
+}
+
+# Highlight all these baddies:
+field_id_map.values.each do |observed_field_id|
+  page.visual_effect :highlight, observed_field_id, :duration => 3, :startcolor => "#FF0000"
+end
+
+# Revert the amount_outstanding on the affected records:
+@invalid_amount_columns.each do |invalid_column|
+
+  if Admin::PaymentsController::VALID_INVOICE_ASSIGNMENT_INPUT.match invalid_column
+    invoice_id = $1.to_i
+    
+    page.replace_html(
+      "%s_outstanding" % field_id_map[invalid_column],
+      h_money(invoice_amount_outstanding_for(@invoice_map[invoice_id], @record.id ))
+    )
+  end
+end
+
+# We can only focus one of these:
+page[ 
+  (field_id_map.has_key? @observed_column) ? 
+    field_id_map[@observed_column] : 
+    field_id_map.values.first 
+].focus

data/app/views/admin/payments/on_assignment_observation.js.rjs

@@ -0,0 +1,28 @@
+if @observed_assignment
+  # Make sure the observed input field looks properly formatted:
+  observed_column_id = options_for_column(@observed_column)[:id]
+  
+  page[observed_column_id].value = @observed_assignment.amount.to_s
+  
+  page.replace_html(
+    "%s_outstanding" % observed_column_id,
+    h_money(
+      invoice_amount_outstanding_for(@observed_invoice, @record.id, @observed_assignment.amount )
+    )
+  )
+else
+  # Make sure the input field looks properly formatted:
+  page[amount_field_id].value = @record.amount.to_s if @record.amount_in_cents_changed?
+
+  # Now let's render these guessed assignments
+  page.replace(
+    'record_invoice_assignment_%s' % @record.id , 
+    payment_assignments_form_column(@record) 
+  )
+end
+
+# Notate the unallocated_amount :
+page.replace_html(
+  amount_unallocated_field_id, 
+  :text => (@record.amount) ? h_money(@record.amount_unallocated) : t(:enter_a_payment_amount)
+)

data/app/views/authentication/{login.rhtml → login.html.erb}

@@ -44,32 +44,27 @@ remember_flash = flash[:notice] ? flash_notice( :info, flash[:notice] ) : 'To ge
 
   Event.observe( window, 'load', function() {$('email_address').focus();} );
 </script>
-<% welcome_form_box 'Sign-in' do %>
-	<% # form_remote_tag(
-#    :url => url_for(:action => params[:action]), 
-#    :before => "$('loading_indicator').style.visibility = 'visible'; new Effect.BlindUp('flash-notice', {duration: 0.20 });"
-#  ) do -%>
-    <%= hidden_field 'commit', '', :id => "commit" %>
-		<fieldset>
-			<div id="flash-notice"><%=remember_flash%></div>
-			
-			<label>E-mail address :</label>
-			<%= text_field_tag 'email_address', nil, :id => 'email_address' %>
-			
-			<div id="password">
-				<label>Password :</label>
-				<%= password_field_tag 'password', nil, :id => 'password_input' %>
-			</div>
-		</fieldset>
-	
-		<div id="login_submit">
-			<%= submit_tag 'Login', :class => 'submit', :name => '_commit', :onclick => "submit_fix('login')" %>
-			<span class="submit_note">Oops - <%= link_to_function "I forgot!", "forgot_password()" %></span>
+<% welcome_form_box('Sign-in') do %>
+  <%= hidden_field 'commit', '', :id => "commit" %>
+	<fieldset>
+		<div id="flash-notice"><%=remember_flash%></div>
+		
+		<label>E-mail address :</label>
+		<%= text_field_tag 'email_address', nil, :id => 'email_address' %>
+		
+		<div id="password">
+			<label>Password :</label>
+			<%= password_field_tag 'password', nil, :id => 'password_input' %>
 		</div>
+	</fieldset>
 
-		<div id="forgot_submit" style="display: none;">
-			<%= submit_tag 'E-mail my password!', :class => 'submit', :id => 'email_my_password', :name => '_commit', :onclick => "submit_fix('email')" %>
-			<span class="submit_note">No wait - <%= link_to_function "I remember now!", "remember()" %></span>
-		</div>
-  <% # end -%>
+	<div id="login_submit">
+		<%= submit_tag 'Login', :class => 'submit', :name => '_commit', :onclick => "submit_fix('login')" %>
+		<span class="submit_note">Oops - <%= link_to_function "I forgot!", "forgot_password()" %></span>
+	</div>
+
+	<div id="forgot_submit" style="display: none;">
+		<%= submit_tag 'E-mail my password!', :class => 'submit', :id => 'email_my_password', :name => '_commit', :onclick => "submit_fix('email')" %>
+		<span class="submit_note">No wait - <%= link_to_function "I remember now!", "remember()" %></span>
+	</div>
 <% end -%>

data/app/views/notifier/invoice_available.html.erb

@@ -0,0 +1,5 @@
+<%= render :partial => 'email_header.html' %>
+<p>Your newest is available, and is attached to this email.</p>
+
+<p><%=@payment_notice%></p>
+<%= render :partial => 'email_footer.html' %>

data/app/views/notifier/{invoice_available.plain.rhtml → invoice_available.plain.erb}

@@ -1,4 +1,4 @@
 Your newest is available, and is attached to this email.
 
 <%=@payment_notice%>
-<%= render :partial => 'email_footer.plain.rhtml' %>
+<%= render :partial => 'email_footer.plain' %>

data/app/views/notifier/{reset_password_requested.html.rhtml → reset_password_requested.html.erb}

@@ -1,4 +1,4 @@
-<%= render :partial => 'email_header.html.rhtml' %>
+<%= render :partial => 'email_header.html' %>
 <p>Hello <%=@credential_name%>,</p>
 
 <p>Recently, someone (hopefully you) requested that your password be reset on <%=h @company_name%>'s website.
@@ -12,4 +12,4 @@ Please forward this email to <a href="mailto:<%=@site_admin_email%>"><%=@site_ad
 information you may have.</p>
 
 <p>Feel free to contact us at any time for further help on resetting your password.</p>
-<%= render :partial => 'email_footer.html.rhtml' %>
+<%= render :partial => 'email_footer.html' %>

data/app/views/notifier/{reset_password_requested.plain.rhtml → reset_password_requested.plain.erb}

@@ -6,4 +6,4 @@ Recently, someone (hopefully you) requested that your password be reset on <%=h
 If this request was not initiated by you, then perhaps someone is up to no good, with your account on this system. Please forward this email to <%=@site_admin_email%> with any additional information you may have.
 
 Feel free to contact us at any time for further help on resetting your password.
-<%= render :partial => 'email_footer.plain.rhtml' %>
+<%= render :partial => 'email_footer.plain' %>

data/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -16,18 +16,19 @@ BriskBills::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
+  config.gem 'test-unit', :lib => 'test/unit', :version => '1.2.3'
+
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-
+  
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :active_record_store
 
   config.action_controller.session = { 
-    :session_key => "_briskbills_session",
+    :key => "_briskbills_session",
     :secret => 'eHqaX)DcVnzAHe2@U7*ZNcgjhFSwMz+s(OQnkd$3!BStoC4NCSIGvX'
   }
 
@@ -36,4 +37,4 @@ BriskBills::Initializer.run do |config|
 
 end
 
-ActionMailer::Base.delivery_method = :sendmail
+ActionMailer::Base.delivery_method = :sendmail

data/config/locale/en.rb

@@ -5,6 +5,15 @@
         :default => '%m/%d/%y %l:%M%P'
       }
     },
+    
+    :salt_is_missing => "Salt is missing - No Salt is a bad idea!",
+    
+    :invoice_outstanding_details => 'for Invoice #{{inv_id}} ({{issued_on}}). Currently outstanding: {{amount_outstanding}}',
+    :enter_a_payment_amount => '(Enter a Payment Amount)',
+    :no_outstanding_invoices_for_account => 'There are no outstanding invoices on this account.',
+    :choose_a_client => '(Choose a Client)',
+    :payment_method_identifier_description => 'Last four card digits, check number...',
+    
     :first_time_setup_welcome => "\nWelcome to Brisk Bills!\nWhat follows is your first-time setup 'wizard'. This task, if successful, will test your database, run your migrations, and create your first employee log-in account. To ensure success,  hit 'y' when you don't understand a question.",
     :first_time_setup_confirm_env => "\nI see we're running in the #{RAILS_ENV.inspect} environment, with the following settings:",
     :first_time_setup_confirm_env_prompt => "Is this the database environment and configuration you wish to create/use? (Y/N) : ",

data/db/migrate/001_create_employees.rb

@@ -1,6 +1,6 @@
 class CreateEmployees < ActiveRecord::Migration
   def self.up
-    create_table :employees, :options => 'TYPE=InnoDB' do |t|
+    create_table :employees do |t|
        t.string  :first_name, :last_name, :email_address, :password
        t.integer :phone_extension
 

data/db/migrate/002_create_employee_slimtimers.rb

@@ -1,6 +1,6 @@
 class CreateEmployeeSlimtimers < ActiveRecord::Migration
   def self.up
-    create_table :employee_slimtimers, :options => 'TYPE=InnoDB' do |t|
+    create_table :employee_slimtimers do |t|
        t.column :employee_id,   :integer, :null => false
        t.column :api_key,       :string
        t.column :username,      :string

data/db/migrate/003_create_slimtimer_tasks.rb

@@ -1,6 +1,6 @@
 class CreateSlimtimerTasks < ActiveRecord::Migration
   def self.up
-    create_table :slimtimer_tasks, :options => 'TYPE=InnoDB' do |t|
+    create_table :slimtimer_tasks do |t|
       # Owner id:
       t.column :owner_employee_slimtimer_id, :integer
       

data/db/migrate/004_create_slimtimer_time_entries.rb

@@ -1,6 +1,6 @@
 class CreateSlimtimerTimeEntries < ActiveRecord::Migration
   def self.up
-    create_table :slimtimer_time_entries, :options => 'TYPE=InnoDB' do |t|
+    create_table :slimtimer_time_entries do |t|
       
       t.column :employee_slimtimer_id, :integer
       t.column :slimtimer_task_id,     :integer

data/db/migrate/005_create_clients.rb

@@ -1,6 +1,6 @@
 class CreateClients < ActiveRecord::Migration
   def self.up
-    create_table :clients, :options => 'TYPE=InnoDB' do |t|
+    create_table :clients do |t|
       t.string  :company_name, :address1, :address2, :city, :state, :zip, :phone_number, :fax_number
       t.timestamps
     end

data/db/migrate/006_create_client_representatives.rb

@@ -1,6 +1,6 @@
 class CreateClientRepresentatives < ActiveRecord::Migration
   def self.up
-    create_table :client_representatives, :options => 'TYPE=InnoDB' do |t|
+    create_table :client_representatives do |t|
       t.integer  :client_id
       t.string   :first_name, :last_name, :title, :cell_phone, :email_address, :password
 #      t.boolean  :accepts_tos, :default => 0, :null => false

data/db/migrate/008_create_activities.rb

@@ -1,6 +1,6 @@
 class CreateActivities < ActiveRecord::Migration
   def self.up
-    create_table :activities, :options => 'TYPE=InnoDB' do |t|
+    create_table :activities do |t|
       t.integer   :client_id, :invoice_id
       t.boolean   :is_published, :default => 0, :null => false
       t.string    :activity_type

data/db/migrate/009_create_activity_labors.rb

@@ -1,6 +1,6 @@
 class CreateActivityLabors < ActiveRecord::Migration
   def self.up
-    create_table :activity_labors, :options => 'TYPE=InnoDB' do |t|
+    create_table :activity_labors do |t|
       
       t.integer :employee_id, :activity_id
       t.text    :comments

data/db/migrate/010_create_employee_client_labor_rates.rb

@@ -1,6 +1,6 @@
 class CreateEmployeeClientLaborRates < ActiveRecord::Migration
   def self.up
-    create_table :employee_client_labor_rates, :options => 'TYPE=InnoDB' do |t|
+    create_table :employee_client_labor_rates do |t|
       # Note : The only reason we really have an id here is b/c it makes things easier with ActiveScaffold
       t.integer   :employee_id
       t.integer   :client_id

data/db/migrate/011_create_activity_adjustments.rb

@@ -1,6 +1,6 @@
 class CreateActivityAdjustments < ActiveRecord::Migration
   def self.up
-    create_table :activity_adjustments, :options => 'TYPE=InnoDB' do |t|
+    create_table :activity_adjustments do |t|
       
       t.integer :activity_id
       t.string    :label

data/db/migrate/012_create_activity_materials.rb

@@ -1,6 +1,6 @@
 class CreateActivityMaterials < ActiveRecord::Migration
   def self.up
-    create_table :activity_materials, :options => 'TYPE=InnoDB' do |t|
+    create_table :activity_materials do |t|
       
       t.integer :activity_id
       t.string  :label

data/db/migrate/013_create_activity_proposals.rb

@@ -1,6 +1,6 @@
 class CreateActivityProposals < ActiveRecord::Migration
   def self.up
-    create_table :activity_proposals, :options => 'TYPE=InnoDB' do |t|
+    create_table :activity_proposals do |t|
       
       t.integer   :activity_id
       

data/db/migrate/014_create_invoices.rb

@@ -1,6 +1,6 @@
 class CreateInvoices < ActiveRecord::Migration
   def self.up
-    create_table :invoices, :options => 'TYPE=InnoDB' do |t|
+    create_table :invoices do |t|
       t.integer   :client_id
       t.text      :comments
       t.timestamp :issued_on

data/db/migrate/015_create_payments.rb

@@ -1,6 +1,6 @@
 class CreatePayments < ActiveRecord::Migration
   def self.up
-    create_table :payments, :options => 'TYPE=InnoDB' do |t|
+    create_table :payments do |t|
       t.integer   :client_id
       t.integer   :payment_method_id
       t.text      :payment_method_identifier  # Check No./Card Name/last four

data/db/migrate/016_create_payment_methods.rb

@@ -1,6 +1,6 @@
 class CreatePaymentMethods < ActiveRecord::Migration
   def self.up
-    create_table :payment_methods, :options => 'TYPE=InnoDB' do |t|
+    create_table :payment_methods do |t|
       t.string    :name
       
       t.timestamps

data/db/migrate/017_create_invoice_payments.rb

@@ -1,6 +1,6 @@
 class CreateInvoicePayments < ActiveRecord::Migration
   def self.up
-    create_table( :invoice_payments, :options => 'TYPE=InnoDB') do |t|
+    create_table( :invoice_payments) do |t|
       t.integer :payment_id, :invoice_id, :null => false
       t.decimal :amount, :precision => 10, :scale => 2,  :null => false
     end

data/db/migrate/018_create_activity_types.rb

@@ -1,13 +1,13 @@
 class CreateActivityTypes < ActiveRecord::Migration
   def self.up
-    create_table( :activity_types, :options => 'TYPE=InnoDB') do |t|
+    create_table( :activity_types) do |t|
       t.string  :label
       
       t.timestamps
     end
     
     # Create invoice_activity_types for habtm
-    create_table( :invoices_activity_types, :options => 'TYPE=InnoDB', :id => false ) do |t|
+    create_table( :invoices_activity_types, :id => false ) do |t|
       t.integer :invoice_id, :activity_type_id
     end