===================================================================
RCS file: /cvs/RT/Invoicing/rt_invoices.pl,v
retrieving revision 1.27
retrieving revision 1.35
diff -u -r1.27 -r1.35
--- RT/Invoicing/rt_invoices.pl	2011/04/19 04:21:06	1.27
+++ RT/Invoicing/rt_invoices.pl	2011/05/18 20:02:36	1.35
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $AFresh1: rt_invoices.pl,v 1.25 2011/04/19 03:18:13 andrew Exp $
+# $AFresh1: rt_invoices.pl,v 1.34 2011/05/07 02:34:17 andrew Exp $
 ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #
@@ -76,12 +76,7 @@
 
 my $iterator = $results->get_iterator;
 while ( my $ticket = &$iterator ) {
-    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;
@@ -101,30 +96,31 @@
     foreach my $fee ( @{ $project->{fees} } ) {
         my $hours = hours_for_date( $cust->{invoice}, $fee->{date} );
 
-        my $h_type
-            = exists $hours->{ $fee->{type} }
-            ? $fee->{type}
-            : 'default';
+        my $type = 'unknown';
+        while ($type && $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};
-        }
-        else {
-            $discount_time = $hours->{$h_type};
-            $hours->{$h_type} = 0;
-        }
+            my $discount_time = 0;
+            if ( $hours->{$type} > $fee->{count} ) {
+                $hours->{$type} -= $fee->{count};
+                $discount_time = $fee->{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}{$h_type} += $discount_time;
+            if ($discount_time) {
+                $cust->{invoice}->{discount}->{amount}
+                    += round( $discount_time * $fee->{rate} );
+                $cust->{invoice}->{discount}->{hours}{$type} += $discount_time;
 
-            $h_type = '' if $h_type eq 'default';
-            $fee->{detail} = "$discount_time $h_type Hours Discounted";
+                $type = '' if $type eq 'default';
+                $fee->{detail} .= " $discount_time $type Hours Discounted";
+            }
         }
     }
 
@@ -135,11 +131,16 @@
     my $invoice = $cust->{invoice};
     next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };
 
-    my %li = ( custid => $cust->{id}, invdate => DateTime->now->ymd, );
+    my %li = (
+        custid  => $cust->{id},
+        invdate => DateTime->now( time_zone => 'local' )->ymd,
+        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} } ) {
@@ -152,12 +153,14 @@
         $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;
     }
+    @{ $li{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";
             }
@@ -177,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');
 
@@ -239,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 );
         }
     }
 
@@ -313,19 +319,16 @@
         default { die "Unknown per [$per]\n" }
     }
 
-    my $billends = DateTime->now
-        ->subtract( days => 1 )
-        ->set( hour => 23, minute => 59, second => 59 );
+    my $billend = DateTime->now( time_zone => 'local' )
+        ->set( hour => 0, minute => 0, second => 0 );
 
     # XXX This is helpful, but monthly and billday > 28 == !!!
-    $billends->subtract( days => 1 )
-        while $day && $billends->$day_method != $day;
+    $billend->subtract( days => 1 )
+        while $day && $billend->$day_method != $day;
 
-    my $date = $billends->clone->subtract( $per => $freq )
-        ->set( hour => 0, minute => 0, second => 0 );
+    my $date = $billend->clone->subtract( $per => $freq );
+    my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );
 
-    my %invoice = ( end => $billends->clone->subtract( seconds => 1 ) );
-
     my $lastinvoice = $state->last_invoice( $cust->{id} );
     if ( $lastinvoice->{date} ) {
         my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
@@ -338,18 +341,17 @@
     }
 
     # Is the start date more than $freq $per before the end date?
-    my $diff = $billends - $date;
-    return {} if $diff->in_units($per) < 1;
+    return {}
+        if DateTime->compare( $date->clone->add( $per => $freq ), $billend )
+            > 0;
 
     if ( $cust->{base_rate} ) {
         my ( $project, $hours ) = make_base_project(
             $cust,
-            {   startdate  => $date,
-                enddate    => $billends,
-                per        => $per,
-                freq       => $freq,
-                day        => $day,
-                day_method => $day_method,
+            {   date    => $date,
+                billend => $billend,
+                per     => $per,
+                freq    => $freq,
             }
         );
 
@@ -375,12 +377,10 @@
 sub make_base_project {
     my ( $cust, $args ) = @_;
 
-    my $date       = $args->{startdate};
-    my $enddate    = $args->{enddate};
-    my $per        = $args->{per};
-    my $freq       = $args->{freq};
-    my $day        = $args->{day};
-    my $day_method = $args->{day_method};
+    my $date    = $args->{date};
+    my $billend = $args->{billend};
+    my $per     = $args->{per};
+    my $freq    = $args->{freq};
 
     my $title
         = $freq == 1
@@ -391,19 +391,14 @@
     my %project = ( title => $title, start => $date->clone, fees => [], );
     my @hours;
 
-    while ( $date < $enddate ) {
+    while ( $date < $billend ) {
         my $start = $date->clone;
 
         $date->add( $per => $freq );
-        $date = $enddate->clone if $date > $enddate;
 
-        # XXX This is helpful, but monthly and billday > 28 == !!!
-        $date->subtract( days => 1 ) while $day && $date->$day_method != $day;
-
         my $end = $date->clone->subtract( seconds => 1 );
+        $end = $billend->clone->subtract( seconds => 1 ) if $date > $billend;
 
-        last if $end < $start;
-
         $project{end} = $end->clone;
 
         push @{ $project{fees} },
@@ -476,9 +471,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} ) ) {
@@ -487,15 +488,17 @@
         }
 
         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};
 
         push @{ $project{fees} },         $fee;
-        push @{ $project{transactions} }, $txn->id;
+        $project{transactions}{ $txn->id } = 1;
     }
 
     return \%project;
@@ -509,6 +512,13 @@
     my $work_time = sprintf "%.03f", $txn->time_taken / 60;
     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 . ' ('
@@ -527,6 +537,24 @@
     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 ) = @_;
 
@@ -550,12 +578,13 @@
     my ( $hour, $minute, $second ) = split ':', $time if $time;
 
     return DateTime->new(
-        year   => $year,
-        month  => $month,
-        day    => $day,
-        hour   => $hour || 0,
-        minute => $minute || 0,
-        second => $second || 0,
+        year      => $year,
+        month     => $month,
+        day       => $day,
+        hour      => $hour || 0,
+        minute    => $minute || 0,
+        second    => $second || 0,
+        time_zone => 'local',
     );
 }
 
@@ -619,8 +648,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') {
@@ -628,7 +657,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 );
@@ -637,7 +666,7 @@
             $value = 'invoice.tex.tt';
         }
         when ('logo') {
-            $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' );
+            $value = File::Spec->catfile( $volume, $directories, 'Logo.pdf' );
         }
     }