[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.20 and 1.23

version 1.20, 2011/03/24 00:05:47 version 1.23, 2011/04/08 19:00:16
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $AFresh1: rt_invoices.pl,v 1.19 2011/03/22 05:27:12 andrew Exp $  # $AFresh1: rt_invoices.pl,v 1.22 2011/04/08 17:10:28 andrew Exp $
 ########################################################################  ########################################################################
 # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2011 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 40 
Line 40 
   
 $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );  $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
   
   #use YAML;
 #print Dump $config, $state; exit;  #print Dump $config, $state; exit;
   
 my $startdate;  my $startdate;
Line 88 
Line 89 
         next;          next;
     }      }
     if ( !$cust->{invoice} ) {      if ( !$cust->{invoice} ) {
           say "$cust->{id} has no open invoices [" . $ticket->id . ']';
         #say "Customer has no open invoices for ticket " . $ticket->id;  
         next;          next;
     }      }
       say 'Giving ticket ' . $ticket->id . " to $cust->{id}";
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
   
     my $project = make_project( $ticket, $cust );      my $project = make_project( $ticket, $cust );
Line 176 
Line 177 
     $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} || $custid );      $invoice->{to}           = make_address( $cust->{address} || $custid );
   
     $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');
   
     foreach my $k (qw/ file transactions start end total past_due total_due /)      foreach my $k (qw/ file transactions start end total past_due total_due /)
     {      {
Line 210 
Line 212 
     File::Path::make_path($invoice_dir);      File::Path::make_path($invoice_dir);
     my $file = join '/', $invoice_dir, $invoice->{file};      my $file = join '/', $invoice_dir, $invoice->{file};
   
     my $tt = Template->new(      my $tt = Template->new( INCLUDE_PATH => $config->get('template_dir'), )
         INCLUDE_PATH => $config->get('template_dir'),          || die $Template::ERROR, "\n";
     )|| die $Template::ERROR, "\n";  
   
     $tt->process( $config->get('invoice_template'), $invoice, $file )      $tt->process( $config->get('invoice_template'), $invoice, $file )
         or die $tt->error . "\n";          or die $tt->error . "\n";
Line 234 
Line 235 
 sub find_customer_for_ticket {  sub find_customer_for_ticket {
     my ( $customers, $ticket ) = @_;      my ( $customers, $ticket ) = @_;
   
 INVOICE: foreach my $cust ( values %{$customers} ) {      foreach my $cust ( values %{$customers} ) {
         next INVOICE 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 $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} ) {              if (! $match) {
                 my $match = lc $m->{$type};  
                 next INVOICE unless lc($thing) ~~ $match;  
             }  
             elsif ( $m->{regex} ) {  
                 next INVOICE unless $thing ~~ /\Q$m->{regex}\E/;  
             }  
             else {  
                 warn "Invalid match!";                  warn "Invalid match!";
                 next INVOICE;                  next;
             }              }
               return $cust if ($match ~~ $thing);
         }          }
         return $cust;  
     }      }
   
     return fake_customer( $customers, $ticket );      return fake_customer( $customers, $ticket );
Line 316 
Line 311 
 sub make_invoice {  sub make_invoice {
     my ($cust) = @_;      my ($cust) = @_;
   
     my $day  = $cust->{day}       ||= 1;      my $day  = $cust->{day}       ||= 0;
     my $per  = $cust->{per}       ||= 'week';      my $per  = $cust->{per}       ||= 'week';
     my $freq = $cust->{frequency} ||= 1;      my $freq = $cust->{frequency} ||= 1;
   
Line 330 
Line 325 
     my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );      my $billends = DateTime->now->set( hour => 0, minute => 0, second => 0 );
   
     # XXX This is helpful, but monthly and billday > 28 == !!!      # XXX This is helpful, but monthly and billday > 28 == !!!
     $billends->subtract( days => 1 ) while $billends->$day_method != $day;      $billends->subtract( days => 1 )
           while $day && $billends->$day_method != $day;
   
     my $date = $billends->clone->subtract( $per => $freq );      my $date = $billends->clone->subtract( $per => $freq );
   
Line 347 
Line 343 
             if !$startdate || $startdate > $date;              if !$startdate || $startdate > $date;
     }      }
   
     return if $billends <= $date;      # Is the start date more than $freq $per before the end date?
       my $diff = $billends - $date;
       return unless $diff->subtract( $per => $freq )->is_positive;
   
     if ( $cust->{base_rate} ) {      if ( $cust->{base_rate} ) {
         my ( $project, $hours ) = make_base_project(          my ( $project, $hours ) = make_base_project(
Line 406 
Line 404 
         $date = $enddate->clone if $date > $enddate;          $date = $enddate->clone if $date > $enddate;
   
         # XXX This is helpful, but monthly and billday > 28 == !!!          # XXX This is helpful, but monthly and billday > 28 == !!!
         $date->subtract( days => 1 ) while $date->$day_method != $day;          $date->subtract( days => 1 ) while $day && $date->$day_method != $day;
   
         my $end = $date->clone->subtract( seconds => 1 );          my $end = $date->clone->subtract( seconds => 1 );
   
Line 572 
Line 570 
 use 5.010;  use 5.010;
   
 use YAML::Any qw/ LoadFile Dump Load /;  use YAML::Any qw/ LoadFile Dump Load /;
 use File::Basename;  use File::Spec;
   
 sub new {  sub new {
     my ( $class, $args ) = @_;      my ( $class, $args ) = @_;
Line 625 
Line 623 
     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(
            File::Spec->rel2abs( $self->{file} ));
   
     given ($key) {      given ($key) {
         when ('state') {          when ('state') {
Line 632 
Line 632 
             $value =~ s/(?:\.[^.]+)?$/\.state/;              $value =~ s/(?:\.[^.]+)?$/\.state/;
         }          }
         when ('invoice_dir') {          when ('invoice_dir') {
             $value = dirname( $self->{file} ) . '/invoices';              $value = File::Spec->catdir($volume, $directories, 'invoices' );
         }          }
         when ('template_dir') {          when ('template_dir') {
             $value = dirname( $self->{file} );              $value = File::Spec->catdir( $volume, $directories );
         }          }
         when ('invoice_template') {          when ('invoice_template') {
             $value = 'invoice.tex.tt';              $value = 'invoice.tex.tt';
           }
           when ('logo') {
               $value = File::Spec->catfile($volume, $directories, 'Logo.pdf' );
         }          }
     }      }
   
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.23
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>