=================================================================== RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v retrieving revision 1.16 retrieving revision 1.24 diff -u -r1.16 -r1.24 --- RT/Invoicing/rt_invoices.pl 2011/03/22 04:32:58 1.16 +++ RT/Invoicing/rt_invoices.pl 2011/04/12 20:32:15 1.24 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $AFresh1$ +# $AFresh1: rt_invoices.pl,v 1.23 2011/04/08 18:00:16 andrew Exp $ ######################################################################## # Copyright (c) 2011 Andrew Fresh # @@ -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,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 ); @@ -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} || $custid ); + $state->{lastinvoice}++; - $invoice->{id} = $state->{lastinvoice}; - $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf'; + $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,8 +207,15 @@ $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, @@ -222,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 ); @@ -304,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; @@ -315,12 +322,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 +346,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( @@ -394,7 +407,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 ); @@ -461,8 +474,8 @@ title => $ticket->subject, detail => 'Ticket: ' . $ticket->id - . ' Queue: ' - . $ticket->queue + . ' Status: ' + . $ticket->status . ' Requestors: ' . join( ', ', $ticket->requestors ), fees => [], @@ -560,7 +573,7 @@ use 5.010; use YAML::Any qw/ LoadFile Dump Load /; -use File::Basename; +use File::Spec; sub new { my ( $class, $args ) = @_; @@ -611,13 +624,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; }