[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.8 and 1.9

version 1.8, 2011/03/22 00:22:27 version 1.9, 2011/03/22 01:01:53
Line 105 
Line 105 
         }          }
     }      }
   
       $cust->{from} ||= get_user($custid);
     $cust->{invoice} = \%invoice;      $cust->{invoice} = \%invoice;
 }  }
   
Line 180 
Line 181 
         }          }
     }      }
   
     print " Added ticket $project->{id}\n";  
     push @{ $invoice->{projects} }, $project;      push @{ $invoice->{projects} }, $project;
 }  }
   
Line 191 
Line 191 
     my %li = ( custid => $custid, );      my %li = ( custid => $custid, );
   
     foreach my $project ( @{ $invoice->{projects} } ) {      foreach my $project ( @{ $invoice->{projects} } ) {
         print "$project->{title}\n";  
         if ( $project->{transactions} ) {          if ( $project->{transactions} ) {
             push @{ $li{transactions} }, @{ $project->{transactions} };              push @{ $li{transactions} }, @{ $project->{transactions} };
         }          }
         my $subtotal = 0;          my $subtotal = 0;
         foreach my $fee ( @{ $project->{fees} } ) {          foreach my $fee ( @{ $project->{fees} } ) {
             my $amount = round( $fee->{count} * $fee->{rate} );              my $amount = round( $fee->{count} * $fee->{rate} );
             print "  $amount (" . ( $fee->{count} * $fee->{rate} ) . ")\n";  
             $subtotal += $amount;              $subtotal += $amount;
         }          }
         foreach my $expense ( @{ $project->{expenses} } ) {          foreach my $expense ( @{ $project->{expenses} } ) {
Line 206 
Line 204 
         }          }
         $project->{total} = $subtotal;          $project->{total} = $subtotal;
         $invoice->{total} += $subtotal;          $invoice->{total} += $subtotal;
         print " Subtotal $subtotal\n";  
     }      }
   
     if ( $invoice->{discount} ) {      if ( $invoice->{discount} ) {
Line 226 
Line 223 
         $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};          $invoice->{total_due} = $invoice->{total} + $invoice->{past_due};
     }      }
   
       next unless $invoice->{total} > 0 || $invoice->{total_due};
   
     # 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} = $config->get('from');
Line 235 
Line 234 
     $invoice->{id}   = $state->{lastinvoice};      $invoice->{id}   = $state->{lastinvoice};
     $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';      $invoice->{file} = 'invoice_' . $state->{lastinvoice} . '.pdf';
   
     foreach my $k (qw/ transactions /) {  
         if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }  
         elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }  
     }  
   
     $state->{invoice}->{ $invoice->{end}->ymd }{ $state->{lastinvoice} }  
         = \%li;  
   
     print "Created Invoice\n";  
     print Dump $cust;  
   
     foreach my $key (qw/ start end /) {      foreach my $key (qw/ start end /) {
         if ( exists $invoice->{$key} ) {          if ( exists $invoice->{$key} ) {
             $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');              $invoice->{$key} = $invoice->{$key}->strftime('%B %d, %Y');
         }          }
     }      }
   
       foreach my $k (qw/ transactions start end total past_due total_due /) {
           if    ( $invoice->{$k} ) { $li{$k} = $invoice->{$k} }
           elsif ( $cust->{$k} )    { $li{$k} = $cust->{$k} }
       }
   
       $state->{invoice}->{ $invoice->{end} }{ $invoice->{id} } = \%li;
   
     my $tt = Template->new;      my $tt = Template->new;
     $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )      $tt->process( 'invoice.tex.tt', $invoice, $invoice->{file} )
         or die $tt->error . "\n";          or die $tt->error . "\n";
   
     print "Generated $invoice->{file}\n";      printf "Generated %s for %s: \$%.02f\n", $invoice->{file}, $custid,
           $invoice->{total};
 }  }
   
 # XXX Save State  
 print Dump $state;  
 $state->save;  $state->save;
   
 sub round {  sub round {
Line 306 
Line 300 
     return unless $custid;      return unless $custid;
   
     my $cust = $config->get('default') || {};      my $cust = $config->get('default') || {};
     $cust->{to} = get_requestor($custid);      $cust->{to} = get_user($custid);
   
     my %invoice = ( end => DateTime->now );      my %invoice = ( end => DateTime->now );
   
Line 324 
Line 318 
     return $cust;      return $cust;
 }  }
   
 sub get_requestor {  sub get_user {
     my ($id) = @_;      my ($id) = @_;
   
     state %requestors;      state %users;
     return $requestors{$id} if $requestors{$id};      return $users{$id} if $users{$id};
   
     my %map = (      my %map = (
         address_one   => 'addr1',          address_one   => 'addr1',
         address_two   => 'addr2',          address_two   => 'addr2',
         email_address => 'email',          email_address => 'email',
           real_name     => 'name',
           name          => 'username',
     );      );
   
     $users->id($id);      $users->id($id);
     $users->retrieve;      $users->retrieve;
   
     my %requestor;      my %user;
     foreach my $m ( keys %{ $users->_attributes } ) {      foreach my $m ( keys %{ $users->_attributes } ) {
         next unless $users->can($m);          next unless $users->can($m);
   
Line 348 
Line 344 
   
         $m = $map{$m} if exists $map{$m};          $m = $map{$m} if exists $map{$m};
   
         $requestor{$m} = $v;          $user{$m} = $v;
     }      }
   
     $requestors{$id} = \%requestor;      $users{$id} = \%user;
     return \%requestor;      return \%user;
 }  }
   
 sub make_project {  sub make_project {
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>