[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.11 and 1.12

version 1.11, 2011/03/22 01:16:32 version 1.12, 2011/03/22 01:46:41
Line 37 
Line 37 
     timeout => $rt_conf->{timeout},      timeout => $rt_conf->{timeout},
 );  );
 my $tickets = RT::Client::REST::Ticket->new( rt => $rt );  my $tickets = RT::Client::REST::Ticket->new( rt => $rt );
 my $users = RT::Client::REST::User->new( rt => $rt );  
   
 $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );  $rt->login( username => $rt_conf->{user}, password => $rt_conf->{pass} );
   
Line 121 
Line 120 
         }          }
     }      }
   
     $cust->{from} ||= get_user($custid);      $cust->{address} ||= get_user($custid);
     $cust->{invoice} = \%invoice;      $cust->{invoice} = \%invoice;
 }  }
   
Line 160 
Line 159 
         next;          next;
     }      }
     if ( !$cust->{invoice} ) {      if ( !$cust->{invoice} ) {
   
         #say "Customer has no open invoices for ticket " . $ticket->id;          #say "Customer has no open invoices for ticket " . $ticket->id;
         next;          next;
     }      }
Line 204 
Line 204 
     my $invoice = $cust->{invoice};      my $invoice = $cust->{invoice};
     next unless $invoice->{projects} && @{ $invoice->{projects} };      next unless $invoice->{projects} && @{ $invoice->{projects} };
   
     my %li = ( custid => $custid, );      my %li = ( custid => $custid, invdate => DateTime->now->ymd, );
   
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
Line 243 
Line 243 
   
     # XXX Here we need to "make_address"      # XXX Here we need to "make_address"
     $invoice->{info} = $config->get('info');      $invoice->{info} = $config->get('info');
     $invoice->{from} = $config->get('from');      $invoice->{from} = make_address( $config->get('from') );
     $invoice->{to}   = $cust->{address};      $invoice->{to}   = make_address( $cust->{address} );
   
     $state->{lastinvoice}++;      $state->{lastinvoice}++;
     $invoice->{id}   = $state->{lastinvoice};      $invoice->{id}   = $state->{lastinvoice};
Line 256 
Line 256 
         if    ( $invoice->{$k} ) { $v = $invoice->{$k} }          if    ( $invoice->{$k} ) { $v = $invoice->{$k} }
         elsif ( $cust->{$k} )    { $v = $cust->{$k} }          elsif ( $cust->{$k} )    { $v = $cust->{$k} }
   
         if (defined $v && length $v) {          if ( defined $v && length $v ) {
             if ( ref $v eq 'DateTime' ) {              if ( ref $v eq 'DateTime' ) {
                 $li{$k} = $v->ymd;                  $li{$k} = $v->ymd;
             }              }
Line 325 
Line 325 
     return unless $custid;      return unless $custid;
   
     my $cust = $config->get('default') || {};      my $cust = $config->get('default') || {};
     $cust->{to} = get_user($custid);      $cust->{address} = get_user($custid);
   
     my %invoice = ( end => DateTime->now );      my %invoice = ( end => DateTime->now );
   
Line 357 
Line 357 
         name          => 'username',          name          => 'username',
     );      );
   
     $users->id($id);      my $users = RT::Client::REST::User->new( rt => $rt, id => $id );
     $users->retrieve;      $users->retrieve;
   
     my %user;      my %user;
Line 374 
Line 374 
   
     $users{$id} = \%user;      $users{$id} = \%user;
     return \%user;      return \%user;
   }
   
   sub make_address {
       my ($addr) = @_;
       my @adr;
   
       if ( $addr->{organization} ) {
           push @adr, $addr->{organization};
       }
       elsif ( $addr->{name} && !$addr->{attn} ) {
           push @adr, $addr->{name};
       }
   
       if (   ( $addr->{addr1} || $addr->{addr2} )
           && $addr->{city}
           && $addr->{state}
           && $addr->{zip} )
       {
           push @adr, $addr->{attn}  if $addr->{attn};
           push @adr, $addr->{addr1} if $addr->{addr1};
           push @adr, $addr->{addr2} if $addr->{addr2};
           push @adr,
               $addr->{city} . ', ' . $addr->{state} . '  ' . $addr->{zip};
       }
       else {
           push @adr, $addr->{email} if $addr->{email};
       }
   
       return join "\n\n", @adr;
 }  }
   
 sub make_project {  sub make_project {
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>