===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.17
retrieving revision 1.27
diff -u -r1.17 -r1.27
--- RT/Invoicing/rt_invoices.pl	2011/03/22 05:06:05	1.17
+++ RT/Invoicing/rt_invoices.pl	2011/04/19 04:21:06	1.27
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1$
+# $AFresh1: rt_invoices.pl,v 1.25 2011/04/19 03:18:13 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -20,12 +20,12 @@
 
 use 5.010;
 
-use YAML::Any;
 use Template;
 use RT::Client::REST;
 use RT::Client::REST::Ticket;
 use RT::Client::REST::User;
 
+use File::Path;
 use DateTime;
 
 my $config = RTI::Config->new();
@@ -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,23 +76,30 @@
 
 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} }
@@ -118,23 +119,23 @@
         }
 
         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}{$h_type} += $discount_time;
 
             $h_type = '' if $h_type eq 'default';
             $fee->{detail} = "$discount_time $h_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->ymd, );
 
     foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {
@@ -172,12 +173,17 @@
     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} || $custid );
+    my $from = $config->get('from');
+    $from = get_user($from) if !ref $from;
 
+    $invoice->{organization} = $from->{organization} || $from->{name};
+    $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 /)
     {
@@ -201,11 +207,18 @@
             $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');
         }
     }
-    my $tt = Template->new;
-    $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )
+
+    my $invoice_dir = $config->get('invoice_dir');
+    File::Path::make_path($invoice_dir);
+    my $file = join '/', $invoice_dir, $invoice->{file};
+
+    my $tt = Template->new( INCLUDE_PATH => $config->get('template_dir'), )
+        || die $Template::ERROR, "\n";
+
+    $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};
 }
 
@@ -220,39 +233,29 @@
 }
 
 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',
@@ -260,11 +263,6 @@
         }
     ];
 
-    if ( my $invoice = make_invoice($cust) ) {
-        $cust->{invoice} = $invoice;
-    }
-
-    $customers->{ $cust->{id} } = $cust;
     return $cust;
 }
 
@@ -304,7 +302,7 @@
 sub make_invoice {
     my ($cust) = @_;
 
-    my $day  = $cust->{day}       ||= 1;
+    my $day  = $cust->{day}       ||= 0;
     my $per  = $cust->{per}       ||= 'week';
     my $freq = $cust->{frequency} ||= 1;
 
@@ -315,12 +313,16 @@
         default { die "Unknown per [$per]\n" }
     }
 
-    my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );
+    my $billends = DateTime->now
+        ->subtract( days => 1 )
+        ->set( hour => 23, minute => 59, second => 59 );
 
     # XXX This is helpful, but monthly and billday > 28 == !!!
-    $billends->subtract( days => 1 ) while $billends->$day_method != $day;
+    $billends->subtract( days => 1 )
+        while $day && $billends->$day_method != $day;
 
-    my $date = $billends->clone->subtract( $per => $freq );
+    my $date = $billends->clone->subtract( $per => $freq )
+        ->set( hour => 0, minute => 0, second => 0 );
 
     my %invoice = ( end => $billends->clone->subtract( seconds => 1 ) );
 
@@ -335,7 +337,9 @@
             if !$startdate || $startdate > $date;
     }
 
-    return if $billends <= $date;
+    # Is the start date more than $freq $per before the end date?
+    my $diff = $billends - $date;
+    return {} if $diff->in_units($per) < 1;
 
     if ( $cust->{base_rate} ) {
         my ( $project, $hours ) = make_base_project(
@@ -363,7 +367,7 @@
         ];
     }
 
-    return if $invoice{start} && $invoice{end} < $invoice{start};
+    return {} if $invoice{start} && $invoice{end} < $invoice{start};
 
     return \%invoice;
 }
@@ -394,7 +398,7 @@
         $date = $enddate->clone if $date > $enddate;
 
         # XXX This is helpful, but monthly and billday > 28 == !!!
-        $date->subtract( days => 1 ) while $date->$day_method != $day;
+        $date->subtract( days => 1 ) while $day && $date->$day_method != $day;
 
         my $end = $date->clone->subtract( seconds => 1 );
 
@@ -483,9 +487,11 @@
         }
 
         my $invoice = $cust->{invoice};
-        next
-            if $invoice->{start}
-                && $invoice->{start} > $fee->{date};
+        if ($invoice->{start} && $invoice->{start} > $fee->{date}) {
+            warn "Ticket " . $ticket->id 
+                . " has old uninvoiced Transaction " .  $txn->id . "\n";
+            next;
+        }
         next if $invoice->{end} < $fee->{date};
 
         push @{ $project{fees} },         $fee;
@@ -560,7 +566,7 @@
 use 5.010;
 
 use YAML::Any qw/ LoadFile Dump Load /;
-use File::Basename;
+use File::Spec;
 
 sub new {
     my ( $class, $args ) = @_;
@@ -595,9 +601,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} ) );
             }
@@ -611,13 +617,30 @@
 sub get {
     my ( $self, $key ) = @_;
     my $value = Load( Dump( $self->{_config}->{$key} ) );
-    if ( !$value ) {
-        given ($key) {
-            when ('state') {
-                $value = dirname( $self->{file} ) . '/rt_invoice.state'
-            }
+
+    return $value if $value;
+    my ($volume,$directories,$file) =File::Spec->splitpath(
+         File::Spec->rel2abs( $self->{file} ));
+
+    given ($key) {
+        when ('state') {
+            $value = $self->{file};
+            $value =~ s/(?:\.[^.]+)?$/\.state/;
         }
+        when ('invoice_dir') {
+            $value = File::Spec->catdir($volume, $directories, 'invoices' );
+        }
+        when ('template_dir') {
+            $value = File::Spec->catdir( $volume, $directories );
+        }
+        when ('invoice_template') {
+            $value = 'invoice.tex.tt';
+        }
+        when ('logo') {
+            $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' );
+        }
     }
+
     return $value;
 }