===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -r1.8 -r1.11
--- RT/Invoicing/rt_invoices.pl	2011/03/22 00:22:27	1.8
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 01:16:32	1.11
@@ -1,4 +1,20 @@
 #!/usr/bin/perl
+# $AFresh1$
+########################################################################
+# 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;
 
@@ -105,6 +121,7 @@
         }
     }
 
+    $cust->{from} ||= get_user($custid);
     $cust->{invoice} = \%invoice;
 }
 
@@ -139,11 +156,11 @@
 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};
@@ -180,7 +197,6 @@
         }
     }
 
-    print " Added ticket $project->{id}\n";
     push @{ $invoice->{projects} }, $project;
 }
 
@@ -191,14 +207,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} } ) {
@@ -206,7 +220,6 @@
         }
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
-        print " Subtotal $subtotal\n";
     }
 
     if ( $invoice->{discount} ) {
@@ -226,6 +239,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');
@@ -235,32 +250,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 {
@@ -306,7 +325,7 @@
     return unless $custid;
 
     my $cust = $config->get('default') || {};
-    $cust->{to} = get_requestor($custid);
+    $cust->{to} = get_user($custid);
 
     my %invoice = ( end => DateTime->now );
 
@@ -324,22 +343,24 @@
     return $cust;
 }
 
-sub get_requestor {
+sub get_user {
     my ($id) = @_;
 
-    state %requestors;
-    return $requestors{$id} if $requestors{$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 %requestor;
+    my %user;
     foreach my $m ( keys %{ $users->_attributes } ) {
         next unless $users->can($m);
 
@@ -348,11 +369,11 @@
 
         $m = $map{$m} if exists $map{$m};
 
-        $requestor{$m} = $v;
+        $user{$m} = $v;
     }
 
-    $requestors{$id} = \%requestor;
-    return \%requestor;
+    $users{$id} = \%user;
+    return \%user;
 }
 
 sub make_project {
@@ -443,7 +464,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;