===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.2
retrieving revision 1.43
diff -u -r1.2 -r1.43
--- RT/Invoicing/rt_invoices.pl	2011/03/21 01:05:38	1.2
+++ RT/Invoicing/rt_invoices.pl	2011/12/30 03:30:51	1.43
@@ -1,122 +1,55 @@
 #!/usr/bin/perl
+# $AFresh1: rt_invoices.pl,v 1.42 2011/12/30 03:20:45 andrew Exp $
+########################################################################
+# Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+########################################################################
 use strict;
 use warnings;
 
 use 5.010;
 
-use YAML::Any;
 use Template;
 use RT::Client::REST;
 use RT::Client::REST::Ticket;
 use RT::Client::REST::User;
 
+use File::Path;
 use DateTime;
 
-my %included_hours;
+use lib './lib';    # XXX This is fragile, there are better ways
+use RTI::Config;
+use RTI::State;
 
 my $config = RTI::Config->new();
+my $state  = RTI::State->new( $config->get('state') );
 
-#print Dump $config; exit;
-
-# my $state = RTI::State->new($cust);
-# $invoice{state} = $state;
-my $lastinvdate;    # = $state->{lastinvoicedte}; XXX Needs to be a DateTime
-
-#$lastinvdate = DateTime->now->subtract( months => 2 );
-my $invoiceid = 1;    # $state->{lastinvoice} + 1;
-
-my $startdate;
-my @invoices;
-foreach my $cust ( @{ $config->get('customers') } ) {
-    my %invoice = (
-        from  => $config->get('from'),
-        to    => $cust->{address},
-        rates => $cust->{rates},
-        match => $cust->{match},
-    );
-
-    if ( $cust->{base_rate} ) {
-        my $date = DateTime->now;
-        my $day  = $cust->{day} || 1;
-        my $freq = $cust->{frequency} || 1;
-
-        my $diff;
-        my $per;
-        given ( $cust->{per} ) {
-            when ('week')  { $per = 'weeks';  $diff = $date->dow - $day; }
-            when ('month') { $per = 'months'; $diff = $date->day - $day; }
-            default { die "Unknown per [$cust->{per}]\n" }
-        }
-
-        # $day is start day, end should be one day further back
-        $diff = abs($diff) + 1;
-        $date->subtract( days => $diff );
-
-        my $title
-            = $freq == 1
-            ? ucfirst( $cust->{per} . 'ly' )
-            : $freq . ' ' . ucfirst( $cust->{per} );
-        $title .= ' Retainer';
-
-        my %project = ( title => $title, fees => [], );
-
-        # XXX need to add them until we get to where we billed already
-        # if we don't know the last invoice date, assume the day before
-        $lastinvdate ||= $date->clone->subtract( days => 1 );
-        while ( $date > $lastinvdate ) {
-            $invoice{enddate} = $date->clone;
-            my %hours = (
-                end   => $date->clone,
-                hours => { %{ $cust->{hours} } },
-            );
-
-            my $contents = ' to ' . $date->ymd;
-            $date->subtract( $per => $freq )->add( days => 1 );
-            $contents = $date->ymd . $contents;
-
-            $invoice{startdate} ||= $date->clone;
-            $hours{start} = $date->clone;
-            $startdate = $date->clone;
-
-            unshift @{ $invoice{hours} }, \%hours;
-            unshift @{ $project{fees} },
-                {
-                count    => 1,
-                rate     => $cust->{base_rate},
-                contents => $contents,
-                };
-
-            # Next time, one day less
-            $date->subtract( days => 1 );
-        }
-
-        if (@{ $project{fees} }) {
-            push @{ $invoice{projects} }, \%project;
-        }
-    }
-    else {
-        $invoice{enddate} = DateTime->now->ymd;
-        push @{ $invoice{hours} },
-            { end => DateTime->now, hours => $cust->{hours} };
-    }
-
-    push @invoices, \%invoice;
-}
-
-#print Dump \@invoices; exit;
-
 my $rt_conf = $config->get('rt');
 my $rt      = RT::Client::REST->new(
     server  => $rt_conf->{server},
     timeout => $rt_conf->{timeout},
 );
-$rt->login(
-    username => $rt_conf->{user},
-    password => $rt_conf->{pass},
-);
 my $tickets = RT::Client::REST::Ticket->new( rt => $rt );
-my $users = RT::Client::REST::User->new( rt => $rt );
 
+$rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
+
+#use YAML;
+#print Dump $config, $state; exit;
+
+my $customers = $config->get('customers');
+my $startdate = set_dates($customers);
+
 my @limits = map +{
     attribute  => 'status',
     operator   => '=',
@@ -127,151 +60,94 @@
     # XXX This should be a config option
     qw/ open stalled resolved /;
 
-#push @limits,
-#    {
-#    attribute => 'resolved',
-#    operator  => '>=',
-#    value     => '2011-03-01'
-#    };
-if ($startdate) {
-    push @limits,
-        {
-        attribute => 'last_updated',
-        operator  => '>=',
-        value     => $startdate->ymd,
-        };
-}
+push @limits,
+    {
+    attribute => 'last_updated',
+    operator  => '>=',
+    value     => $startdate->ymd,
+    };
 
-#push @limits, { attribute => 'id', operator => '=', value => '51' };
-#push @limits, { attribute => '', operator => '', value => '' };
-
 my $results = $tickets->search(
     limits  => \@limits,
     orderby => 'id',
 );
 
-#print Dump $ticket, $results;
-
 my $count = $results->count;
 print "There are $count results that matched your query\n";
 
 my $iterator = $results->get_iterator;
 while ( my $ticket = &$iterator ) {
-    my %project = (
-        id     => $ticket->id,
-        queue  => $ticket->queue,
-        owner  => $ticket->owner,
-        title  => $ticket->id . ': ' . $ticket->subject,
-        detail => 'Requestors: '
-            . join( ', ', $ticket->requestors )
-            . ' Queue: '
-            . $ticket->queue,
-        fees     => [],
-        expenses => [],
-    );
-
-    my $invoice;
-INVOICE: foreach my $i (@invoices) {
-        next INVOICE unless $i->{match};
-        foreach my $m ( @{ $i->{match} } ) {
-            my $type = $m->{type};
-            my $thing = join ' ', $ticket->$type;
-
-            if ( $m->{$type} ) {
-                my $match = lc $m->{$type};
-                next INVOICE unless lc($thing) ~~ $match;
-            }
-            elsif ( $m->{regex} ) {
-                next INVOICE unless $thing ~~ /\Q$m->{regex}\E/;
-            }
-            else {
-                warn "Invalid match!";
-                next INVOICE;
-            }
-        }
-        $invoice = $i;
+    my $cust = find_customer_for_ticket( $ticket, $customers );
+    if ( !$cust ) {
+        warn "No customer found for ticket " . $ticket->id;
+        next;
     }
 
-    if ( !$invoice ) {
-        say "No invoice found for ticket " . $ticket->id;
-
-        # XXX should construct a "new" invoice to pop onto the list
+    next if $cust->{no_invoice};
+    $cust->{invoice} ||= make_invoice($cust);
+    if ( !$cust->{invoice} ) {
+        $cust->{no_invoice} = 1;
+        say "$cust->{id} has no open invoices [" . $ticket->id . ']';
         next;
     }
 
-    #foreach my $r ($ticket->requestors) {
-    #    $users->id( $r );
-    #    $users->retrieve;
-    #    print Dump $users;
-    #}
+    say 'Ticket ' . $ticket->id . " belongs to $cust->{id}";
 
-    my $txns = $ticket->transactions( type => [qw(Comment Correspond)] );
-    my $txn_i = $txns->get_iterator;
-    while ( my $txn = $txn_i->() ) {
-        next unless $txn->time_taken;
+    my $project = make_project( $ticket, $cust );
+    next unless @{ $project->{fees} } || @{ $project->{expenses} };
 
-        my $work_time = sprintf "%.03f", $txn->time_taken / 60;
-        my $work_type = $txn->cf('WorkType');
-        my $work_rate 
-            = $invoice->{rates}{$work_type}
-            || $invoice->{rates}{default}
-            || 0;
+    foreach my $fee ( @{ $project->{fees} } ) {
+        my $hours = hours_for_date( $cust->{invoice}, $fee->{date} );
 
-        my $ih_type
-            = exists $included_hours{$work_type}
-            ? $work_type
-            : 'default';
+        my $type  = 'unknown';
+        my $count = $fee->{count};
+        while ( $type && $count > 0 && $type ne 'default' ) {
+            $type = exists $hours->{ $fee->{type} }
+                && $hours->{ $fee->{type} } > 0 ? $fee->{type} : 'default';
 
-        my %fee = (
-            id       => $txn->id,
-            contents => $txn->created . ' ('
-                . $txn->id . ')' . "\n\n"
-                . ( $txn->data || $ticket->subject ),
-            count => $work_time,
-            rate  => $work_rate,
-        );
-        if ( $work_type && $work_type ne 'Normal' ) {
-            $fee{detail} = $work_type . ' rate';
-        }
+            next unless exists $hours->{$type} && $hours->{$type} > 0;
 
-        push @{ $project{fees} }, \%fee;
+            my $discount_time = 0;
+            if ( $hours->{$type} > $count ) {
+                $hours->{$type} -= $count;
+                $discount_time = $count;
+            }
+            else {
+                $discount_time = $hours->{$type};
+                $hours->{$type} = 0;
+            }
 
-        next
-            unless $included_hours{$ih_type} && $included_hours{$ih_type} > 0;
+            if ($discount_time) {
+                $cust->{invoice}->{discount}->{amount}
+                    += round( $discount_time * $fee->{rate} );
+                $cust->{invoice}->{discount}->{hours}{$type}
+                    += $discount_time;
 
-        my $discount_time = 0;
-        if ( $included_hours{$ih_type} > $work_time ) {
-            $included_hours{$ih_type} -= $work_time;
-            $discount_time = $work_time;
+                $type = '' if $type eq 'default';
+                $count -= $discount_time;
+                $fee->{detail} .= " $discount_time $type Hours Discounted";
+            }
         }
-        else {
-            $discount_time = $included_hours{$ih_type};
-            $included_hours{$ih_type} = 0;
-        }
-
-        if ($discount_time) {
-            $fee{detail} = "$discount_time $work_type Hours Discounted";
-            $invoice->{discount}{amount} += $discount_time * $fee{rate};
-            $invoice->{discount}{hours}{$work_type} += $discount_time;
-        }
-
-        #print Dump $txn; exit;
     }
 
-    next unless @{ $project{fees} } || @{ $project{expenses} };
-    print " Added ticket $project{id}\n";
-    push @{ $invoice->{projects} }, \%project;
+    push @{ $cust->{invoice}->{projects} }, $project;
 }
 
-foreach my $invoice (@invoices) {
-    next unless $invoice->{projects} && @{ $invoice->{projects} };
+foreach my $cust ( @{$customers} ) {
+    my $invoice = $cust->{invoice};
+    next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };
 
+    $invoice->{custid}       = $cust->{id};
+    $invoice->{transactions} = [];
+
+    my %transactions;
     foreach my $project ( @{ $invoice->{projects} } ) {
-        print "$project->{title}\n";
+        if ( $project->{transactions} ) {
+            %transactions = ( %transactions, %{ $project->{transactions} } );
+        }
         my $subtotal = 0;
         foreach my $fee ( @{ $project->{fees} } ) {
             my $amount = round( $fee->{count} * $fee->{rate} );
-            print "  $amount (" . ( $fee->{count} * $fee->{rate} ) . ")\n";
             $subtotal += $amount;
         }
         foreach my $expense ( @{ $project->{expenses} } ) {
@@ -279,14 +155,15 @@
         }
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
-        print " Subtotal $subtotal\n";
     }
+    @{ $invoice->{transactions} } = sort { $a <=> $b } keys %transactions;
 
     if ( $invoice->{discount} ) {
         my $c = "Included Hours\n";
         if ( $invoice->{discount}{hours} ) {
             foreach my $t ( keys %{ $invoice->{discount}{hours} } ) {
-                $c .= "\n$invoice->{discount}{hours}{$t} $t hour";
+                my $type = $t eq 'default' ? '' : $t;
+                $c .= "\n$invoice->{discount}{hours}{$t} $type hour";
                 $c .= 's' if $invoice->{discount}{hours}{$t} != 1;
                 $c .= "\n";
             }
@@ -295,26 +172,75 @@
         $invoice->{total} -= round( $invoice->{discount}{amount} );
     }
 
-    if ( $invoice->{past_due} ) {
-        $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};
+    if ( my $unpaid_invoices = $state->unpaid_invoices( $cust->{id} ) ) {
+        my %project = ( title => 'Unpaid Invoices', fees => [], );
+        my $past_due = 0;
+
+        foreach my $id ( sort { $a <=> $b } keys %{$unpaid_invoices} ) {
+            my $unpaid  = $state->get_invoice($id);
+            my $invdate = ymd_to_DateTime( $unpaid->{invdate} );
+
+            next
+                if $cust->{duedate}
+                    && DateTime->compare( $invdate, $cust->{duedate} ) > 0;
+
+            $past_due += $unpaid_invoices->{$id};
+            push @{ $project{fees} },
+                {
+                id => $id,
+                contents =>
+                    sprintf( "Invoice %06d from %s", $id, $invdate->ymd ),
+                count => 1,
+                rate  => $unpaid_invoices->{$id},
+                };
+        }
+
+        if ($past_due) {
+            $invoice->{past_due}  = $past_due;
+            $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};
+
+            unshift @{ $invoice->{projects} }, \%project;
+        }
     }
 
-    $invoice->{id}   = $invoiceid;
-    $invoice->{file} = 'invoice_' . $invoiceid . '.pdf';
+    next unless $invoice->{total} > 0 || $invoice->{total_due};
 
-    print "Created Invoice\n";
-    print Dump $invoice;
+    $invoice->{info} = $config->get('info');
+    my $from = $config->get('from');
+    $from = get_user($from) if !ref $from;
 
-    my $tt = Template->new;
-    $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )
+    $invoice->{id} = $state->next_invoice_id;
+    $invoice->{file} = sprintf 'invoice_%06d.pdf', $invoice->{id};
+
+    $invoice->{organization} = $from->{organization} || $from->{name};
+    $invoice->{from} = make_address($from);
+    $invoice->{to}   = make_address( $cust->{address} || $cust->{id} );
+    $invoice->{logo} = $config->get('logo');
+
+    $state->add_invoice($invoice);
+
+    foreach my $key (qw/ start end /) {
+        if ( exists $invoice->{$key} ) {
+            $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');
+        }
+    }
+
+    my $invoice_dir = $config->get('invoice_dir');
+    File::Path::make_path($invoice_dir);
+    my $file = join '/', $invoice_dir, $invoice->{file};
+
+    my $tt = Template->new( INCLUDE_PATH => $config->get('template_dir'), )
+        || die $Template::ERROR, "\n";
+
+    $tt->process( $config->get('invoice_template'), $invoice, $file )
         or die $tt->error . "\n";
 
-    print "Generated $invoice->{file}\n";
+    printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $cust->{id},
+        $invoice->{total};
 
-    $invoiceid++;
 }
 
-# XXX Save State
+$state->save;
 
 sub round {
     my ($amount) = @_;
@@ -324,81 +250,391 @@
     return sprintf "%.02f", $amount;
 }
 
-package RTI::Config;
-use strict;
-use warnings;
+sub find_customer_for_ticket {
+    my ( $ticket, $customers ) = @_;
 
-use 5.010;
+    foreach my $cust ( @{$customers} ) {
+        next unless $cust->{match};
+        foreach my $m ( @{ $cust->{match} } ) {
+            my $type = $m->{type};
+            my $match
+                = exists $m->{$type}
+                ? lc( $m->{$type} )
+                : qr/\Q$m->{regex}\E/;
+            my $thing = [ map {lc} $ticket->$type ];
 
-use YAML::Any qw/ LoadFile /;
+            if ( !$match ) {
+                warn "Invalid match!";
+                next;
+            }
+            return $cust if ( $match ~~ $thing );
+        }
+    }
 
-sub new {
-    my ( $class, $args ) = @_;
+    # Fake customer if we didn't find one
+    my $cust = $config->new_customer;
 
-    my $self = { file => '', };
-    bless $self, $class;
-    my $file = $args->{file} || $self->_find_config;
-    $self->read_config($file);
+    ( $cust->{id} ) = $ticket->requestors;
+    return unless $cust->{id};
+    push @{$customers}, $cust;
 
-    return $self;
+    $cust->{match} = [
+        {   type  => 'requestors',
+            regex => $cust->{id},
+        }
+    ];
+
+    set_cust_dates($cust);
+    return $cust;
 }
 
-sub _find_config {
-    my ($self) = @_;
+sub get_user {
+    my ($id) = @_;
 
-    # XXX This needs to be better
-    foreach my $file (qw/ rt_invoice.conf rt_invoice.cfg .rt_invoicerc /) {
-        foreach my $dir ( '.', $ENV{HOME} . '/.rt_invoice', $ENV{HOME} ) {
-            my $path = join '/', $dir, $file;
-            return $path if -e $path;
-        }
+    state %users;
+    return $users{$id} if $users{$id};
+
+    my %map = (
+        address_one   => 'addr1',
+        address_two   => 'addr2',
+        email_address => 'email',
+        real_name     => 'name',
+        name          => 'username',
+    );
+
+    my $users = RT::Client::REST::User->new( rt => $rt, id => $id );
+    $users->retrieve;
+
+    my %user;
+    foreach my $m ( keys %{ $users->_attributes } ) {
+        next unless $users->can($m);
+
+        my $v = $users->$m;
+        next unless $v;
+
+        $m = $map{$m} if exists $map{$m};
+
+        $user{$m} = $v;
     }
-    return;
+
+    $users{$id} = \%user;
+    return \%user;
 }
 
-sub read_config {
-    my ( $self, $file ) = @_;
+sub make_invoice {
+    my ($cust) = @_;
 
-    $file ||= $self->{file};
-    die "$file: no such file\n" unless -e $file;
+    return if $cust->{no_invoice};
+    return unless $cust->{billstart};
 
-    my $c = LoadFile($file) or die "Unable to load $file\n";
+    my %invoice
+        = ( end => $cust->{billend}->clone->subtract( seconds => 1 ) );
+    $invoice{start} = $cust->{startinvoicedate}->clone
+        if $cust->{startinvoicedate};
 
-    $c->{customers} ||= [];
-    if ( $c->{default} ) {
-        foreach my $cust ( @{ $c->{customers} } ) {
-            foreach my $k ( keys %{ $c->{default} } ) {
-                $cust->{$k} //= $c->{default}->{$k};
+    return if $invoice{start} && $invoice{start} > $invoice{end};
+
+    if ( $cust->{base_rate} ) {
+        my ( $project, $hours ) = make_base_project($cust);
+
+        if ( @{ $project->{fees} } ) {
+            $invoice{end}   = $project->{end};
+            $invoice{hours} = $hours;
+            push @{ $invoice{projects} }, $project;
+        }
+    }
+    elsif ( $cust->{hours} ) {
+        $invoice{hours} = [
+            {   end   => $invoice{end}->clone,
+                hours => $cust->{hours},
             }
+        ];
+    }
+
+    return \%invoice;
+}
+
+sub make_base_project {
+    my ($cust) = @_;
+
+    my $date    = $cust->{billstart}->clone;
+    my $billend = $cust->{billend}->clone;
+    my ($freq)  = get_billing_frequency($cust);
+
+    my $title
+        = $cust->{frequency} == 1
+        ? ucfirst( $cust->{per} . 'ly' )
+        : $freq . ' ' . ucfirst( $cust->{per} );
+    $title .= ' Retainer';
+
+    my %project = ( title => $title, start => $date->clone, fees => [], );
+    my @hours;
+
+    while ( $date < $billend ) {
+        my $start = $date->clone;
+
+        $date->add($freq);
+
+        my $end = $date > $billend ? $billend->clone : $date->clone;
+        $end->subtract( seconds => 1 );
+
+        $project{end} = $end->clone;
+
+        push @{ $project{fees} },
+            {
+            count    => 1,
+            rate     => $cust->{base_rate},
+            contents => $start->ymd . ' to ' . $end->ymd,
+            };
+
+        push @hours,
+            {
+            start => $start->clone,
+            end   => $end->clone,
+            hours => { %{ $cust->{hours} } },
+            };
+    }
+
+    return \%project, \@hours;
+}
+
+sub make_address {
+    my ($addr) = @_;
+    my @adr;
+
+    $addr = get_user($addr) unless ref $addr;
+
+    if ( $addr->{organization} ) {
+        push @adr, $addr->{organization};
+    }
+    elsif ( $addr->{name} && !$addr->{attn} ) {
+        push @adr, $addr->{name};
+    }
+
+    if (   ( $addr->{addr1} || $addr->{addr2} )
+        && $addr->{city}
+        && $addr->{state}
+        && $addr->{zip} )
+    {
+        push @adr, $addr->{attn}  if $addr->{attn};
+        push @adr, $addr->{addr1} if $addr->{addr1};
+        push @adr, $addr->{addr2} if $addr->{addr2};
+        push @adr,
+            $addr->{city} . ', ' . $addr->{state} . '  ' . $addr->{zip};
+    }
+    else {
+        push @adr, $addr->{email} if $addr->{email};
+    }
+
+    return join "\n\n", @adr;
+}
+
+sub make_project {
+    my ( $ticket, $cust ) = @_;
+
+    my %project = (
+        id     => $ticket->id,
+        queue  => $ticket->queue,
+        owner  => $ticket->owner,
+        title  => $ticket->subject,
+        detail => 'Ticket: '
+            . $ticket->id
+            . ' Status: '
+            . $ticket->status
+            . ' Requestors: '
+            . join( ', ', $ticket->requestors ),
+        fees     => [],
+        expenses => [],
+    );
+
+    my $txns = $ticket->transactions( type => [qw(Comment Correspond)] );
+    my $txn_i = $txns->get_iterator;
+    while ( my $txn = $txn_i->() ) {
+        next if $state->txn_is_invoiced( $txn->id );
+
+        if ( my $expense = make_expense( $txn, $ticket ) ) {
+            push @{ $project{expenses} }, $expense;
+            $project{transactions}{ $txn->id } = 1;
         }
+
+        next unless $txn->time_taken;
+
+        my $fee = make_fee( $txn, $cust->{rates}, $ticket );
+
+        if ( !( $fee->{rate} && $fee->{count} ) ) {
+            warn "Invalid Fee, no rate or count";
+            next;
+        }
+
+        my $invoice = $cust->{invoice};
+        if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) {
+            warn "Ticket "
+                . $ticket->id
+                . " has uninvoiced Transaction "
+                . $txn->id . "\n";
+            next;
+        }
+        next if $invoice->{end} < $fee->{date};
+
+        push @{ $project{fees} }, $fee;
+        $project{transactions}{ $txn->id } = 1;
     }
 
-    $self->{_config} = $c;
-    $self->{file}    = $file;
+    return \%project;
 }
 
-sub get {
-    my ( $self, $key ) = @_;
+sub make_fee {
+    my ( $txn, $rates, $ticket ) = @_;
 
-    # XXX This should deep copy? not a reference would be good
-    return $self->{_config}->{$key};
+    # XXX Only need $ticket for the alternate subject
+
+    my $work_time = sprintf "%.03f", $txn->time_taken / 60;
+    my $work_type = $txn->cf('WorkType');
+
+    if ( $work_type =~ s/\s*Onsite//i ) {
+
+        # XXX Do something special for onsite activities
+    }
+
+    $work_type =~ s/^\s+|\s+$//g;
+    $work_type ||= 'Normal';
+
+    my %fee = (
+        id       => $txn->id,
+        contents => $txn->created . ' ('
+            . $txn->id . ')' . "\n\n"
+            . ( $txn->data || $ticket->subject ),
+        count => $work_time,
+        type  => $work_type,
+        date  => ymd_to_DateTime( $txn->created ),
+        rate  => $rates->{$work_type} || $rates->{default} || 0,
+    );
+
+    if ( $work_type && $work_type ne 'Normal' ) {
+        $fee{detail} = $work_type . ' rate';
+    }
+
+    return \%fee;
 }
 
-package RTI::State;
-use strict;
-use warnings;
+sub make_expense {
+    my ( $txn, $ticket ) = @_;
 
-use 5.010;
+    my $amount = $txn->cf('ExpenseAmount') or return;
 
-use YAML::Any qw/ LoadFile DumpFile /;
+    my %expense = (
+        id       => $txn->id,
+        contents => $txn->created . ' ('
+            . $txn->id . ')' . "\n\n"
+            . ( $txn->data || $ticket->subject ),
+        amount => $amount,
+        date   => ymd_to_DateTime( $txn->created ),
 
-sub new {
-    my ( $class, $args ) = @_;
+        # detail => ???,
+    );
 
-    my $self = { file => '', };
-    bless $self, $class;
-    my $file = $args->{file} || $self->_find_config;
-    $self->read_config($file);
+    return \%expense;
+}
 
-    return $self;
+sub hours_for_date {
+    my ( $invoice, $date ) = @_;
+
+    my $hours = {};
+    if ( $invoice->{hours} ) {
+        foreach my $h ( @{ $invoice->{hours} } ) {
+            next if $h->{start} && $h->{start} > $date;
+            next if $h->{end} < $date;
+
+            $hours = $h->{hours};
+            last;
+        }
+    }
+    return $hours;
+}
+
+sub ymd_to_DateTime {
+    my ($ymd) = @_;
+    my ( $date, $time ) = split /[\sT]/, $ymd;
+    my ( $year, $month, $day ) = split '-', $date;
+    my ( $hour, $minute, $second ) = split ':', $time if $time;
+
+    return DateTime->new(
+        year      => $year,
+        month     => $month,
+        day       => $day,
+        hour      => $hour || 0,
+        minute    => $minute || 0,
+        second    => $second || 0,
+        time_zone => 'local',
+    );
+}
+
+sub get_billing_frequency {
+    my ($cust) = @_;
+    my $per  = $cust->{per}       || 'week';
+    my $freq = $cust->{frequency} || 1;
+
+    my $day_method;
+    given ($per) {
+        when ('week')  { $per = 'weeks';  $day_method = 'dow' }
+        when ('month') { $per = 'months'; $day_method = 'day' }
+        default { die "Unknown per [$per]\n" }
+    }
+
+    return DateTime::Duration->new( $per => $freq ), $day_method;
+}
+
+sub set_dates {
+    my ($customers) = @_;
+
+    my $newest_invoice;
+    my $max_duration;
+
+    foreach my $cust ( @{$customers} ) {
+        set_cust_dates($cust);
+
+        my ($freq) = get_billing_frequency($cust);
+        $max_duration = $freq
+            if !$max_duration
+                || DateTime::Duration->compare( $freq, $max_duration ) > 0;
+
+        if ( $cust->{startinvoicedate} ) {
+            my $date = $cust->{startinvoicedate}->clone;
+            $newest_invoice = $date->clone
+                if !$newest_invoice || $newest_invoice < $date;
+        }
+    }
+
+    return $newest_invoice->clone->subtract($max_duration)
+        ->subtract( days => 1 );
+}
+
+sub set_cust_dates {
+    my ($cust) = @_;
+
+    my $day = $cust->{day} || 0;
+    my ( $freq, $day_method ) = get_billing_frequency($cust);
+
+    my $end = DateTime->now( time_zone => 'local' )
+        ->set( hour => 0, minute => 0, second => 0 );
+
+    my $start = $end->clone->subtract($freq);
+
+    # XXX This is helpful, but monthly and billday > 28 == !!!
+    $end->subtract( days => 1 ) while $day && $end->$day_method != $day;
+
+    my $lastinvoice = $state->last_invoice( $cust->{id} );
+    if ( $lastinvoice && $lastinvoice->{end} ) {
+        $start = ymd_to_DateTime( $lastinvoice->{end} )->add( days => 1 );
+        $cust->{startinvoicedate} = $start->clone;
+    }
+
+    $cust->{duedate}
+        = $cust->{net}
+        ? DateTime->now->subtract( days => $cust->{net} )
+        : 0;
+
+    $cust->{no_invoice} = 1 if $start->clone->add($freq) > $end;
+    $cust->{billend}    = $end;
+    $cust->{billstart}  = $start;
 }