===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- RT/Invoicing/rt_invoices.pl	2011/03/21 21:49:44	1.6
+++ 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;
 
@@ -38,8 +54,8 @@
         my $day  = $cust->{day}       || 1;
         my $freq = $cust->{frequency} || 1;
 
-        my $day_method;
         my $per;
+        my $day_method;
         given ( $cust->{per} ) {
             when ('week')  { $per = 'weeks';  $day_method = 'dow' }
             when ('month') { $per = 'months'; $day_method = 'day' }
@@ -48,23 +64,18 @@
 
         my $billends
             = DateTime->now->set( hour => 0, minute => 0, second => 0 );
-        while ( $billends->$day_method != $day ) {
-            $billends->subtract( days => 1 );
-        }
+        $billends->subtract( days => 1 ) while $billends->$day_method != $day;
 
         my $date = $billends->clone->subtract( $per => $freq );
 
         my $lastinvoice = $state->last_invoice($custid);
         if ( $lastinvoice->{date} ) {
             my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
-
-            warn "HAVE LASTINVOICE DATE\n";
-            next CUSTOMER
-                if DateTime->compare( $billends, $last_invoice_date ) < 1;
-
             $date = $last_invoice_date->clone->add( days => 1 );
         }
 
+        next CUSTOMER if $billends <= $date;
+
         my $title
             = $freq == 1
             ? ucfirst( $cust->{per} . 'ly' )
@@ -78,12 +89,14 @@
 
             $date->add( $per => $freq );
             $date = $billends->clone if $date > $billends;
-            if ( my $diff = $date->$day_method - $day ) {
-                $date->subtract( days => $diff );
-            }
 
+            # XXX This is helpful, but monthly and billday > 28 == !!!
+            $date->subtract( days => 1 ) while $date->$day_method != $day;
+
             my $end = $date->clone->subtract( seconds => 1 );
 
+            next if $end < $start;
+
             $startdate = $start->clone if !$startdate || $startdate > $start;
             $invoice{start} ||= $start->clone;
             $invoice{end} = $end->clone;
@@ -108,6 +121,7 @@
         }
     }
 
+    $cust->{from} ||= get_user($custid);
     $cust->{invoice} = \%invoice;
 }
 
@@ -142,19 +156,16 @@
 while ( my $ticket = &$iterator ) {
     my $cust = find_customer_for_ticket( $customers, $ticket );
     if ( !$cust ) {
-        say "No customer found for ticket " . $ticket->id;
-
-        # XXX should construct a "new" invoice to pop onto the list
+        warn "No customer found for ticket " . $ticket->id;
         next;
     }
+    if ( !$cust->{invoice} ) {
+        #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( $invoice, $ticket );
+    my $project = make_project( $ticket, $cust );
     next unless @{ $project->{fees} } || @{ $project->{expenses} };
 
     foreach my $fee ( @{ $project->{fees} } ) {
@@ -186,7 +197,6 @@
         }
     }
 
-    print " Added ticket $project->{id}\n";
     push @{ $invoice->{projects} }, $project;
 }
 
@@ -194,15 +204,15 @@
     my $invoice = $cust->{invoice};
     next unless $invoice->{projects} && @{ $invoice->{projects} };
 
+    my %li = ( custid => $custid, );
+
     foreach my $project ( @{ $invoice->{projects} } ) {
-        print "$project->{title}\n";
         if ( $project->{transactions} ) {
-            push @{ $cust->{transactions} }, @{ $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} } ) {
@@ -210,7 +220,6 @@
         }
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
-        print " Subtotal $subtotal\n";
     }
 
     if ( $invoice->{discount} ) {
@@ -230,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');
@@ -239,34 +250,36 @@
     $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';
 
-    my %li = ( custid => $custid, );
+    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} }
 
-    foreach my $k (qw/ transactions /) {
-        if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
-        elsif ( $cust->{$k} )    { $li{$k} = $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 $invoice;
-
     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,18 +314,70 @@
         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 ( $invoice, $ticket ) = @_;
+    my ( $ticket, $cust ) = @_;
 
     my %project = (
         id     => $ticket->id,
@@ -335,13 +400,17 @@
         next unless $txn->time_taken;
         next if $state->txn_is_invoiced( $txn->id );
 
-        my $fee = make_fee( $ticket, $txn, $invoice->{rates} );
+        my $fee = make_fee( $txn, $cust->{rates}, $ticket );
+
         if ( !( $fee->{rate} && $fee->{count} ) ) {
             warn "Invalid Fee, no rate or count";
             next;
         }
 
-        next if $invoice->{start} && $invoice->{start} > $fee->{date};
+        my $invoice = $cust->{invoice};
+        next
+            if $invoice->{start}
+                && $invoice->{start} > $fee->{date};
         next if $invoice->{end} < $fee->{date};
 
         push @{ $project{fees} },         $fee;
@@ -352,11 +421,12 @@
 }
 
 sub make_fee {
-    my ( $ticket, $txn, $rates ) = @_;
+    my ( $txn, $rates, $ticket ) = @_;
 
+    # XXX Only need $ticket for the alternate subject
+
     my $work_time = sprintf "%.03f", $txn->time_taken / 60;
     my $work_type = $txn->cf('WorkType');
-    my $work_rate = $rates->{$work_type} || $rates->{default} || 0;
 
     my %fee = (
         id       => $txn->id,
@@ -364,9 +434,9 @@
             . $txn->id . ')' . "\n\n"
             . ( $txn->data || $ticket->subject ),
         count => $work_time,
-        rate  => $work_rate,
         type  => $work_type,
         date  => ymd_to_DateTime( $txn->created ),
+        rate  => $rates->{$work_type} || $rates->{default} || 0,
     );
 
     if ( $work_type && $work_type ne 'Normal' ) {
@@ -394,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;