===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RT/Invoicing/rt_invoices.pl	2011/03/22 02:41:43	1.15
+++ RT/Invoicing/rt_invoices.pl	2011/03/22 04:32:58	1.16
@@ -45,82 +45,12 @@
 my $startdate;
 
 my $customers = $config->get('customers');
-CUSTOMER: while ( my ( $custid, $cust ) = each %{$customers} ) {
+while ( my ( $custid, $cust ) = each %{$customers} ) {
+    $cust->{id} = $custid;
 
-    my $invoice = make_invoice($cust);
-
-    if ( $cust->{base_rate} ) {
-        $invoice->{hours} = [];
-        my $day  = $cust->{day}       || 1;
-        my $freq = $cust->{frequency} || 1;
-
-        my $per;
-        my $day_method;
-        given ( $cust->{per} ) {
-            when ('week')  { $per = 'weeks';  $day_method = 'dow' }
-            when ('month') { $per = 'months'; $day_method = 'day' }
-            default { die "Unknown per [$cust->{per}]\n" }
-        }
-
-        my $billends = $invoice->{end}->clone;
-        $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} );
-            $date = $last_invoice_date->clone->add( days => 1 );
-        }
-
-        next CUSTOMER if $billends <= $date;
-
-        my $title
-            = $freq == 1
-            ? ucfirst( $cust->{per} . 'ly' )
-            : $freq . ' ' . ucfirst( $cust->{per} );
-        $title .= ' Retainer';
-
-        my %project = ( title => $title, fees => [], );
-
-        while ( $date < $billends ) {
-            my $start = $date->clone;
-
-            $date->add( $per => $freq );
-            $date = $billends->clone if $date > $billends;
-
-            # 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;
-            my %hours = (
-                start => $start->clone,
-                end   => $end->clone,
-                hours => { %{ $cust->{hours} } },
-            );
-
-            push @{ $invoice->{hours} }, \%hours;
-            push @{ $project{fees} },
-                {
-                count    => 1,
-                rate     => $cust->{base_rate},
-                contents => $start->ymd . ' to ' . $end->ymd,
-                };
-
-        }
-
-        if ( @{ $project{fees} } ) {
-            push @{ $invoice->{projects} }, \%project;
-        }
+    if ( my $invoice = make_invoice($cust) ) {
+        $cust->{invoice} = $invoice;
     }
-
-    $cust->{invoice} = $invoice;
 }
 
 my @limits = map +{
@@ -241,10 +171,9 @@
 
     next unless $invoice->{total} > 0 || $invoice->{total_due};
 
-
     $invoice->{info} = $config->get('info');
     $invoice->{from} = make_address( $config->get('from') );
-    $invoice->{to}   = make_address( $cust->{address} || get_user($custid) );
+    $invoice->{to}   = make_address( $cust->{address} || $custid );
 
     $state->{lastinvoice}++;
     $invoice->{id}   = $state->{lastinvoice};
@@ -320,31 +249,22 @@
 sub fake_customer {
     my ( $customers, $ticket ) = @_;
 
-    # make the custid the first requestor
-    my ($custid) = $ticket->requestors;
-    return unless $custid;
-
     my $cust = $config->get('default') || {};
 
+    ( $cust->{id} ) = $ticket->requestors;
+    return unless $cust->{id};
+
     $cust->{match} = [
         {   type  => 'requestors',
-            regex => $custid,
+            regex => $cust->{id},
         }
     ];
 
-    my $invoice = make_invoice($cust);
-
-    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} ) ) {
+    if ( my $invoice = make_invoice($cust) ) {
         $cust->{invoice} = $invoice;
     }
 
-    $customers->{$custid} = $cust;
+    $customers->{ $cust->{id} } = $cust;
     return $cust;
 }
 
@@ -384,25 +304,127 @@
 sub make_invoice {
     my ($cust) = @_;
 
-    my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 )
-        ->clone->subtract( days => 1, seconds => 1 );
+    my $day  = $cust->{day}       ||= 1;
+    my $per  = $cust->{per}       ||= 'week';
+    my $freq = $cust->{frequency} ||= 1;
 
-    my %invoice = ( end => $billends );
+    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" }
+    }
 
-    if ( $cust && $cust->{hours} ) {
+    my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );
+
+    # XXX This is helpful, but monthly and billday > 28 == !!!
+    $billends->subtract( days => 1 ) while $billends->$day_method != $day;
+
+    my $date = $billends->clone->subtract( $per => $freq );
+
+    my %invoice = ( end => $billends->clone->subtract( seconds => 1 ) );
+
+    my $lastinvoice = $state->last_invoice( $cust->{id} );
+    if ( $lastinvoice->{date} ) {
+        my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
+        $date = $last_invoice_date->clone->add( days => 1 );
+
+        $invoice{start} = $date->clone;
+
+        $startdate = $date->clone->subtract( $per => $freq )
+            if !$startdate || $startdate > $date;
+    }
+
+    return if $billends <= $date;
+
+    if ( $cust->{base_rate} ) {
+        my ( $project, $hours ) = make_base_project(
+            $cust,
+            {   startdate  => $date,
+                enddate    => $billends,
+                per        => $per,
+                freq       => $freq,
+                day        => $day,
+                day_method => $day_method,
+            }
+        );
+
+        if ( @{ $project->{fees} } ) {
+            $invoice{end}   = $project->{end};
+            $invoice{hours} = $hours;
+            push @{ $invoice{projects} }, $project;
+        }
+    }
+    elsif ( $cust->{hours} ) {
         $invoice{hours} = [
-            {   end   => $billends,
+            {   end   => $invoice{end}->clone,
                 hours => $cust->{hours},
             }
         ];
     }
 
+    return if $invoice{start} && $invoice{end} < $invoice{start};
+
     return \%invoice;
 }
 
+sub make_base_project {
+    my ( $cust, $args ) = @_;
+
+    my $date       = $args->{startdate};
+    my $enddate    = $args->{enddate};
+    my $per        = $args->{per};
+    my $freq       = $args->{freq};
+    my $day        = $args->{day};
+    my $day_method = $args->{day_method};
+
+    my $title
+        = $freq == 1
+        ? ucfirst( $cust->{per} . 'ly' )
+        : $freq . ' ' . ucfirst( $cust->{per} );
+    $title .= ' Retainer';
+
+    my %project = ( title => $title, start => $date->clone, fees => [], );
+    my @hours;
+
+    while ( $date < $enddate ) {
+        my $start = $date->clone;
+
+        $date->add( $per => $freq );
+        $date = $enddate->clone if $date > $enddate;
+
+        # 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 );
+
+        last if $end < $start;
+
+        $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};