[BACK]Return to rt_invoices.pl CVS log [TXT][DIR] Up to [local] / RT / Invoicing

Diff for /RT/Invoicing/rt_invoices.pl between version 1.6 and 1.7

version 1.6, 2011/03/21 21:49:44 version 1.7, 2011/03/21 23:29:22
Line 38 
Line 38 
         my $day  = $cust->{day}       || 1;          my $day  = $cust->{day}       || 1;
         my $freq = $cust->{frequency} || 1;          my $freq = $cust->{frequency} || 1;
   
         my $day_method;  
         my $per;          my $per;
           my $day_method;
         given ( $cust->{per} ) {          given ( $cust->{per} ) {
             when ('week')  { $per = 'weeks';  $day_method = 'dow' }              when ('week')  { $per = 'weeks';  $day_method = 'dow' }
             when ('month') { $per = 'months'; $day_method = 'day' }              when ('month') { $per = 'months'; $day_method = 'day' }
Line 48 
Line 48 
   
         my $billends          my $billends
             = DateTime->now->set( hour => 0, minute => 0, second => 0 );              = DateTime->now->set( hour => 0, minute => 0, second => 0 );
         while ( $billends->$day_method != $day ) {          $billends->subtract( days => 1 ) while $billends->$day_method != $day;
             $billends->subtract( days => 1 );  
         }  
   
         my $date = $billends->clone->subtract( $per => $freq );          my $date = $billends->clone->subtract( $per => $freq );
   
         my $lastinvoice = $state->last_invoice($custid);          my $lastinvoice = $state->last_invoice($custid);
         if ( $lastinvoice->{date} ) {          if ( $lastinvoice->{date} ) {
             my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );              my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
   
             warn "HAVE LASTINVOICE DATE\n";  
             next CUSTOMER  
                 if DateTime->compare( $billends, $last_invoice_date ) < 1;  
   
             $date = $last_invoice_date->clone->add( days => 1 );              $date = $last_invoice_date->clone->add( days => 1 );
         }          }
   
           next CUSTOMER if $billends <= $date;
   
         my $title          my $title
             = $freq == 1              = $freq == 1
             ? ucfirst( $cust->{per} . 'ly' )              ? ucfirst( $cust->{per} . 'ly' )
Line 78 
Line 73 
   
             $date->add( $per => $freq );              $date->add( $per => $freq );
             $date = $billends->clone if $date > $billends;              $date = $billends->clone if $date > $billends;
             if ( my $diff = $date->$day_method - $day ) {  
                 $date->subtract( days => $diff );  
             }  
   
               # 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 );              my $end = $date->clone->subtract( seconds => 1 );
   
               next if $end < $start;
   
             $startdate = $start->clone if !$startdate || $startdate > $start;              $startdate = $start->clone if !$startdate || $startdate > $start;
             $invoice{start} ||= $start->clone;              $invoice{start} ||= $start->clone;
             $invoice{end} = $end->clone;              $invoice{end} = $end->clone;
Line 143 
Line 140 
     my $cust = find_customer_for_ticket( $customers, $ticket );      my $cust = find_customer_for_ticket( $customers, $ticket );
     if ( !$cust ) {      if ( !$cust ) {
         say "No customer found for ticket " . $ticket->id;          say "No customer found for ticket " . $ticket->id;
   
         # XXX should construct a "new" invoice to pop onto the list  
         next;          next;
     }      }
       if ( !$cust->{invoice} ) {
           say "Customer has no open invoices for ticket " . $ticket->id;
           next;
       }
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
   
     #foreach my $r ($ticket->requestors) {      #foreach my $r ($ticket->requestors) {
Line 154 
Line 153 
     #    $users->retrieve;      #    $users->retrieve;
     #    print Dump $users;      #    print Dump $users;
     #}      #}
     my $project = make_project( $invoice, $ticket );  
       my $project = make_project( $ticket, $cust );
     next unless @{ $project->{fees} } || @{ $project->{expenses} };      next unless @{ $project->{fees} } || @{ $project->{expenses} };
   
     foreach my $fee ( @{ $project->{fees} } ) {      foreach my $fee ( @{ $project->{fees} } ) {
Line 194 
Line 194 
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
     next unless $invoice->{projects} && @{ $invoice->{projects} };      next unless $invoice->{projects} && @{ $invoice->{projects} };
   
       my %li = ( custid => $custid, );
   
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         print "$project->{title}\n";          print "$project->{title}\n";
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
             push @{ $cust->{transactions} }, @{ $project->{transactions} };              push @{ $li{transactions} }, @{ $project->{transactions} };
         }          }
         my $subtotal = 0;          my $subtotal = 0;
         foreach my $fee ( @{ $project->{fees} } ) {          foreach my $fee ( @{ $project->{fees} } ) {
Line 239 
Line 241 
     $invoice->{id}   = $state->{lastinvoice};      $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';      $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';
   
     my %li = ( custid => $custid, );  
   
     foreach my $k (qw/ transactions /) {      foreach my $k (qw/ transactions /) {
         if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }          if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
         elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }          elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }
Line 250 
Line 250 
         = \%li;          = \%li;
   
     print "Created Invoice\n";      print "Created Invoice\n";
     print Dump $invoice;      print Dump $cust;
   
     foreach my $key (qw/ start end /) {      foreach my $key (qw/ start end /) {
         if ( exists $invoice->{$key} ) {          if ( exists $invoice->{$key} ) {
Line 312 
Line 312 
 }  }
   
 sub make_project {  sub make_project {
     my ( $invoice, $ticket ) = @_;      my ( $ticket, $cust ) = @_;
   
     my %project = (      my %project = (
         id     => $ticket->id,          id     => $ticket->id,
Line 335 
Line 335 
         next unless $txn->time_taken;          next unless $txn->time_taken;
         next if $state->txn_is_invoiced( $txn->id );          next if $state->txn_is_invoiced( $txn->id );
   
         my $fee = make_fee( $ticket, $txn, $invoice->{rates} );          my $fee = make_fee( $txn, $cust->{rates}, $ticket );
   
         if ( !( $fee->{rate} && $fee->{count} ) ) {          if ( !( $fee->{rate} && $fee->{count} ) ) {
             warn "Invalid Fee, no rate or count";              warn "Invalid Fee, no rate or count";
             next;              next;
         }          }
   
         next if $invoice->{start} && $invoice->{start} > $fee->{date};          my $invoice = $cust->{invoice};
           next
               if $invoice->{start}
                   && $invoice->{start} > $fee->{date};
         next if $invoice->{end} < $fee->{date};          next if $invoice->{end} < $fee->{date};
   
         push @{ $project{fees} },         $fee;          push @{ $project{fees} },         $fee;
Line 352 
Line 356 
 }  }
   
 sub make_fee {  sub make_fee {
     my ( $ticket, $txn, $rates ) = @_;      my ( $txn, $rates, $ticket ) = @_;
   
       # XXX Only need $ticket for the alternate subject
   
     my $work_time = sprintf "%.03f", $txn->time_taken / 60;      my $work_time = sprintf "%.03f", $txn->time_taken / 60;
     my $work_type = $txn->cf('WorkType');      my $work_type = $txn->cf('WorkType');
     my $work_rate = $rates->{$work_type} || $rates->{default} || 0;  
   
     my %fee = (      my %fee = (
         id       => $txn->id,          id       => $txn->id,
Line 364 
Line 369 
             . $txn->id . ')' . "\n\n"              . $txn->id . ')' . "\n\n"
             . ( $txn->data || $ticket->subject ),              . ( $txn->data || $ticket->subject ),
         count => $work_time,          count => $work_time,
         rate  => $work_rate,  
         type  => $work_type,          type  => $work_type,
         date  => ymd_to_DateTime( $txn->created ),          date  => ymd_to_DateTime( $txn->created ),
           rate  => $rates->{$work_type} || $rates->{default} || 0,
     );      );
   
     if ( $work_type && $work_type ne 'Normal' ) {      if ( $work_type && $work_type ne 'Normal' ) {
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>