[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.21 and 1.22

version 1.21, 2011/03/24 21:03:49 version 1.22, 2011/04/08 18:10:28
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $AFresh1: rt_invoices.pl,v 1.20 2011/03/23 23:05:47 andrew Exp $  # $AFresh1: rt_invoices.pl,v 1.21 2011/03/24 20:03:49 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 182 
Line 183 
     $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 233 
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 572 
Line 568 
 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 621 
     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 630 
             $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.21  
changed lines
  Added in v.1.22
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>