=================================================================== RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v retrieving revision 1.11 retrieving revision 1.53 diff -u -r1.11 -r1.53 --- RT/Invoicing/rt_invoices.pl 2011/03/22 01:16:32 1.11 +++ RT/Invoicing/rt_invoices.pl 2015/05/07 06:26:08 1.53 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $AFresh1$ +# $AFresh1: rt_invoices.pl,v 1.52 2015/05/07 05:23:15 andrew Exp $ ######################################################################## # Copyright (c) 2011 Andrew Fresh # @@ -19,15 +19,26 @@ use warnings; use 5.010; +use experimental qw( switch smartmatch ); -use YAML::Any; +# Because we don't have a real cert +$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0; + use Template; use RT::Client::REST; use RT::Client::REST::Ticket; use RT::Client::REST::User; +use File::Path; use DateTime; +use List::Util qw/ sum /; + +use lib './lib'; # XXX This is fragile, there are better ways +use RTI::Config; +use RTI::State; +use RTI::Util qw/ round ymd_to_DateTime /; + my $config = RTI::Config->new(); my $state = RTI::State->new( $config->get('state') ); @@ -37,94 +48,15 @@ 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} ); +#use YAML; #print Dump $config, $state; exit; -my $startdate; - my $customers = $config->get('customers'); -CUSTOMER: while ( my ( $custid, $cust ) = each %{$customers} ) { +my $startdate = set_dates($customers); - my %invoice = ( end => DateTime->now, ); - - if ( $cust->{base_rate} ) { - my $day = $cust->{day} || 1; - my $freq = $cust->{frequency} || 1; - - my $per; - my $day_method; - given ( $cust->{per} ) { - when ('week') { $per = 'weeks'; $day_method = 'dow' } - when ('month') { $per = 'months'; $day_method = 'day' } - default { die "Unknown per [$cust->{per}]\n" } - } - - my $billends - = DateTime->now->set( hour => 0, minute => 0, second => 0 ); - $billends->subtract( days => 1 ) while $billends->$day_method != $day; - - my $date = $billends->clone->subtract( $per => $freq ); - - my $lastinvoice = $state->last_invoice($custid); - if ( $lastinvoice->{date} ) { - my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} ); - $date = $last_invoice_date->clone->add( days => 1 ); - } - - next CUSTOMER if $billends <= $date; - - my $title - = $freq == 1 - ? ucfirst( $cust->{per} . 'ly' ) - : $freq . ' ' . ucfirst( $cust->{per} ); - $title .= ' Retainer'; - - my %project = ( title => $title, fees => [], ); - - while ( $date < $billends ) { - my $start = $date->clone; - - $date->add( $per => $freq ); - $date = $billends->clone if $date > $billends; - - # XXX This is helpful, but monthly and billday > 28 == !!! - $date->subtract( days => 1 ) while $date->$day_method != $day; - - my $end = $date->clone->subtract( seconds => 1 ); - - next if $end < $start; - - $startdate = $start->clone if !$startdate || $startdate > $start; - $invoice{start} ||= $start->clone; - $invoice{end} = $end->clone; - my %hours = ( - start => $start->clone, - end => $end->clone, - hours => { %{ $cust->{hours} } }, - ); - - push @{ $invoice{hours} }, \%hours; - push @{ $project{fees} }, - { - count => 1, - rate => $cust->{base_rate}, - contents => $start->ymd . ' to ' . $end->ymd, - }; - - } - - if ( @{ $project{fees} } ) { - push @{ $invoice{projects} }, \%project; - } - } - - $cust->{from} ||= get_user($custid); - $cust->{invoice} = \%invoice; -} - my @limits = map +{ attribute => 'status', operator => '=', @@ -135,14 +67,12 @@ # XXX This should be a config option qw/ open stalled resolved /; -if ($startdate) { - push @limits, - { - attribute => 'last_updated', - operator => '>=', - value => $startdate->ymd, - }; -} +push @limits, + { + attribute => 'last_updated', + operator => '>=', + value => $startdate->ymd, + }; my $results = $tickets->search( limits => \@limits, @@ -154,61 +84,156 @@ my $iterator = $results->get_iterator; while ( my $ticket = &$iterator ) { - my $cust = find_customer_for_ticket( $customers, $ticket ); + my $cust = find_customer_for_ticket( $ticket, $customers ); if ( !$cust ) { warn "No customer found for ticket " . $ticket->id; next; } - if ( !$cust->{invoice} ) { - #say "Customer has no open invoices for ticket " . $ticket->id; - next; - } - my $invoice = $cust->{invoice}; + next if $cust->{no_invoice}; + $cust->{invoice} ||= make_invoice($cust); + + die "$cust->{id} has no open invoices [" . $ticket->id . ']' + unless $cust->{invoice}; + + say 'Ticket ' . $ticket->id . " belongs to $cust->{id}"; + 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} } - ? $fee->{type} - : 'default'; + my $type = 'unknown'; + my $count = $fee->{count}; + while ( $type && $count > 0 && $type ne 'default' ) { + $type = exists $hours->{ $fee->{type} } + && $hours->{ $fee->{type} } > 0 ? $fee->{type} : 'default'; - next unless exists $hours->{$h_type} && $hours->{$h_type} > 0; + next unless exists $hours->{$type} && $hours->{$type} > 0; - my $discount_time = 0; - if ( $hours->{$h_type} > $fee->{count} ) { - $hours->{$h_type} -= $fee->{count}; - $discount_time = $fee->{count}; + my $discount_time = 0; + if ( $hours->{$type} > $count ) { + $hours->{$type} -= $count; + $discount_time = $count; + } + else { + $discount_time = $hours->{$type}; + $hours->{$type} = 0; + } + + if ($discount_time) { + $cust->{invoice}->{discount}->{amount} + += round( $discount_time * $fee->{rate} ); + $cust->{invoice}->{discount}->{hours}{$type} + += $discount_time; + + $type = '' if $type eq 'default'; + $count -= $discount_time; + $fee->{detail} .= " $discount_time $type Hours Discounted"; + } } - else { - $discount_time = $hours->{$h_type}; - $hours->{$h_type} = 0; + } + + push @{ $cust->{invoice}->{projects} }, $project; +} + + +if ( my $unpaid_invoices = $state->unpaid_invoices() ) { + foreach my $custid ( keys %{$unpaid_invoices} ) { + my %project + = ( title => 'Unpaid Invoices', fees => [], no_total => 1 ); + my $past_due = 0; + my $unpaid = 0; + + my $cust; + foreach ( @{$customers} ) { + if ( $_->{id} eq $custid ) { + $cust = $_; + last; + } } + $cust ||= fake_customer($custid); - if ($discount_time) { - $invoice->{discount}{amount} += $discount_time * $fee->{rate}; - $invoice->{discount}{hours}{$h_type} += $discount_time; + foreach my $id ( + sort { $a <=> $b } + keys %{ $unpaid_invoices->{$custid} } + ) + { + my $unpaid = $state->get_invoice($id); + my $invdate = ymd_to_DateTime( $unpaid->{invdate} ); - $h_type = '' if $h_type eq 'default'; - $fee->{detail} = "$discount_time $h_type Hours Discounted"; + my $content + = sprintf( "Invoice %06d from %s", $id, $invdate->ymd ); + if ( $cust->{duedate} && $invdate < $cust->{duedate}) { + $content = "PAST DUE: $content"; + $past_due += $unpaid_invoices->{$custid}->{$id}; + } + else { + $unpaid += $unpaid_invoices->{$custid}->{$id}; + } + + push @{ $project{fees} }, + { + id => $id, + contents => $content, + count => 1, + rate => $unpaid_invoices->{$custid}->{$id}, + }; } + + if ($past_due) { + $cust->{invoice} ||= make_invoice($cust); + + $cust->{invoice}->{past_due} = $past_due; + $cust->{invoice}->{unpaid} = $unpaid; + + unshift @{ $cust->{invoice}->{projects} }, \%project; + } } +} - push @{ $invoice->{projects} }, $project; +if ( my $credits = $state->credits ) { + foreach my $custid ( keys %{$credits} ) { + + my $cust; + foreach ( @{$customers} ) { + if ( $_->{id} eq $custid ) { + $cust = $_; + last; + } + } + + next unless $cust; + next unless $cust->{invoice}; + next unless $credits->{$custid} < 0; + + $cust->{invoice}->{credit} = $credits->{$custid}; + + unshift @{ $cust->{invoice}->{projects} }, { + title => 'Credits', + no_total => 1, + fees => [ + { contents => 'Available Credit', + count => 1, + rate => -$credits->{$custid}, + } + ], + }; + } } -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, ); + $invoice->{custid} = $cust->{id}; + $invoice->{transactions} = []; + my %transactions; foreach my $project ( @{ $invoice->{projects} } ) { if ( $project->{transactions} ) { - push @{ $li{transactions} }, @{ $project->{transactions} }; + %transactions = ( %transactions, %{ $project->{transactions} } ); } my $subtotal = 0; foreach my $fee ( @{ $project->{fees} } ) { @@ -219,14 +244,18 @@ $subtotal += round( $expense->{amount} ); } $project->{total} = $subtotal; + + next if $project->{no_total}; $invoice->{total} += $subtotal; } + @{ $invoice->{transactions} } = sort { $a <=> $b } keys %transactions; if ( $invoice->{discount} ) { my $c = "Included Hours\n"; if ( $invoice->{discount}{hours} ) { foreach my $t ( keys %{ $invoice->{discount}{hours} } ) { - $c .= "\n$invoice->{discount}{hours}{$t} $t hour"; + my $type = $t eq 'default' ? '' : $t; + $c .= "\n$invoice->{discount}{hours}{$t} $type hour"; $c .= 's' if $invoice->{discount}{hours}{$t} != 1; $c .= "\n"; } @@ -235,111 +264,83 @@ $invoice->{total} -= round( $invoice->{discount}{amount} ); } - if ( $invoice->{past_due} ) { - $invoice->{total_due} = $invoice->{total} + $invoice->{past_due}; + if ($invoice->{past_due}) { + $invoice->{total_due} + = sum( @{ $invoice }{ qw/ total past_due unpaid / } ); } next unless $invoice->{total} > 0 || $invoice->{total_due}; - # XXX Here we need to "make_address" $invoice->{info} = $config->get('info'); - $invoice->{from} = $config->get('from'); - $invoice->{to} = $cust->{address}; + my $from = $config->get('from'); + $from = get_user($from) if !ref $from; - $state->{lastinvoice}++; - $invoice->{id} = $state->{lastinvoice}; - $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf'; + $invoice->{id} = $state->next_invoice_id; + $invoice->{file} = sprintf 'invoice_%06d.pdf', $invoice->{id}; - 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} } + $invoice->{organization} = $from->{organization} || $from->{name}; + $invoice->{from} = make_address($from); + $invoice->{to} = make_address( $cust->{address} || $cust->{id} ); + $invoice->{logo} = $config->get('logo'); - 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; + $state->add_invoice($invoice); - foreach my $key (qw/ start end /) { - if ( exists $invoice->{$key} ) { - $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}; + } $state->save; -sub round { - my ($amount) = @_; - - #$amount =~ s/\.\d\d\K.*$//; - #return $amount; - return sprintf "%.02f", $amount; -} - sub find_customer_for_ticket { - my ( $customers, $ticket ) = @_; + my ( $ticket, $customers ) = @_; -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 ); + return fake_customer($ticket->requestors); } sub fake_customer { - my ( $customers, $ticket ) = @_; - - # make the custid the first requestor - my ($custid) = $ticket->requestors; + my ($custid) = @_; return unless $custid; - my $cust = $config->get('default') || {}; - $cust->{to} = get_user($custid); + my $cust = $config->new_customer; + push @{$customers}, $cust; - my %invoice = ( end => DateTime->now ); + $cust->{id} = $custid; + $cust->{match} = [ + { type => 'requestors', + regex => $cust->{id}, + } + ]; - 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 ); - } - - if ( !( $invoice{start} && $invoice{start} < $invoice{end} ) ) { - $cust->{invoice} = \%invoice; - } - - $customers->{$custid} = $cust; + set_cust_dates($cust); return $cust; } @@ -357,7 +358,7 @@ name => 'username', ); - $users->id($id); + my $users = RT::Client::REST::User->new( rt => $rt, id => $id ); $users->retrieve; my %user; @@ -376,6 +377,111 @@ return \%user; } +sub make_invoice { + my ($cust) = @_; + + my %invoice = ( + end => $cust->{billend}->clone->subtract( seconds => 1 ), + total => 0, + ); + $invoice{start} = $cust->{startinvoicedate}->clone + if $cust->{startinvoicedate}; + + if ( $cust->{base_rate} ) { + my ( $project, $hours ) = make_base_project($cust); + + if ( @{ $project->{fees} } ) { + $invoice{end} = $project->{end}; + $invoice{hours} = $hours; + push @{ $invoice{projects} }, $project; + } + } + elsif ( $cust->{hours} ) { + $invoice{hours} = [ + { end => $invoice{end}->clone, + hours => $cust->{hours}, + } + ]; + } + + return \%invoice; +} + +sub make_base_project { + my ($cust) = @_; + + my $date = $cust->{billstart}->clone; + my $billend = $cust->{billend}->clone; + my ($freq) = get_billing_frequency($cust); + + my $title + = $cust->{frequency} == 1 + ? ucfirst( $cust->{per} . 'ly' ) + : $freq . ' ' . ucfirst( $cust->{per} ); + $title .= ' Retainer'; + + my %project = ( title => $title, start => $date->clone, fees => [], ); + my @hours; + + while ( $date < $billend ) { + my $start = $date->clone; + + $date->add_duration($freq); + + my $end = $date > $billend ? $billend->clone : $date->clone; + $end->subtract( seconds => 1 ); + + $project{end} = $end->clone; + + push @{ $project{fees} }, + { + count => 1, + rate => $cust->{base_rate}, + contents => $start->ymd . ' to ' . $end->ymd, + }; + + push @hours, + { + start => $start->clone, + end => $end->clone, + hours => { %{ $cust->{hours} } }, + }; + } + + return \%project, \@hours; +} + +sub make_address { + my ($addr) = @_; + my @adr; + + $addr = get_user($addr) unless ref $addr; + + 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 ) = @_; @@ -386,8 +492,8 @@ title => $ticket->subject, detail => 'Ticket: ' . $ticket->id - . ' Queue: ' - . $ticket->queue + . ' Status: ' + . $ticket->status . ' Requestors: ' . join( ', ', $ticket->requestors ), fees => [], @@ -397,9 +503,15 @@ my $txns = $ticket->transactions( type => [qw(Comment Correspond)] ); my $txn_i = $txns->get_iterator; while ( my $txn = $txn_i->() ) { - next unless $txn->time_taken; next if $state->txn_is_invoiced( $txn->id ); + if ( my $expense = make_expense( $txn, $ticket ) ) { + push @{ $project{expenses} }, $expense; + $project{transactions}{ $txn->id } = 1; + } + + next unless $txn->time_taken; + my $fee = make_fee( $txn, $cust->{rates}, $ticket ); if ( !( $fee->{rate} && $fee->{count} ) ) { @@ -408,13 +520,17 @@ } my $invoice = $cust->{invoice}; - next - if $invoice->{start} - && $invoice->{start} > $fee->{date}; + if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) { + warn "Ticket " + . $ticket->id + . " has uninvoiced Transaction " + . $txn->id . "\n"; + next; + } next if $invoice->{end} < $fee->{date}; - push @{ $project{fees} }, $fee; - push @{ $project{transactions} }, $txn->id; + push @{ $project{fees} }, $fee; + $project{transactions}{ $txn->id } = 1; } return \%project; @@ -426,8 +542,16 @@ # XXX Only need $ticket for the alternate subject my $work_time = sprintf "%.03f", $txn->time_taken / 60; - my $work_type = $txn->cf('WorkType'); + my $work_type = $txn->cf('WorkType') || ''; + if ( $work_type =~ s/\s*Onsite//i ) { + + # XXX Do something special for onsite activities + } + + $work_type =~ s/^\s+|\s+$//g; + $work_type ||= 'Normal'; + my %fee = ( id => $txn->id, contents => $txn->created . ' (' @@ -446,6 +570,25 @@ return \%fee; } +sub make_expense { + my ( $txn, $ticket ) = @_; + + my $amount = $txn->cf('ExpenseAmount') or return; + + my %expense = ( + id => $txn->id, + contents => $txn->created . ' (' + . $txn->id . ')' . "\n\n" + . ( $txn->data || $ticket->subject ), + amount => $amount, + date => ymd_to_DateTime( $txn->created ), + + # detail => ???, + ); + + return \%expense; +} + sub hours_for_date { my ( $invoice, $date ) = @_; @@ -462,150 +605,74 @@ return $hours; } -sub ymd_to_DateTime { - my ($ymd) = @_; - my ( $date, $time ) = split /[\sT]/, $ymd; - my ( $year, $month, $day ) = split '-', $date; - my ( $hour, $minute, $second ) = split ':', $time if $time; +sub get_billing_frequency { + my ($cust) = @_; + my $per = $cust->{per} || 'week'; + my $freq = $cust->{frequency} || 1; - return DateTime->new( - year => $year, - month => $month, - day => $day, - hour => $hour || 0, - minute => $minute || 0, - second => $second || 0, - ); -} + my $day_method; + given ($per) { + when ('week') { $per = 'weeks'; $day_method = 'dow' } + when ('month') { $per = 'months'; $day_method = 'day' } + default { die "Unknown per [$per]\n" } + } -package RTI::Config; -use strict; -use warnings; - -use 5.010; - -use YAML::Any qw/ LoadFile Dump Load /; -use File::Basename; - -sub new { - my ( $class, $args ) = @_; - - my $self = { file => '', }; - bless $self, $class; - - my $file = $args->{file} || $self->_find_config; - $self->read_config($file); - - return $self; + return DateTime::Duration->new( $per => $freq ), $day_method; } -sub _find_config { - my ($self) = @_; +sub set_dates { + my ($customers) = @_; - # XXX This needs to be better - foreach my $file (qw/ rt_invoice.conf rt_invoice.cfg .rt_invoicerc /) { - foreach my $dir ( '.', $ENV{HOME} . '/.rt_invoicing', $ENV{HOME} ) { - my $path = join '/', $dir, $file; - return $path if -e $path; - } - } - return; -} + my $newest_invoice; + my $max_duration; -sub read_config { - my ( $self, $file ) = @_; + foreach my $cust ( @{$customers} ) { + set_cust_dates($cust); - $file ||= $self->{file}; - die "$file: no such file\n" unless -e $file; + my ($freq) = get_billing_frequency($cust); + $max_duration = $freq + if !$max_duration + || DateTime::Duration->compare( $freq, $max_duration ) > 0; - my $c = LoadFile($file) or die "Unable to load $file\n"; - - $c->{customers} ||= {}; - if ( $c->{default} ) { - foreach my $cust ( values %{ $c->{customers} } ) { - foreach my $k ( keys %{ $c->{default} } ) { - $cust->{$k} //= Load( Dump( $c->{default}->{$k} ) ); - } + if ( $cust->{startinvoicedate} ) { + my $date = $cust->{startinvoicedate}->clone; + $newest_invoice = $date->clone + if !$newest_invoice || $newest_invoice < $date; } } - $self->{_config} = $c; - $self->{file} = $file; -} + $newest_invoice ||= DateTime->now; -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; + return $newest_invoice->clone->subtract_duration($max_duration) + ->subtract( days => 1 ); } -package RTI::State; -use strict; -use warnings; +sub set_cust_dates { + my ($cust) = @_; -use 5.010; + my $day = $cust->{day} || 0; + my ( $freq, $day_method ) = get_billing_frequency($cust); -use YAML::Any qw/ LoadFile DumpFile /; + my $end = DateTime->now( time_zone => 'local' ) + ->set( hour => 0, minute => 0, second => 0 ); -my $file = ''; + my $start = $end->clone->subtract_duration($freq); -sub new { - my $class; - ( $class, $file ) = @_; + # XXX This is helpful, but monthly and billday > 28 == !!! + $end->subtract( days => 1 ) while $day && $end->$day_method != $day; - my $self = { lastinvoice => 0, }; - if ( -e $file ) { - $self = LoadFile($file) or die "Unable to load state: $!"; + my $lastinvoice = $state->last_invoice( $cust->{id} ); + if ( $lastinvoice && $lastinvoice->{end} ) { + $start = ymd_to_DateTime( $lastinvoice->{end} )->add( days => 1 ); + $cust->{startinvoicedate} = $start->clone; } - bless $self, $class; + $cust->{duedate} + = $cust->{net} + ? DateTime->now->subtract( days => $cust->{net} ) + : 0; - die "Need to pass filename to new: $!" unless $file; - - return $self; -} - -sub last_invoice { - my ( $self, $custid ) = @_; - state %table; - if ( !%table ) { - foreach my $date ( sort keys %{ $self->{invoice} } ) { - while ( my ( $id, $inv ) = each %{ $self->{invoice}->{$date} } ) { - next unless $inv->{custid}; - $table{ $inv->{custid} } = { - id => $id, - date => $date, - %{$inv}, - }; - } - } - } - return $table{$custid} || {}; -} - -sub txn_is_invoiced { - my ( $self, $txn ) = @_; - state %table; - if ( !%table ) { - foreach my $date ( sort keys %{ $self->{invoice} } ) { - foreach my $inv ( values %{ $self->{invoice}->{$date} } ) { - foreach my $t ( @{ $inv->{transactions} } ) { - $table{$t} = 1; - } - } - } - } - return $table{$txn}; -} - -sub save { - my ($self) = @_; - DumpFile( $file, {%$self} ) or die "Unable to save state: $!"; + $cust->{no_invoice} = 1 if $start->clone->add_duration($freq) > $end; + $cust->{billend} = $end; + $cust->{billstart} = $start; }