===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.20
retrieving revision 1.22
diff -u -r1.20 -r1.22
--- RT/Invoicing/rt_invoices.pl	2011/03/24 00:05:47	1.20
+++ RT/Invoicing/rt_invoices.pl	2011/04/08 18:10:28	1.22
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1: rt_invoices.pl,v 1.19 2011/03/22 05:27:12 andrew Exp $
+# $AFresh1: rt_invoices.pl,v 1.21 2011/03/24 20:03:49 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -40,6 +40,7 @@
 
 $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
 
+#use YAML;
 #print Dump $config, $state; exit;
 
 my $startdate;
@@ -88,10 +89,10 @@
         next;
     }
     if ( !$cust->{invoice} ) {
-
-        #say "Customer has no open invoices for ticket " . $ticket->id;
+        say "$cust->{id} has no open invoices [" . $ticket->id . ']';
         next;
     }
+    say 'Giving ticket ' . $ticket->id . " to $cust->{id}";
     my $invoice = $cust->{invoice};
 
     my $project = make_project( $ticket, $cust );
@@ -176,12 +177,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} || $custid );
 
     $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 /)
     {
@@ -210,9 +212,8 @@
     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";
+    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";
@@ -234,25 +235,19 @@
 sub find_customer_for_ticket {
     my ( $customers, $ticket ) = @_;
 
-INVOICE: foreach my $cust ( values %{$customers} ) {
-        next INVOICE unless $cust->{match};
+    foreach my $cust ( values %{$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 );
@@ -316,7 +311,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;
 
@@ -330,7 +325,8 @@
     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;
+    $billends->subtract( days => 1 )
+        while $day && $billends->$day_method != $day;
 
     my $date = $billends->clone->subtract( $per => $freq );
 
@@ -406,7 +402,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 );
 
@@ -572,7 +568,7 @@
 use 5.010;
 
 use YAML::Any qw/ LoadFile Dump Load /;
-use File::Basename;
+use File::Spec;
 
 sub new {
     my ( $class, $args ) = @_;
@@ -625,6 +621,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 +630,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' );
         }
     }