===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.21
retrieving revision 1.31
diff -u -r1.21 -r1.31
--- RT/Invoicing/rt_invoices.pl	2011/03/24 21:03:49	1.21
+++ RT/Invoicing/rt_invoices.pl	2011/05/07 02:03:55	1.31
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1: rt_invoices.pl,v 1.20 2011/03/23 23:05:47 andrew Exp $
+# $AFresh1: rt_invoices.pl,v 1.30 2011/05/03 04:41:11 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -40,19 +40,13 @@
 
 $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
 
+#use YAML;
 #print Dump $config, $state; exit;
 
 my $startdate;
 
 my $customers = $config->get('customers');
-while ( my ( $custid, $cust ) = each %{$customers} ) {
-    $cust->{id} = $custid;
 
-    if ( my $invoice = make_invoice($cust) ) {
-        $cust->{invoice} = $invoice;
-    }
-}
-
 my @limits = map +{
     attribute  => 'status',
     operator   => '=',
@@ -82,59 +76,67 @@
 
 my $iterator = $results->get_iterator;
 while ( my $ticket = &$iterator ) {
-    my $cust = find_customer_for_ticket( $customers, $ticket );
+    if ( !$ticket->time_worked ) {
+        say "Ticket " . $ticket->id . " has no time worked";
+        next;
+    }
+
+    my $cust = find_customer_for_ticket($ticket);
     if ( !$cust ) {
         warn "No customer found for ticket " . $ticket->id;
         next;
     }
-    if ( !$cust->{invoice} ) {
 
-        #say "Customer has no open invoices for ticket " . $ticket->id;
+    say 'Ticket ' . $ticket->id . " belongs to $cust->{id}";
+
+    $cust->{invoice} ||= make_invoice($cust);
+    if ( !$cust->{invoice}->{end} ) {
+        say "  $cust->{id} has no open invoices [" . $ticket->id . ']';
         next;
     }
-    my $invoice = $cust->{invoice};
 
     my $project = make_project( $ticket, $cust );
     next unless @{ $project->{fees} } || @{ $project->{expenses} };
 
     foreach my $fee ( @{ $project->{fees} } ) {
-        my $hours = hours_for_date( $invoice, $fee->{date} );
+        my $hours = hours_for_date( $cust->{invoice}, $fee->{date} );
 
-        my $h_type
-            = exists $hours->{ $fee->{type} }
-            ? $fee->{type}
-            : 'default';
+        my $type = exists $hours->{ $fee->{type} }
+            && $hours->{ $fee->{type} } > 0 ? $type : 'default';
 
-        next unless exists $hours->{$h_type} && $hours->{$h_type} > 0;
+        next unless exists $hours->{$type} && $hours->{$type} > 0;
 
         my $discount_time = 0;
-        if ( $hours->{$h_type} > $fee->{count} ) {
-            $hours->{$h_type} -= $fee->{count};
+        if ( $hours->{$type} > $fee->{count} ) {
+            $hours->{$type} -= $fee->{count};
             $discount_time = $fee->{count};
         }
         else {
-            $discount_time = $hours->{$h_type};
-            $hours->{$h_type} = 0;
+            $discount_time = $hours->{$type};
+            $hours->{$type} = 0;
         }
 
         if ($discount_time) {
-            $invoice->{discount}{amount}
+            $cust->{invoice}->{discount}->{amount}
                 += round( $discount_time * $fee->{rate} );
-            $invoice->{discount}{hours}{$h_type} += $discount_time;
+            $cust->{invoice}->{discount}->{hours}{$type} += $discount_time;
 
-            $h_type = '' if $h_type eq 'default';
-            $fee->{detail} = "$discount_time $h_type Hours Discounted";
+            $type = '' if $type eq 'default';
+            $fee->{detail} = "$discount_time $type Hours Discounted";
         }
     }
 
-    push @{ $invoice->{projects} }, $project;
+    push @{ $cust->{invoice}->{projects} }, $project;
 }
 
-while ( my ( $custid, $cust ) = each %{$customers} ) {
+foreach my $cust ( @{$customers} ) {
     my $invoice = $cust->{invoice};
-    next unless $invoice->{projects} && @{ $invoice->{projects} };
+    next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };
 
-    my %li = ( custid => $custid, invdate => DateTime->now->ymd, );
+    my %li = (
+        custid  => $cust->{id},
+        invdate => DateTime->now( time_zone => 'local' )->ymd,
+    );
 
     foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {
@@ -176,12 +178,13 @@
     $from = get_user($from) if !ref $from;
 
     $invoice->{organization} = $from->{organization} || $from->{name};
-    $invoice->{from}         = make_address($from);
-    $invoice->{to}           = make_address( $cust->{address} || $custid );
+    $invoice->{from} = make_address($from);
+    $invoice->{to} = make_address( $cust->{address} || $cust->{id} );
 
     $state->{lastinvoice}++;
-    $invoice->{id} = $state->{lastinvoice};
+    $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};
+    $invoice->{logo} = $config->get('logo');
 
     foreach my $k (qw/ file transactions start end total past_due total_due /)
     {
@@ -216,7 +219,7 @@
     $tt->process( $config->get('invoice_template'), $invoice, $file )
         or die $tt->error . "\n";
 
-    printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $custid,
+    printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $cust->{id},
         $invoice->{total};
 }
 
@@ -231,39 +234,32 @@
 }
 
 sub find_customer_for_ticket {
-    my ( $customers, $ticket ) = @_;
+    my ($ticket) = @_;
 
-INVOICE: foreach my $cust ( values %{$customers} ) {
-        next INVOICE unless $cust->{match};
+    foreach my $cust ( @{$customers} ) {
+        next unless $cust->{match};
         foreach my $m ( @{ $cust->{match} } ) {
             my $type = $m->{type};
-            my $thing = join ' ', $ticket->$type;
+            my $match
+                = exists $m->{$type}
+                ? lc( $m->{$type} )
+                : qr/\Q$m->{regex}\E/;
+            my $thing = [ map {lc} $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 {
+            if ( !$match ) {
                 warn "Invalid match!";
-                next INVOICE;
+                next;
             }
+            return $cust if ( $match ~~ $thing );
         }
-        return $cust;
     }
 
-    return fake_customer( $customers, $ticket );
-}
-
-sub fake_customer {
-    my ( $customers, $ticket ) = @_;
-
+    # Fake customer if we didn't find one
     my $cust = $config->get('default') || {};
 
     ( $cust->{id} ) = $ticket->requestors;
     return unless $cust->{id};
+    push @{$customers}, $cust;
 
     $cust->{match} = [
         {   type  => 'requestors',
@@ -271,11 +267,6 @@
         }
     ];
 
-    if ( my $invoice = make_invoice($cust) ) {
-        $cust->{invoice} = $invoice;
-    }
-
-    $customers->{ $cust->{id} } = $cust;
     return $cust;
 }
 
@@ -326,16 +317,16 @@
         default { die "Unknown per [$per]\n" }
     }
 
-    my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );
+    my $billend = DateTime->now( time_zone => 'local' )
+        ->set( hour => 0, minute => 0, second => 0 );
 
     # XXX This is helpful, but monthly and billday > 28 == !!!
-    $billends->subtract( days => 1 )
-        while $day && $billends->$day_method != $day;
+    $billend->subtract( days => 1 )
+        while $day && $billend->$day_method != $day;
 
-    my $date = $billends->clone->subtract( $per => $freq );
+    my $date = $billend->clone->subtract( $per => $freq );
+    my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );
 
-    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} );
@@ -347,17 +338,18 @@
             if !$startdate || $startdate > $date;
     }
 
-    return if $billends <= $date;
+    # Is the start date more than $freq $per before the end date?
+    return {}
+        if DateTime->compare( $date->clone->add( $per => $freq ), $billend )
+            > 0;
 
     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,
+            {   date    => $date,
+                billend => $billend,
+                per     => $per,
+                freq    => $freq,
             }
         );
 
@@ -375,7 +367,7 @@
         ];
     }
 
-    return if $invoice{start} && $invoice{end} < $invoice{start};
+    return {} if $invoice{start} && $invoice{end} < $invoice{start};
 
     return \%invoice;
 }
@@ -383,12 +375,10 @@
 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 $date    = $args->{date};
+    my $billend = $args->{billend};
+    my $per     = $args->{per};
+    my $freq    = $args->{freq};
 
     my $title
         = $freq == 1
@@ -399,19 +389,14 @@
     my %project = ( title => $title, start => $date->clone, fees => [], );
     my @hours;
 
-    while ( $date < $enddate ) {
+    while ( $date < $billend ) {
         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 $day && $date->$day_method != $day;
-
         my $end = $date->clone->subtract( seconds => 1 );
+        $end = $billend->clone->subtract( seconds => 1 ) if $date > $billend;
 
-        last if $end < $start;
-
         $project{end} = $end->clone;
 
         push @{ $project{fees} },
@@ -495,9 +480,13 @@
         }
 
         my $invoice = $cust->{invoice};
-        next
-            if $invoice->{start}
-                && $invoice->{start} > $fee->{date};
+        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;
@@ -556,12 +545,13 @@
     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,
+        year      => $year,
+        month     => $month,
+        day       => $day,
+        hour      => $hour || 0,
+        minute    => $minute || 0,
+        second    => $second || 0,
+        time_zone => 'local',
     );
 }
 
@@ -572,7 +562,7 @@
 use 5.010;
 
 use YAML::Any qw/ LoadFile Dump Load /;
-use File::Basename;
+use File::Spec;
 
 sub new {
     my ( $class, $args ) = @_;
@@ -607,9 +597,9 @@
 
     my $c = LoadFile($file) or die "Unable to load $file\n";
 
-    $c->{customers} ||= {};
+    $c->{customers} ||= [];
     if ( $c->{default} ) {
-        foreach my $cust ( values %{ $c->{customers} } ) {
+        foreach my $cust ( @{ $c->{customers} } ) {
             foreach my $k ( keys %{ $c->{default} } ) {
                 $cust->{$k} //= Load( Dump( $c->{default}->{$k} ) );
             }
@@ -625,6 +615,8 @@
     my $value = Load( Dump( $self->{_config}->{$key} ) );
 
     return $value if $value;
+    my ( $volume, $directories, $file )
+        = File::Spec->splitpath( File::Spec->rel2abs( $self->{file} ) );
 
     given ($key) {
         when ('state') {
@@ -632,13 +624,16 @@
             $value =~ s/(?:\.[^.]+)?$/\.state/;
         }
         when ('invoice_dir') {
-            $value = dirname( $self->{file} ) . '/invoices';
+            $value = File::Spec->catdir( $volume, $directories, 'invoices' );
         }
         when ('template_dir') {
-            $value = dirname( $self->{file} );
+            $value = File::Spec->catdir( $volume, $directories );
         }
         when ('invoice_template') {
             $value = 'invoice.tex.tt';
+        }
+        when ('logo') {
+            $value = File::Spec->catfile( $volume, $directories, 'Logo.pdf' );
         }
     }