[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.27 and 1.30

version 1.27, 2011/04/19 04:21:06 version 1.30, 2011/05/03 05:41:11
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $AFresh1: rt_invoices.pl,v 1.25 2011/04/19 03:18:13 andrew Exp $  # $AFresh1: rt_invoices.pl,v 1.29 2011/05/03 04:38:56 andrew Exp $
 ########################################################################  ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 76 
Line 76 
   
 my $iterator = $results->get_iterator;  my $iterator = $results->get_iterator;
 while ( my $ticket = &$iterator ) {  while ( my $ticket = &$iterator ) {
     if (!$ticket->time_worked) {      if ( !$ticket->time_worked ) {
         say "Ticket " . $ticket->id . " has no time worked";          say "Ticket " . $ticket->id . " has no time worked";
         next;          next;
     }      }
   
     my $cust = find_customer_for_ticket( $ticket );      my $cust = find_customer_for_ticket($ticket);
     if ( !$cust ) {      if ( !$cust ) {
         warn "No customer found for ticket " . $ticket->id;          warn "No customer found for ticket " . $ticket->id;
         next;          next;
Line 135 
Line 135 
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
     next unless $invoice && $invoice->{projects} && @{ $invoice->{projects} };      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,
       );
   
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
Line 177 
Line 180 
     $from = get_user($from) if !ref $from;      $from = get_user($from) if !ref $from;
   
     $invoice->{organization} = $from->{organization} || $from->{name};      $invoice->{organization} = $from->{organization} || $from->{name};
     $invoice->{from}         = make_address($from);      $invoice->{from} = make_address($from);
     $invoice->{to}           = make_address( $cust->{address} || $cust->{id} );      $invoice->{to} = make_address( $cust->{address} || $cust->{id} );
   
     $state->{lastinvoice}++;      $state->{lastinvoice}++;
     $invoice->{id} = $state->{lastinvoice};      $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};      $invoice->{file} = sprintf 'invoice_%06d.pdf', $state->{lastinvoice};
     $invoice->{logo} = $config->get('logo');      $invoice->{logo} = $config->get('logo');
   
Line 239 
Line 242 
         next unless $cust->{match};          next unless $cust->{match};
         foreach my $m ( @{ $cust->{match} } ) {          foreach my $m ( @{ $cust->{match} } ) {
             my $type = $m->{type};              my $type = $m->{type};
             my $match = exists $m->{$type} ? lc($m->{$type}) : qr/\Q$m->{regex}\E/;              my $match
             my $thing = [ map { lc } $ticket->$type ];                  = exists $m->{$type}
                   ? lc( $m->{$type} )
                   : qr/\Q$m->{regex}\E/;
               my $thing = [ map {lc} $ticket->$type ];
   
             if (! $match) {              if ( !$match ) {
                 warn "Invalid match!";                  warn "Invalid match!";
                 next;                  next;
             }              }
             return $cust if ($match ~~ $thing);              return $cust if ( $match ~~ $thing );
         }          }
     }      }
   
Line 313 
Line 319 
         default { die "Unknown per [$per]\n" }          default { die "Unknown per [$per]\n" }
     }      }
   
     my $billends = DateTime->now      my $billend = DateTime->now( time_zone => 'local' )
         ->subtract( days => 1 )          ->set( hour => 0, minute => 0, second => 0 );
         ->set( hour => 23, minute => 59, second => 59 );  
   
     # XXX This is helpful, but monthly and billday > 28 == !!!      # XXX This is helpful, but monthly and billday > 28 == !!!
     $billends->subtract( days => 1 )      $billend->subtract( days => 1 )
         while $day && $billends->$day_method != $day;          while $day && $billend->$day_method != $day;
   
     my $date = $billends->clone->subtract( $per => $freq )      my $date = $billend->clone->subtract( $per => $freq );
         ->set( hour => 0, minute => 0, second => 0 );      my %invoice = ( end => $billend->clone->subtract( seconds => 1 ) );
   
     my %invoice = ( end => $billends->clone->subtract( seconds => 1 ) );  
   
     my $lastinvoice = $state->last_invoice( $cust->{id} );      my $lastinvoice = $state->last_invoice( $cust->{id} );
     if ( $lastinvoice->{date} ) {      if ( $lastinvoice->{date} ) {
         my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );          my $last_invoice_date = ymd_to_DateTime( $lastinvoice->{date} );
Line 338 
Line 341 
     }      }
   
     # Is the start date more than $freq $per before the end date?      # Is the start date more than $freq $per before the end date?
     my $diff = $billends - $date;      return {}
     return {} if $diff->in_units($per) < 1;          if DateTime->compare( $date->clone->add( $per => $freq ), $billend )
               > 0;
   
     if ( $cust->{base_rate} ) {      if ( $cust->{base_rate} ) {
         my ( $project, $hours ) = make_base_project(          my ( $project, $hours ) = make_base_project(
             $cust,              $cust,
             {   startdate  => $date,              {   date    => $date,
                 enddate    => $billends,                  billend => $billend,
                 per        => $per,                  per     => $per,
                 freq       => $freq,                  freq    => $freq,
                 day        => $day,  
                 day_method => $day_method,  
             }              }
         );          );
   
Line 375 
Line 377 
 sub make_base_project {  sub make_base_project {
     my ( $cust, $args ) = @_;      my ( $cust, $args ) = @_;
   
     my $date       = $args->{startdate};      my $date    = $args->{date};
     my $enddate    = $args->{enddate};      my $billend = $args->{billend};
     my $per        = $args->{per};      my $per     = $args->{per};
     my $freq       = $args->{freq};      my $freq    = $args->{freq};
     my $day        = $args->{day};  
     my $day_method = $args->{day_method};  
   
     my $title      my $title
         = $freq == 1          = $freq == 1
Line 391 
Line 391 
     my %project = ( title => $title, start => $date->clone, fees => [], );      my %project = ( title => $title, start => $date->clone, fees => [], );
     my @hours;      my @hours;
   
     while ( $date < $enddate ) {      while ( $date < $billend ) {
         my $start = $date->clone;          my $start = $date->clone;
   
         $date->add( $per => $freq );          $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 );          my $end = $date->clone->subtract( seconds => 1 );
           $end = $billend->clone->subtract( seconds => 1 ) if $date > $billend;
   
         last if $end < $start;  
   
         $project{end} = $end->clone;          $project{end} = $end->clone;
   
         push @{ $project{fees} },          push @{ $project{fees} },
Line 487 
Line 482 
         }          }
   
         my $invoice = $cust->{invoice};          my $invoice = $cust->{invoice};
         if ($invoice->{start} && $invoice->{start} > $fee->{date}) {          if ( $invoice->{start} && $invoice->{start} > $fee->{date} ) {
             warn "Ticket " . $ticket->id              warn "Ticket "
                 . " has old uninvoiced Transaction " .  $txn->id . "\n";                  . $ticket->id
                   . " has uninvoiced Transaction "
                   . $txn->id . "\n";
             next;              next;
         }          }
         next if $invoice->{end} < $fee->{date};          next if $invoice->{end} < $fee->{date};
Line 550 
Line 547 
     my ( $hour, $minute, $second ) = split ':', $time if $time;      my ( $hour, $minute, $second ) = split ':', $time if $time;
   
     return DateTime->new(      return DateTime->new(
         year   => $year,          year      => $year,
         month  => $month,          month     => $month,
         day    => $day,          day       => $day,
         hour   => $hour || 0,          hour      => $hour || 0,
         minute => $minute || 0,          minute    => $minute || 0,
         second => $second || 0,          second    => $second || 0,
           time_zone => 'local',
     );      );
 }  }
   
Line 619 
Line 617 
     my $value = Load( Dump( $self->{_config}->{$key} ) );      my $value = Load( Dump( $self->{_config}->{$key} ) );
   
     return $value if $value;      return $value if $value;
     my ($volume,$directories,$file) =File::Spec->splitpath(      my ( $volume, $directories, $file )
          File::Spec->rel2abs( $self->{file} ));          = File::Spec->splitpath( File::Spec->rel2abs( $self->{file} ) );
   
     given ($key) {      given ($key) {
         when ('state') {          when ('state') {
Line 628 
Line 626 
             $value =~ s/(?:\.[^.]+)?$/\.state/;              $value =~ s/(?:\.[^.]+)?$/\.state/;
         }          }
         when ('invoice_dir') {          when ('invoice_dir') {
             $value = File::Spec->catdir($volume, $directories, 'invoices' );              $value = File::Spec->catdir( $volume, $directories, 'invoices' );
         }          }
         when ('template_dir') {          when ('template_dir') {
             $value = File::Spec->catdir( $volume, $directories );              $value = File::Spec->catdir( $volume, $directories );
Line 637 
Line 635 
             $value = 'invoice.tex.tt';              $value = 'invoice.tex.tt';
         }          }
         when ('logo') {          when ('logo') {
             $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' );              $value = File::Spec->catfile( $volume, $directories, 'Logo.pdf' );
         }          }
     }      }
   
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.30
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>