Pratt 1.6.2 → 1.6.4

data/models/invoice_whence.rb

@@ -0,0 +1,18 @@
+class InvoiceWhence < ActiveRecord::Base
+	belongs_to :invoice
+	belongs_to :whence
+
+    def self.migrate which = :up 
+      ActiveRecord::Schema.define do
+        if which == :up
+          create_table :invoice_whences do |t|
+            t.references :invoice
+			t.references :whence
+			t.datetime :created_at
+          end
+        elsif which == :down
+          drop_table :invoice_whences
+        end
+      end
+    end
+end

data/models/payment.rb

@@ -2,7 +2,7 @@ class Payment < ActiveRecord::Base
   belongs_to :billable, :polymorphic => true
 
   def pretty_print
-    "$%0.2f"% (rate/100)
+    "$%0.2f"% (rate/100.0)
   end
 
   class << self

data/models/pratt.rb

@@ -6,14 +6,5 @@ class Pratt
       cond = [(cond << "start_at BETWEEN ? AND ?").join(' AND ')] | [when_to.send("beginning_of_#{scale}"), when_to.send("end_of_#{scale}")] unless scale.nil?
       cond
     end
-
-    def spent what
-      Proc.new {|*scale_when|
-        scale, when_to = scale_when
-        what.send(:all, :conditions => conditions_for_time_spent(scale, when_to) ).inject(0.0) {|total, whence| 
-          total += ( whence.end_at - whence.start_at )
-        } / 3600
-      }
-    end
   end
 end

data/models/project.rb

@@ -26,11 +26,16 @@ class Project < ActiveRecord::Base
   end
 
   def time_spent scale = nil, when_to = DateTime.now
-    spent(self.whences).call(scale, when_to)
+    whences_since = self.whences.find :all, :conditions => conditions_for_time_spent(scale, when_to)
+    whences_since.inject(0.0) {|total, whence| 
+      total += ( whence.end_at - whence.start_at )
+    } / 3600
   end
 
   def amount scale = nil, when_to = Time.now
-    spent(self.whences).call(scale, when_to) * (payment.rate / 100.0)
+    amount = time_spent(scale, when_to) 
+    amount *= payment.rate / 100.0
+    amount.to_money
   end
 
   class << self
@@ -47,6 +52,15 @@ class Project < ActiveRecord::Base
       all - [primary, off]
     end
 
+    def longest_project_name
+      project_names = all.collect(&:name)
+      longest = project_names.inject(0) do |max, next_name|
+        max = next_name.length if next_name.length > max
+        max
+      end
+      longest
+    end
+
     def migrate which = :up
       ActiveRecord::Schema.define do
         if which == :up
@@ -55,26 +69,6 @@ class Project < ActiveRecord::Base
             t.integer :weight, :default => -1
             t.references :customer, :null => false
           end
-
-          Project.create(
-            [
-              {
-                :name => 'Refactor',
-                :weight => 1,
-                :customer_id => 0
-              },
-              {
-                :name => 'Lunch/Break',
-                :weight => 0,
-                :customer_id => 0
-              },
-              {
-                :name => 'Other',
-                :weight => -1,
-                :customer_id => 0
-              }
-            ]
-          )
         elsif which == :down
           drop_table :projects
         end

data/models/whence.rb

@@ -2,6 +2,8 @@ require 'models/pratt'
 
 class Whence < ActiveRecord::Base
   belongs_to :project
+  has_many :invoice_whences
+  has_many :invoices, :through => :invoice_whences
   validates_associated :project
 
   def stop! when_to
@@ -33,12 +35,19 @@ class Whence < ActiveRecord::Base
   def inspect
     "#<Whence id: '#{id || ''}', project: '#{project ? project.name : ''}', start_at: '#{start_at? ? start_at.strftime(Pratt::FMT) : ''}', end_at: '#{end_at? ? end_at.strftime(Pratt::FMT) : ''}', invoiced: #{invoiced ? 'true' : 'false'}>"
   end
+
+  def invoiced?
+	read_attribute(:invoiced) == true
+  end
   
   class << self
     include Pratt::TimeSpent
 
     def time_spent scale = nil, when_to = Time.now
-      spent(self).call(scale, when_to)
+      whences_since = Whence.find :all, :conditions => conditions_for_time_spent(scale, when_to)
+      whences_since.inject(0.0) {|total, whence| 
+          total += ( whence.end_at - whence.start_at )
+        } / 3600
     end
 
     def last_unended

data/models/zip.rb

@@ -0,0 +1,27 @@
+class Zip < ActiveRecord::Base
+
+  validates_presence_of :zip, :city, :ST, :state, :longitude, :latitude
+
+  def before_validation_on_create
+    self.ST = self.state[0,2].upcase
+  end
+
+  class << self
+    def migrate which = :up
+      ActiveRecord::Schema.define do
+        if which == :up
+          create_table :zips do |t|
+            t.string :zip,      :null => false
+			t.string :city,     :null => false
+			t.string :ST,       :null => false, :limit => 2
+			t.string :state,    :null => false
+            t.float :longitude, :null => false
+            t.float :latitude,  :null => false
+          end
+        elsif which == :down
+          drop_table :zips
+        end
+      end
+    end
+  end
+end

data/spec/fixtures/graph.expectation

@@ -11,8 +11,3 @@ Project detail
            Task3| 01 day 17 hour 32 min
 
 ------------------------------------------------------------
-
-                    Total 43.69 hrs
-            **** ******** 0.00%
-              Lunch/Break 3.11%
-                    Other 100.00%

data/spec/fixtures/proportions.expectation

@@ -0,0 +1,4 @@
+                    Total 43.69 hrs
+            **** ******** 0.00%
+              Lunch/Break 3.11%
+                    Other 100.00%

data/spec/float_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'pratt'
+
+describe Float do
+  it { 2.0.should respond_to(:format_integer) }
+  it { 2.0.should respond_to(:percentage) }
+
+  it "should format correctly" do
+    2.0.format_integer.should eql("02")
+  end
+
+  it "shows percentage correctly with no total" do
+    2.3.percentage.should eql("230.00%")
+  end
+
+  it "shows percentage correctly with total" do
+    2.5.percentage(5).should eql("50.00%")
+  end
+
+  it "handles with_label as expected" do
+    Project.expects(:longest_project_name).returns 21
+    3.5.with_label("label").should eql("                label 3.5")
+  end
+end

data/spec/numeric_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'pratt'
+
+describe Numeric do
+  it { 1.should respond_to(:format_integer) }
+  it { 1.should respond_to(:with_label) }
+
+  it "should format correctly" do
+    Pratt.color = false
+    1.format_integer.should eql("01")
+  end
+
+  it '"format" with with_label' do
+    Pratt.color = false
+    Project.expects(:longest_project_name).returns(11)
+    1.with_label(:blue).should eql("       blue 1")
+  end
+
+  it "recursively applies formatting without color" do
+    Pratt.color = false
+    Project.expects(:longest_project_name).returns(11)
+    1.format_integer.blue.with_label("#").should eql("          # 01")
+  end
+
+  it "recursively applies formatting with color" do
+    Pratt.color = true
+    Project.expects(:longest_project_name).returns(11)
+    1.format_integer.blue.with_label("#").should eql("          # \e[34m01\e[0m")
+  end
+end

data/spec/pratt_spec.rb

@@ -55,8 +55,8 @@ describe Pratt do
 
   describe "\b#root" do
     before :each do
-      Dir.stubs(:pwd).returns("/home/scott/git/pratt")
-      @expected_root = "/home/scott/git/pratt"
+      @expected_root = File.dirname( File.expand_path( '..', __FILE__ ) ).to_s
+      Dir.stubs(:pwd).returns(@expected_root)
     end
 
     it "is correct without arguments" do
@@ -75,8 +75,9 @@ describe Pratt do
 
     it "is correct with an argument and block" do
       received = []
+      expected = %w(app.rb customer.rb project.rb payment.rb pratt.rb whence.rb invoice.rb invoice_whence.rb zip.rb)
       Pratt.root('models', '*.rb') {|model| received << model }
-      received.to_set.should == %w(app.rb customer.rb project.rb payment.rb pratt.rb whence.rb).collect {|model| Pathname.new File.join(@expected_root, "models", model) }.to_set
+      received.to_set.should == expected.collect {|model| Pathname.new File.join(@expected_root, "models", model) }.to_set
     end
   end
 
@@ -125,7 +126,7 @@ describe Pratt do
 
     it "should look right with data" do
       populate_with_data
-#      @pratt.expects(:process_template!)
+      @pratt.expects(:process_template!)
 
       @pratt.graph.should == get_expected_display
     end

data/spec/project_spec.rb

@@ -10,6 +10,11 @@ end
 describe Project do
   it_should_behave_like "being a billable item"
 
+  it{ Project.should respond_to(:primary) }
+  it{ Project.should respond_to(:off) }
+  it{ Project.should respond_to(:rest) }
+  it{ Project.should respond_to(:longest_project_name) }
+
   context "scopes" do
     it "named primary" do 
       Project.expects(:first).with(:conditions => { :weight => 1 }).returns(mock('Refactor'))
@@ -96,7 +101,7 @@ describe Project do
 
     context "amount calculation" do
       before :each do
-        Payment.create :rate => '315', :billable => @project
+        Payment.create :rate => '315.0', :billable => @project
 
         @now = Time.parse("2009-10-04 17:53:58")
         Time.stubs(:now).returns(@now.beginning_of_week)
@@ -132,7 +137,7 @@ describe Project do
     end
 
     it "correctly calculates with no data" do
-      Whence.expects(:find).with(:all, :conditions => ["end_at IS NOT NULL"]).returns []
+      @project.expects(:time_spent).returns 0
       @project.time_spent.should == 0.0
     end
 
@@ -160,4 +165,5 @@ describe Project do
       @project.time_spent('day', Chronic.parse('yesterday')).should == 18.0/60
     end
   end
+
 end

data/spec/spec.opts

@@ -1 +1 @@
-color=true color: true color colour c --colour --color -c
+--color

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
+require 'rubygems'
 require 'spec'
-require 'config'
+require 'mocha'
+require 'lib/pratt'
 require 'ruby-debug'
 
 Spec::Runner.configure do |config|
@@ -9,6 +11,34 @@ Spec::Runner.configure do |config|
   config.mock_with :mocha
 
   Pratt.connect! 'test'
+
+  Customer.create(
+	:name         => 'Scott Noel-Hemming',
+	:company_name => 'Frogstarr78 Software',
+	:address      => '312 NW 7th',
+	:phone        => '509.730.5401',
+	:zip          => '97862'
+  ) unless Customer.count > 0
+
+  Project.create(
+	[
+	  {
+		:name => 'Refactor',
+		:weight => 1,
+		:customer_id => 0
+	  },
+	  {
+		:name => 'Lunch/Break',
+		:weight => 0,
+		:customer_id => 0
+	  },
+	  {
+		:name => 'Other',
+		:weight => -1,
+		:customer_id => 0
+	  }
+	]
+  ) unless Project.count > 0
 end
 
 shared_examples_for "Time spent on a project" do

data/spec/string_ext_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'pratt'
+
+describe String do
+  it { subject.should respond_to(:colorize) }
+  it { subject.should respond_to(:or) }
+  it { subject.should respond_to(:with_label) }
+
+  it "doesn't process alternate format when Pratt.color? == false" do
+    Pratt.color = false
+    "abc".or("xyz").should eql("abc")
+  end
+
+  it "processes alternate format when Pratt.color? == true" do
+    Pratt.color = true
+    "abc".or("xyz").should eql("xyz")
+  end
+
+  it "doesn't colorize when Pratt.color? == false" do
+    Pratt.color = false
+    "abc".blue.should eql("abc")
+  end
+
+  it "colorizes when Pratt.color? == true" do
+    Pratt.color = true
+    "abc".blue.should eql("\e[34mabc\e[0m")
+  end
+
+  it "handles with_label as expected" do
+    Project.expects(:longest_project_name).returns 11
+    "abc".with_label("label").should eql("      label abc")
+  end
+end

data/views/current.eruby

@@ -0,0 +1,5 @@
+   projects: <%= @project_names.join ' ' %>
+<% if @last_whence.end_at.nil? %>
+    started: <%= @last_whence.start_at.strftime(Pratt::FMT).send(:blue) %>
+next prompt: <%= ( @time_til / 60.0 ).format_integer.yellow %> min <%= ( @time_til % 60 ).format_integer.yellow %> sec
+<% end %>

data/views/general-invoice.eruby

@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <!--This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info.-->
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title xml:lang="en-US">Frogstarr78 Software Invoice</title>
+
+    <style type="text/css">
+		@page {  }
+		body  {
+			padding: 15px;
+		}
+		table {
+			border-collapse: collapse;
+			border-spacing: 0;
+			empty-cells: show
+		}
+		td, th {
+			vertical-align: top;
+			font-size: 10pt;
+		}
+		* {
+			margin: 0;
+		}
+		.Default {
+			font-family: Arial;
+		}
+		.ce1 {
+			color: #4CBB17;
+			font-family: sans-serif;
+			font-size: 16pt;
+			font-variant: small-caps;
+		}
+		.ce11 {
+			font-family: Arial;
+			border: 1px solid #666666;
+			border-top: none;
+			vertical-align: top;
+			text-align: left ! important;
+			margin-left: 0in;
+		}
+		.ce12 {
+			font-family: Arial;
+			border-style: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce13 {
+			font-family: Arial;
+			border-style: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce14 {
+			font-family: Trebuchet MS;
+			border-style: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+			font-size: 12pt;
+			font-style: italic;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: bold;
+		}
+		.ce15 {
+			font-family: Trebuchet MS;
+			border-style: none;
+			vertical-align: top;
+			text-align: right ! important;
+			margin-left: 0in;
+			color: #4CBB17;
+			font-size: 28pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: bold;
+		}
+		.ce16 {
+			font-family: Arial;
+			border-style: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+		}
+		.ce18 {
+			font-family: Arial;
+			border: none;
+			border-bottom: 1px solid #000000;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+		}
+		.ce20 {
+			font-family: Trebuchet MS;
+			background-color: transparent;
+			vertical-align: top;
+			text-align: left ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: bold;
+		}
+		.ce21 {
+			font-family: Trebuchet MS;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: bold;
+		}
+		.ce22 {
+			font-family: Arial;
+			border: none;
+			border-right: 1px solid #000000;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+		}
+		.ce25 {
+			font-family: Arial;
+			border: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce26 {
+			font-family: Trebuchet MS;
+			border-style: none;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: bold;
+		}
+		.ce28 {
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce29 {
+			font-family: Arial;
+			border: 1px solid #000000;
+			vertical-align: top;
+			text-align: center ! important;
+			margin-left: 0in;
+		}
+		.ce3 {
+			font-family: Arial;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce31 {
+			font-family: Arial;
+			border-bottom: none;
+			border-left: 0.0879cm solid #000000;
+			border-right: 0.0879cm solid #000000;
+			border-top: none;
+		}
+		.ce32 {
+			font-family: Arial;
+			border: 0.0879cm solid #000000;
+			border-top: none;
+		}
+		.ce34 {
+			font-family: Arial;
+			border: none;
+		}
+		.ce35 {
+			font-family: Arial;
+			border: none;
+			border-bottom: 0.1049cm double #000000;
+			background-color: transparent;
+		}
+		.ce36 {
+			font-family: Trebuchet MS;
+			border-bottom: 0.1049cm double #000000;
+			background-color: transparent;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none
+		}
+		.ce5 {
+			background-color: #4CBB17;
+			border: none;
+			color: #ffffff;
+			font-family: Trebuchet MS;
+			font-size: 10pt;
+			font-style: normal;
+			font-weight: bold;
+			margin-left: 0in;
+			text-align: center ! important;
+			text-decoration: none ! important;
+			text-shadow: none;
+			vertical-align: top;
+		}
+		.ce30 {
+			border: 0.0879cm solid #000000;
+			border-bottom: none;
+		}
+		.ceN {
+			vertical-align: top;
+			text-align: left ! important;
+			margin-left: 0in;
+			font-size: 10pt;
+			font-style: normal;
+			text-shadow: none;
+			text-decoration: none ! important;
+			font-weight: normal;
+		}
+		.ce6 {
+			padding-left: 7px;
+			font-family: Arial;
+			border-bottom: none;
+			border-left: 1px solid #000000;
+			border-right: 1px solid #000000;
+			border-top: none;
+
+		}
+		.ce8 {
+			font-family: Trebuchet MS;
+			border: none;
+			border-bottom: 1px solid #666666;
+			background-color: #c0c0c0;
+			font-weight: bold;
+		}
+		.ce10 {
+			font-family: Arial;
+			border: 1px solid #666666;
+			border-bottom: none;
+			border-top: none;
+		}
+		.ro1 {
+			height: 0.4736in;
+		}
+		.ro2 {
+			height: 0.1736in;
+		}
+		.ro3 {
+			height: 0.1807in;
+		}
+		.ro4 {
+			height: 0.2071in;
+		}
+
+		.TN {
+			font-style: normal;
+			text-shadow: none;
+			font-weight: normal;
+			text-decoration: none;
+			font-family: Trebuchet MS;
+		}
+
+		.T1 {
+			float: left;
+			font-size: 38pt;
+			text-decoration: underline;
+		}
+		.T2 {
+			font-size: 16pt;
+		}
+		.T3 {
+			font-family: Arial;
+			font-size: 10pt;
+		}
+	</style>
+
+  </head>
+
+  <body dir="ltr">
+    <table border="0" cellspacing="0" cellpadding="0" class="ta1">
+      <colgroup>
+        <col width="224"/>
+        <col width="181"/>
+        <col width="100"/>
+        <col width="100"/>
+        <col width="140"/>
+      </colgroup>
+
+      <tr class="ro1">
+        <td colspan="3" class="ce1">
+			<p>
+				<span style="float:left;">
+					<span style="float: left; height: 25px; padding-top: 11px;">
+						Frogstarr 
+					</span>
+
+					<span style="float: left; clear: left;">
+						Software
+					</span>
+				</span>
+				<span class="TN T1">78</span>
+			</p>
+        </td>
+        <td colspan="2" class="ce15">
+          <p>INVOICE</p>
+        </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="2" class="ce3">
+          <p>312 NW 7<span class="TN T3">th</span></p>
+        </td>
+        <td class="Default"> </td>
+        <td class="ce20">
+          <p>DATE:</p>
+        </td>
+        <td style="text-align: right; background-color: #AAE09A;" class="ce29">
+          <p><%= when_to.send("beginning_of_#{scale}").strftime(Pratt::INVOICE_FMT) %> to <%= when_to.send("end_of_#{scale}").strftime(Pratt::INVOICE_FMT) %></p>
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="2" class="ce3">
+          <p>Milton-Freewater, OR 97862</p>
+        </td>
+        <td class="Default"> </td>
+        <td class="ce20">
+          <p>INVOICE #</p>
+        </td>
+        <td class="ce29 ce28">
+		<p><%= project.customer.id %>-<%= when_to.week %>-01</p>
+        </td>
+      </tr>
+      <tr class="ro3">
+        <td colspan="2" class="ce3">
+          <p>Phone: 509-730-5401</p>
+        </td>
+        <td class="Default"> </td>
+        <td class="ce21">
+          <p>Customer ID</p>
+        </td>
+        <td style="text-align: right;" class="ce29">
+			<p><%= project.customer.id %></p>
+        </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="5" class="Default"> </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="5" class="Default"> </td>
+      </tr>
+
+      <tr class="ro2">
+	    <td style="border-bottom: 1px solid #000000; text-align: left;" class="ce5">
+          <p>BILL TO:</p>
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td class="ce3">
+			<p><%= project.customer.name %></p>
+        </td>
+      </tr>
+<%
+	  if project.customer.address
+%>
+      <tr class="ro2">
+		<td class="ce3">
+			<p><%= project.customer.address %></p>
+		</td>
+      </tr>
+<%
+	  end 
+
+	  if project.customer.company_name
+%>
+      <tr class="ro2">
+		  <td class="ce3">
+			  <p><%= project.customer.company_name %></p>
+		  </td>
+      </tr>
+<%
+	  end 
+
+	  if project.customer.zip
+%>
+      <tr class="ro2">
+        <td class="ce3">
+			<p><%= project.customer.city_state_zip %></p>
+        </td>
+      </tr>
+<%
+	  end 
+
+	  if project.customer.phone
+%>
+      <tr class="ro2">
+        <td class="ce3">
+			<p><%= project.customer.phone.pretty_print %></p>
+        </td>
+      </tr>
+<%
+	  end 
+%>
+      <tr class="ro2">
+        <td class="Default"> </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="2" class="ce5">
+          <p>DESCRIPTION</p>
+        </td>
+        <td class="ce5">
+          <p>HOURS</p>
+        </td>
+        <td class="ce5">
+          <p>RATE</p>
+        </td>
+        <td class="ce5 ce30">
+          <p>AMOUNT</p>
+        </td>
+      </tr>
+
+		<% @projects.each do |project| %>
+      <tr class="ro2">
+        <td colspan="2" class="ceN ce6">
+			<p><%= project.name %></p>
+        </td>
+        <td style="text-align:right;  " class="ce16">
+			<p><%= project.time_spent(scale, when_to).pretty_print %></p>
+        </td>
+        <td style="text-align:right;  " class="ce22">
+			<p><%= project.payment.pretty_print %></p>
+        </td>
+        <td style="text-align:right;  " class="ce31">
+          <p><%= project.amount(scale, when_to).pretty_print %></p>
+        </td>
+      </tr>
+		<% end %>
+      <tr class="ro2">
+        <td colspan="2" style="border: 1px solid black; border-top: none;"> </td>
+        <td class="ce18"> </td>
+        <td style="border-right: 1px solid #000000;" class="ce18"> </td>
+        <td class="ce32"> </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="2" class="Default"> </td>
+        <td class="Default"> </td>
+        <td class="Default ce35">
+          <!--p>SUBTOTAL</p-->
+        </td>
+        <td style="text-align:right;  " class="ce36">
+          <!--p><%= project.amount(scale, when_to).pretty_print %></p-->
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="2" class="ceN ce8">
+          <p>OTHER COMMENTS</p>
+        </td>
+        <td class="Default"> </td>
+        <td class="ce21">
+          <p>TOTAL</p>
+        </td>
+		<td style="text-align:right;  " class="ce21 ce34">
+          <p><%= project.amount(scale, when_to).pretty_print %></p>
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="2" class="ceN ce10">
+          <p>1. Total payment due in 30 days</p>
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="2" class="ceN ce10">
+          <p>2. Please include the invoice number on your check</p>
+        </td>
+        <td class="Default"> </td>
+        <td colspan="2" class="ce25">
+          <p>Make all checks payable to</p>
+        </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="2" class="ceN ce10"> </td>
+        <td class="Default"> </td>
+        <td colspan="2" class="ce26">
+			<p>Frogstarr78 Software</p>
+        </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="2" class="ce11"> </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="5" class="Default"> </td>
+      </tr>
+
+      <tr class="ro2">
+        <td colspan="5" class="ce12">
+          <p>If you have any questions about this invoice, please contact</p>
+        </td>
+      </tr>
+      <tr class="ro3">
+        <td colspan="5" class="ce13">
+          <p>
+            Scott Noel-Hemming, 509.301.6893, <a href="mailto:frogstarr78@gmail.com">frogstarr78@gmail.com</a>
+          </p>
+        </td>
+      </tr>
+      <tr class="ro2">
+        <td colspan="5" class="Default"> </td>
+      </tr>
+      <tr class="ro4">
+        <td colspan="5" class="ce14">
+          <p>Thank You For Your Business!</p>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>