=================================================================== RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v retrieving revision 1.9 retrieving revision 1.14 diff -u -r1.9 -r1.14 --- RT/Invoicing/rt_invoices.pl 2011/03/22 01:01:53 1.9 +++ RT/Invoicing/rt_invoices.pl 2011/03/22 02:37:14 1.14 @@ -1,4 +1,20 @@ #!/usr/bin/perl +# $AFresh1$ +######################################################################## +# Copyright (c) 2011 Andrew Fresh +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +######################################################################## use strict; use warnings; @@ -21,7 +37,6 @@ timeout => $rt_conf->{timeout}, ); my $tickets = RT::Client::REST::Ticket->new( rt => $rt ); -my $users = RT::Client::REST::User->new( rt => $rt ); $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} ); @@ -32,9 +47,10 @@ my $customers = $config->get('customers'); CUSTOMER: while ( my ( $custid, $cust ) = each %{$customers} ) { - my %invoice = ( end => DateTime->now, ); + my $invoice = make_invoice($cust); if ( $cust->{base_rate} ) { + $invoice->{hours} = []; my $day = $cust->{day} || 1; my $freq = $cust->{frequency} || 1; @@ -46,8 +62,7 @@ default { die "Unknown per [$cust->{per}]\n" } } - my $billends - = DateTime->now->set( hour => 0, minute => 0, second => 0 ); + my $billends = $invoice->{end}->clone; $billends->subtract( days => 1 ) while $billends->$day_method != $day; my $date = $billends->clone->subtract( $per => $freq ); @@ -82,15 +97,15 @@ next if $end < $start; $startdate = $start->clone if !$startdate || $startdate > $start; - $invoice{start} ||= $start->clone; - $invoice{end} = $end->clone; + $invoice->{start} ||= $start->clone; + $invoice->{end} = $end->clone; my %hours = ( start => $start->clone, end => $end->clone, hours => { %{ $cust->{hours} } }, ); - push @{ $invoice{hours} }, \%hours; + push @{ $invoice->{hours} }, \%hours; push @{ $project{fees} }, { count => 1, @@ -101,12 +116,12 @@ } if ( @{ $project{fees} } ) { - push @{ $invoice{projects} }, \%project; + push @{ $invoice->{projects} }, \%project; } } - $cust->{from} ||= get_user($custid); - $cust->{invoice} = \%invoice; + $cust->{address} ||= get_user($custid); + $cust->{invoice} = $invoice; } my @limits = map +{ @@ -140,11 +155,12 @@ while ( my $ticket = &$iterator ) { my $cust = find_customer_for_ticket( $customers, $ticket ); if ( !$cust ) { - say "No customer found for ticket " . $ticket->id; + warn "No customer found for ticket " . $ticket->id; next; } if ( !$cust->{invoice} ) { - say "Customer has no open invoices for ticket " . $ticket->id; + + #say "Customer has no open invoices for ticket " . $ticket->id; next; } my $invoice = $cust->{invoice}; @@ -173,7 +189,8 @@ } if ($discount_time) { - $invoice->{discount}{amount} += $discount_time * $fee->{rate}; + $invoice->{discount}{amount} + += round($discount_time * $fee->{rate}); $invoice->{discount}{hours}{$h_type} += $discount_time; $h_type = '' if $h_type eq 'default'; @@ -188,7 +205,7 @@ my $invoice = $cust->{invoice}; next unless $invoice->{projects} && @{ $invoice->{projects} }; - my %li = ( custid => $custid, ); + my %li = ( custid => $custid, invdate => DateTime->now->ymd, ); foreach my $project ( @{ $invoice->{projects} } ) { if ( $project->{transactions} ) { @@ -227,26 +244,35 @@ # XXX Here we need to "make_address" $invoice->{info} = $config->get('info'); - $invoice->{from} = $config->get('from'); - $invoice->{to} = $cust->{address}; + $invoice->{from} = make_address( $config->get('from') ); + $invoice->{to} = make_address( $cust->{address} ); $state->{lastinvoice}++; $invoice->{id} = $state->{lastinvoice}; $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf'; + foreach my $k (qw/ file transactions start end total past_due total_due /) + { + my $v; + if ( $invoice->{$k} ) { $v = $invoice->{$k} } + elsif ( $cust->{$k} ) { $v = $cust->{$k} } + + if ( defined $v && length $v ) { + if ( ref $v eq 'DateTime' ) { + $li{$k} = $v->ymd; + } + else { + $li{$k} = $v; + } + } + } + $state->{invoice}->{ $li{end} }{ $invoice->{id} } = \%li; + foreach my $key (qw/ start end /) { if ( exists $invoice->{$key} ) { $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y'); } } - - foreach my $k (qw/ transactions start end total past_due total_due /) { - if ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} } - elsif ( $cust->{$k} ) { $li{$k} = $cust->{$k} } - } - - $state->{invoice}->{ $invoice->{end} }{ $invoice->{id} } = \%li; - my $tt = Template->new; $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} ) or die $tt->error . "\n"; @@ -300,18 +326,24 @@ return unless $custid; my $cust = $config->get('default') || {}; - $cust->{to} = get_user($custid); + $cust->{address} = get_user($custid); - my %invoice = ( end => DateTime->now ); + $cust->{match} = [ + { type => 'requestors', + regex => $custid, + } + ]; + my $invoice = make_invoice($cust); + my $lastinvoice = $state->last_invoice($custid); if ( $lastinvoice->{date} ) { my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} ); - $invoice{start} = $last_invoice_date->clone->add( days => 1 ); + $invoice->{start} = $last_invoice_date->clone->add( days => 1 ); } - if ( !( $invoice{start} && $invoice{start} < $invoice{end} ) ) { - $cust->{invoice} = \%invoice; + if ( !( $invoice->{start} && $invoice->{start} < $invoice->{end} ) ) { + $cust->{invoice} = $invoice; } $customers->{$custid} = $cust; @@ -332,7 +364,7 @@ name => 'username', ); - $users->id($id); + my $users = RT::Client::REST::User->new( rt => $rt, id => $id ); $users->retrieve; my %user; @@ -351,6 +383,54 @@ return \%user; } +sub make_invoice { + my ($cust) = @_; + + my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 ) + ->clone->subtract( days => 1, seconds => 1 ); + + my %invoice = ( end => $billends ); + + if ( $cust && $cust->{hours} ) { + $invoice{hours} = [ + { end => $billends, + hours => $cust->{hours}, + } + ]; + } + + return \%invoice; +} + +sub make_address { + my ($addr) = @_; + my @adr; + + if ( $addr->{organization} ) { + push @adr, $addr->{organization}; + } + elsif ( $addr->{name} && !$addr->{attn} ) { + push @adr, $addr->{name}; + } + + if ( ( $addr->{addr1} || $addr->{addr2} ) + && $addr->{city} + && $addr->{state} + && $addr->{zip} ) + { + push @adr, $addr->{attn} if $addr->{attn}; + push @adr, $addr->{addr1} if $addr->{addr1}; + push @adr, $addr->{addr2} if $addr->{addr2}; + push @adr, + $addr->{city} . ', ' . $addr->{state} . ' ' . $addr->{zip}; + } + else { + push @adr, $addr->{email} if $addr->{email}; + } + + return join "\n\n", @adr; +} + sub make_project { my ( $ticket, $cust ) = @_; @@ -439,7 +519,7 @@ sub ymd_to_DateTime { my ($ymd) = @_; - my ( $date, $time ) = split ' ', $ymd; + my ( $date, $time ) = split /[\sT]/, $ymd; my ( $year, $month, $day ) = split '-', $date; my ( $hour, $minute, $second ) = split ':', $time if $time;