===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -r1.7 -r1.10
--- RT/Invoicing/rt_invoices.pl	2011/03/21 23:29:22	1.7
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 01:15:27	1.10
@@ -105,6 +105,7 @@
         }
     }
 
+    $cust->{from} ||= get_user($custid);
     $cust->{invoice} = \%invoice;
 }
 
@@ -139,21 +140,15 @@
 while ( my $ticket = &$iterator ) {
     my $cust = find_customer_for_ticket( $customers, $ticket );
     if ( !$cust ) {
-        say "No customer found for ticket " . $ticket->id;
+        warn "No customer found for ticket " . $ticket->id;
         next;
     }
     if ( !$cust->{invoice} ) {
-        say "Customer has no open invoices for ticket " . $ticket->id;
+        #say "Customer has no open invoices for ticket " . $ticket->id;
         next;
     }
     my $invoice = $cust->{invoice};
 
-    #foreach my $r ($ticket->requestors) {
-    #    $users->id( $r );
-    #    $users->retrieve;
-    #    print Dump $users;
-    #}
-
     my $project = make_project( $ticket, $cust );
     next unless @{ $project->{fees} } || @{ $project->{expenses} };
 
@@ -186,7 +181,6 @@
         }
     }
 
-    print " Added ticket $project->{id}\n";
     push @{ $invoice->{projects} }, $project;
 }
 
@@ -197,14 +191,12 @@
     my %li = ( custid => $custid, );
 
     foreach my $project ( @{ $invoice->{projects} } ) {
-        print "$project->{title}\n";
         if ( $project->{transactions} ) {
             push @{ $li{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} } ) {
@@ -212,7 +204,6 @@
         }
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
-        print " Subtotal $subtotal\n";
     }
 
     if ( $invoice->{discount} ) {
@@ -232,6 +223,8 @@
         $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};
     }
 
+    next unless $invoice->{total} > 0 || $invoice->{total_due};
+
     # XXX Here we need to "make_address"
     $invoice->{info} = $config->get('info');
     $invoice->{from} = $config->get('from');
@@ -241,32 +234,36 @@
     $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';
 
-    foreach my $k (qw/ transactions /) {
-        if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
-        elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }
+    foreach my $k (qw/ file transactions start end total past_due total_due /)
+    {
+        my $v;
+        if    ( $invoice->{$k} ) { $v = $invoice->{$k} }
+        elsif ( $cust->{$k} )    { $v = $cust->{$k} }
+
+        if (defined $v && length $v) {
+            if ( ref $v eq 'DateTime' ) {
+                $li{$k} = $v->ymd;
+            }
+            else {
+                $li{$k} = $v;
+            }
+        }
     }
+    $state->{invoice}->{ $li{end} }{ $invoice->{id} } = \%li;
 
-    $state->{invoice}->{ $invoice->{end}->ymd }{ $state->{lastinvoice} }
-        = \%li;
-
-    print "Created Invoice\n";
-    print Dump $cust;
-
     foreach my $key (qw/ start end /) {
         if ( exists $invoice->{$key} ) {
             $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');
         }
     }
-
     my $tt = Template->new;
     $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )
         or die $tt->error . "\n";
 
-    print "Generated $invoice->{file}\n";
+    printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $custid,
+        $invoice->{total};
 }
 
-# XXX Save State
-print Dump $state;
 $state->save;
 
 sub round {
@@ -301,16 +298,68 @@
         return $cust;
     }
 
-    return fake_customer($ticket);
+    return fake_customer( $customers, $ticket );
 }
 
 sub fake_customer {
-    my ($ticket) = @_;
+    my ( $customers, $ticket ) = @_;
 
-    # XXX eventually, will generate a customer we can bill!
-    return;
+    # make the custid the first requestor
+    my ($custid) = $ticket->requestors;
+    return unless $custid;
+
+    my $cust = $config->get('default') || {};
+    $cust->{to} = get_user($custid);
+
+    my %invoice = ( end => DateTime->now );
+
+    my $lastinvoice = $state->last_invoice($custid);
+    if ( $lastinvoice->{date} ) {
+        my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
+        $invoice{start} = $last_invoice_date->clone->add( days => 1 );
+    }
+
+    if ( !( $invoice{start} && $invoice{start} < $invoice{end} ) ) {
+        $cust->{invoice} = \%invoice;
+    }
+
+    $customers->{$custid} = $cust;
+    return $cust;
 }
 
+sub get_user {
+    my ($id) = @_;
+
+    state %users;
+    return $users{$id} if $users{$id};
+
+    my %map = (
+        address_one   => 'addr1',
+        address_two   => 'addr2',
+        email_address => 'email',
+        real_name     => 'name',
+        name          => 'username',
+    );
+
+    $users->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;
+    }
+
+    $users{$id} = \%user;
+    return \%user;
+}
+
 sub make_project {
     my ( $ticket, $cust ) = @_;
 
@@ -399,7 +448,7 @@
 
 sub ymd_to_DateTime {
     my ($ymd) = @_;
-    my ( $date, $time ) = split ' ', $ymd;
+    my ( $date, $time ) = split /[\sT]/, $ymd;
     my ( $year, $month, $day ) = split '-', $date;
     my ( $hour, $minute, $second ) = split ':', $time if $time;