=================================================================== RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- RT/Invoicing/rt_invoices.pl 2011/04/19 04:35:12 1.28 +++ RT/Invoicing/rt_invoices.pl 2011/05/03 05:38:56 1.29 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $AFresh1: rt_invoices.pl,v 1.27 2011/04/19 03:21:06 andrew Exp $ +# $AFresh1: rt_invoices.pl,v 1.28 2011/04/19 03:35:12 andrew Exp $ ######################################################################## # Copyright (c) 2011 Andrew Fresh # @@ -76,12 +76,12 @@ my $iterator = $results->get_iterator; while ( my $ticket = &$iterator ) { - if (!$ticket->time_worked) { + if ( !$ticket->time_worked ) { say "Ticket " . $ticket->id . " has no time worked"; next; } - my $cust = find_customer_for_ticket( $ticket ); + my $cust = find_customer_for_ticket($ticket); if ( !$cust ) { warn "No customer found for ticket " . $ticket->id; next; @@ -135,8 +135,10 @@ my $invoice = $cust->{invoice}; next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} }; - my %li = ( custid => $cust->{id}, invdate => - DateTime->now( time_zone => 'local' )->ymd, ); + my %li = ( + custid => $cust->{id}, + invdate => DateTime->now( time_zone => 'local' )->ymd, + ); foreach my $project ( @{ $invoice->{projects} } ) { if ( $project->{transactions} ) { @@ -178,11 +180,11 @@ $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} ); + $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'); @@ -240,14 +242,17 @@ next unless $cust->{match}; foreach my $m ( @{ $cust->{match} } ) { my $type = $m->{type}; - my $match = exists $m->{$type} ? lc($m->{$type}) : qr/\Q$m->{regex}\E/; - my $thing = [ map { lc } $ticket->$type ]; + my $match + = exists $m->{$type} + ? lc( $m->{$type} ) + : qr/\Q$m->{regex}\E/; + my $thing = [ map {lc} $ticket->$type ]; - if (! $match) { + if ( !$match ) { warn "Invalid match!"; next; } - return $cust if ($match ~~ $thing); + return $cust if ( $match ~~ $thing ); } } @@ -321,7 +326,7 @@ $billend->subtract( days => 1 ) while $day && $billend->$day_method != $day; - my $date = $billend->clone->subtract( $per => $freq ); + my $date = $billend->clone->subtract( $per => $freq ); my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) ); my $lastinvoice = $state->last_invoice( $cust->{id} ); @@ -342,10 +347,10 @@ if ( $cust->{base_rate} ) { my ( $project, $hours ) = make_base_project( $cust, - { date => $date, - billend => $billend, - per => $per, - freq => $freq, + { date => $date, + billend => $billend, + per => $per, + freq => $freq, } ); @@ -476,9 +481,11 @@ } my $invoice = $cust->{invoice}; - if ($invoice->{start} && $invoice->{start} > $fee->{date}) { - warn "Ticket " . $ticket->id - . " has old uninvoiced Transaction " . $txn->id . "\n"; + if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) { + warn "Ticket " + . $ticket->id + . " has uninvoiced Transaction " + . $txn->id . "\n"; next; } next if $invoice->{end} < $fee->{date}; @@ -609,8 +616,8 @@ my $value = Load( Dump( $self->{_config}->{$key} ) ); return $value if $value; - my ($volume,$directories,$file) =File::Spec->splitpath( - File::Spec->rel2abs( $self->{file} )); + my ( $volume, $directories, $file ) + = File::Spec->splitpath( File::Spec->rel2abs( $self->{file} ) ); given ($key) { when ('state') { @@ -618,7 +625,7 @@ $value =~ s/(?:\.[^.]+)?$/\.state/; } when ('invoice_dir') { - $value = File::Spec->catdir($volume, $directories, 'invoices' ); + $value = File::Spec->catdir( $volume, $directories, 'invoices' ); } when ('template_dir') { $value = File::Spec->catdir( $volume, $directories ); @@ -627,7 +634,7 @@ $value = 'invoice.tex.tt'; } when ('logo') { - $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' ); + $value = File::Spec->catfile( $volume, $directories, 'Logo.pdf' ); } }