From 32db3ad86bcf04e4f34705a396b718061d333f20 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 10 Mar 2009 16:14:11 +0000
Subject: merge webpay support in with autoselection of old realtime_bop and
 realtime_refund_bop

---
 FS/FS/ClientAPI/MyAccount.pm |   35 ++
 FS/FS/ClientAPI/Signup.pm    |  141 ++++-
 FS/FS/Conf.pm                |   12 +
 FS/FS/Schema.pm              |    4 +
 FS/FS/agent.pm               |  102 +++
 FS/FS/cust_main.pm           | 1410 ++++++++++++++++++++++++++++++++++++++----
 FS/FS/cust_pay_pending.pm    |   13 +
 FS/FS/cust_pkg.pm            |    4 +-
 FS/FS/payby.pm               |   15 +
 FS/FS/payment_gateway.pm     |   49 +-
 10 files changed, 1663 insertions(+), 122 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index c0586af00..c6a4e0058 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -353,6 +353,9 @@ sub payment_info {
       'paytypes' => [ @FS::cust_main::paytypes ],
 
       'paybys' => [ $conf->config('signup_server-payby') ],
+      'cust_paybys' => [ map { FS::payby->payby2payment($_) }
+                                 $conf->config('signup_server-payby')
+                       ],
 
       'stateid_label' => FS::Msgcat::_gettext('stateid'),
       'stateid_state_label' => FS::Msgcat::_gettext('stateid_state'),
@@ -375,6 +378,18 @@ sub payment_info {
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
     or return { 'error' => "unknown custnum $custnum" };
 
+  $return{hide_payment_fields} =
+  [
+    map { FS::payby->realtime($_) &&
+          $cust_main
+            ->agent
+            ->payment_gateway( 'method' => FS::payby->payby2bop($_) )
+            ->gateway_namespace
+            eq 'Business::OnlineThirdPartyPayment'
+        }
+    @{ $return{cust_paybys} }
+  ];
+
   $return{balance} = $cust_main->balance;
 
   $return{payname} = $cust_main->payname
@@ -531,6 +546,26 @@ sub process_payment {
 
 }
 
+sub realtime_collect {
+
+  my $p = shift;
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  my $error = $cust_main->realtime_collect( 'method'     => $p->{'method'},
+                                            'session_id' => $p->{'session_id'},
+                                          );
+  return { 'error' => $error } unless ref( $error );
+
+  return { 'error' => '', amount => $cust_main->balance, %$error };
+}
+
 sub process_payment_order_pkg {
   my $p = shift;
 
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 5569dfbde..02aa5800b 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -6,6 +6,7 @@ use Data::Dumper;
 use Tie::RefHash;
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs dbdef);
+use FS::CGI qw(popurl);
 use FS::Msgcat qw(gettext);
 use FS::Misc qw(card_types);
 use FS::ClientAPI_SessionCache;
@@ -20,6 +21,7 @@ use FS::svc_phone;
 use FS::acct_snarf;
 use FS::queue;
 use FS::reg_code;
+use FS::payby;
 
 $DEBUG = 0;
 $me = '[FS::ClientAPI::Signup]';
@@ -276,6 +278,29 @@ sub signup_info {
 
   if ( $agentnum ) {
 
+    warn "$me setting agent-specific payment flag\n" if $DEBUG > 1;
+    my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+    warn "$me has agent $agent\n" if $DEBUG > 1;
+    if ( $agent ) { #else complain loudly?
+      $signup_info->{'hide_payment_fields'} = [];
+      foreach my $payby (@{$signup_info->{payby}}) {
+        warn "$me checking $payby payment fields\n" if $DEBUG > 1;
+        my $hide = 0;
+        if (FS::payby->realtime($payby)) {
+          my $payment_gateway =
+            $agent->payment_gateway( 'method' => FS::payby->payby2bop($payby) );
+          if ($payment_gateway->gateway_namespace eq
+              'Business::OnlineThirdPartyPayment'
+             ) {
+            warn "$me hiding $payby payment fields\n" if $DEBUG > 1;
+            $hide = 1;
+          }
+        }
+        push @{$signup_info->{'hide_payment_fields'}}, $hide;
+      }
+    }
+    warn "$me done setting agent-specific payment flag\n" if $DEBUG > 1;
+
     warn "$me setting agent-specific package list\n" if $DEBUG > 1;
     $signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum}
       unless @{ $signup_info->{'part_pkg'} };
@@ -295,8 +320,6 @@ sub signup_info {
       ];
     warn "$me done setting agent-specific adv. source list\n" if $DEBUG > 1;
 
-    my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-                           
     $signup_info->{'agent_name'} = $agent->agent;
 
     $signup_info->{'company_name'} = $conf->config('company_name', $agentnum);
@@ -436,6 +459,23 @@ sub new_customer {
     unless grep { $_ eq $packet->{'payby'} }
                 $conf->config('signup_server-payby');
 
+  if (FS::payby->realtime($packet->{payby})) {
+    my $payby = $packet->{payby};
+
+    my $agent = qsearchs('agent', { 'agentnum' => $agentnum });
+    return { 'error' => "Unknown reseller" }
+      unless $agent;
+
+    my $payment_gateway =
+      $agent->payment_gateway( 'method' => FS::payby->payby2bop($payby) );
+
+    if ($payment_gateway->gateway_namespace eq
+        'Business::OnlineThirdPartyPayment'
+       ) {
+      $cust_main->payby('BILL');   # MCRD better?
+    }
+  }
+
   $cust_main->payinfo($cust_main->daytime)
     if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
 
@@ -547,10 +587,26 @@ sub new_customer {
     #     " new customer: $bill_error"
     #  if $bill_error;
 
-    $bill_error = $cust_main->collect('realtime' => 1);
+    if ($cust_main->_new_bop_required()) {
+      $bill_error = $cust_main->realtime_collect(
+         method        => FS::payby->payby2bop( $packet->{payby} ),
+         depend_jobnum => $placeholder->jobnum,
+      );
+    } else {
+      $bill_error = $cust_main->collect('realtime' => 1);
+    }
     #warn "[fs_signup_server] error collecting from new customer: $bill_error"
     #  if $bill_error;
 
+    if ($bill_error && ref($bill_error) eq 'HASH') {
+      return { 'error' => '_collect',
+               ( map { $_ => $bill_error->{$_} }
+                 qw(popup_url reference collectitems)
+               ),
+               amount => $cust_main->balance,
+             };
+    }
+
     if ( $cust_main->balance > 0 ) {
 
       #this makes sense.  credit is "un-doing" the invoice
@@ -600,4 +656,83 @@ sub new_customer {
 
 }
 
+sub capture_payment {
+  my $packet = shift;
+
+  warn "$me capture_payment called on $packet\n" if $DEBUG;
+
+  ###
+  # identify processor/gateway from called back URL
+  ###
+
+  my $conf = new FS::Conf;
+
+  my $url = $packet->{url};
+  my $payment_gateway =
+    qsearchs('payment_gateway', { 'gateway_callback_url' => popurl(0, $url) } );
+
+  unless ($payment_gateway) {
+
+    my ( $processor, $login, $password, $action, @bop_options ) =
+      $conf->config('business-onlinepayment');
+    $action ||= 'normal authorization';
+    pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+    die "No real-time processor is enabled - ".
+        "did you set the business-onlinepayment configuration value?\n"
+      unless $processor;
+
+    $payment_gateway = new FS::payment_gateway( {
+      gateway_namespace => $conf->config('business-onlinepayment-namespace'),
+      gateway_module    => $processor,
+      gateway_username  => $login,
+      gateway_password  => $password,
+      gateway_action    => $action,
+      options   => [ ( @bop_options ) ],
+    });
+
+  }
+ 
+  die "No real-time third party processor is enabled - ".
+      "did you set the business-onlinepayment configuration value?\n*"
+    unless $payment_gateway->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
+
+  ###
+  # locate pending transaction
+  ###
+
+  eval "use Business::OnlineThirdPartyPayment";
+  die $@ if $@;
+
+  my $transaction =
+    new Business::OnlineThirdPartyPayment( $payment_gateway->gateway_module,
+                                           @{ [ $payment_gateway->options ] },
+                                         );
+
+  my $paypendingnum = $transaction->reference($packet->{data});
+
+  my $cust_pay_pending =
+    qsearchs('cust_pay_pending', { paypendingnum => $paypendingnum } );
+
+  unless ($cust_pay_pending) {
+    my $bill_error = "No payment is being processed with id $paypendingnum".
+                     "; Transaction aborted.";
+    return { error => '_decline', bill_error => $bill_error };
+  }
+
+  if ($cust_pay_pending->status ne 'pending') {
+    my $bill_error = "Payment with id $paypendingnum is not pending, but ".
+                     $cust_pay_pending->status.  "; Transaction aborted.";
+    return { error => '_decline', bill_error => $bill_error };
+  }
+
+  my $cust_main = $cust_pay_pending->cust_main;
+  my $bill_error =
+    $cust_main->realtime_botpp_capture( $cust_pay_pending, %{$packet->{data}} );
+
+  return { 'error'      => ( $bill_error->{bill_error} ? '_decline' : '' ),
+           %$bill_error,
+         };
+
+}
+
 1;
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b86930255..3921afdaa 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -8,6 +8,7 @@ use MIME::Base64;
 use FS::ConfItem;
 use FS::ConfDefaults;
 use FS::Conf_compat17;
+use FS::payby;
 use FS::conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::UID qw(dbh datasrc use_confcompat);
@@ -619,6 +620,17 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'business-onlinepayment-namespace',
+    'section'     => 'billing',
+    'description' => 'Specifies which perl module namespace (which group of collection routines) is used by default.',
+    'type'        => 'select',
+    'select_hash' => [
+                       'Business::OnlinePayment' => 'Direct API (Business::OnlinePayment)',
+		       'Business::OnlineThirdPartyPayment' => 'Web API (Business::ThirdPartyPayment)',
+                     ],
+  },
+
   {
     'key'         => 'business-onlinepayment-description',
     'section'     => 'billing',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 885eaaa28..65f7a7f40 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -845,10 +845,12 @@ sub tables_hashref {
         'payunique',    'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage
 
         'status',       'varchar',     '', $char_d, '', '', 
+        'session_id',   'varchar', 'NULL', $char_d, '', '', #only need 32
         'statustext',   'text',    'NULL',  '', '', '', 
         'gatewaynum',   'int',     'NULL',  '', '', '',
         #'cust_balance', @money_type,            '', '',
         'paynum',       'int',     'NULL',  '', '', '',
+        'jobnum',       'int',     'NULL',  '', '', '', 
       ],
       'primary_key' => 'paypendingnum',
       'unique'      => [ [ 'payunique' ] ],
@@ -1857,10 +1859,12 @@ sub tables_hashref {
     'payment_gateway' => {
       'columns' => [
         'gatewaynum',       'serial',   '',     '', '', '', 
+        'gateway_namespace','varchar',  'NULL', $char_d, '', '', 
         'gateway_module',   'varchar',  '',     $char_d, '', '', 
         'gateway_username', 'varchar',  'NULL', $char_d, '', '', 
         'gateway_password', 'varchar',  'NULL', $char_d, '', '', 
         'gateway_action',   'varchar',  'NULL', $char_d, '', '', 
+        'gateway_callback_url', 'varchar',  'NULL', $char_d, '', '', 
         'disabled',   'char',  'NULL',   1, '', '', 
       ],
       'primary_key' => 'gatewaynum',
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index ff0a2b1f6..e471e04a5 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -3,12 +3,14 @@ package FS::agent;
 use strict;
 use vars qw( @ISA );
 #use Crypt::YAPassGen;
+use Business::CreditCard 0.28;
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_main;
 use FS::cust_pkg;
 use FS::agent_type;
 use FS::reg_code;
 use FS::TicketSystem;
+use FS::Conf;
 
 @ISA = qw( FS::m2m_Common FS::Record );
 
@@ -200,6 +202,106 @@ sub ticketing_queue {
   FS::TicketSystem->queue($self->ticketing_queueid);
 };
 
+=item payment_gateway [ OPTION => VALUE, ... ]
+
+Returns a payment gateway object (see L<FS::payment_gateway>) for this agent.
+
+Currently available options are I<invnum>, I<method>, and I<payinfo>.
+
+If I<invnum> is set to the number of an invoice (see L<FS::cust_bill>) then
+an attempt will be made to select a gateway suited for the taxes paid on 
+the invoice.
+
+The I<method> and I<payinfo> options can be used to influence the choice
+as well.  Presently only 'CC' and 'ECHECK' methods are meaningful.
+
+When the I<method> is 'CC' then the card number in I<payinfo> can direct
+this routine to route to a gateway suited for that type of card.
+
+=cut
+
+sub payment_gateway {
+  my ( $self, %options ) = @_;
+
+  my $taxclass = '';
+  if ( $options{invnum} ) {
+    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $options{invnum} } );
+    die "invnum ". $options{'invnum'}. " not found" unless $cust_bill;
+    my @taxclasses =
+      map  { $_->part_pkg->taxclass }
+      grep { $_ }
+      map  { $_->cust_pkg }
+      $cust_bill->cust_bill_pkg;
+    unless ( grep { $taxclasses[0] ne $_ } @taxclasses ) { #unless there are
+                                                           #different taxclasses      $taxclass = $taxclasses[0];
+    }
+  }
+
+  #look for an agent gateway override first
+  my $cardtype;
+  if ( $options{method} && $options{method} eq 'CC' ) {
+    $cardtype = cardtype($options{payinfo});
+  } elsif ( $options{method} && $options{method} eq 'ECHECK' ) {
+    $cardtype = 'ACH';
+  } else {
+    $cardtype = $options{method} || '';
+  }
+
+  my $override =
+       qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
+                                           cardtype => $cardtype,
+                                           taxclass => $taxclass,       } )
+    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
+                                           cardtype => '',
+                                           taxclass => $taxclass,       } )
+    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
+                                           cardtype => $cardtype,
+                                           taxclass => '',              } )
+    || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
+                                           cardtype => '',
+                                           taxclass => '',              } );
+
+  my $payment_gateway = new FS::payment_gateway;
+  if ( $override ) { #use a payment gateway override
+
+    $payment_gateway = $override->payment_gateway;
+
+  } else { #use the standard settings from the config
+    # the standard settings from the config could be moved to a null agent
+    # agent_payment_gateway referenced payment_gateway
+
+    my $conf = new FS::Conf;
+    die "Real-time processing not enabled\n"
+      unless $conf->exists('business-onlinepayment');
+
+    #load up config
+    my $bop_config = 'business-onlinepayment';
+    $bop_config .= '-ach'
+      if ( $options{method}
+           && $options{method} =~ /^(ECHECK|CHEK)$/
+           && $conf->exists($bop_config. '-ach')
+         );
+    my ( $processor, $login, $password, $action, @bop_options ) =
+      $conf->config($bop_config);
+    $action ||= 'normal authorization';
+    pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+    die "No real-time processor is enabled - ".
+        "did you set the business-onlinepayment configuration value?\n"
+      unless $processor;
+
+    $payment_gateway->gateway_namespace( $conf->config('business-onlinepayment-namespace') ||
+                                 'Business::OnlinePayment');
+    $payment_gateway->gateway_module($processor);
+    $payment_gateway->gateway_username($login);
+    $payment_gateway->gateway_password($password);
+    $payment_gateway->gateway_action($action);
+    $payment_gateway->set('options', [ @bop_options ]);
+
+  }
+
+  $payment_gateway;
+}
+
 =item num_prospect_cust_main
 
 Returns the number of prospects (customers with no packages ever ordered) for
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 865632f6c..2bad5ec3e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3368,6 +3368,10 @@ sub retry_realtime {
 
 }
 
+# some horrid false laziness here to avoid refactor fallout
+# eventually realtime realtime_bop and realtime_refund_bop should go
+# away and be replaced by _new_realtime_bop and _new_realtime_refund_bop
+
 =item realtime_bop METHOD AMOUNT [ OPTION => VALUE ... ]
 
 Runs a realtime credit card, ACH (electronic check) or phone bill transaction
@@ -3401,7 +3405,12 @@ I<payunique> is a unique identifier for this payment.
 =cut
 
 sub realtime_bop {
-  my( $self, $method, $amount, %options ) = @_;
+  my $self = shift;
+
+  return $self->_new_realtime_bop(@_)
+    if $self->_new_bop_required();
+
+  my( $method, $amount, %options ) = @_;
   if ( $DEBUG ) {
     warn "$me realtime_bop: $method $amount\n";
     warn "  $_ => $options{$_}\n" foreach keys %options;
@@ -3942,119 +3951,6 @@ sub realtime_bop {
 
 }
 
-=item fake_bop
-
-=cut
-
-sub fake_bop {
-  my( $self, $method, $amount, %options ) = @_;
-
-  if ( $options{'fake_failure'} ) {
-     return "Error: No error; test failure requested with fake_failure";
-  }
-
-  my %method2payby = (
-    'CC'     => 'CARD',
-    'ECHECK' => 'CHEK',
-    'LEC'    => 'LECB',
-  );
-
-  #my $paybatch = '';
-  #if ( $payment_gateway ) { # agent override
-  #  $paybatch = $payment_gateway->gatewaynum. '-';
-  #}
-  #
-  #$paybatch .= "$processor:". $transaction->authorization;
-  #
-  #$paybatch .= ':'. $transaction->order_number
-  #  if $transaction->can('order_number')
-  #  && length($transaction->order_number);
-
-  my $paybatch = 'FakeProcessor:54:32';
-
-  my $cust_pay = new FS::cust_pay ( {
-     'custnum'  => $self->custnum,
-     'invnum'   => $options{'invnum'},
-     'paid'     => $amount,
-     '_date'    => '',
-     'payby'    => $method2payby{$method},
-     #'payinfo'  => $payinfo,
-     'payinfo'  => '4111111111111111',
-     'paybatch' => $paybatch,
-     #'paydate'  => $paydate,
-     'paydate'  => '2012-05-01',
-  } );
-  $cust_pay->payunique( $options{payunique} ) if length($options{payunique});
-
-  my $error = $cust_pay->insert($options{'manual'} ? ( 'manual' => 1 ) : () );
-
-  if ( $error ) {
-    $cust_pay->invnum(''); #try again with no specific invnum
-    my $error2 = $cust_pay->insert( $options{'manual'} ?
-                                    ( 'manual' => 1 ) : ()
-                                  );
-    if ( $error2 ) {
-      # gah, even with transactions.
-      my $e = 'WARNING: Card/ACH debited but database not updated - '.
-              "error inserting (fake!) payment: $error2".
-              " (previously tried insert with invnum #$options{'invnum'}" .
-              ": $error )";
-      warn $e;
-      return $e;
-    }
-  }
-
-  if ( $options{'paynum_ref'} ) {
-    ${ $options{'paynum_ref'} } = $cust_pay->paynum;
-  }
-
-  return ''; #no error
-
-}
-
-=item default_payment_gateway
-
-=cut
-
-sub default_payment_gateway {
-  my( $self, $method ) = @_;
-
-  die "Real-time processing not enabled\n"
-    unless $conf->exists('business-onlinepayment');
-
-  #load up config
-  my $bop_config = 'business-onlinepayment';
-  $bop_config .= '-ach'
-    if $method =~ /^(ECHECK|CHEK)$/ && $conf->exists($bop_config. '-ach');
-  my ( $processor, $login, $password, $action, @bop_options ) =
-    $conf->config($bop_config);
-  $action ||= 'normal authorization';
-  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
-  die "No real-time processor is enabled - ".
-      "did you set the business-onlinepayment configuration value?\n"
-    unless $processor;
-
-  ( $processor, $login, $password, $action, @bop_options )
-}
-
-=item remove_cvv
-
-Removes the I<paycvv> field from the database directly.
-
-If there is an error, returns the error, otherwise returns false.
-
-=cut
-
-sub remove_cvv {
-  my $self = shift;
-  my $sth = dbh->prepare("UPDATE cust_main SET paycvv = '' WHERE custnum = ?")
-    or return dbh->errstr;
-  $sth->execute($self->custnum)
-    or return $sth->errstr;
-  $self->paycvv('');
-  '';
-}
-
 =item realtime_refund_bop METHOD [ OPTION => VALUE ... ]
 
 Refunds a realtime credit card, ACH (electronic check) or phone bill transaction
@@ -4094,7 +3990,12 @@ gateway is attempted.
 #some false laziness w/realtime_bop, not enough to make it worth merging
 #but some useful small subs should be pulled out
 sub realtime_refund_bop {
-  my( $self, $method, %options ) = @_;
+  my $self = shift;
+
+  return $self->_new_realtime_refund_bop(@_)
+    if $self->_new_bop_required();
+
+  my( $method, %options ) = @_;
   if ( $DEBUG ) {
     warn "$me realtime_refund_bop: $method refund\n";
     warn "  $_ => $options{$_}\n" foreach keys %options;
@@ -4373,6 +4274,1285 @@ sub realtime_refund_bop {
 
 }
 
+# does the configuration indicate the new bop routines are required?
+
+sub _new_bop_required {
+  my $self = shift;
+
+  my $botpp = 'Business::OnlineThirdPartyPayment';
+
+  return 1
+    if ( $conf->config('business-onlinepayment-namespace') eq $botpp ||
+         scalar( grep { $_->gateway_namespace eq $botpp } 
+                 qsearch( 'payment_gateway', { 'disabled' => '' } )
+               )
+       )
+  ;
+
+  '';
+}
+  
+
+=item realtime_collect [ OPTION => VALUE ... ]
+
+Runs a realtime credit card, ACH (electronic check) or phone bill transaction
+via a Business::OnlinePayment or Business::OnlineThirdPartyPayment realtime
+gateway.  See L<http://420.am/business-onlinepayment> and 
+L<http://420.am/business-onlinethirdpartypayment> for supported gateways.
+
+On failure returns an error message.
+
+Returns false or a hashref upon success.  The hashref contains keys popup_url reference, and collectitems.  The first is a URL to which a browser should be redirected for completion of collection.  The second is a reference id for the transaction suitable for the end user.  The collectitems is a reference to a list of name value pairs suitable for assigning to a html form and posted to popup_url.
+
+Available options are: I<method>, I<amount>, I<description>, I<invnum>, I<quiet>, I<paynum_ref>, I<payunique>, I<session_id>
+
+I<method> is one of: I<CC>, I<ECHECK> and I<LEC>.  If none is specified
+then it is deduced from the customer record.
+
+If no I<amount> is specified, then the customer balance is used.
+
+The additional options I<payname>, I<address1>, I<address2>, I<city>, I<state>,
+I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
+if set, will override the value from the customer record.
+
+I<description> is a free-text field passed to the gateway.  It defaults to
+"Internet services".
+
+If an I<invnum> is specified, this payment (if successful) is applied to the
+specified invoice.  If you don't specify an I<invnum> you might want to
+call the B<apply_payments> method.
+
+I<quiet> can be set true to surpress email decline notices.
+
+I<paynum_ref> can be set to a scalar reference.  It will be filled in with the
+resulting paynum, if any.
+
+I<payunique> is a unique identifier for this payment.
+
+I<session_id> is a session identifier associated with this payment.
+
+I<depend_jobnum> allows payment capture to unlock export jobs
+
+=cut
+
+sub realtime_collect {
+  my( $self, %options ) = @_;
+
+  if ( $DEBUG ) {
+    warn "$me realtime_collect:\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
+  $options{amount} = $self->balance unless exists( $options{amount} );
+  $options{method} = FS::payby->payby2bop($self->payby)
+    unless exists( $options{method} );
+
+  return $self->realtime_bop({%options});
+
+}
+
+=item _realtime_bop { [ ARG => VALUE ... ] }
+
+Runs a realtime credit card, ACH (electronic check) or phone bill transaction
+via a Business::OnlinePayment realtime gateway.  See
+L<http://420.am/business-onlinepayment> for supported gateways.
+
+Required arguments in the hashref are I<method>, and I<amount>
+
+Available methods are: I<CC>, I<ECHECK> and I<LEC>
+
+Available optional arguments are: I<description>, I<invnum>, I<quiet>, I<paynum_ref>, I<payunique>, I<session_id>
+
+The additional options I<payname>, I<address1>, I<address2>, I<city>, I<state>,
+I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
+if set, will override the value from the customer record.
+
+I<description> is a free-text field passed to the gateway.  It defaults to
+"Internet services".
+
+If an I<invnum> is specified, this payment (if successful) is applied to the
+specified invoice.  If you don't specify an I<invnum> you might want to
+call the B<apply_payments> method.
+
+I<quiet> can be set true to surpress email decline notices.
+
+I<paynum_ref> can be set to a scalar reference.  It will be filled in with the
+resulting paynum, if any.
+
+I<payunique> is a unique identifier for this payment.
+
+I<session_id> is a session identifier associated with this payment.
+
+I<depend_jobnum> allows payment capture to unlock export jobs
+
+(moved from cust_bill) (probably should get realtime_{card,ach,lec} here too)
+
+=cut
+
+# some helper routines
+sub _payment_gateway {
+  my ($self, $options) = @_;
+
+  $options->{payment_gateway} = $self->agent->payment_gateway( %$options )
+    unless exists($options->{payment_gateway});
+
+  $options->{payment_gateway};
+}
+
+sub _bop_auth {
+  my ($self, $options) = @_;
+
+  (
+    'login'    => $options->{payment_gateway}->gateway_username,
+    'password' => $options->{payment_gateway}->gateway_password,
+  );
+}
+
+sub _bop_options {
+  my ($self, $options) = @_;
+
+  $options->{payment_gateway}->gatewaynum
+    ? $options->{payment_gateway}->options
+    : @{ $options->{payment_gateway}->get('options') };
+}
+
+sub _bop_defaults {
+  my ($self, $options) = @_;
+
+  $options->{description} ||= 'Internet services';
+  $options->{payinfo} = $self->payinfo unless exists( $options->{payinfo} );
+  $options->{invnum} ||= '';
+  $options->{payname} = $self->payname unless exists( $options->{payname} );
+}
+
+sub _bop_content {
+  my ($self, $options) = @_;
+  my %content = ();
+
+  $content{address} = exists($options->{'address1'})
+                        ? $options->{'address1'}
+                        : $self->address1;
+  my $address2 = exists($options->{'address2'})
+                   ? $options->{'address2'}
+                   : $self->address2;
+  $content{address} .= ", ". $address2 if length($address2);
+
+  my $payip = exists($options->{'payip'}) ? $options->{'payip'} : $self->payip;
+  $content{customer_ip} = $payip if length($payip);
+
+  $content{invoice_number} = $options->{'invnum'}
+    if exists($options->{'invnum'}) && length($options->{'invnum'});
+
+  $content{email_customer} = 
+    (    $conf->exists('business-onlinepayment-email_customer')
+      || $conf->exists('business-onlinepayment-email-override') );
+      
+  $content{payfirst} = $self->getfield('first');
+  $content{paylast} = $self->getfield('last');
+
+  $content{account_name} = "$content{payfirst} $content{paylast}"
+    if $options->{method} eq 'ECHECK';
+
+  $content{name} = $options->{payname};
+  $content{name} = $content{account_name} if exists($content{account_name});
+
+  $content{city} = exists($options->{city})
+                     ? $options->{city}
+                     : $self->city;
+  $content{state} = exists($options->{state})
+                      ? $options->{state}
+                      : $self->state;
+  $content{zip} = exists($options->{zip})
+                    ? $options->{'zip'}
+                    : $self->zip;
+  $content{country} = exists($options->{country})
+                        ? $options->{country}
+                        : $self->country;
+  $content{referer} = 'http://cleanwhisker.420.am/'; #XXX fix referer :/
+  $content{phone} = $self->daytime || $self->night;
+
+  (%content);
+}
+
+my %bop_method2payby = (
+  'CC'     => 'CARD',
+  'ECHECK' => 'CHEK',
+  'LEC'    => 'LECB',
+);
+
+sub _new_realtime_bop {
+  my $self = shift;
+
+  my %options = ();
+  if (ref($_[0]) eq 'HASH') {
+    %options = %{$_[0]};
+  } else {
+    my ( $method, $amount ) = ( shift, shift );
+    %options = @_;
+    $options{method} = $method;
+    $options{amount} = $amount;
+  }
+  
+  if ( $DEBUG ) {
+    warn "$me realtime_bop (new): $options{method} $options{amount}\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
+  return $self->fake_bop(%options) if $options{'fake'};
+
+  $self->_bop_defaults(\%options);
+
+  ###
+  # select a gateway
+  ###
+
+  my $payment_gateway =  $self->_payment_gateway( \%options );
+  my $namespace = $payment_gateway->gateway_namespace;
+
+  eval "use $namespace";  
+  die $@ if $@;
+
+  ###
+  # check for banned credit card/ACH
+  ###
+
+  my $ban = qsearchs('banned_pay', {
+    'payby'   => $bop_method2payby{$options{method}},
+    'payinfo' => md5_base64($options{payinfo}),
+  } );
+  return "Banned credit card" if $ban;
+
+  ###
+  # massage data
+  ###
+
+  my (%bop_content) = $self->_bop_content(\%options);
+
+  if ( $options{method} ne 'ECHECK' ) {
+    $options{payname} =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
+      or return "Illegal payname $options{payname}";
+    ($bop_content{payfirst}, $bop_content{paylast}) = ($1, $2);
+  }
+
+  my @invoicing_list = $self->invoicing_list_emailonly;
+  if ( $conf->exists('emailinvoiceautoalways')
+       || $conf->exists('emailinvoiceauto') && ! @invoicing_list
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $self->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my $paydate = '';
+  my %content = ();
+  if ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'CC' ) {
+
+    $content{card_number} = $options{payinfo};
+    $paydate = exists($options{'paydate'})
+                    ? $options{'paydate'}
+                    : $self->paydate;
+    $paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+    $content{expiration} = "$2/$1";
+
+    my $paycvv = exists($options{'paycvv'})
+                   ? $options{'paycvv'}
+                   : $self->paycvv;
+    $content{cvv2} = $paycvv
+      if length($paycvv);
+
+    my $paystart_month = exists($options{'paystart_month'})
+                           ? $options{'paystart_month'}
+                           : $self->paystart_month;
+
+    my $paystart_year  = exists($options{'paystart_year'})
+                           ? $options{'paystart_year'}
+                           : $self->paystart_year;
+
+    $content{card_start} = "$paystart_month/$paystart_year"
+      if $paystart_month && $paystart_year;
+
+    my $payissue       = exists($options{'payissue'})
+                           ? $options{'payissue'}
+                           : $self->payissue;
+    $content{issue_number} = $payissue if $payissue;
+
+    $content{recurring_billing} = 'YES'
+      if qsearch('cust_pay', { 'custnum' => $self->custnum,
+                               'payby'   => 'CARD',
+                               'payinfo' => $options{payinfo},
+                             } )
+      || qsearch('cust_pay', { 'custnum' => $self->custnum,
+                               'payby'   => 'CARD',
+                               'paymask' => $self->mask_payinfo('CARD', $options{payinfo}),
+                             } );
+
+
+  } elsif ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'ECHECK' ){
+    ( $content{account_number}, $content{routing_code} ) =
+      split('@', $options{payinfo});
+    $content{bank_name} = $options{payname};
+    $content{bank_state} = exists($options{'paystate'})
+                             ? $options{'paystate'}
+                             : $self->getfield('paystate');
+    $content{account_type} = exists($options{'paytype'})
+                               ? uc($options{'paytype'}) || 'CHECKING'
+                               : uc($self->getfield('paytype')) || 'CHECKING';
+    $content{customer_org} = $self->company ? 'B' : 'I';
+    $content{state_id}       = exists($options{'stateid'})
+                                 ? $options{'stateid'}
+                                 : $self->getfield('stateid');
+    $content{state_id_state} = exists($options{'stateid_state'})
+                                 ? $options{'stateid_state'}
+                                 : $self->getfield('stateid_state');
+    $content{customer_ssn} = exists($options{'ss'})
+                               ? $options{'ss'}
+                               : $self->ss;
+  } elsif ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'LEC' ) {
+    $content{phone} = $options{payinfo};
+  } elsif ( $namespace eq 'Business::OnlineThirdPartyPayment' ) {
+    #move along
+  } else {
+    #die an evil death
+  }
+
+  ###
+  # run transaction(s)
+  ###
+
+  my $balance = exists( $options{'balance'} )
+                  ? $options{'balance'}
+                  : $self->balance;
+
+  $self->select_for_update; #mutex ... just until we get our pending record in
+
+  #the checks here are intended to catch concurrent payments
+  #double-form-submission prevention is taken care of in cust_pay_pending::check
+
+  #check the balance
+  return "The customer's balance has changed; $options{method} transaction aborted."
+    if $self->balance < $balance;
+    #&& $self->balance < $options{amount}; #might as well anyway?
+
+  #also check and make sure there aren't *other* pending payments for this cust
+
+  my @pending = qsearch('cust_pay_pending', {
+    'custnum' => $self->custnum,
+    'status'  => { op=>'!=', value=>'done' } 
+  });
+  return "A payment is already being processed for this customer (".
+         join(', ', map 'paypendingnum '. $_->paypendingnum, @pending ).
+         "); $options{method} transaction aborted."
+    if scalar(@pending);
+
+  #okay, good to go, if we're a duplicate, cust_pay_pending will kick us out
+
+  my $cust_pay_pending = new FS::cust_pay_pending {
+    'custnum'    => $self->custnum,
+    #'invnum'     => $options{'invnum'},
+    'paid'       => $options{amount},
+    '_date'      => '',
+    'payby'      => $bop_method2payby{$options{method}},
+    'payinfo'    => $options{payinfo},
+    'paydate'    => $paydate,
+    'status'     => 'new',
+    'gatewaynum' => $payment_gateway->gatewaynum || '',
+    'session_id' => $options{session_id} || '',
+    'jobnum'     => $options{depend_jobnum} || '',
+  };
+  $cust_pay_pending->payunique( $options{payunique} )
+    if defined($options{payunique}) && length($options{payunique});
+  my $cpp_new_err = $cust_pay_pending->insert; #mutex lost when this is inserted
+  return $cpp_new_err if $cpp_new_err;
+
+  my( $action1, $action2 ) =
+    split( /\s*\,\s*/, $payment_gateway->gateway_action );
+
+  my $transaction = new $namespace( $payment_gateway->gateway_module,
+                                    $self->_bop_options(\%options),
+                                  );
+
+  $transaction->content(
+    'type'           => $options{method},
+    $self->_bop_auth(\%options),          
+    'action'         => $action1,
+    'description'    => $options{'description'},
+    'amount'         => $options{amount},
+    #'invoice_number' => $options{'invnum'},
+    'customer_id'    => $self->custnum,
+    %bop_content,
+    'reference'      => $cust_pay_pending->paypendingnum, #for now
+    'email'          => $email,
+    %content, #after
+  );
+
+  $cust_pay_pending->status('pending');
+  my $cpp_pending_err = $cust_pay_pending->replace;
+  return $cpp_pending_err if $cpp_pending_err;
+
+  #config?
+  my $BOP_TESTING = 0;
+  my $BOP_TESTING_SUCCESS = 1;
+
+  unless ( $BOP_TESTING ) {
+    $transaction->submit();
+  } else {
+    if ( $BOP_TESTING_SUCCESS ) {
+      $transaction->is_success(1);
+      $transaction->authorization('fake auth');
+    } else {
+      $transaction->is_success(0);
+      $transaction->error_message('fake failure');
+    }
+  }
+
+  if ( $transaction->is_success() && $namespace eq 'Business::OnlineThirdPartyPayment' ) {
+
+    return { reference => $cust_pay_pending->paypendingnum,
+             map { $_ => $transaction->$_ } qw ( popup_url collectitems ) };
+
+  } elsif ( $transaction->is_success() && $action2 ) {
+
+    $cust_pay_pending->status('authorized');
+    my $cpp_authorized_err = $cust_pay_pending->replace;
+    return $cpp_authorized_err if $cpp_authorized_err;
+
+    my $auth = $transaction->authorization;
+    my $ordernum = $transaction->can('order_number')
+                   ? $transaction->order_number
+                   : '';
+
+    my $capture =
+      new Business::OnlinePayment( $payment_gateway->gateway_module,
+                                   $self->_bop_options(\%options),
+                                 );
+
+    my %capture = (
+      %content,
+      type           => $options{method},
+      action         => $action2,
+      $self->_bop_auth(\%options),          
+      order_number   => $ordernum,
+      amount         => $options{amount},
+      authorization  => $auth,
+      description    => $options{'description'},
+    );
+
+    foreach my $field (qw( authorization_source_code returned_ACI
+                           transaction_identifier validation_code           
+                           transaction_sequence_num local_transaction_date    
+                           local_transaction_time AVS_result_code          )) {
+      $capture{$field} = $transaction->$field() if $transaction->can($field);
+    }
+
+    $capture->content( %capture );
+
+    $capture->submit();
+
+    unless ( $capture->is_success ) {
+      my $e = "Authorization successful but capture failed, custnum #".
+              $self->custnum. ': '.  $capture->result_code.
+              ": ". $capture->error_message;
+      warn $e;
+      return $e;
+    }
+
+  }
+
+  ###
+  # remove paycvv after initial transaction
+  ###
+
+  #false laziness w/misc/process/payment.cgi - check both to make sure working
+  # correctly
+  if ( defined $self->dbdef_table->column('paycvv')
+       && length($self->paycvv)
+       && ! grep { $_ eq cardtype($options{payinfo}) } $conf->config('cvv-save')
+  ) {
+    my $error = $self->remove_cvv;
+    if ( $error ) {
+      warn "WARNING: error removing cvv: $error\n";
+    }
+  }
+
+  ###
+  # result handling
+  ###
+
+  $self->_realtime_bop_result( $cust_pay_pending, $transaction, %options );
+
+}
+
+=item fake_bop
+
+=cut
+
+sub fake_bop {
+  my $self = shift;
+
+  my %options = ();
+  if (ref($_[0]) eq 'HASH') {
+    %options = %{$_[0]};
+  } else {
+    my ( $method, $amount ) = ( shift, shift );
+    %options = @_;
+    $options{method} = $method;
+    $options{amount} = $amount;
+  }
+  
+  if ( $options{'fake_failure'} ) {
+     return "Error: No error; test failure requested with fake_failure";
+  }
+
+  #my $paybatch = '';
+  #if ( $payment_gateway->gatewaynum ) { # agent override
+  #  $paybatch = $payment_gateway->gatewaynum. '-';
+  #}
+  #
+  #$paybatch .= "$processor:". $transaction->authorization;
+  #
+  #$paybatch .= ':'. $transaction->order_number
+  #  if $transaction->can('order_number')
+  #  && length($transaction->order_number);
+
+  my $paybatch = 'FakeProcessor:54:32';
+
+  my $cust_pay = new FS::cust_pay ( {
+     'custnum'  => $self->custnum,
+     'invnum'   => $options{'invnum'},
+     'paid'     => $options{amount},
+     '_date'    => '',
+     'payby'    => $bop_method2payby{$options{method}},
+     #'payinfo'  => $payinfo,
+     'payinfo'  => '4111111111111111',
+     'paybatch' => $paybatch,
+     #'paydate'  => $paydate,
+     'paydate'  => '2012-05-01',
+  } );
+  $cust_pay->payunique( $options{payunique} ) if length($options{payunique});
+
+  my $error = $cust_pay->insert($options{'manual'} ? ( 'manual' => 1 ) : () );
+
+  if ( $error ) {
+    $cust_pay->invnum(''); #try again with no specific invnum
+    my $error2 = $cust_pay->insert( $options{'manual'} ?
+                                    ( 'manual' => 1 ) : ()
+                                  );
+    if ( $error2 ) {
+      # gah, even with transactions.
+      my $e = 'WARNING: Card/ACH debited but database not updated - '.
+              "error inserting (fake!) payment: $error2".
+              " (previously tried insert with invnum #$options{'invnum'}" .
+              ": $error )";
+      warn $e;
+      return $e;
+    }
+  }
+
+  if ( $options{'paynum_ref'} ) {
+    ${ $options{'paynum_ref'} } = $cust_pay->paynum;
+  }
+
+  return ''; #no error
+
+}
+
+
+# item _realtime_bop_result CUST_PAY_PENDING, BOP_OBJECT [ OPTION => VALUE ... ]
+# 
+# Wraps up processing of a realtime credit card, ACH (electronic check) or
+# phone bill transaction.
+
+sub _realtime_bop_result {
+  my( $self, $cust_pay_pending, $transaction, %options ) = @_;
+  if ( $DEBUG ) {
+    warn "$me _realtime_bop_result: pending transaction ".
+      $cust_pay_pending->paypendingnum. "\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
+  my $payment_gateway = $options{payment_gateway}
+    or return "no payment gateway in arguments to _realtime_bop_result";
+
+  $cust_pay_pending->status($transaction->is_success() ? 'captured' : 'declined');
+  my $cpp_captured_err = $cust_pay_pending->replace;
+  return $cpp_captured_err if $cpp_captured_err;
+
+  if ( $transaction->is_success() ) {
+
+    my $paybatch = '';
+    if ( $payment_gateway->gatewaynum ) { # agent override
+      $paybatch = $payment_gateway->gatewaynum. '-';
+    }
+
+    $paybatch .= $payment_gateway->gateway_module. ":".
+      $transaction->authorization;
+
+    $paybatch .= ':'. $transaction->order_number
+      if $transaction->can('order_number')
+      && length($transaction->order_number);
+
+    my $cust_pay = new FS::cust_pay ( {
+       'custnum'  => $self->custnum,
+       'invnum'   => $options{'invnum'},
+       'paid'     => $cust_pay_pending->paid,
+       '_date'    => '',
+       'payby'    => $cust_pay_pending->payby,
+       #'payinfo'  => $payinfo,
+       'paybatch' => $paybatch,
+       'paydate'  => $cust_pay_pending->paydate,
+    } );
+    #doesn't hurt to know, even though the dup check is in cust_pay_pending now
+    $cust_pay->payunique( $options{payunique} )
+      if defined($options{payunique}) && length($options{payunique});
+
+    my $oldAutoCommit = $FS::UID::AutoCommit;
+    local $FS::UID::AutoCommit = 0;
+    my $dbh = dbh;
+
+    #start a transaction, insert the cust_pay and set cust_pay_pending.status to done in a single transction
+
+    my $error = $cust_pay->insert($options{'manual'} ? ( 'manual' => 1 ) : () );
+
+    if ( $error ) {
+      $cust_pay->invnum(''); #try again with no specific invnum
+      my $error2 = $cust_pay->insert( $options{'manual'} ?
+                                      ( 'manual' => 1 ) : ()
+                                    );
+      if ( $error2 ) {
+        # gah.  but at least we have a record of the state we had to abort in
+        # from cust_pay_pending now.
+        my $e = "WARNING: $options{method} captured but payment not recorded -".
+                " error inserting payment (". $payment_gateway->gateway_module.
+                "): $error2".
+                " (previously tried insert with invnum #$options{'invnum'}" .
+                ": $error ) - pending payment saved as paypendingnum ".
+                $cust_pay_pending->paypendingnum. "\n";
+        warn $e;
+        return $e;
+      }
+    }
+
+    my $jobnum = $cust_pay_pending->jobnum;
+    if ( $jobnum ) {
+       my $placeholder = qsearchs( 'queue', { 'jobnum' => $jobnum } );
+      
+       unless ( $placeholder ) {
+         $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+         my $e = "WARNING: $options{method} captured but job $jobnum not ".
+             "found for paypendingnum ". $cust_pay_pending->paypendingnum. "\n";
+         warn $e;
+         return $e;
+       }
+
+       $error = $placeholder->delete;
+
+       if ( $error ) {
+         $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+         my $e = "WARNING: $options{method} captured but could not delete ".
+              "job $jobnum for paypendingnum ".
+              $cust_pay_pending->paypendingnum. ": $error\n";
+         warn $e;
+         return $e;
+       }
+
+    }
+    
+    if ( $options{'paynum_ref'} ) {
+      ${ $options{'paynum_ref'} } = $cust_pay->paynum;
+    }
+
+    $cust_pay_pending->status('done');
+    $cust_pay_pending->statustext('captured');
+    $cust_pay_pending->paynum($cust_pay->paynum);
+    my $cpp_done_err = $cust_pay_pending->replace;
+
+    if ( $cpp_done_err ) {
+
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      my $e = "WARNING: $options{method} captured but payment not recorded - ".
+              "error updating status for paypendingnum ".
+              $cust_pay_pending->paypendingnum. ": $cpp_done_err \n";
+      warn $e;
+      return $e;
+
+    } else {
+
+      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+      return ''; #no error
+
+    }
+
+  } else {
+
+    my $perror = $payment_gateway->gateway_module. " error: ".
+      $transaction->error_message;
+
+    my $jobnum = $cust_pay_pending->jobnum;
+    if ( $jobnum ) {
+       my $placeholder = qsearchs( 'queue', { 'jobnum' => $jobnum } );
+      
+       if ( $placeholder ) {
+         my $error = $placeholder->depended_delete;
+         $error ||= $placeholder->delete;
+         warn "error removing provisioning jobs after declined paypendingnum ".
+           $cust_pay_pending->paypendingnum. "\n";
+       } else {
+         my $e = "error finding job $jobnum for declined paypendingnum ".
+              $cust_pay_pending->paypendingnum. "\n";
+         warn $e;
+       }
+
+    }
+    
+    unless ( $transaction->error_message ) {
+
+      my $t_response;
+      if ( $transaction->can('response_page') ) {
+        $t_response = {
+                        'page'    => ( $transaction->can('response_page')
+                                         ? $transaction->response_page
+                                         : ''
+                                     ),
+                        'code'    => ( $transaction->can('response_code')
+                                         ? $transaction->response_code
+                                         : ''
+                                     ),
+                        'headers' => ( $transaction->can('response_headers')
+                                         ? $transaction->response_headers
+                                         : ''
+                                     ),
+                      };
+      } else {
+        $t_response .=
+          "No additional debugging information available for ".
+            $payment_gateway->gateway_module;
+      }
+
+      $perror .= "No error_message returned from ".
+                   $payment_gateway->gateway_module. " -- ".
+                 ( ref($t_response) ? Dumper($t_response) : $t_response );
+
+    }
+
+    if ( !$options{'quiet'} && !$realtime_bop_decline_quiet
+         && $conf->exists('emaildecline')
+         && grep { $_ ne 'POST' } $self->invoicing_list
+         && ! grep { $transaction->error_message =~ /$_/ }
+                   $conf->config('emaildecline-exclude')
+    ) {
+      my @templ = $conf->config('declinetemplate');
+      my $template = new Text::Template (
+        TYPE   => 'ARRAY',
+        SOURCE => [ map "$_\n", @templ ],
+      ) or return "($perror) can't create template: $Text::Template::ERROR";
+      $template->compile()
+        or return "($perror) can't compile template: $Text::Template::ERROR";
+
+      my $templ_hash = { error => $transaction->error_message };
+
+      my $error = send_email(
+        'from'    => $conf->config('invoice_from', $self->agentnum ),
+        'to'      => [ grep { $_ ne 'POST' } $self->invoicing_list ],
+        'subject' => 'Your payment could not be processed',
+        'body'    => [ $template->fill_in(HASH => $templ_hash) ],
+      );
+
+      $perror .= " (also received error sending decline notification: $error)"
+        if $error;
+
+    }
+
+    $cust_pay_pending->status('done');
+    $cust_pay_pending->statustext("declined: $perror");
+    my $cpp_done_err = $cust_pay_pending->replace;
+    if ( $cpp_done_err ) {
+      my $e = "WARNING: $options{method} declined but pending payment not ".
+              "resolved - error updating status for paypendingnum ".
+              $cust_pay_pending->paypendingnum. ": $cpp_done_err \n";
+      warn $e;
+      $perror = "$e ($perror)";
+    }
+
+    return $perror;
+  }
+
+}
+
+=item realtime_botpp_capture CUST_PAY_PENDING [ OPTION => VALUE ... ]
+
+Verifies successful third party processing of a realtime credit card,
+ACH (electronic check) or phone bill transaction via a
+Business::OnlineThirdPartyPayment realtime gateway.  See
+L<http://420.am/business-onlinethirdpartypayment> for supported gateways.
+
+Available options are: I<description>, I<invnum>, I<quiet>, I<paynum_ref>, I<payunique>
+
+The additional options I<payname>, I<city>, I<state>,
+I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
+if set, will override the value from the customer record.
+
+I<description> is a free-text field passed to the gateway.  It defaults to
+"Internet services".
+
+If an I<invnum> is specified, this payment (if successful) is applied to the
+specified invoice.  If you don't specify an I<invnum> you might want to
+call the B<apply_payments> method.
+
+I<quiet> can be set true to surpress email decline notices.
+
+I<paynum_ref> can be set to a scalar reference.  It will be filled in with the
+resulting paynum, if any.
+
+I<payunique> is a unique identifier for this payment.
+
+Returns a hashref containing elements bill_error (which will be undefined
+upon success) and session_id of any associated session.
+
+=cut
+
+sub realtime_botpp_capture {
+  my( $self, $cust_pay_pending, %options ) = @_;
+  if ( $DEBUG ) {
+    warn "$me realtime_botpp_capture: pending transaction $cust_pay_pending\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
+  eval "use Business::OnlineThirdPartyPayment";  
+  die $@ if $@;
+
+  ###
+  # select the gateway
+  ###
+
+  my $method = FS::payby->payby2bop($cust_pay_pending->payby);
+
+  my $payment_gateway = $cust_pay_pending->gatewaynum
+    ? qsearchs( 'payment_gateway',
+                { gatewaynum => $cust_pay_pending->gatewaynum }
+              )
+    : $self->agent->payment_gateway( 'method' => $method,
+                                     # 'invnum'  => $cust_pay_pending->invnum,
+                                     # 'payinfo' => $cust_pay_pending->payinfo,
+                                   );
+
+  $options{payment_gateway} = $payment_gateway; # for the helper subs
+
+  ###
+  # massage data
+  ###
+
+  my @invoicing_list = $self->invoicing_list_emailonly;
+  if ( $conf->exists('emailinvoiceautoalways')
+       || $conf->exists('emailinvoiceauto') && ! @invoicing_list
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $self->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my %content = ();
+
+  $content{email_customer} = 
+    (    $conf->exists('business-onlinepayment-email_customer')
+      || $conf->exists('business-onlinepayment-email-override') );
+      
+  ###
+  # run transaction(s)
+  ###
+
+  my $transaction =
+    new Business::OnlineThirdPartyPayment( $payment_gateway->gateway_module,
+                                           $self->_bop_options(\%options),
+                                         );
+
+  $transaction->reference({ %options }); 
+
+  $transaction->content(
+    'type'           => $method,
+    $self->_bop_auth(\%options),
+    'action'         => 'Post Authorization',
+    'description'    => $options{'description'},
+    'amount'         => $cust_pay_pending->paid,
+    #'invoice_number' => $options{'invnum'},
+    'customer_id'    => $self->custnum,
+    'referer'        => 'http://cleanwhisker.420.am/',
+    'reference'      => $cust_pay_pending->paypendingnum,
+    'email'          => $email,
+    'phone'          => $self->daytime || $self->night,
+    %content, #after
+    # plus whatever is required for bogus capture avoidance
+  );
+
+  $transaction->submit();
+
+  my $error =
+    $self->_realtime_bop_result( $cust_pay_pending, $transaction, %options );
+
+  {
+    bill_error => $error,
+    session_id => $cust_pay_pending->session_id,
+  }
+
+}
+
+=item default_payment_gateway DEPRECATED -- use agent->payment_gateway
+
+=cut
+
+sub default_payment_gateway {
+  my( $self, $method ) = @_;
+
+  die "Real-time processing not enabled\n"
+    unless $conf->exists('business-onlinepayment');
+
+  #warn "default_payment_gateway deprecated -- use agent->payment_gateway\n";
+
+  #load up config
+  my $bop_config = 'business-onlinepayment';
+  $bop_config .= '-ach'
+    if $method =~ /^(ECHECK|CHEK)$/ && $conf->exists($bop_config. '-ach');
+  my ( $processor, $login, $password, $action, @bop_options ) =
+    $conf->config($bop_config);
+  $action ||= 'normal authorization';
+  pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+  die "No real-time processor is enabled - ".
+      "did you set the business-onlinepayment configuration value?\n"
+    unless $processor;
+
+  ( $processor, $login, $password, $action, @bop_options )
+}
+
+=item remove_cvv
+
+Removes the I<paycvv> field from the database directly.
+
+If there is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub remove_cvv {
+  my $self = shift;
+  my $sth = dbh->prepare("UPDATE cust_main SET paycvv = '' WHERE custnum = ?")
+    or return dbh->errstr;
+  $sth->execute($self->custnum)
+    or return $sth->errstr;
+  $self->paycvv('');
+  '';
+}
+
+=item _new_realtime_refund_bop METHOD [ OPTION => VALUE ... ]
+
+Refunds a realtime credit card, ACH (electronic check) or phone bill transaction
+via a Business::OnlinePayment realtime gateway.  See
+L<http://420.am/business-onlinepayment> for supported gateways.
+
+Available methods are: I<CC>, I<ECHECK> and I<LEC>
+
+Available options are: I<amount>, I<reason>, I<paynum>, I<paydate>
+
+Most gateways require a reference to an original payment transaction to refund,
+so you probably need to specify a I<paynum>.
+
+I<amount> defaults to the original amount of the payment if not specified.
+
+I<reason> specifies a reason for the refund.
+
+I<paydate> specifies the expiration date for a credit card overriding the
+value from the customer record or the payment record. Specified as yyyy-mm-dd
+
+Implementation note: If I<amount> is unspecified or equal to the amount of the
+orignal payment, first an attempt is made to "void" the transaction via
+the gateway (to cancel a not-yet settled transaction) and then if that fails,
+the normal attempt is made to "refund" ("credit") the transaction via the
+gateway is attempted.
+
+#The additional options I<payname>, I<address1>, I<address2>, I<city>, I<state>,
+#I<zip>, I<payinfo> and I<paydate> are also available.  Any of these options,
+#if set, will override the value from the customer record.
+
+#If an I<invnum> is specified, this payment (if successful) is applied to the
+#specified invoice.  If you don't specify an I<invnum> you might want to
+#call the B<apply_payments> method.
+
+=cut
+
+#some false laziness w/realtime_bop, not enough to make it worth merging
+#but some useful small subs should be pulled out
+sub _new_realtime_refund_bop {
+  my $self = shift;
+
+  my %options = ();
+  if (ref($_[0]) ne 'HASH') {
+    %options = %{$_[0]};
+  } else {
+    my $method = shift;
+    %options = @_;
+    $options{method} = $method;
+  }
+
+  if ( $DEBUG ) {
+    warn "$me realtime_refund_bop (new): $options{method} refund\n";
+    warn "  $_ => $options{$_}\n" foreach keys %options;
+  }
+
+  ###
+  # look up the original payment and optionally a gateway for that payment
+  ###
+
+  my $cust_pay = '';
+  my $amount = $options{'amount'};
+
+  my( $processor, $login, $password, @bop_options, $namespace ) ;
+  my( $auth, $order_number ) = ( '', '', '' );
+
+  if ( $options{'paynum'} ) {
+
+    warn "  paynum: $options{paynum}\n" if $DEBUG > 1;
+    $cust_pay = qsearchs('cust_pay', { paynum=>$options{'paynum'} } )
+      or return "Unknown paynum $options{'paynum'}";
+    $amount ||= $cust_pay->paid;
+
+    $cust_pay->paybatch =~ /^((\d+)\-)?(\w+):\s*([\w\-\/ ]*)(:([\w\-]+))?$/
+      or return "Can't parse paybatch for paynum $options{'paynum'}: ".
+                $cust_pay->paybatch;
+    my $gatewaynum = '';
+    ( $gatewaynum, $processor, $auth, $order_number ) = ( $2, $3, $4, $6 );
+
+    if ( $gatewaynum ) { #gateway for the payment to be refunded
+
+      my $payment_gateway =
+        qsearchs('payment_gateway', { 'gatewaynum' => $gatewaynum } );
+      die "payment gateway $gatewaynum not found"
+        unless $payment_gateway;
+
+      $processor   = $payment_gateway->gateway_module;
+      $login       = $payment_gateway->gateway_username;
+      $password    = $payment_gateway->gateway_password;
+      $namespace   = $payment_gateway->gateway_namespace;
+      @bop_options = $payment_gateway->options;
+
+    } else { #try the default gateway
+
+      my $conf_processor;
+      my $payment_gateway =
+        $self->agent->payment_gateway('method' => $options{method});
+
+      ( $conf_processor, $login, $password, $namespace ) =
+        map { my $method = "gateway_$_"; $payment_gateway->$method }
+          qw( module username password namespace );
+
+      @bop_options = $payment_gateway->gatewaynum
+                       ? $payment_gateway->options
+                       : @{ $payment_gateway->get('options') };
+
+      return "processor of payment $options{'paynum'} $processor does not".
+             " match default processor $conf_processor"
+        unless $processor eq $conf_processor;
+
+    }
+
+
+  } else { # didn't specify a paynum, so look for agent gateway overrides
+           # like a normal transaction 
+ 
+    my $payment_gateway =
+      $self->agent->payment_gateway( 'method'  => $options{method},
+                                     #'payinfo' => $payinfo,
+                                   );
+    my( $processor, $login, $password, $namespace ) =
+      map { my $method = "gateway_$_"; $payment_gateway->$method }
+        qw( module username password namespace );
+
+    my @bop_options = $payment_gateway->gatewaynum
+                        ? $payment_gateway->options
+                        : @{ $payment_gateway->get('options') };
+
+  }
+  return "neither amount nor paynum specified" unless $amount;
+
+  eval "use $namespace";  
+  die $@ if $@;
+
+  my %content = (
+    'type'           => $options{method},
+    'login'          => $login,
+    'password'       => $password,
+    'order_number'   => $order_number,
+    'amount'         => $amount,
+    'referer'        => 'http://cleanwhisker.420.am/', #XXX fix referer :/
+  );
+  $content{authorization} = $auth
+    if length($auth); #echeck/ACH transactions have an order # but no auth
+                      #(at least with authorize.net)
+
+  my $disable_void_after;
+  if ($conf->exists('disable_void_after')
+      && $conf->config('disable_void_after') =~ /^(\d+)$/) {
+    $disable_void_after = $1;
+  }
+
+  #first try void if applicable
+  if ( $cust_pay && $cust_pay->paid == $amount
+    && (
+      ( not defined($disable_void_after) )
+      || ( time < ($cust_pay->_date + $disable_void_after ) )
+    )
+  ) {
+    warn "  attempting void\n" if $DEBUG > 1;
+    my $void = new Business::OnlinePayment( $processor, @bop_options );
+    $void->content( 'action' => 'void', %content );
+    $void->submit();
+    if ( $void->is_success ) {
+      my $error = $cust_pay->void($options{'reason'});
+      if ( $error ) {
+        # gah, even with transactions.
+        my $e = 'WARNING: Card/ACH voided but database not updated - '.
+                "error voiding payment: $error";
+        warn $e;
+        return $e;
+      }
+      warn "  void successful\n" if $DEBUG > 1;
+      return '';
+    }
+  }
+
+  warn "  void unsuccessful, trying refund\n"
+    if $DEBUG > 1;
+
+  #massage data
+  my $address = $self->address1;
+  $address .= ", ". $self->address2 if $self->address2;
+
+  my($payname, $payfirst, $paylast);
+  if ( $self->payname && $options{method} ne 'ECHECK' ) {
+    $payname = $self->payname;
+    $payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
+      or return "Illegal payname $payname";
+    ($payfirst, $paylast) = ($1, $2);
+  } else {
+    $payfirst = $self->getfield('first');
+    $paylast = $self->getfield('last');
+    $payname =  "$payfirst $paylast";
+  }
+
+  my @invoicing_list = $self->invoicing_list_emailonly;
+  if ( $conf->exists('emailinvoiceautoalways')
+       || $conf->exists('emailinvoiceauto') && ! @invoicing_list
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $self->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my $payip = exists($options{'payip'})
+                ? $options{'payip'}
+                : $self->payip;
+  $content{customer_ip} = $payip
+    if length($payip);
+
+  my $payinfo = '';
+  if ( $options{method} eq 'CC' ) {
+
+    if ( $cust_pay ) {
+      $content{card_number} = $payinfo = $cust_pay->payinfo;
+      (exists($options{'paydate'}) ? $options{'paydate'} : $cust_pay->paydate)
+        =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/ &&
+        ($content{expiration} = "$2/$1");  # where available
+    } else {
+      $content{card_number} = $payinfo = $self->payinfo;
+      (exists($options{'paydate'}) ? $options{'paydate'} : $self->paydate)
+        =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+      $content{expiration} = "$2/$1";
+    }
+
+  } elsif ( $options{method} eq 'ECHECK' ) {
+
+    if ( $cust_pay ) {
+      $payinfo = $cust_pay->payinfo;
+    } else {
+      $payinfo = $self->payinfo;
+    } 
+    ( $content{account_number}, $content{routing_code} )= split('@', $payinfo );
+    $content{bank_name} = $self->payname;
+    $content{account_type} = 'CHECKING';
+    $content{account_name} = $payname;
+    $content{customer_org} = $self->company ? 'B' : 'I';
+    $content{customer_ssn} = $self->ss;
+  } elsif ( $options{method} eq 'LEC' ) {
+    $content{phone} = $payinfo = $self->payinfo;
+  }
+
+  #then try refund
+  my $refund = new Business::OnlinePayment( $processor, @bop_options );
+  my %sub_content = $refund->content(
+    'action'         => 'credit',
+    'customer_id'    => $self->custnum,
+    'last_name'      => $paylast,
+    'first_name'     => $payfirst,
+    'name'           => $payname,
+    'address'        => $address,
+    'city'           => $self->city,
+    'state'          => $self->state,
+    'zip'            => $self->zip,
+    'country'        => $self->country,
+    'email'          => $email,
+    'phone'          => $self->daytime || $self->night,
+    %content, #after
+  );
+  warn join('', map { "  $_ => $sub_content{$_}\n" } keys %sub_content )
+    if $DEBUG > 1;
+  $refund->submit();
+
+  return "$processor error: ". $refund->error_message
+    unless $refund->is_success();
+
+  my $paybatch = "$processor:". $refund->authorization;
+  $paybatch .= ':'. $refund->order_number
+    if $refund->can('order_number') && $refund->order_number;
+
+  while ( $cust_pay && $cust_pay->unapplied < $amount ) {
+    my @cust_bill_pay = $cust_pay->cust_bill_pay;
+    last unless @cust_bill_pay;
+    my $cust_bill_pay = pop @cust_bill_pay;
+    my $error = $cust_bill_pay->delete;
+    last if $error;
+  }
+
+  my $cust_refund = new FS::cust_refund ( {
+    'custnum'  => $self->custnum,
+    'paynum'   => $options{'paynum'},
+    'refund'   => $amount,
+    '_date'    => '',
+    'payby'    => $bop_method2payby{$options{method}},
+    'payinfo'  => $payinfo,
+    'paybatch' => $paybatch,
+    'reason'   => $options{'reason'} || 'card or ACH refund',
+  } );
+  my $error = $cust_refund->insert;
+  if ( $error ) {
+    $cust_refund->paynum(''); #try again with no specific paynum
+    my $error2 = $cust_refund->insert;
+    if ( $error2 ) {
+      # gah, even with transactions.
+      my $e = 'WARNING: Card/ACH refunded but database not updated - '.
+              "error inserting refund ($processor): $error2".
+              " (previously tried insert with paynum #$options{'paynum'}" .
+              ": $error )";
+      warn $e;
+      return $e;
+    }
+  }
+
+  ''; #no error
+
+}
+
 =item batch_card OPTION => VALUE...
 
 Adds a payment for this invoice to the pending credit card batch (see
diff --git a/FS/FS/cust_pay_pending.pm b/FS/FS/cust_pay_pending.pm
index bbabd247e..fba19ea19 100644
--- a/FS/FS/cust_pay_pending.pm
+++ b/FS/FS/cust_pay_pending.pm
@@ -191,6 +191,7 @@ sub check {
     #|| $self->ut_textn('statustext')
     || $self->ut_anything('statustext')
     #|| $self->ut_money('cust_balance')
+    || $self->ut_hexn('session_id')
     || $self->ut_foreign_keyn('paynum', 'cust_pay', 'paynum' )
     || $self->payinfo_check() #payby/payinfo/paymask/paydate
   ;
@@ -215,6 +216,18 @@ sub check {
   $self->SUPER::check;
 }
 
+=item cust_main
+
+Returns the associated L<FS::cust_main> record if any.  Otherwise returns false.
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs('cust_main', { custnum => $self->custnum } );
+}
+
+
 #these two are kind-of false laziness w/cust_main::realtime_bop
 #(currently only used when resolving pending payments manually)
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index dd6db1be9..7c8656c09 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -439,9 +439,7 @@ replace methods.
 sub check {
   my $self = shift;
 
-  $self->locationnum('')
-    if defined($self->locationnum) && length($self->locationnum)
-    && ( $self->locationnum == 0 || $self->locationnum == -1 );
+  $self->locationnum('') if !$self->locationnum || $self->locationnum == -1;
 
   my $error = 
     $self->ut_numbern('pkgnum')
diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index b54e5d938..30a03ddfe 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -48,28 +48,33 @@ tie %hash, 'Tie::IxHash',
     tinyname  => 'card',
     shortname => 'Credit card',
     longname  => 'Credit card (automatic)',
+    realtime  => 1,
   },
   'DCRD' => {
     tinyname  => 'card',
     shortname => 'Credit card',
     longname  => 'Credit card (on-demand)',
     cust_pay  => 'CARD', #this is a customer type only, payments are CARD...
+    realtime  => 1,
   },
   'CHEK' => {
     tinyname  => 'check',
     shortname => 'Electronic check',
     longname  => 'Electronic check (automatic)',
+    realtime  => 1,
   },
   'DCHK' => {
     tinyname  => 'check',
     shortname => 'Electronic check',
     longname  => 'Electronic check (on-demand)',
     cust_pay  => 'CHEK', #this is a customer type only, payments are CHEK...
+    realtime  => 1,
   },
   'LECB' => {
     tinyname  => 'phone bill',
     shortname => 'Phone bill billing',
     longname  => 'Phone bill billing',
+    realtime  => 1,
   },
   'BILL' => {
     tinyname  => 'billing',
@@ -131,6 +136,15 @@ sub can_payby {
   return 1;
 }
 
+sub realtime {  # can use realtime payment facilities
+  my( $self, $payby ) = @_;
+
+  return 0 unless $hash{$payby};
+  return 0 unless exists( $hash{$payby}->{realtime} );
+
+  return $hash{$payby}->{realtime};
+}
+
 sub payby2longname {
   my $self = shift;
   map { $_ => $hash{$_}->{longname} } $self->payby;
@@ -157,6 +171,7 @@ sub longname {
 %payby2bop = (
   'CARD' => 'CC',
   'CHEK' => 'ECHECK',
+  'MCRD' => 'CC',
 );
 
 sub payby2bop {
diff --git a/FS/FS/payment_gateway.pm b/FS/FS/payment_gateway.pm
index 35b4f0835..bc8b875c3 100644
--- a/FS/FS/payment_gateway.pm
+++ b/FS/FS/payment_gateway.pm
@@ -1,12 +1,14 @@
 package FS::payment_gateway;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $me $DEBUG );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::option_Common;
 use FS::agent_payment_gateway;
 
 @ISA = qw( FS::option_Common );
+$me = '[ FS::payment_gateway ]';
+$DEBUG=0;
 
 =head1 NAME
 
@@ -37,6 +39,8 @@ currently supported:
 
 =item gatewaynum - primary key
 
+=item gateway_namespace - Business::OnlinePayment or Business::OnlineThirdPartyPayment
+
 =item gateway_module - Business::OnlinePayment:: module name
 
 =item gateway_username - payment gateway username
@@ -110,8 +114,12 @@ sub check {
   my $error = 
     $self->ut_numbern('gatewaynum')
     || $self->ut_alpha('gateway_module')
+    || $self->ut_enum('gateway_namespace', ['Business::OnlinePayment',
+                                            'Business::OnlineThirdPartyPayment',
+                                           ] )
     || $self->ut_textn('gateway_username')
     || $self->ut_anything('gateway_password')
+    || $self->ut_textn('gateway_callback_url')  # a bit too permissive
     || $self->ut_enum('disabled', [ '', 'Y' ] )
     #|| $self->ut_textn('gateway_action')
   ;
@@ -131,6 +139,10 @@ sub check {
     $self->gateway_action('Normal Authorization');
   }
 
+  # this little kludge mimics FS::CGI::popurl
+  $self->gateway_callback_url($self->gateway_callback_url. '/')
+    if ( $self->gateway_callback_url && $self->gateway_callback_url !~ /\/$/ );
+
   $self->SUPER::check;
 }
 
@@ -186,6 +198,41 @@ sub disable {
 
 }
 
+=item namespace_description
+
+returns a friendly name for the namespace
+
+=cut
+
+my %namespace2description = (
+  '' => 'Direct',
+  'Business::OnlinePayment' => 'Direct',
+  'Business::OnlineThirdPartyPayment' => 'Hosted',
+);
+
+sub namespace_description {
+  $namespace2description{shift->gateway_namespace} || 'Unknown';
+}
+
+# _upgrade_data
+#
+# Used by FS::Upgrade to migrate to a new database.
+#
+#
+
+sub _upgrade_data {
+  my ($class, %opts) = @_;
+  my $dbh = dbh;
+
+  warn "$me upgrading $class\n" if $DEBUG;
+
+  foreach ( qsearch( 'payment_gateway', { 'gateway_namespace' => '' } ) ) {
+    $_->gateway_namespace('Business::OnlinePayment');  #defaulting
+    my $error = $_->replace;
+    die "$class had error during upgrade replacement: $error" if $error;
+  }
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From d3c80e75b62421ea742cbe4547305227f8c10bea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Mar 2009 09:41:51 +0000
Subject: add cdr display with accountcode included, RT#4405

---
 FS/FS/cdr.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 67c5c1c2a..f0082279e 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -464,6 +464,10 @@ my %export_names = (
     'name'           => 'Default with source',
     'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
   },
+  'accountcode_default' => {
+    'name'           => 'Default plus accountcode',
+    'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
+  },
 );
 
 my %export_formats = (
@@ -528,6 +532,11 @@ my %export_formats = (
   ],
 );
 $export_formats{'source_default'} = [ 'src', @{ $export_formats{'default'} }, ];
+$export_formats{'accountcode_default'} =
+  [ @{ $export_formats{'default'} }[0,1],
+    'accountcode',
+    @{ $export_formats{'default'} }[2..5],
+  ];
 
 sub downstream_csv {
   my( $self, %opt ) = @_;
-- 
cgit v1.2.1


From 2ea58badb5e0e2985a796f8b614912db9b6e43bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 11 Mar 2009 10:04:00 +0000
Subject: add previous_balance-summary_only config, RT#4404

---
 FS/FS/Conf.pm      |  7 +++++++
 FS/FS/cust_bill.pm | 52 ++++++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 24 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3921afdaa..3f150e1e7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2485,6 +2485,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'previous_balance-summary_only',
+    'section'     => 'billing',
+    'description' => 'Only show a single line summarizing the total previous balance rather than one line per invoice.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'usps_webtools-userid',
     'section'     => 'UI',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 704b3504a..1f78d72f4 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2080,33 +2080,37 @@ sub print_generic {
     push @sections, { 'description' => '', 'subtotal' => '' };
   }
 
-  foreach my $line_item ( $conf->exists('disable_previous_balance') 
-                            ? ()
-                            : $self->_items_previous
-                        )
+  unless (    $conf->exists('disable_previous_balance')
+           || $conf->exists('previous_balance-summary_only')
+         )
   {
-    my $detail = {
-      ext_description => [],
-    };
-    $detail->{'ref'} = $line_item->{'pkgnum'};
-    $detail->{'quantity'} = 1;
-    $detail->{'section'} = $previous_section;
-    $detail->{'description'} = &$escape_function($line_item->{'description'});
-    if ( exists $line_item->{'ext_description'} ) {
-      @{$detail->{'ext_description'}} = map {
-        &$escape_function($_);
-      } @{$line_item->{'ext_description'}};
+
+    foreach my $line_item ( $self->_items_previous ) {
+
+      my $detail = {
+        ext_description => [],
+      };
+      $detail->{'ref'} = $line_item->{'pkgnum'};
+      $detail->{'quantity'} = 1;
+      $detail->{'section'} = $previous_section;
+      $detail->{'description'} = &$escape_function($line_item->{'description'});
+      if ( exists $line_item->{'ext_description'} ) {
+        @{$detail->{'ext_description'}} = map {
+          &$escape_function($_);
+        } @{$line_item->{'ext_description'}};
+      }
+      $detail->{'amount'} = ( $old_latex ? '' : $money_char).
+                            $line_item->{'amount'};
+      $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
+
+      push @detail_items, $detail;
+      push @buf, [ $detail->{'description'},
+                   $money_char. sprintf("%10.2f", $line_item->{'amount'}),
+                 ];
     }
-    $detail->{'amount'} = ( $old_latex ? '' : $money_char).
-                          $line_item->{'amount'};
-    $detail->{'product_code'} = $line_item->{'pkgpart'} || 'N/A';
-  
-    push @detail_items, $detail;
-    push @buf, [ $detail->{'description'},
-                 $money_char. sprintf("%10.2f", $line_item->{'amount'}),
-               ];
+
   }
-  
+
   if ( @pr_cust_bill && !$conf->exists('disable_previous_balance') ) {
     push @buf, ['','-----------'];
     push @buf, [ 'Total Previous Balance',
-- 
cgit v1.2.1


From 64916ad920572e19351df79127d4822fab57f621 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 13 Mar 2009 18:22:21 +0000
Subject: prevent more duplicate MACs from sneaking in in the interim

---
 FS/FS/svc_broadband.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index b808527a1..eb2964635 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -217,6 +217,10 @@ sub check {
   ;
   return $error if $error;
 
+  #redundant, but prevents further problems until column constraint in place
+  return "MAC already in use"
+    if scalar( qsearch( 'svc_broadband', { 'mac_addr', $self->mac_addr } ) );
+
   if($self->speed_up < 0) { return 'speed_up must be positive'; }
   if($self->speed_down < 0) { return 'speed_down must be positive'; }
 
-- 
cgit v1.2.1


From dae7ad7ff2a06ae047de9fd6d88e74edc526b4ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 14 Mar 2009 23:44:38 +0000
Subject: fix emailed logos to come from db config, not old files, RT#3093 /
 RT#4963

---
 FS/FS/cust_bill.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1f78d72f4..c8384c009 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -660,21 +660,22 @@ sub generate_email {
     my $from = $1 || 'example.com';
     my $content_id = join('.', rand()*(2**32), $$, time). "\@$from";
 
-    my $path = "$FS::UID::conf_dir/conf.$FS::UID::datasrc";
-    my $file;
+    my $logo;
+    my $agentnum = $self->cust_main->agentnum;
     if ( defined($args{'template'}) && length($args{'template'})
-         && -e "$path/logo_". $args{'template'}. ".png"
+         && $conf->exists( 'logo_'. $args{'template'}. '.png', $agentnum )
        )
     {
-      $file = "$path/logo_". $args{'template'}. ".png";
+      $logo = 'logo_'. $args{'template'}. '.png';
     } else {
-      $file = "$path/logo.png";
+      $logo = "logo.png";
     }
+    my $image_data = $conf->config_binary( $logo, $agentnum);
 
     my $image = build MIME::Entity
       'Type'       => 'image/png',
       'Encoding'   => 'base64',
-      'Path'       => $file,
+      'Data'       => $image_data,
       'Filename'   => 'logo.png',
       'Content-ID' => "<$content_id>",
     ;
-- 
cgit v1.2.1


From 5cf0508a1ec3dafaeef8a4bd206ef5e5b51235c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 07:33:06 +0000
Subject: cust_main::payment_info, for ClientAPI::MyAccount

---
 FS/FS/cust_main.pm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2bad5ec3e..69126956a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6032,6 +6032,86 @@ sub in_transit_payments {
   sprintf( "%.2f", $in_transit_payments );
 }
 
+=item payment_info
+
+Returns a hash of useful information for making a payment.
+
+=over 4
+
+=item balance
+
+Current balance.
+
+=item payby
+
+'CARD' (credit card - automatic), 'DCRD' (credit card - on-demand),
+'CHEK' (electronic check - automatic), 'DCHK' (electronic check - on-demand),
+'LECB' (Phone bill billing), 'BILL' (billing), or 'COMP' (free).
+
+=back
+
+For credit card transactions:
+
+=over 4
+
+=item card_type 1
+
+=item payname
+
+Exact name on card
+
+=back
+
+For electronic check transactions:
+
+=over 4
+
+=item stateid_state
+
+=back
+
+=cut
+
+sub payment_info {
+  my $self = shift;
+
+  my %return = ();
+
+  $return{balance} = $self->balance;
+
+  $return{payname} = $self->payname
+                     || ( $self->first. ' '. $self->get('last') );
+
+  $return{$_} = $self->get($_) for qw(address1 address2 city state zip);
+
+  $return{payby} = $self->payby;
+  $return{stateid_state} = $self->stateid_state;
+
+  if ( $self->payby =~ /^(CARD|DCRD)$/ ) {
+    $return{card_type} = cardtype($self->payinfo);
+    $return{payinfo} = $self->paymask;
+
+    @return{'month', 'year'} = $self->paydate_monthyear;
+
+  }
+
+  if ( $self->payby =~ /^(CHEK|DCHK)$/ ) {
+    my ($payinfo1, $payinfo2) = split '@', $self->paymask;
+    $return{payinfo1} = $payinfo1;
+    $return{payinfo2} = $payinfo2;
+    $return{paytype}  = $self->paytype;
+    $return{paystate} = $self->paystate;
+
+  }
+
+  #doubleclick protection
+  my $_date = time;
+  $return{paybatch} = "webui-MyAccount-$_date-$$-". rand() * 2**32;
+
+  %return;
+
+}
+
 =item paydate_monthyear
 
 Returns a two-element list consisting of the month and year of this customer's
-- 
cgit v1.2.1


From dc24b4b7e2e41dbb3039e9ce367b018fef299ade Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 10:30:26 +0000
Subject: we're not a disk drive manufacturer, don't use halfass base-10
 megs/gigs

---
 FS/FS/UI/bytecount.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm
index 0891e6d68..0ddc7545c 100644
--- a/FS/FS/UI/bytecount.pm
+++ b/FS/FS/UI/bytecount.pm
@@ -32,9 +32,9 @@ sub bytecount_unexact {
   return("$bc bytes")
     if ($bc < 1000);
   return(sprintf("%.2f Kbytes", $bc/1024))
-    if ($bc < 1000000);
+    if ($bc < 1048576);
   return(sprintf("%.2f Mbytes", $bc/1048576))
-    if ($bc < 1000000000);
+    if ($bc < 1073741824);
   return(sprintf("%.2f Gbytes", $bc/1073741824));
 }
 
-- 
cgit v1.2.1


From fd1bf67102a849280d78a041eff33e87c3cc7179 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 10:46:31 +0000
Subject: fix application of data fields from prepaid cards in addition to time
 field

---
 FS/FS/cust_main.pm | 95 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 32 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 69126956a..27a617e1a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -23,6 +23,7 @@ use FS::UID qw( getotaker dbh driver_name );
 use FS::Record qw( qsearchs qsearch dbdef );
 use FS::Misc qw( generate_email send_email generate_ps do_print );
 use FS::Msgcat qw(gettext);
+use FS::payby;
 use FS::cust_pkg;
 use FS::cust_svc;
 use FS::cust_bill;
@@ -392,7 +393,7 @@ sub insert {
   my $dbh = dbh;
 
   my $prepay_identifier = '';
-  my( $amount, $seconds ) = ( 0, 0 );
+  my( $amount, $seconds, $upbytes, $downbytes, $totalbytes ) = (0, 0, 0, 0, 0);
   my $payby = '';
   if ( $self->payby eq 'PREPAY' ) {
 
@@ -403,7 +404,13 @@ sub insert {
     warn "  looking up prepaid card $prepay_identifier\n"
       if $DEBUG > 1;
 
-    my $error = $self->get_prepay($prepay_identifier, \$amount, \$seconds);
+    my $error = $self->get_prepay( $prepay_identifier,
+                                   'amount_ref'     => \$amount,
+                                   'seconds_ref'    => \$seconds,
+                                   'upbytes_ref'    => \$upbytes,
+                                   'downbytes_ref'  => \$downbytes,
+                                   'totalbytes_ref' => \$totalbytes,
+                                 );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       #return "error applying prepaid card (transaction rolled back): $error";
@@ -465,7 +472,13 @@ sub insert {
   warn "  ordering packages\n"
     if $DEBUG > 1;
 
-  $error = $self->order_pkgs($cust_pkgs, \$seconds, %options);
+  $error = $self->order_pkgs( $cust_pkgs,
+                              %options,
+                              'seconds_ref'    => \$seconds,
+                              'upbytes_ref'    => \$upbytes,
+                              'downbytes_ref'  => \$downbytes,
+                              'totalbytes_ref' => \$totalbytes,
+                            );
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -475,6 +488,10 @@ sub insert {
     $dbh->rollback if $oldAutoCommit;
     return "No svc_acct record to apply pre-paid time";
   }
+  if ( $upbytes || $downbytes || $totalbytes ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "No svc_acct record to apply pre-paid data";
+  }
 
   if ( $amount ) {
     warn "  inserting initial $payby payment of $amount\n"
@@ -701,7 +718,6 @@ sub order_pkg {
     if $DEBUG;
 
   my $cust_pkg = $opt->{'cust_pkg'};
-  my $seconds  = $opt->{'seconds'};
   my $svcs     = $opt->{'svcs'} || [];
 
   my %svc_options = ();
@@ -745,9 +761,12 @@ sub order_pkg {
       $error = $new_cust_svc->replace($old_cust_svc);
     } else {
       $svc_something->pkgnum( $cust_pkg->pkgnum );
-      if ( $seconds && $$seconds && $svc_something->isa('FS::svc_acct') ) {
-        $svc_something->seconds( $svc_something->seconds + $$seconds );
-        $$seconds = 0;
+      if ( $svc_something->isa('FS::svc_acct') ) {
+        foreach ( grep { $opt->{$_.'_ref'} && ${ $opt->{$_.'_ref'} } }
+                       qw( seconds upbytes downbytes totalbytes )      ) {
+          $svc_something->$_( $svc_something->$_() + ${ $opt->{$_.'_ref'} } );
+          ${ $opt->{$_.'_ref'} } = 0;
+        }
       }
       $error = $svc_something->insert(%svc_options);
     }
@@ -762,7 +781,8 @@ sub order_pkg {
 
 }
 
-=item order_pkgs HASHREF, [ SECONDSREF, [ , OPTION => VALUE ... ] ]
+#deprecated #=item order_pkgs HASHREF [ , SECONDSREF ] [ , OPTION => VALUE ... ]
+=item order_pkgs HASHREF [ , OPTION => VALUE ... ]
 
 Like the insert method on an existing record, this method orders multiple
 packages and included services atomicaly.  Pass a Tie::RefHash data structure
@@ -776,12 +796,13 @@ example:
     $cust_pkg => [ $svc_acct ],
     ...
   );
-  $cust_main->order_pkgs( \%hash, \'0', 'noexport'=>1 );
+  $cust_main->order_pkgs( \%hash, 'noexport'=>1 );
 
 Services can be new, in which case they are inserted, or existing unaudited
 services, in which case they are linked to the newly-created package.
 
-Currently available options are: I<depend_jobnum> and I<noexport>.
+Currently available options are: I<depend_jobnum>, I<noexport>, I<seconds_ref>,
+I<upbytes_ref>, I<downbytes_ref>, and I<totalbytes_ref>.
 
 If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
 on the supplied jobnum (they will not run until the specific job completes).
@@ -794,13 +815,18 @@ the B<reexport> method for each cust_pkg object.  Using the B<reexport> method
 on the cust_main object is not recommended, as existing services will also be
 reexported.)
 
+If I<seconds_ref>, I<upbytes_ref>, I<downbytes_ref>, or I<totalbytes_ref> is
+provided, the scalars (provided by references) will be incremented by the
+values of the prepaid card.`
+
 =cut
 
 sub order_pkgs {
   my $self = shift;
   my $cust_pkgs = shift;
-  my $seconds = shift;
+  my $seconds_ref = ref($_[0]) ? shift : ''; #deprecated
   my %options = @_;
+  $seconds_ref ||= $options{'seconds_ref'};
 
   warn "$me order_pkgs called with options ".
        join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
@@ -821,11 +847,14 @@ sub order_pkgs {
 
   foreach my $cust_pkg ( keys %$cust_pkgs ) {
 
-    my $error = $self->order_pkg( 'cust_pkg'      => $cust_pkg,
-                                  'svcs'          => $cust_pkgs->{$cust_pkg},
-                                  'seconds'       => $seconds,
-                                  'depend_jobnum' => $options{'depend_jobnum'},
-                                );
+    my $error = $self->order_pkg(
+      'cust_pkg'     => $cust_pkg,
+      'svcs'         => $cust_pkgs->{$cust_pkg},
+      'seconds_ref'  => $seconds_ref,
+      map { $_ => $options{$_} } qw( upbytes_ref downbytes_ref totalbytes_ref
+                                     depend_jobnum
+                                   )
+    );
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
@@ -844,13 +873,14 @@ L<FS::prepay_credit>), specified either by I<identifier> or as an
 FS::prepay_credit object.  If there is an error, returns the error, otherwise
 returns false.
 
-Optionally, four scalar references can be passed as well.  They will have their
-values filled in with the amount, number of seconds, and number of upload and
-download bytes applied by this prepaid
-card.
+Optionally, five scalar references can be passed as well.  They will have their
+values filled in with the amount, number of seconds, and number of upload,
+download, and total bytes applied by this prepaid card.
 
 =cut
 
+#the ref bullshit here should be refactored like get_prepay.  MyAccount.pm is
+#the only place that uses these args
 sub recharge_prepay { 
   my( $self, $prepay_credit, $amountref, $secondsref, 
       $upbytesref, $downbytesref, $totalbytesref ) = @_;
@@ -868,8 +898,13 @@ sub recharge_prepay {
 
   my( $amount, $seconds, $upbytes, $downbytes, $totalbytes) = ( 0, 0, 0, 0, 0 );
 
-  my $error = $self->get_prepay($prepay_credit, \$amount,
-                                \$seconds, \$upbytes, \$downbytes, \$totalbytes)
+  my $error = $self->get_prepay( $prepay_credit,
+                                 'amount_ref'     => \$amount,
+                                 'seconds_ref'    => \$seconds,
+                                 'upbytes_ref'    => \$upbytes,
+                                 'downbytes_ref'  => \$downbytes,
+                                 'totalbytes_ref' => \$totalbytes,
+                               )
            || $self->increment_seconds($seconds)
            || $self->increment_upbytes($upbytes)
            || $self->increment_downbytes($downbytes)
@@ -896,13 +931,13 @@ sub recharge_prepay {
 
 }
 
-=item get_prepay IDENTIFIER | PREPAY_CREDIT_OBJ , AMOUNTREF, SECONDSREF
+=item get_prepay IDENTIFIER | PREPAY_CREDIT_OBJ [ , OPTION => VALUE ... ]
 
 Looks up and deletes a prepaid card (see L<FS::prepay_credit>),
 specified either by I<identifier> or as an FS::prepay_credit object.
 
-References to I<amount> and I<seconds> scalars should be passed as arguments
-and will be incremented by the values of the prepaid card.
+Available options are: I<amount_ref>, I<seconds_ref>, I<upbytes_ref>, I<downbytes_ref>, and I<totalbytes_ref>.  The scalars (provided by references) will be
+incremented by the values of the prepaid card.
 
 If the prepaid card specifies an I<agentnum> (see L<FS::agent>), it is used to
 check or set this customer's I<agentnum>.
@@ -913,8 +948,7 @@ If there is an error, returns the error, otherwise returns false.
 
 
 sub get_prepay {
-  my( $self, $prepay_credit, $amountref, $secondsref,
-      $upref, $downref, $totalref) = @_;
+  my( $self, $prepay_credit, %opt ) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -959,11 +993,8 @@ sub get_prepay {
     return "removing prepay_credit (transaction rolled back): $error";
   }
 
-  $$amountref  += $prepay_credit->amount;
-  $$secondsref += $prepay_credit->seconds;
-  $$upref      += $prepay_credit->upbytes;
-  $$downref    += $prepay_credit->downbytes;
-  $$totalref   += $prepay_credit->totalbytes;
+  ${ $opt{$_.'_ref'} } += $prepay_credit->$_()
+    for grep $opt{$_.'_ref'}, qw( amount seconds upbytes downbytes totalbytes );
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
-- 
cgit v1.2.1


From fcd4ede322d50422e38426908c4ef62611043435 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 19:42:33 +0000
Subject: should give better performance if we search for what we want instead
 of using a string match

---
 FS/FS/cust_pkg_reason.pm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm
index 403751369..bb0542be2 100644
--- a/FS/FS/cust_pkg_reason.pm
+++ b/FS/FS/cust_pkg_reason.pm
@@ -136,12 +136,15 @@ sub reasontext {
 
 use FS::h_cust_pkg;
 use FS::h_cust_pkg_reason;
+use FS::Schema qw(dbdef);
 
 sub _upgrade_data { # class method
   my ($class, %opts) = @_;
 
-  my $test_cust_pkg_reason = new FS::cust_pkg_reason;
-  return '' unless $test_cust_pkg_reason->dbdef_table->column('action');
+  return '' unless dbdef->table('cust_pkg_reason')->column('action');
+
+  my $action_replace =
+    " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )";
 
   my $count = 0;
   my @unmigrated = qsearch('cust_pkg_reason', { 'action' => '' } ); 
@@ -151,27 +154,24 @@ sub _upgrade_data { # class method
     
     next unless scalar(@history_cust_pkg_reason) == 1;
 
-    my %action_value = ( op    => 'LIKE',
-                         value => 'replace_%',
-                       );
     my $hashref = { pkgnum => $_->pkgnum,
                     history_date   => $history_cust_pkg_reason[0]->history_date,
-                    history_action => { %action_value },
                   };
 
-    my @history = qsearch({ table    => 'h_cust_pkg',
-                            hashref  => $hashref,
-                            order_by => 'ORDER BY history_action',
+    my @history = qsearch({ table     => 'h_cust_pkg',
+                            hashref   => $hashref,
+                            extra_sql => $action_replace,
+                            order_by  => 'ORDER BY history_action',
                          });
 
     my $fuzz = 0;
     while (scalar(@history) < 2 && $fuzz < 3) {
       $hashref->{history_date}++;
-      $hashref->{history_action} = { %action_value }; # qsearch distorts this!
       $fuzz++;
-      push @history, qsearch({ table    => 'h_cust_pkg',
-                               hashref  => $hashref,
-                               order_by => 'ORDER BY history_action',
+      push @history, qsearch({ table     => 'h_cust_pkg',
+                               hashref   => $hashref,
+                               extra_sql => $action_replace,
+                               order_by  => 'ORDER BY history_action',
                             });
     }
 
@@ -226,26 +226,23 @@ sub _upgrade_data { # class method
                             }); 
     foreach ( @unmigrated ) {
 
-      my %action_value = ( op    => 'LIKE',
-                           value => 'replace_%',
-                         );
       my $hashref = { pkgnum => $_->pkgnum,
                       history_date   => $_->date,
-                      history_action => { %action_value },
                     };
 
-      my @history = qsearch({ table    => 'h_cust_pkg',
-                              hashref  => $hashref,
-                              order_by => 'ORDER BY history_action',
+      my @history = qsearch({ table     => 'h_cust_pkg',
+                              hashref   => $hashref,
+                              extra_sql => $action_replace,
+                              order_by  => 'ORDER BY history_action',
                            });
 
       my $fuzz = 0;
       while (scalar(@history) < 2 && $fuzz < 3) {
         $hashref->{history_date}++;
-        $hashref->{history_action} = { %action_value }; # qsearch distorts this!
         $fuzz++;
         push @history, qsearch({ table    => 'h_cust_pkg',
                                  hashref  => $hashref,
+                                 extra_sql => $action_replace,
                                  order_by => 'ORDER BY history_action',
                               });
       }
-- 
cgit v1.2.1


From 1c4c7cf9e2c1b4baae0453d844e23391cda7dfbb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 15 Mar 2009 22:33:09 +0000
Subject: don't throw 'Use of uninitialized value in addition (+) at
 /usr/local/share/perl/5.8.8/FS/cust_svc.pm line 626.' error when using
 attribute_since_sqlradacct

---
 FS/FS/cust_svc.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 30b23908c..320f78aa0 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -629,7 +629,8 @@ sub attribute_since_sqlradacct {
     ) or die $dbh->errstr;
     $sth->execute($username, $start, $end) or die $sth->errstr;
 
-    $sum += $sth->fetchrow_arrayref->[0];
+    my $row = $sth->fetchrow_arrayref;
+    $sum += $row->[0] if defined($row->[0]);
 
     warn "$mes done SUMing sessions\n"
       if $DEBUG;
-- 
cgit v1.2.1


From 8d419aa7155fd8edd1f2f2338265ec372a8eea5d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 16 Mar 2009 00:57:59 +0000
Subject: comment change

---
 FS/FS/svc_broadband.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index eb2964635..d4d41018a 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -217,7 +217,7 @@ sub check {
   ;
   return $error if $error;
 
-  #redundant, but prevents further problems until column constraint in place
+  #redundant, but better error message
   return "MAC already in use"
     if scalar( qsearch( 'svc_broadband', { 'mac_addr', $self->mac_addr } ) );
 
-- 
cgit v1.2.1


From 7f37738733c36b6af0f421779addac3e9af9a809 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 16 Mar 2009 04:22:42 +0000
Subject: use part_svc_router

---
 FS/FS/svc_broadband.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index d4d41018a..d9a25b487 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -6,6 +6,7 @@ use FS::Record qw( qsearchs qsearch dbh );
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::addr_block;
+use FS::part_svc_router;
 use NetAddr::IP;
 
 @ISA = qw( FS::svc_Common );
-- 
cgit v1.2.1


From 59a12152b6521065b8a2a82a48575445b6cd61d8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 16 Mar 2009 08:08:44 +0000
Subject: get the dup checking right

---
 FS/FS/svc_broadband.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index d9a25b487..6007c7083 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -111,6 +111,8 @@ sub table_info {
 
 sub table { 'svc_broadband'; }
 
+sub table_dupcheck_fields { ( 'mac_addr' ); }
+
 =item search_sql STRING
 
 Class method which returns an SQL fragment to search for the given string.
@@ -218,10 +220,6 @@ sub check {
   ;
   return $error if $error;
 
-  #redundant, but better error message
-  return "MAC already in use"
-    if scalar( qsearch( 'svc_broadband', { 'mac_addr', $self->mac_addr } ) );
-
   if($self->speed_up < 0) { return 'speed_up must be positive'; }
   if($self->speed_down < 0) { return 'speed_down must be positive'; }
 
@@ -293,6 +291,18 @@ sub check {
   $self->SUPER::check;
 }
 
+sub _check_duplicate {
+  my $self = shift;
+
+  return "MAC already in use"
+    if ( $self->mac_addr &&
+         scalar( qsearch( 'svc_broadband', { 'mac_addr', $self->mac_addr } ) )
+       );
+
+  '';
+}
+
+
 =item NetAddr
 
 Returns a NetAddr::IP object containing the IP address of this service.  The netmask 
-- 
cgit v1.2.1


From d3784b40552e9f00c9d803ac0833e09828c73d96 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 16 Mar 2009 17:06:40 +0000
Subject: have prizm use service data rather than package data to select a
 profile RT#4853

---
 FS/FS/Schema.pm            |  1 +
 FS/FS/part_export/prizm.pm | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 65f7a7f40..4ffeaa2e8 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1666,6 +1666,7 @@ sub tables_hashref {
         'longitude', 'decimal', 'NULL', '', '', '', 
         'altitude', 'decimal', 'NULL', '', '', '', 
         'vlan_profile', 'varchar', 'NULL', $char_d, '', '', 
+        'performance_profile', 'varchar', 'NULL', $char_d, '', '',
       ],
       'primary_key' => 'svcnum',
       'unique'      => [ [ 'mac_addr' ] ],
diff --git a/FS/FS/part_export/prizm.pm b/FS/FS/part_export/prizm.pm
index 2d4d8584c..97054408f 100644
--- a/FS/FS/part_export/prizm.pm
+++ b/FS/FS/part_export/prizm.pm
@@ -200,6 +200,9 @@ sub _export_insert {
 #    }
 #  }
 
+  my $performance_profile = $svc->performance_profile;
+  $performance_profile ||= $svc->cust_svc->cust_pkg->part_pkg->pkg;
+
   my $element_name_length = 50;
   $element_name_length = $1
     if $self->option('element_name_length') =~ /^\s*(\d+)\s*$/;
@@ -211,7 +214,7 @@ sub _export_insert {
                                       $location,
                                       $contact,
                                       sprintf("%032X", $svc->authkey),
-                                      $svc->cust_svc->cust_pkg->part_pkg->pkg,
+                                      $performance_profile,
                                       $svc->vlan_profile,
                                       ($self->option('ems') ? 1 : 0 ),
                                      );
@@ -256,7 +259,7 @@ sub _export_insert {
 
   $err_or_som = $self->prizm_command('NetworkIfService', 'setElementConfigSet',
                                      [ $element ],
-                                     $svc->cust_svc->cust_pkg->part_pkg->pkg,
+                                     $performance_profile,
                                      0,
                                      1,
                                     );
@@ -395,9 +398,12 @@ sub _export_replace {
   return $err_or_som
     unless ref($err_or_som);
 
+  my $performance_profile = $new->performance_profile;
+  $performance_profile ||= $new->cust_svc->cust_pkg->part_pkg->pkg;
+
   $err_or_som = $self->prizm_command('NetworkIfService', 'setElementConfigSet',
                                      [ $element ],
-                                     $new->cust_svc->cust_pkg->part_pkg->pkg,
+                                     $performance_profile,
                                      0,
                                      1,
                                     );
-- 
cgit v1.2.1


From 541207eb5505eee6eafd25e861230bdb36ac5fb3 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 16 Mar 2009 23:28:28 +0000
Subject: avoid the need for approximate comparisons RT#4903

---
 FS/FS/Schema.pm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 4ffeaa2e8..7307165da 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -320,6 +320,8 @@ sub tables_hashref {
   my @perl_type = ( 'text', 'NULL', ''  ); 
   my @money_type = ( 'decimal',   '', '10,2' );
   my @money_typen = ( 'decimal',   'NULL', '10,2' );
+  my @taxrate_type  = ( 'decimal',   '',     '14,8' ); # requires pg 8 for 
+  my @taxrate_typen = ( 'decimal',   'NULL', '14,8' ); # fs-upgrade to work
 
   my $username_len = 32; #usernamemax config file
 
@@ -770,17 +772,17 @@ sub tables_hashref {
         'location',    'varchar', 'NULL', $char_d, '', '',#provided by tax authority
         'taxclassnum', 'int',      '',      '', '', '', 
         'effective_date', @date_type, '', '', 
-        'tax',        'real',  '',    '', '', '',        # tax %
-        'excessrate', 'real',  'NULL','', '', '',        # second tax %
+        'tax',        @taxrate_type,      '', '',        # tax %
+        'excessrate', @taxrate_typen,     '', '',        # second tax %
         'taxbase',    @money_typen, '', '',              # amount at first tax rate
         'taxmax',     @money_typen, '', '',              # maximum about at both rates
-        'usetax',        'real',  'NULL',    '', '', '', # tax % when non-local
-        'useexcessrate', 'real',  'NULL',    '', '', '', # second tax % when non-local
+        'usetax',        @taxrate_typen,     '', '',     # tax % when non-local
+        'useexcessrate', @taxrate_typen,     '', '',     # second tax % when non-local
         'unittype',    'int',  'NULL', '', '', '',      # for fee
-        'fee',         'real', 'NULL', '', '', '',      # amount tax per unit
-        'excessfee',   'real', 'NULL', '', '', '',      # second amount tax per unit
-        'feebase',     'real', 'NULL', '', '', '',      # units taxed at first rate
-        'feemax',      'real', 'NULL', '', '', '',      # maximum number of unit taxed
+        'fee',         @taxrate_typen,     '', '',      # amount tax per unit
+        'excessfee',   @taxrate_typen,     '', '',      # second amount tax per unit
+        'feebase',     @taxrate_typen,     '', '',      # units taxed at first rate
+        'feemax',      @taxrate_typen,     '', '',      # maximum number of unit taxed
         'maxtype',     'int',  'NULL', '', '', '',      # indicator of how thresholds accumulate
         'taxname', 'varchar',  'NULL', $char_d, '', '', # may appear on invoice
         'taxauth',     'int',  'NULL', '', '', '',      # tax authority
-- 
cgit v1.2.1


From 2755d4a4810600f4392eaf73f362b4f358adeec6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 09:58:17 +0000
Subject: add eps preview to config, for RT#5025

---
 FS/FS/Conf.pm         |   2 +-
 FS/FS/Mason.pm        |   1 +
 FS/FS/Misc/eps2png.pm | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/Misc/eps2png.pm

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3f150e1e7..8ea57304c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2304,7 +2304,7 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'logo.eps',
     'section'     => 'billing',  #? 
     'description' => 'Company logo for printed and PDF invoices, in EPS format.',
-    'type'        => 'binary',
+    'type'        => 'image',
     'per_agent'   => 1, #XXX as above, kinda
   },
 
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index ee777a485..bcdc2fe8e 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -91,6 +91,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::UI::bytecount;
   use FS::Msgcat qw(gettext geterror);
   use FS::Misc qw( send_email send_fax states_hash counties state_label );
+  use FS::Misc::eps2png qw( eps2png );
   use FS::Report::Table::Monthly;
   use FS::TicketSystem;
   use FS::Tron qw( tron_lint );
diff --git a/FS/FS/Misc/eps2png.pm b/FS/FS/Misc/eps2png.pm
new file mode 100644
index 000000000..49c1d5682
--- /dev/null
+++ b/FS/FS/Misc/eps2png.pm
@@ -0,0 +1,278 @@
+package FS::Misc::eps2png;
+
+#based on eps2png by Johan Vromans
+#Copyright 1994,2008 by Johan Vromans.
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the Perl Artistic License or the
+#GNU General Public License as published by the Free Software
+#Foundation; either version 2 of the License, or (at your option) any
+#later version.
+
+use strict;
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
+use File::Temp;
+use File::Slurp qw( slurp );
+#use FS::UID;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( eps2png );
+
+################ Program parameters ################
+
+# Some GhostScript programs can produce GIF directly.
+# If not, we need the PBM package for the conversion.
+# NOTE: This will be changed upon install.
+my $use_pbm = 0;
+
+my $res = 82;			# default resolution
+my $scale = 1;			# default scaling
+my $mono = 0;			# produce BW images if non-zero
+my $format;			# output format
+my $gs_format;			# GS output type
+my $output;			# output, defaults to STDOUT
+my $antialias = 8; #4;              # antialiasing
+my $DEF_width;			# desired widht
+my $DEF_height;		# desired height
+#my $DEF_width = 90;			# desired widht
+#my $DEF_height = 36;		# desired height
+
+my ($verbose,$trace,$test,$debug) = (0,0,0,1);
+#handle_options ();
+set_out_type ('png'); # unless defined $format;
+warn "Producing $format ($gs_format) image.\n" if $verbose;
+
+$trace |= $test | $debug;
+$verbose |= $trace;
+
+################ Presets ################
+
+################ The Process ################
+
+my $err = 0;
+
+sub eps2png {
+    my( $eps, %options ) = @_; #well, no options yet
+
+    my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
+    my $eps_file = new File::Temp( TEMPLATE => 'image.XXXXXXXX',
+                                   DIR      => $dir,
+                                   SUFFIX   => '.eps',
+                                   #UNLINK   => 0,
+                                 ) or die "can't open temp file: $!\n";
+    print $eps_file $eps;
+    close $eps_file;
+
+    my @eps = split(/\r?\n/, $eps);
+
+    warn "converting eps (". length($eps). " bytes, ". scalar(@eps). " lines)\n"
+      ;#if $verbose;
+
+    my $line = shift @eps; #<EPS>;
+    unless ( $eps =~ /^%!PS-Adobe.*EPSF-/ ) {
+	warn "not EPS file (no %!PS-Adobe header)\n";
+        return; #empty png file?
+    }
+
+    my $ps = "";		# PostScript input data
+    my $xscale;
+    my $yscale;
+    my $gotbb;
+
+    # Prevent derived values from propagating.
+    my $width = $DEF_width;
+    my $height = $DEF_height;
+
+    while ( @eps ) {
+
+        $line = shift(@eps)."\n";
+
+	# Search for BoundingBox.
+	if ( $line =~ /^%%BoundingBox:\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/i ) {
+	    $gotbb++;
+	    warn "$eps_file: x0=$1, y0=$2, w=", $3-$1, ", h=", $4-$2
+		if $verbose;
+
+	    if ( defined $width ) {
+		$res = 72;
+		$xscale = $width / ($3 - $1);
+		if ( defined $height ) {
+		    $yscale = $height / ($4 - $2);
+		}
+		else {
+		    $yscale = $xscale;
+		    $height = ($4 - $2) * $yscale;
+		}
+	    }
+	    elsif ( defined $height ) {
+		$res = 72;
+		$yscale = $height / ($4 - $2);
+		if ( defined $width ) {
+		    $xscale = $width / ($3 - $1);
+		}
+		else {
+		    $xscale = $yscale;
+		    $width = ($3 - $1) * $xscale;
+		}
+	    }
+	    unless ( defined $xscale ) {
+		$xscale = $yscale = $scale;
+		# Calculate actual width.
+		$width  = $3 - $1;
+		$height = $4 - $2;
+		# Normal PostScript resolution is 72.
+		$width  *= $res/72 * $xscale;
+		$height *= $res/72 * $yscale;
+		# Round up.
+		$width  = int ($width + 0.5) + 1;
+		$height = int ($height + 0.5) + 1;
+	    }
+	    warn ", width=$width, height=$height\n" if $verbose;
+
+	    # Scale.
+	    $ps .= "$xscale $yscale scale\n"
+	      if $xscale != 1 || $yscale != 1;
+
+	    # Create PostScript code to translate coordinates.
+	    $ps .= (0-$1) . " " . (0-$2) . " translate\n"
+	      unless $1 == 0 && $2 == 0;
+
+	    # Include the image, show and quit.
+	    $ps .= "($eps_file) run\n".
+	      "showpage\n".
+		"quit\n";
+
+	    last;
+	}
+	elsif ( $line =~ /^%%EndComments/i ) {
+	    last;
+	}
+    }
+
+    unless ( $gotbb ) {
+	warn "No bounding box in $eps_file\n";
+	return;
+    }
+
+    #it would be better to ask gs to spit out files on stdout, but c'est la vie
+
+    #my $out_file;		# output file
+    #my $pbm_file;		# temporary file for PBM conversion
+
+    my $out_file = new File::Temp( TEMPLATE => 'image.XXXXXXXX',
+                                   DIR      => $dir,
+                                   SUFFIX   => '.png',
+                                   #UNLINK   => 0,
+                                 ) or die "can't open temp file: $!\n";
+
+    my $pbm_file = new File::Temp( TEMPLATE => 'image.XXXXXXXX',
+                                   DIR      => $dir,
+                                   SUFFIX   => '.pbm',
+                                   #UNLINK   => 0,
+                                 ) or die "can't open temp file: $!\n";
+
+    # Note the temporary PBM file is created where the output file is
+    # located, since that will guarantee accessibility (and a valid
+    # filename).
+    warn "Creating $out_file\n" if $verbose;
+
+    my $gs0 = "gs -q -dNOPAUSE -r$res -g${width}x$height";
+    my $gs1 = "-";
+    $gs0 .= " -dTextAlphaBits=$antialias -dGraphicsAlphaBits=$antialias"
+      if $antialias;
+    if ( $format eq 'png' ) {
+	mysystem ("$gs0 -sDEVICE=". ($mono ? "pngmono" : $gs_format).
+		  " -sOutputFile=$out_file $gs1", $ps);
+    }
+    elsif ( $format eq 'jpg' ) {
+	mysystem ("$gs0 -sDEVICE=". ($mono ? "jpeggray" : $gs_format).
+		  " -sOutputFile=$out_file $gs1", $ps);
+    }
+    elsif ( $format eq 'gif' ) {
+	if ( $use_pbm ) {
+	    # Convert to PPM and use some of the PBM converters.
+	    mysystem ("$gs0 -sDEVICE=". ($mono ? "pbm" : "ppm").
+		      " -sOutputFile=$pbm_file $gs1", $ps);
+	    # mysystem ("pnmcrop $pbm_file | ppmtogif > $out_file");
+	    mysystem ("ppmtogif $pbm_file > $out_file");
+	    unlink ($pbm_file);
+	}
+	else {
+	    # GhostScript has GIF drivers built-in.
+	    mysystem ("$gs0 -sDEVICE=". ($mono ? "gifmono" : "gif8").
+		      " -sOutputFile=$out_file $gs1", $ps);
+	}
+    }
+    else {
+	warn "ASSERT ERROR: Unhandled output type: $format\n";
+	exit (1);
+    }
+
+#    unless ( -s $out_file ) {
+#	warn "Problem creating $out_file for $eps_file\n";
+#	$err++;
+#    }
+
+    slurp($out_file);
+
+}
+
+exit 1 if $err;
+
+################ Subroutines ################
+
+sub mysystem {
+    my ($cmd, $data) = @_;
+    warn "+ $cmd\n" if $trace;
+    if ( $data ) {
+	if ( $trace ) {
+	    my $dp = ">> " . $data;
+	    $dp =~ s/\n(.)/\n>> $1/g;
+	    warn "$dp";
+	}
+	open (CMD, "|$cmd") or die ("$cmd: $!\n");
+	print CMD $data;
+	close CMD or die ("$cmd close: $!\n");
+    }
+    else {
+	system ($cmd);
+    }
+}
+
+sub set_out_type {
+    my ($opt) = lc (shift (@_));
+    if ( $opt =~ /^png(mono|gray|16|256|16m|alpha)?$/ ) {
+	$format = 'png';
+	$gs_format = $format.(defined $1 ? $1 : '16m');
+    }
+    elsif ( $opt =~ /^gif(mono)?$/ ) {
+	$format = 'gif';
+	$gs_format = $format.(defined $1 ? $1 : '');
+    }
+    elsif ( $opt =~ /^(jpg|jpeg)(gray)?$/ ) {
+	$format = 'jpg';
+	$gs_format = 'jpeg'.(defined $2 ? $2 : '');
+    }
+    else {
+	warn "ASSERT ERROR: Invalid value to set_out_type: $opt\n";
+	exit (1);
+    }
+}
+
+#			     'antialias|aa=i'   => \$antialias,
+#			     'noantialias|noaa' => sub { $antialias = 0 },
+#			     'scale=f'     => \$scale,
+#			     'width=i'	   => \$width,
+#			     'height=i'	   => \$height,
+#			     'resolution=i' => \$res,
+
+#    die ("Antialias value must be 0, 1, 2, 4, or 8\n")
+
+#    -width XXX		desired with
+#    -height XXX		desired height
+#    -resolution XXX	resolution (default = $res)
+#    -scale XXX		scaling factor
+#    -antialias XX	antialias factor (must be 0, 1, 2, 4 or 8; default: 4)
+#    -noantialias	no antialiasing (same as -antialias 0)
+
+1;
-- 
cgit v1.2.1


From 455342c5657299275c14741ad459ff2ce4f03559 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 09:59:30 +0000
Subject: less debugging

---
 FS/FS/Misc/eps2png.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Misc/eps2png.pm b/FS/FS/Misc/eps2png.pm
index 49c1d5682..c175b3be8 100644
--- a/FS/FS/Misc/eps2png.pm
+++ b/FS/FS/Misc/eps2png.pm
@@ -37,7 +37,7 @@ my $DEF_height;		# desired height
 #my $DEF_width = 90;			# desired widht
 #my $DEF_height = 36;		# desired height
 
-my ($verbose,$trace,$test,$debug) = (0,0,0,1);
+my ($verbose,$trace,$test,$debug) = (0,0,0,0);
 #handle_options ();
 set_out_type ('png'); # unless defined $format;
 warn "Producing $format ($gs_format) image.\n" if $verbose;
@@ -66,7 +66,7 @@ sub eps2png {
     my @eps = split(/\r?\n/, $eps);
 
     warn "converting eps (". length($eps). " bytes, ". scalar(@eps). " lines)\n"
-      ;#if $verbose;
+      if $verbose;
 
     my $line = shift @eps; #<EPS>;
     unless ( $eps =~ /^%!PS-Adobe.*EPSF-/ ) {
-- 
cgit v1.2.1


From 4445165860112be241b1a51c50436ad0828a297a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 12:01:25 +0000
Subject: agent-virt invoice_*{notes,footer,smallfooter,coupon}, RT#5025

---
 FS/FS/Conf.pm      | 6 ++++++
 FS/FS/cust_bill.pm | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8ea57304c..67ce56c6d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -818,6 +818,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Notes section for HTML invoices.  Defaults to the same data in invoice_latexnotes if not specified.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
@@ -825,6 +826,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Footer for HTML invoices.  Defaults to the same data in invoice_latexfooter if not specified.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
@@ -846,6 +848,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Notes section for LaTeX typeset PostScript invoices.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
@@ -853,6 +856,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Footer for LaTeX typeset PostScript invoices.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
@@ -860,6 +864,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Remittance coupon for LaTeX typeset PostScript invoices.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
@@ -874,6 +879,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'billing',
     'description' => 'Optional small footer for multi-page LaTeX typeset PostScript invoices.',
     'type'        => 'textarea',
+    'per_agent'   => 1,
   },
 
   {
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index c8384c009..6fac0a946 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1990,15 +1990,18 @@ sub print_generic {
   $invoice_data{'previous_balance'} = sprintf("%.2f", $pr_total);
   $invoice_data{'balance'} = sprintf("%.2f", $balance_due);
 
+  my $agentnum = $self->cust_main->agentnum;
+
   #do variable substitution in notes, footer, smallfooter
   foreach my $include (qw( notes footer smallfooter coupon )) {
 
     my $inc_file = $conf->key_orbase("invoice_${format}$include", $template);
     my @inc_src;
 
-    if ( $conf->exists($inc_file) && length( $conf->config($inc_file) ) ) {
+    if ( $conf->exists($inc_file, $agentnum)
+         && length( $conf->config($inc_file, $agentnum) ) ) {
 
-      @inc_src = $conf->config($inc_file);
+      @inc_src = $conf->config($inc_file, $agentnum);
 
     } else {
 
@@ -2010,7 +2013,7 @@ sub print_generic {
                        s/--\@\]/$delimiters{$format}[1]/g;
                        $_;
                      } 
-                 &$convert_map( $conf->config($inc_file) );
+                 &$convert_map( $conf->config($inc_file, $agentnum) );
 
     }
 
-- 
cgit v1.2.1


From e20a3591dee00904c2def9cd68207d941eaf43b4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 17 Mar 2009 16:06:31 +0000
Subject: column upgrade for tax_rate RT#4903)

---
 FS/FS/Upgrade.pm  |  3 +++
 FS/FS/tax_rate.pm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 97f24d403..5abfa6940 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -126,6 +126,9 @@ sub upgrade_data {
     #fixup access rights
     'access_right' => [],
 
+    #change tax_rate column types
+    'tax_rate' => [],
+
   ;
 
   \%hash;
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 0d9156b43..3323e0060 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -3,11 +3,14 @@ package FS::tax_rate;
 use strict;
 use vars qw( @ISA $DEBUG $me
              %tax_unittypes %tax_maxtypes %tax_basetypes %tax_authorities
-             %tax_passtypes );
+             %tax_passtypes %GetInfoType );
 use Date::Parse;
 use Storable qw( thaw );
 use MIME::Base64;
-use FS::Record qw( qsearch qsearchs dbh );
+use DBIx::DBSchema;
+use DBIx::DBSchema::Table;
+use DBIx::DBSchema::Column;
+use FS::Record qw( qsearch qsearchs dbh dbdef );
 use FS::tax_class;
 use FS::cust_bill_pkg;
 use FS::cust_tax_location;
@@ -1063,6 +1066,67 @@ sub browse_queries {
   return ($query, "SELECT COUNT(*) FROM tax_rate $extra_sql");
 }
 
+# _upgrade_data
+#
+# Used by FS::Upgrade to migrate to a new database.
+#
+#
+
+sub _upgrade_data {  # class method
+  my ($self, %opts) = @_;
+  my $dbh = dbh;
+
+  warn "$me upgrading $self\n" if $DEBUG;
+
+  my @column = qw ( tax excessrate usetax useexcessrate fee excessfee
+                    feebase feemax );
+
+  if ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+
+    eval "use DBI::Const::GetInfoType;";
+    die $@ if $@;
+
+    my $major_version = 0;
+    $dbh->get_info( $GetInfoType{SQL_DBMS_VER} ) =~ /^(\d{2})/
+      && ( $major_version = sprintf("%d", $1) );
+
+    if ( $major_version > 7 ) {
+
+      # ideally this would be supported in DBIx-DBSchema and friends
+
+      foreach my $column ( @column ) {
+        my $columndef = dbdef->table($self->table)->column($column);
+        unless ($columndef->type eq 'numeric') {
+
+          warn "updating tax_rate column $column to numeric\n" if $DEBUG;
+          my $sql = "ALTER TABLE tax_rate ALTER $column TYPE numeric(14,8)";
+          my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+          warn "updating h_tax_rate column $column to numeric\n" if $DEBUG;
+          $sql = "ALTER TABLE h_tax_rate ALTER $column TYPE numeric(14,8)";
+          $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+        }
+      }
+
+    } else {
+
+      warn "WARNING: tax_rate table upgrade unsupported for this Pg version\n";
+
+    }
+
+  } else {
+
+    warn "WARNING: tax_rate table upgrade only supported for Pg 8+\n";
+
+  }
+
+  '';
+
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 968936c184fd0ba1d00ce5939569e7e0bbcb6c24 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 19:48:32 +0000
Subject: adding ClientAPI/SGNG.pm

---
 FS/FS/ClientAPI/SGNG.pm | 256 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 256 insertions(+)
 create mode 100644 FS/FS/ClientAPI/SGNG.pm

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/SGNG.pm b/FS/FS/ClientAPI/SGNG.pm
new file mode 100644
index 000000000..6f74e23a0
--- /dev/null
+++ b/FS/FS/ClientAPI/SGNG.pm
@@ -0,0 +1,256 @@
+#this stuff is SG-specific (i.e. multi-customer company username hack)
+
+package FS::ClientAPI::SGNG;
+
+use strict;
+use vars qw( $cache $DEBUG );
+use Time::Local qw(timelocal timelocal_nocheck);
+use Business::CreditCard;
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_pkg;
+use FS::ClientAPI::MyAccount; #qw( payment_info process_payment )
+
+$DEBUG = 0;
+
+sub _cache {
+  $cache ||= new FS::ClientAPI_SessionCache( {
+               'namespace' => 'FS::ClientAPI::MyAccount', #yes, share session_ids
+             } );
+}
+
+#this might almost be general-purpose
+sub decompify_pkgs {
+  my $p = shift;
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  return { 'error' => 'Not a complimentary customer' }
+    unless $cust_main->payby eq 'COMP';
+
+  my $paydate =
+    $cust_main->paydate =~ /^\S+$/ ? $cust_main->paydate : '2037-12-31';
+
+  my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
+
+  my $date = timelocal(0,0,0,$payday,--$paymonth,$payyear);
+
+  foreach my $cust_pkg (
+    qsearch({ 'table'     => 'cust_pkg',
+              'hashref'   => { 'custnum' => $custnum,
+                               'bill'    => '',
+                             },
+              'extra_sql' => ' AND '. FS::cust_pkg->active_sql,
+           })
+  ) {
+    $cust_pkg->set('bill', $date);
+    my $error = $cust_pkg->replace;
+    return { 'error' => $error } if $error;
+  }
+
+  return { 'error' => '' };
+
+}
+
+#find old payment info
+# (should work just like MyAccount::payment_info, except returns previous info
+#  too)
+# definitly sg-specific, no one else stores past customer records like this
+sub previous_payment_info {
+  my $p = shift;
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $payment_info = FS::ClientAPI::MyAccount::payment_info($p);
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  #?
+  return $payment_info if $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/;
+
+  foreach my $prev_cust_main (
+    reverse _previous_cust_main( 'custnum'       => $custnum, 
+                                 'username'      => $cust_main->company,
+                                 'with_payments' => 1,
+                               )
+  ) {
+
+    next unless $prev_cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/;
+
+    if ( $prev_cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+
+      #card expired?
+      my ($payyear,$paymonth,$payday) = split (/-/, $cust_main->paydate);
+
+      my $expdate = timelocal_nocheck(0,0,0,1,$paymonth,$payyear);
+
+      next if $expdate < time;
+
+    } elsif ( $prev_cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
+
+      #any check?  or just skip these in favor of cards?
+
+    }
+
+    return { %$payment_info,
+             #$prev_cust_main->payment_info
+             _cust_main_payment_info( $prev_cust_main ),
+             'previous_custnum' => $prev_cust_main->custnum,
+           };
+
+  }
+
+  #still nothing?  return an error?
+  return $payment_info;
+
+}
+
+#this is really FS::cust_main::payment_info, but here for now
+sub _cust_main_payment_info {
+  my $self = shift;
+
+  my %return = ();
+
+  $return{balance} = $self->balance;
+
+  $return{payname} = $self->payname
+                     || ( $self->first. ' '. $self->get('last') );
+
+  $return{$_} = $self->get($_) for qw(address1 address2 city state zip);
+
+  $return{payby} = $self->payby;
+  $return{stateid_state} = $self->stateid_state;
+
+  if ( $self->payby =~ /^(CARD|DCRD)$/ ) {
+    $return{card_type} = cardtype($self->payinfo);
+    $return{payinfo} = $self->paymask;
+
+    @return{'month', 'year'} = $self->paydate_monthyear;
+
+  }
+
+  if ( $self->payby =~ /^(CHEK|DCHK)$/ ) {
+    my ($payinfo1, $payinfo2) = split '@', $self->paymask;
+    $return{payinfo1} = $payinfo1;
+    $return{payinfo2} = $payinfo2;
+    $return{paytype}  = $self->paytype;
+    $return{paystate} = $self->paystate;
+
+  }
+
+  #doubleclick protection
+  my $_date = time;
+  $return{paybatch} = "webui-MyAccount-$_date-$$-". rand() * 2**32;
+
+  %return;
+
+}
+
+#find old cust_main records (with payments)
+sub _previous_cust_main {
+  my %opt = @_;
+  my $custnum  = $opt{'custnum'};
+  my $username = $opt{'username'};
+  
+  my %search = ();
+  if ( $opt{'with_payments'} ) {
+    $search{'extra_sql'} =
+      ' AND 0 < ( SELECT COUNT(*) FROM cust_pay
+                    WHERE cust_pay.custnum = cust_main.custnum
+                )
+      ';
+  }
+
+  qsearch( {
+    'table'    => 'cust_main', 
+    'hashref'  => { 'company' => { op => 'ILIKE', value => $opt{'username'} },
+                    'custnum' => { op => '!=',    value => $opt{'custnum'}  },
+                  },
+    'order_by' => 'ORDER BY custnum',
+    %search,
+  } );
+
+}
+
+#since we could be passing masked old CC data, need to look that up and
+#replace it (like regular process_payment does) w/info from old customer record
+sub previous_process_payment {
+  my $p = shift;
+
+  return FS::ClientAPI::MyAccount::process_payment($p)
+    unless $p->{'previous_custnum'}
+        && (    ( $p->{'payby'} =~ /^(CARD|DCRD)$/ && $p->{'payinfo'}  =~ /x/i )
+             || ( $p->{'payby'} =~ /^(CHEK|DCHK)$/ && $p->{'payinfo1'} =~ /x/i )
+           );
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $custnum = $session->{'custnum'};
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  #make sure this is really a previous custnum of this customer
+  my @previous_cust_main =
+    grep { $_->custnum == $p->{'previous_custnum'} }
+         _previous_cust_main( 'custnum'       => $custnum, 
+                              'username'      => $cust_main->company,
+                              'with_payments' => 1,
+                            );
+
+  my $previous_cust_main = $previous_cust_main[0];
+
+  #causes problems with old data w/old masking method
+  #if $previous_cust_main->paymask eq $payinfo;
+  
+  if ( $p->{'payby'} =~ /^(CHEK|DCHK)$/ && $p->{'payinfo1'} =~ /x/i ) {
+    ( $p->{'payinfo1'}, $p->{'payinfo2'} ) =
+      split('@', $previous_cust_main->payinfo);
+  } elsif ( $p->{'payby'} =~ /^(CARD|DCRD)$/ && $p->{'payinfo'} =~ /x/i ) {
+    $p->{'payinfo'} = $previous_cust_main->payinfo;
+  }
+
+  FS::ClientAPI::MyAccount::process_payment($p);
+
+}
+
+sub previous_process_payment_order_pkg {
+  my $p = shift;
+
+  my $hr = previous_process_payment($p);
+  return $hr if $hr->{'error'};
+
+  order_pkg($p);
+}
+
+sub previous_process_payment_change_pkg {
+  my $p = shift;
+
+  my $hr = previous_process_payment($p);
+  return $hr if $hr->{'error'};
+
+  change_pkg($p);
+}
+
+sub previous_process_payment_order_renew {
+  my $p = shift;
+
+  my $hr = previous_process_payment($p);
+  return $hr if $hr->{'error'};
+
+  order_renew($p);
+}
+
+1;
+
-- 
cgit v1.2.1


From d8942379e744c35b50c3f43ef68ef78afbfad243 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 20:04:16 +0000
Subject: apacheip isn't actually deprecated yet

---
 FS/FS/Conf.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 67ce56c6d..9197bb153 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -573,8 +573,11 @@ worry that config_items is freeside-specific and icky.
 
   {
     'key'         => 'apacheip',
-    'section'     => 'deprecated',
-    'description' => '<b>DEPRECATED</b>, add an <i>apache</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be the current IP address to assign to new virtual hosts',
+    #not actually deprecated yet
+    #'section'     => 'deprecated',
+    #'description' => '<b>DEPRECATED</b>, add an <i>apache</i> <a href="../browse/part_export.cgi">export</a> instead.  Used to be the current IP address to assign to new virtual hosts',
+    'section'     => '',
+    'description' => 'IP address to assign to new virtual hosts',
     'type'        => 'text',
   },
 
@@ -686,8 +689,11 @@ worry that config_items is freeside-specific and icky.
 
   {
     'key'         => 'deletecredits',
-    'section'     => 'deprecated',
-    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
+    #not actually deprecated yet
+    #'section'     => 'deprecated',
+    #'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable deletion of unclosed credits.  Be very careful!  Only delete credits that were data-entry errors, not adjustments.  Optionally specify one or more comma-separated email addresses to be notified when a credit is deleted.',
+    'section'     => '',
+    'description' => 'One or more comma-separated email addresses to be notified when a credit is deleted.',
     'type'        => [qw( checkbox text )],
   },
 
-- 
cgit v1.2.1


From 82e3d70fea83fb776473e082097e2978226e3960 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 20:13:26 +0000
Subject: add a conf switch to enable sg multicust stuff, since it could be
 dangerous

---
 FS/FS/Conf.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9197bb153..f765fc721 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2705,6 +2705,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'sg-multicustomer_hack',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
-- 
cgit v1.2.1


From c72e127acc79a61703223e6c8b504abd234ca8b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Mar 2009 21:38:39 +0000
Subject: add payment_info_renew_info method to ClientAPI/MyAccount and
 SG-equivalent previous_payment_info_renew_info to ClientAPI/SGNG

---
 FS/FS/ClientAPI/MyAccount.pm | 22 +++++++++++++++++-----
 FS/FS/ClientAPI/SGNG.pm      | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index c6a4e0058..564acb1a6 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1162,11 +1162,14 @@ sub renew_info {
                     $total += $_->part_pkg->base_recur;
                     my $renew_date = $_->part_pkg->add_freq($_->bill);
                     {
-                      'bill_date'         => $_->bill,
-                      'bill_date_pretty'  => time2str('%x', $_->bill),
-                      'renew_date'        => $renew_date,
-                      'renew_date_pretty' => time2str('%x', $renew_date),
-                      'amount'            => sprintf('%.2f', $total),
+                      'pkgnum'             => $_->pkgnum,
+                      'amount'             => sprintf('%.2f', $total),
+                      'bill_date'          => $_->bill,
+                      'bill_date_pretty'   => time2str('%x', $_->bill),
+                      'renew_date'         => $renew_date,
+                      'renew_date_pretty'  => time2str('%x', $renew_date),
+                      'expire_date'        => $_->expire,
+                      'expire_date_pretty' => time2str('%x', $_->expire),
                     };
                   }
                   @cust_pkg;
@@ -1175,6 +1178,15 @@ sub renew_info {
 
 }
 
+sub payment_info_renew_info {
+  my $p = shift;
+  my $renew_info   = renew_info($p);
+  my $payment_info = payment_info($p);
+  return { %$renew_info,
+           %$payment_info,
+         };
+}
+
 sub order_renew {
   my $p = shift;
 
diff --git a/FS/FS/ClientAPI/SGNG.pm b/FS/FS/ClientAPI/SGNG.pm
index 6f74e23a0..872148abd 100644
--- a/FS/FS/ClientAPI/SGNG.pm
+++ b/FS/FS/ClientAPI/SGNG.pm
@@ -7,6 +7,7 @@ use vars qw( $cache $DEBUG );
 use Time::Local qw(timelocal timelocal_nocheck);
 use Business::CreditCard;
 use FS::Record qw( qsearch qsearchs );
+use FS::Conf;
 use FS::cust_main;
 use FS::cust_pkg;
 use FS::ClientAPI::MyAccount; #qw( payment_info process_payment )
@@ -158,6 +159,10 @@ sub _cust_main_payment_info {
 
 #find old cust_main records (with payments)
 sub _previous_cust_main {
+
+  #safety check!  return nothing unless we're enabled explicitly
+  return () unless FS::Conf->new->exists('sg-multicustomer_hack');
+
   my %opt = @_;
   my $custnum  = $opt{'custnum'};
   my $username = $opt{'username'};
@@ -225,6 +230,15 @@ sub previous_process_payment {
 
 }
 
+sub previous_payment_info_renew_info {
+  my $p = shift;
+  my $renew_info   = renew_info($p);
+  my $payment_info = previous_payment_info($p);
+  return { %$renew_info,
+           %$payment_info,
+         };
+}
+
 sub previous_process_payment_order_pkg {
   my $p = shift;
 
-- 
cgit v1.2.1


From 037c3acd250f637182019d0a74361d5420f29c52 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 18 Mar 2009 00:30:43 +0000
Subject: hide unused usage columns

---
 FS/FS/part_pkg/flat.pm | 11 ++++++++---
 FS/FS/svc_acct.pm      | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 3ac44c4e2..8fd028650 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -195,12 +195,17 @@ sub is_prepaid {
   0; #no, we're postpaid
 }
 
+sub usage_valuehash {
+  my $self = shift;
+  map { $_, $self->option($_) } 
+    grep { $self->option($_, 'hush') } 
+    qw(seconds upbytes downbytes totalbytes);
+}
+
 sub reset_usage {
   my($self, $cust_pkg, %opt) = @_;
   warn "    resetting usage counters" if $opt{debug} > 1;
-  my %values = map { $_, $self->option($_) } 
-    grep { $self->option($_, 'hush') } 
-    qw(seconds upbytes downbytes totalbytes);
+  my %values = $self->usage_valuehash;
   if ($self->option('usage_rollover', 1)) {
     $cust_pkg->recharge(\%values);
   }else{
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6f1105148..57ef615f9 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -26,6 +26,7 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs fields dbh dbdef );
 use FS::Msgcat qw(gettext);
 use FS::UI::bytecount;
+use FS::part_pkg;
 use FS::svc_Common;
 use FS::cust_svc;
 use FS::part_svc;
@@ -277,6 +278,7 @@ sub table_info {
                          type  => 'text',
                          disable_inventory => 1,
                          disable_select => 1,
+                         disable_part_svc_column => 1,
                        },
         'upbytes'   => { label => 'Upload',
                          type  => 'text',
@@ -284,6 +286,7 @@ sub table_info {
                          disable_select => 1,
                          'format' => \&FS::UI::bytecount::display_bytecount,
                          'parse' => \&FS::UI::bytecount::parse_bytecount,
+                         disable_part_svc_column => 1,
                        },
         'downbytes' => { label => 'Download',
                          type  => 'text',
@@ -291,6 +294,7 @@ sub table_info {
                          disable_select => 1,
                          'format' => \&FS::UI::bytecount::display_bytecount,
                          'parse' => \&FS::UI::bytecount::parse_bytecount,
+                         disable_part_svc_column => 1,
                        },
         'totalbytes'=> { label => 'Total up and download',
                          type  => 'text',
@@ -298,11 +302,13 @@ sub table_info {
                          disable_select => 1,
                          'format' => \&FS::UI::bytecount::display_bytecount,
                          'parse' => \&FS::UI::bytecount::parse_bytecount,
+                         disable_part_svc_column => 1,
                        },
         'seconds_threshold'   => { label => 'Seconds threshold',
                                    type  => 'text',
                                    disable_inventory => 1,
                                    disable_select => 1,
+                                   disable_part_svc_column => 1,
                                  },
         'upbytes_threshold'   => { label => 'Upload threshold',
                                    type  => 'text',
@@ -310,6 +316,7 @@ sub table_info {
                                    disable_select => 1,
                                    'format' => \&FS::UI::bytecount::display_bytecount,
                                    'parse' => \&FS::UI::bytecount::parse_bytecount,
+                                   disable_part_svc_column => 1,
                                  },
         'downbytes_threshold' => { label => 'Download threshold',
                                    type  => 'text',
@@ -317,6 +324,7 @@ sub table_info {
                                    disable_select => 1,
                                    'format' => \&FS::UI::bytecount::display_bytecount,
                                    'parse' => \&FS::UI::bytecount::parse_bytecount,
+                                   disable_part_svc_column => 1,
                                  },
         'totalbytes_threshold'=> { label => 'Total up and download threshold',
                                    type  => 'text',
@@ -324,6 +332,7 @@ sub table_info {
                                    disable_select => 1,
                                    'format' => \&FS::UI::bytecount::display_bytecount,
                                    'parse' => \&FS::UI::bytecount::parse_bytecount,
+                                   disable_part_svc_column => 1,
                                  },
         'last_login'=>           {
                                    label     => 'Last login',
@@ -503,6 +512,26 @@ sub insert {
     $self->svcpart($cust_svc->svcpart);
   }
 
+  # set usage fields and thresholds if unset but set in a package def
+  if ( $self->pkgnum ) {
+    my $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
+    my $part_pkg = $cust_pkg->part_pkg if $cust_pkg;
+    if ( $part_pkg && $part_pkg->can('usage_valuehash') ) {
+
+      my %values = $part_pkg->usage_valuehash;
+      my $multiplier = $conf->exists('svc_acct-usage_threshold') 
+                         ? 1 - $conf->config('svc_acct-usage_threshold')/100
+                         : 0.20;
+
+      foreach ( keys %values ) {
+        next if $self->getfield($_);
+        $self->setfield( $_, $values{$_} );
+        $self->setfield( $_. '_threshold', int( $values{$_} * $multiplier ) );
+      }
+
+    }
+  }
+
   my @jobnums;
   $error = $self->SUPER::insert(
     'jobnums'       => \@jobnums,
-- 
cgit v1.2.1


From b8a433b04fc02ae5b246be8f05a0d3b4f8b79d18 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 18 Mar 2009 15:11:03 +0000
Subject: more error information

---
 FS/FS/part_pkg_taxrate.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index 6d1414a18..197bf0fc4 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -295,10 +295,18 @@ sub batch_import {
         delete($hash->{actionflag});
 
         my $part_pkg_taxrate = qsearchs('part_pkg_taxrate', $hash);
-        return "Can't find part_pkg_taxrate to delete: ".
-               #join(" ", map { "$_ => ". $hash->{$_} } @fields)
-               join(" ", map { "$_ => *". $hash->{$_}. '*' } keys(%$hash) )
-          unless $part_pkg_taxrate;
+        unless ( $part_pkg_taxrate ) {
+          if ( $hash->{taxproductnum} ) {
+            my $taxproduct =
+              qsearchs( 'part_pkg_taxproduct',
+                        { 'taxproductnum' => $hash->{taxproductnum} }
+                      );
+            $hash->{taxproductnum} .= ' ( '. $taxproduct->taxproduct. ' )'
+              if $taxproduct;
+          }
+          return "Can't find part_pkg_taxrate to delete: ".
+                 join(" ", map { "$_ => *". $hash->{$_}. '*' } keys(%$hash) );
+        }
 
         my $error = $part_pkg_taxrate->delete;
         return $error if $error;
-- 
cgit v1.2.1


From 06366964387677bd819ff9603a25d4399d9ad84d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Mar 2009 22:14:37 +0000
Subject: freeside-check local monitoring, RT#4610

---
 FS/FS/Cron/check.pm   | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-check |  24 ++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 FS/FS/Cron/check.pm
 create mode 100644 FS/bin/freeside-check

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
new file mode 100644
index 000000000..39dd168b4
--- /dev/null
+++ b/FS/FS/Cron/check.pm
@@ -0,0 +1,123 @@
+package FS::Cron::check;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK $DEBUG $FS_RUN $error_msg
+             $SELFSERVICE_USER $SELFSERVICE_MACHINES @SELFSERVICE_MACHINES
+           );
+use Exporter;
+use LWP::UserAgent;
+use FS::Conf;
+use FS::Record qw(qsearch);
+use FS::cust_pay_pending;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw(
+  check_queued check_selfservice check_apache check_bop_failures
+  alert error_msg
+);
+
+$DEBUG = 0;
+
+$FS_RUN = '/var/run';
+
+sub check_queued {
+  _check_fsproc('queued');
+}
+
+$SELFSERVICE_USER = '%%%SELFSERVICE_USER%%%';
+
+$SELFSERVICE_MACHINES = '%%%SELFSERVICE_MACHINES%%%'; #substituted by Makefile
+$SELFSERVICE_MACHINES =~ s/^\s+//;
+$SELFSERVICE_MACHINES =~ s/\s+$//;
+@SELFSERVICE_MACHINES = split(/\s+/, $SELFSERVICE_MACHINES);
+@SELFSERVICE_MACHINES = ()
+  if scalar(@SELFSERVICE_MACHINES) == 1
+  && $SELFSERVICE_MACHINES[0] eq '%%%'.'SELFSERVICE_MACHINES'.'%%%';
+
+sub check_selfservice {
+  foreach my $machine ( @SELFSERVICE_MACHINES ) {
+    unless ( _check_fsproc("selfservice-server.$SELFSERVICE_USER.$machine") ) {
+      $error_msg = "Self-service daemon not running for $machine";
+      return 0;
+    }
+  }
+  return 1;
+}
+
+sub _check_fsproc {
+  my $arg = shift;
+  _check_pidfile( "freeside-$arg.pid" );
+}
+
+sub _check_pidfile {
+  my $pidfile = shift;
+  open(PID, "$FS_RUN/$pidfile") or return 0;
+  chomp( my $pid = scalar(<PID>) );
+  close PID; # or return 0;
+
+  $pid && kill 0, $pid;
+}
+
+sub check_apache {
+  my $ua = new LWP::UserAgent;
+  $ua->agent("FreesideCronCheck/0.1 " . $ua->agent);
+
+  my $req = new HTTP::Request GET => 'https://localhost/';
+  my $res = $ua->request($req);
+
+  return 1 if $res->is_success;
+  $error_msg = $res->status_line;
+  return 0;
+
+}
+
+#and now for something entirely different...
+my $num_consecutive_bop_failures = 10;
+sub check_bop_failures {
+
+  return 1 if grep { $_->statustext eq 'captured' }
+                   qsearch({
+                     'table'    => 'cust_pay_pending',
+                     'hashref'  => { 'status' => 'done' },
+                     'order_by' => 'ORDER BY paypendingnum DESC'.
+                                   " LIMIT $num_consecutive_bop_failures",
+                   });
+  $error_msg = "Last $num_consecutive_bop_failures real-time payments failed";
+  return 0;
+}
+
+#
+
+sub error_msg {
+  $error_msg;
+}
+
+sub alert {
+  my( $alert, @emails ) = @_;
+
+  my $conf = new FS::Conf;
+  my $smtpmachine = $conf->config('smtpmachine');
+  my $company_name = $conf->config('company_name');
+
+  foreach my $email (@emails) {
+    warn "warning $email about $alert\n" if $DEBUG;
+
+    my $message = <<"__MESSAGE__";
+From: support\@freeside.biz
+To: $email
+Subject: FREESIDE ALERT for $company_name
+
+FREESIDE ALERT: $alert
+
+__MESSAGE__
+
+    my $sender = Email::Send->new({ mailer => 'SMTP' });
+    $sender->mailer_args([ Host => $smtpmachine ]);
+    $sender->send($message);
+
+  }
+
+}
+
+1;
+
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
new file mode 100644
index 000000000..09c9aa4f1
--- /dev/null
+++ b/FS/bin/freeside-check
@@ -0,0 +1,24 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Email::Send;
+use FS::UID qw( adminsuidsetup );
+use FS::Cron::check qw(
+  check_queued check_selfservice check_apache check_bop_failures
+  alert error_msg
+);
+
+my $user = shift or die &usage;
+my @emails = @ARGV;
+#die "no notification email given" unless @emails;
+
+eval { adminsuidsetup $user };
+
+if ( $@ ) { alert("Database down: $@", @emails); exit; }
+
+check_queued       or alert("Queue daemon not running", @emails);
+check_selfservice  or alert(error_msg(), @emails);
+check_apache       or alert("Apache not running: ". error_msg(), @emails);
+
+check_bop_failures or alert(error_msg(), @emails);
+
-- 
cgit v1.2.1


From b690d3b4c830c78eb9d3bbf87de399823eaac867 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Mar 2009 23:32:27 +0000
Subject: 403 forbidden is okay, at lest the server's up

---
 FS/FS/Cron/check.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index 39dd168b4..9a415bd9e 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -65,7 +65,7 @@ sub check_apache {
   my $req = new HTTP::Request GET => 'https://localhost/';
   my $res = $ua->request($req);
 
-  return 1 if $res->is_success;
+  return 1 if $res->is_success || $res->status_line =~ /^403/;
   $error_msg = $res->status_line;
   return 0;
 
-- 
cgit v1.2.1


From dcd8225db25059c0f6fa0c743601eb8945f07692 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Mar 2009 23:37:14 +0000
Subject: Locale::SubCountry warnings clogging up cron output not useful

---
 FS/bin/freeside-check | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index 09c9aa4f1..f2d596b80 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -1,3 +1,4 @@
+#!/usr/bin/perl
 #!/usr/bin/perl -w
 
 use strict;
-- 
cgit v1.2.1


From 8089deb0915306ba481def7118deb27fe51735ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Mar 2009 03:33:40 +0000
Subject: 10 is too few, throwing false positives

---
 FS/FS/Cron/check.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index 9a415bd9e..e23d62bb4 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -72,7 +72,7 @@ sub check_apache {
 }
 
 #and now for something entirely different...
-my $num_consecutive_bop_failures = 10;
+my $num_consecutive_bop_failures = 30;
 sub check_bop_failures {
 
   return 1 if grep { $_->statustext eq 'captured' }
-- 
cgit v1.2.1


From 12af08e945ac5c1f593d2bf9cf2d6df09f35228c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 23 Mar 2009 17:03:03 +0000
Subject: add name (svc_acct.finger) to bulk billing detail, RT#3519

---
 FS/FS/part_pkg/bulk.pm |  2 +-
 FS/FS/svc_Common.pm    |  5 +++++
 FS/FS/svc_acct.pm      | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/bulk.pm b/FS/FS/part_pkg/bulk.pm
index 63d344d6d..809559509 100644
--- a/FS/FS/part_pkg/bulk.pm
+++ b/FS/FS/part_pkg/bulk.pm
@@ -54,7 +54,7 @@ sub calc_recur {
                                            #   END      START
   foreach my $h_svc ( $cust_pkg->h_cust_svc( $$sdate, $last_bill ) ) {
 
-    my @label = $h_svc->label( $$sdate, $last_bill );
+    my @label = $h_svc->label_long( $$sdate, $last_bill );
     die "fatal: no historical label found, wtf?" unless scalar(@label); #?
     #my $svc_details = $label[0].': '. $label[1]. ': ';
     my $svc_details = $label[1]. ': ';
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index da1cfe135..869ab5831 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -151,6 +151,11 @@ sub label {
   $self->svcnum;
 }
 
+sub label_long {
+  my $self = shift;
+  $self->label(@_);
+}
+
 =item check
 
 Checks the validity of fields in this record.
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 57ef615f9..fcd73ac3c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -256,7 +256,7 @@ sub table_info {
                          disable_inventory => 1,
                          disable_select => 1,
                        },
-        'finger'    => 'Real name (GECOS)',
+        'finger'    => 'Real name', # (GECOS)',
         'domsvc'    => {
                          label     => 'Domain',
                          #def_label => 'svcnum from svc_domain',
@@ -446,8 +446,23 @@ sub label {
   $self->email(@_);
 }
 
+=item label_long [ END_TIMESTAMP [ START_TIMESTAMP ] ]
+
+Returns a longer string label for this acccount ("Real Name <username@domain>"
+if available, or "username@domain").
+
+END_TIMESTAMP and START_TIMESTAMP can optionally be passed when dealing with
+history records.
+
 =cut
 
+sub label_long {
+  my $self = shift;
+  ( $self->finger =~ /\S/ )
+    ? $self->finger. ' <'.$self->label(@_).'>'
+    : $self->label(@_);
+}
+
 =item insert [ , OPTION => VALUE ... ]
 
 Adds this account to the database.  If there is an error, returns the error,
-- 
cgit v1.2.1


From 42682206b4ba30de01c82743042f5fb9d48a93ed Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 23 Mar 2009 23:33:04 +0000
Subject: more DTRT with usage on service transfer between packages and
 recharges  RT #2884, #5040 + #4995 fallout

---
 FS/FS/cust_pkg.pm      | 19 +++++++++++++++++--
 FS/FS/part_pkg/flat.pm |  2 +-
 FS/FS/svc_acct.pm      | 13 +++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 7c8656c09..f2c3cccf5 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1135,6 +1135,21 @@ sub change {
     return "Unable to transfer all services from package ". $self->pkgnum;
   }
 
+  #reset usage if changing pkgpart
+  if ($self->pkgpart != $cust_pkg->pkgpart) {
+    my $part_pkg = $cust_pkg->part_pkg;
+    $error = $part_pkg->reset_usage($cust_pkg, $part_pkg->is_prepaid
+                                                 ? ()
+                                                 : ( 'null' => 1 )
+                                   )
+      if $part_pkg->can('reset_usage');
+
+    if ($error) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error setting usage values: $error";
+    }
+  }
+
   #Good to go, cancel old package.
   $error = $self->cancel( quiet=>1 );
   if ($error) {
@@ -2712,11 +2727,11 @@ All svc_accts which are part of this package have their values reset.
 =cut
 
 sub set_usage {
-  my ($self, $valueref) = @_;
+  my ($self, $valueref, %opt) = @_;
 
   foreach my $cust_svc ($self->cust_svc){
     my $svc_x = $cust_svc->svc_x;
-    $svc_x->set_usage($valueref)
+    $svc_x->set_usage($valueref, %opt)
       if $svc_x->can("set_usage");
   }
 }
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 8fd028650..009e54c78 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -209,7 +209,7 @@ sub reset_usage {
   if ($self->option('usage_rollover', 1)) {
     $cust_pkg->recharge(\%values);
   }else{
-    $cust_pkg->set_usage(\%values);
+    $cust_pkg->set_usage(\%values, %opt);
   }
 }
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index fcd73ac3c..c6857e29a 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1821,7 +1821,7 @@ sub _op_usage {
 }
 
 sub set_usage {
-  my( $self, $valueref ) = @_;
+  my( $self, $valueref, %options ) = @_;
 
   warn "$me set_usage called for svcnum ". $self->svcnum.
        ' ('. $self->email. "): ".
@@ -1842,6 +1842,11 @@ sub set_usage {
 
   my $reset = 0;
   my %handyhash = ();
+  if ( $options{null} ) { 
+    %handyhash = ( map { ( $_ => 'NULL', $_."_threshold" => 'NULL' ) }
+                   qw( seconds upbytes downbytes totalbytes )
+                 );
+  }
   foreach my $field (keys %$valueref){
     $reset = 1 if $valueref->{$field};
     $self->setfield($field, $valueref->{$field});
@@ -1860,8 +1865,8 @@ sub set_usage {
   #die $error if $error;         #services not explicity changed via the UI
 
   my $sql = "UPDATE svc_acct SET " .
-    join (',', map { "$_ =  ?" } (keys %handyhash) ).
-    " WHERE svcnum = ?";
+    join (',', map { "$_ =  $handyhash{$_}" } (keys %handyhash) ).
+    " WHERE svcnum = ". $self->svcnum;
 
   warn "$me $sql\n"
     if $DEBUG;
@@ -1869,7 +1874,7 @@ sub set_usage {
   if (scalar(keys %handyhash)) {
     my $sth = $dbh->prepare( $sql )
       or die "Error preparing $sql: ". $dbh->errstr;
-    my $rv = $sth->execute((values %handyhash), $self->svcnum);
+    my $rv = $sth->execute();
     die "Error executing $sql: ". $sth->errstr
       unless defined($rv);
     die "Can't update usage for svcnum ". $self->svcnum
-- 
cgit v1.2.1


From 9006e983ebf98b2000a812ab01f99dcb2335534c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Mar 2009 02:36:31 +0000
Subject: bulk price plan: label as Name <email>, supress extraneous service
 list, RT#3519

---
 FS/FS/Record.pm        |  4 ++--
 FS/FS/cust_bill.pm     | 22 +++++++++++++---------
 FS/FS/cust_svc.pm      | 21 ++++++++++++++++-----
 FS/FS/h_cust_svc.pm    | 12 +++++++++---
 FS/FS/part_pkg.pm      |  3 +++
 FS/FS/part_pkg/bulk.pm | 20 +++++++++++++-------
 6 files changed, 56 insertions(+), 26 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2d0263b22..0e8275b72 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1944,7 +1944,7 @@ sub ut_money {
 =item ut_text COLUMN
 
 Check/untaint text.  Alphanumerics, spaces, and the following punctuation
-symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / = [ ]
+symbols are currently permitted: ! @ # $ % & ( ) - + ; : ' " , . ? / = [ ] < >
 May not be null.  If there is an error, returns the error, otherwise returns
 false.
 
@@ -1956,7 +1956,7 @@ sub ut_text {
   #warn "notexist ". \&notexist. "\n";
   #warn "AUTOLOAD ". \&AUTOLOAD. "\n";
   $self->getfield($field)
-    =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)$/
+    =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]\<\>]+)$/
       or return gettext('illegal_or_empty_text'). " $field: ".
                  $self->getfield($field);
   $self->setfield($field,$1);
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 6fac0a946..77f0dd30f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2832,8 +2832,10 @@ sub _items_cust_bill_pkg {
           my $description = $desc;
           $description .= ' Setup' if $cust_bill_pkg->recur != 0;
 
-          my @d = map &{$escape_function}($_),
-                         $cust_pkg->h_labels_short($self->_date);
+          my @d = ();
+          push @d, map &{$escape_function}($_),
+                       $cust_pkg->h_labels_short($self->_date)
+            unless $cust_pkg->part_pkg->hide_svc_detail;
           push @d, $cust_bill_pkg->details(%details_opt)
             if $cust_bill_pkg->recur == 0;
 
@@ -2862,16 +2864,18 @@ sub _items_cust_bill_pkg {
                             " - ". time2str("%x", $cust_bill_pkg->edate). ")";
           }
 
+          my @d = ();
+
           #at least until cust_bill_pkg has "past" ranges in addition to
           #the "future" sdate/edate ones... see #3032
-          my @d = ();
           push @d, map &{$escape_function}($_),
-                         $cust_pkg->h_labels_short($self->_date)
-                                                #$cust_bill_pkg->edate,
-                                                #$cust_bill_pkg->sdate),
-            ;
-  
-          @d = () if ($cust_bill_pkg->itemdesc || $is_summary);
+                       $cust_pkg->h_labels_short($self->_date)
+                                                 #$cust_bill_pkg->edate,
+                                                 #$cust_bill_pkg->sdate)
+            unless $cust_pkg->part_pkg->hide_svc_detail
+                || $cust_bill_pkg->itemdesc
+                || $is_summary;
+
           push @d, $cust_bill_pkg->details(%details_opt)
             unless ($is_summary || $type && $type eq 'R');
   
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 320f78aa0..c4a75f77a 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -375,23 +375,34 @@ Usage example:
 
   my($label, $value, $svcdb) = $cust_svc->label;
 
+=item label_long
+
+Like the B<label> method, except the second item in the list ("meaningful
+identifier") may be longer - typically, a full name is included.
+
 =cut
 
-sub label {
+sub label      { shift->_label('svc_label',      @_); }
+sub label_long { shift->_label('svc_label_long', @_); }
+
+sub _label {
   my $self = shift;
-  carp "FS::cust_svc::label called on $self" if $DEBUG;
+  my $method = shift;
   my $svc_x = $self->svc_x
     or return "can't find ". $self->part_svc->svcdb. '.svcnum '. $self->svcnum;
 
-  $self->_svc_label($svc_x);
+  $self->$method($svc_x);
 }
 
+sub svc_label      { shift->_svc_label('label',      @_); }
+sub svc_label_long { shift->_svc_label('label_long', @_); }
+
 sub _svc_label {
-  my( $self, $svc_x ) = ( shift, shift );
+  my( $self, $method, $svc_x ) = ( shift, shift, shift );
 
   (
     $self->part_svc->svc,
-    $svc_x->label(@_),
+    $svc_x->$method(@_),
     $self->part_svc->svcdb,
     $self->svcnum
   );
diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
index e03043698..d280d53fe 100644
--- a/FS/FS/h_cust_svc.pm
+++ b/FS/FS/h_cust_svc.pm
@@ -52,9 +52,15 @@ If a service is found, returns a list consisting of:
 
 =cut
 
-sub label {
+sub label      { shift->_label('svc_label',      @_); }
+sub label_long { shift->_label('svc_label_long', @_); }
+
+sub _label {
   my $self = shift;
-  carp "FS::h_cust_svc::label called on $self" if $DEBUG;
+  my $method = shift;
+
+  #carp "FS::h_cust_svc::_label called on $self" if $DEBUG;
+  warn "FS::h_cust_svc::_label called on $self for $method" if $DEBUG;
   my $svc_x = $self->h_svc_x(@_);
   return () unless $svc_x;
   my $part_svc = $self->part_svc;
@@ -65,7 +71,7 @@ sub label {
   }
 
   my @label;
-  eval { @label = $self->_svc_label($svc_x, @_); };
+  eval { @label = $self->$method($svc_x, @_); };
 
   if ($@) {
     carp 'while resolving history record for svcdb/svcnum ' . 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index ef24b5343..81696fcfa 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1116,6 +1116,9 @@ sub calc_remain { 0; }
 sub calc_cancel { 0; }
 sub calc_units  { 0; }
 
+#fallback for everything except bulk.pm
+sub hide_svc_detail { 0; }
+
 =item format OPTION DATA
 
 Returns data formatted according to the function 'format' described
diff --git a/FS/FS/part_pkg/bulk.pm b/FS/FS/part_pkg/bulk.pm
index 809559509..7c81138c1 100644
--- a/FS/FS/part_pkg/bulk.pm
+++ b/FS/FS/part_pkg/bulk.pm
@@ -7,7 +7,7 @@ use FS::part_pkg::flat;
 
 @ISA = qw(FS::part_pkg::flat);
 
-$DEBUG = 0;
+$DEBUG = 1;
 $me = '[FS::part_pkg::bulk]';
 
 %info = (
@@ -45,6 +45,9 @@ sub calc_recur {
 
   my $last_bill = $cust_pkg->last_bill;
 
+  return sprintf("%.2f", $self->base_recur($cust_pkg) )
+    unless $$sdate > $last_bill;
+
   my $total_svc_charge = 0;
 
   warn "$me billing for bulk services from ". time2str('%x', $last_bill).
@@ -52,16 +55,15 @@ sub calc_recur {
     if $DEBUG;
 
                                            #   END      START
-  foreach my $h_svc ( $cust_pkg->h_cust_svc( $$sdate, $last_bill ) ) {
+  foreach my $h_cust_svc ( $cust_pkg->h_cust_svc( $$sdate, $last_bill ) ) {
 
-    my @label = $h_svc->label_long( $$sdate, $last_bill );
+    my @label = $h_cust_svc->label_long( $$sdate, $last_bill );
     die "fatal: no historical label found, wtf?" unless scalar(@label); #?
-    #my $svc_details = $label[0].': '. $label[1]. ': ';
-    my $svc_details = $label[1]. ': ';
+    my $svc_details = $label[0]. ': '. $label[1]. ': ';
 
     my $svc_charge = 0;
 
-    my $svc_start = $h_svc->date_inserted;
+    my $svc_start = $h_cust_svc->date_inserted;
     if ( $svc_start < $last_bill ) {
       $svc_start = $last_bill;
     } elsif ( $svc_setup_fee ) {
@@ -69,7 +71,7 @@ sub calc_recur {
       $svc_details .= $money_char. sprintf('%.2f setup, ', $svc_setup_fee);
     }
 
-    my $svc_end = $h_svc->date_deleted;
+    my $svc_end = $h_cust_svc->date_deleted;
     $svc_end = ( !$svc_end || $svc_end > $$sdate ) ? $$sdate : $svc_end;
 
     $svc_charge = $self->option('svc_recur_fee') * ( $svc_end - $svc_start )
@@ -88,6 +90,10 @@ sub calc_recur {
   sprintf("%.2f", $self->base_recur($cust_pkg) + $total_svc_charge );
 }
 
+sub hide_svc_detail {
+  1;
+}
+
 sub is_free_options {
   qw( setup_fee recur_fee svc_setup_fee svc_recur_fee );
 }
-- 
cgit v1.2.1


From 5bc96f1f56a0549bcf2cebdea0ad4bcae815d021 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Mar 2009 06:31:06 +0000
Subject: add indices for analyzing cc failures, RT#3843

---
 FS/FS/Schema.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 7307165da..745cf674b 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -398,7 +398,9 @@ sub tables_hashref {
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
       'unique' => [],
-      'index' => [ ['invnum'], ['status'], ['eventpart'] ],
+      'index' => [ ['invnum'], ['status'], ['eventpart'],
+                   ['statustext'], ['_date'],
+                 ],
     },
 
     'part_bill_event' => {
@@ -495,7 +497,9 @@ sub tables_hashref {
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
       'unique' => [],
-      'index' => [ ['eventpart'], ['tablenum'], ['status'] ],
+      'index' => [ ['eventpart'], ['tablenum'], ['status'],
+                   ['statustext'], ['_date'],
+                 ],
     },
 
     'cust_bill_pkg' => {
-- 
cgit v1.2.1


From 4b98dc4f89496db2ecf56ac8b968baff6cc3f774 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Mar 2009 08:45:21 +0000
Subject: correct headers on accountcode_default CDR output, RT#5042

---
 FS/FS/cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index f0082279e..2d9200143 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -466,7 +466,7 @@ my %export_names = (
   },
   'accountcode_default' => {
     'name'           => 'Default plus accountcode',
-    'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
+    'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price',
   },
 );
 
-- 
cgit v1.2.1


From fc9d2c2d0b9391c2541f7d0c6e2584166d1775f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Mar 2009 03:53:45 +0000
Subject: sort packages by label of first (primary) service, RT#5041

---
 FS/FS/cust_main.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 27a617e1a..73cf826ab 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1895,15 +1895,21 @@ sub ncancelled_pkgs {
 
 # This should be generalized to use config options to determine order.
 sub sort_packages {
-  if ( $a->get('cancel') and $b->get('cancel') ) {
-    $a->pkgnum <=> $b->pkgnum;
-  } elsif ( $a->get('cancel') or $b->get('cancel') ) {
+  
+  if ( $a->get('cancel') xor $b->get('cancel') ) {
     return -1 if $b->get('cancel');
     return  1 if $a->get('cancel');
+    #shouldn't get here...
     return 0;
   } else {
-    $a->pkgnum <=> $b->pkgnum;
+    my @a_cust_svc = $a->cust_svc;
+    my @b_cust_svc = $b->cust_svc;
+    return 0  if !scalar(@a_cust_svc) && !scalar(@b_cust_svc);
+    return -1 if  scalar(@a_cust_svc) && !scalar(@b_cust_svc);
+    return 1  if !scalar(@a_cust_svc) &&  scalar(@b_cust_svc);
+    $a_cust_svc[0]->svc_x->label cmp $b_cust_svc[0]->svc_x->label;
   }
+
 }
 
 =item suspended_pkgs
-- 
cgit v1.2.1


From 3868d5117cbfeb2d1f75ffe3d5dc96aa63f1e809 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 26 Mar 2009 03:59:57 +0000
Subject: yow

---
 FS/FS/svc_acct.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c6857e29a..7bcd0e7d2 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -20,6 +20,7 @@ use Fcntl qw(:flock);
 use Date::Format;
 use Crypt::PasswdMD5 1.2;
 use Data::Dumper;
+use Text::Template;
 use Authen::Passphrase;
 use FS::UID qw( datasrc driver_name );
 use FS::Conf;
-- 
cgit v1.2.1


From e3c3d86b7091d806af42e40475a28ea8afb5865c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 28 Mar 2009 22:59:36 +0000
Subject: package selector, split by package class, RT#5077

---
 FS/FS/Conf.pm     |  7 +++++++
 FS/FS/part_pkg.pm | 26 ++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f765fc721..b6fea5413 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2712,6 +2712,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'disable-cust-pkg_class',
+    'section'     => 'UI',
+    'description' => 'Disable the two-step dropdown for selecting package class and package, and return to the classic single dropdown.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 81696fcfa..8cf7d0ca1 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1236,9 +1236,31 @@ L<FS::type_pkgs>).
 =cut
 
 sub curuser_pkgs_sql {
-  #my($class) = shift;
+  my $class = shift;
+
+  $class->_pkgs_sql( $FS::CurrentUser::CurrentUser->agentnums );
+
+}
+
+=item agent_pkgs_sql AGENT | AGENTNUM, ...
+
+Returns an SQL fragment for searching for packages the provided agent or agents
+can use, either via part_pkg.agentnum directly, or via agent type (see
+L<FS::type_pkgs>).
+
+=cut
+
+sub agent_pkgs_sql {
+  my $class = shift;  #i'm a class method, not a sub (the question is... why??)
+  my @agentnums = map { ref($_) ? $_->agentnum : $_ } @_;
+
+  $class->_pkgs_sql(@agentnums); #is this why
+
+}
 
-  my $agentnums = join(',', $FS::CurrentUser::CurrentUser->agentnums);
+sub _pkgs_sql {
+  my( $class, @agentnums ) = @_;
+  my $agentnums = join(',', @agentnums);
 
   "
     (
-- 
cgit v1.2.1


From 067cd12b6efe596c4ee57e8c17f30639e86494a2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 29 Mar 2009 10:17:02 +0000
Subject: add "extra_param" option to qsearch for more realisitic profiling
 data, RT#5083

---
 FS/FS/Record.pm   | 68 ++++++++++++++++++++++++++++++++++---------------------
 FS/FS/cust_pkg.pm | 23 ++++++++++---------
 2 files changed, 54 insertions(+), 37 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 0e8275b72..7019cb99c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -215,23 +215,24 @@ objects.
 
 The preferred usage is to pass a hash reference of named parameters:
 
-  my @records = qsearch( {
-                           'table'     => 'table_name',
-                           'hashref'   => { 'field' => 'value'
-                                            'field' => { 'op'    => '<',
-                                                         'value' => '420',
-                                                       },
-                                          },
-
-                           #these are optional...
-                           'select'    => '*',
-                           'extra_sql' => 'AND field ',
-                           'order_by'  => 'ORDER BY something',
-                           #'cache_obj' => '', #optional
-                           'addl_from' => 'LEFT JOIN othtable USING ( field )',
-                           'debug'     => 1,
-                         }
-                       );
+  @records = qsearch( {
+                        'table'       => 'table_name',
+                        'hashref'     => { 'field' => 'value'
+                                           'field' => { 'op'    => '<',
+                                                        'value' => '420',
+                                                      },
+                                         },
+
+                        #these are optional...
+                        'select'      => '*',
+                        'extra_sql'   => 'AND field = ? AND intfield = ?',
+                        'extra_param' => [ 'value', [ 5, 'int' ] ],
+                        'order_by'    => 'ORDER BY something',
+                        #'cache_obj'   => '', #optional
+                        'addl_from'   => 'LEFT JOIN othtable USING ( field )',
+                        'debug'       => 1,
+                      }
+                    );
 
 Much code still uses old-style positional parameters, this is also probably
 fine in the common case where there are only two parameters:
@@ -262,18 +263,20 @@ sub _is_fs_float {
 }
 
 sub qsearch {
-  my($stable, $record, $select, $extra_sql, $order_by, $cache, $addl_from );
+  my($stable, $record, $cache );
+  my( $select, $extra_sql, $extra_param, $order_by, $addl_from );
   my $debug = '';
   if ( ref($_[0]) ) { #hashref for now, eventually maybe accept a list too
     my $opt = shift;
-    $stable    = $opt->{'table'}     or die "table name is required";
-    $record    = $opt->{'hashref'}   || {};
-    $select    = $opt->{'select'}    || '*';
-    $extra_sql = $opt->{'extra_sql'} || '';
-    $order_by  = $opt->{'order_by'}  || '';
-    $cache     = $opt->{'cache_obj'} || '';
-    $addl_from = $opt->{'addl_from'} || '';
-    $debug     = $opt->{'debug'}     || '';
+    $stable      = $opt->{'table'}       or die "table name is required";
+    $record      = $opt->{'hashref'}     || {};
+    $select      = $opt->{'select'}      || '*';
+    $extra_sql   = $opt->{'extra_sql'}   || '';
+    $extra_param = $opt->{'extra_param'} || [];
+    $order_by    = $opt->{'order_by'}    || '';
+    $cache       = $opt->{'cache_obj'}   || '';
+    $addl_from   = $opt->{'addl_from'}   || '';
+    $debug       = $opt->{'debug'}       || '';
   } else {
     ($stable, $record, $select, $extra_sql, $cache, $addl_from ) = @_;
     $select ||= '*';
@@ -359,6 +362,19 @@ sub qsearch {
 
   }
 
+  foreach my $param ( @$extra_param ) {
+    my $TYPE = SQL_VARCHAR;
+    my $value = $param;
+    if ( ref($param) ) {
+      $value = $param->[0];
+      my $type = $param->[1];
+      if ( $type =~ /(big)?(int|serial)/i && $value =~ /^\d+(\.\d+)?$/ ) {
+        $TYPE = SQL_INTEGER;
+      } # & DECIMAL?  well, who cares for now
+    }
+    $sth->bind_param($bind++, $value, { TYPE => $TYPE } );
+  }
+
 #  $sth->execute( map $record->{$_},
 #    grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
 #  ) or croak "Error executing \"$statement\": ". $sth->errstr;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index f2c3cccf5..8d4e0bf70 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1583,17 +1583,18 @@ sub extra_part_svc {
   qsearch( {
     'table'     => 'part_svc',
     'hashref'   => {},
-    'extra_sql' => "WHERE 0 = ( SELECT COUNT(*) FROM pkg_svc 
-                                  WHERE pkg_svc.svcpart = part_svc.svcpart 
-				    AND pkg_svc.pkgpart = $pkgpart
-				    AND quantity > 0 
-			      )
-	              AND 0 < ( SELECT count(*)
-		                  FROM cust_svc
-		                    LEFT JOIN cust_pkg using ( pkgnum )
-				  WHERE cust_svc.svcpart = part_svc.svcpart
-				    AND pkgnum = $pkgnum
-			      )",
+    'extra_sql' =>
+      "WHERE 0 = ( SELECT COUNT(*) FROM pkg_svc 
+                     WHERE pkg_svc.svcpart = part_svc.svcpart 
+                       AND pkg_svc.pkgpart = ?
+                       AND quantity > 0 
+                 )
+	 AND 0 < ( SELECT COUNT(*) FROM cust_svc
+                       LEFT JOIN cust_pkg using ( pkgnum )
+                     WHERE cust_svc.svcpart = part_svc.svcpart
+                       AND pkgnum = ?
+                 )",
+    'extra_param' => [ [$self->pkgpart=>'int'], [$self->pkgnum=>'int'] ],
   } );
 }
 
-- 
cgit v1.2.1


From 10bd4045596bc1daac97ce9d9ad706f696f8e4ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 29 Mar 2009 11:52:22 +0000
Subject: seems to benchmark faster, RT#5083

---
 FS/FS/cust_pkg.pm | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 8d4e0bf70..f2e0005d7 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1580,20 +1580,37 @@ sub extra_part_svc {
   my $pkgnum  = $self->pkgnum;
   my $pkgpart = $self->pkgpart;
 
+#  qsearch( {
+#    'table'     => 'part_svc',
+#    'hashref'   => {},
+#    'extra_sql' =>
+#      "WHERE 0 = ( SELECT COUNT(*) FROM pkg_svc 
+#                     WHERE pkg_svc.svcpart = part_svc.svcpart 
+#                       AND pkg_svc.pkgpart = ?
+#                       AND quantity > 0 
+#                 )
+#	 AND 0 < ( SELECT COUNT(*) FROM cust_svc
+#                       LEFT JOIN cust_pkg USING ( pkgnum )
+#                     WHERE cust_svc.svcpart = part_svc.svcpart
+#                       AND pkgnum = ?
+#                 )",
+#    'extra_param' => [ [$self->pkgpart=>'int'], [$self->pkgnum=>'int'] ],
+#  } );
+
+#seems to benchmark slightly faster...
   qsearch( {
-    'table'     => 'part_svc',
-    'hashref'   => {},
-    'extra_sql' =>
-      "WHERE 0 = ( SELECT COUNT(*) FROM pkg_svc 
-                     WHERE pkg_svc.svcpart = part_svc.svcpart 
-                       AND pkg_svc.pkgpart = ?
-                       AND quantity > 0 
-                 )
-	 AND 0 < ( SELECT COUNT(*) FROM cust_svc
-                       LEFT JOIN cust_pkg using ( pkgnum )
-                     WHERE cust_svc.svcpart = part_svc.svcpart
-                       AND pkgnum = ?
-                 )",
+    'select'      => 'DISTINCT ON (svcpart) part_svc.*',
+    'table'       => 'part_svc',
+    'addl_from'   =>
+      'LEFT JOIN pkg_svc  ON (     pkg_svc.svcpart   = part_svc.svcpart 
+                               AND pkg_svc.pkgpart   = ?
+                               AND quantity > 0
+                             )
+       LEFT JOIN cust_svc ON (     cust_svc.svcpart = part_svc.svcpart )
+       LEFT JOIN cust_pkg USING ( pkgnum )
+      ',
+    'hashref'     => {},
+    'extra_sql'   => "WHERE pkgsvcnum IS NULL AND cust_pkg.pkgnum = ? ",
     'extra_param' => [ [$self->pkgpart=>'int'], [$self->pkgnum=>'int'] ],
   } );
 }
-- 
cgit v1.2.1


From 35e195cdee48f99ca9b6406491696c7cdccb7814 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 29 Mar 2009 11:56:11 +0000
Subject: index pkg_svc.quantity, RT#5083

---
 FS/FS/Schema.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 745cf674b..59abbda8a 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1233,7 +1233,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'pkgsvcnum',
       'unique' => [ ['pkgpart', 'svcpart'] ],
-      'index' => [ ['pkgpart'] ],
+      'index' => [ ['pkgpart'], ['quantity'] ],
     },
 
     'part_referral' => {
-- 
cgit v1.2.1


From 75989a32bd20f0ab3d38d2cd2c05795ea9b7590d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 29 Mar 2009 23:44:12 +0000
Subject: hide over 2 (or configured) cancelled and one-time charge packages,
 RT#5083

---
 FS/FS/Conf.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b6fea5413..17da9def9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2197,6 +2197,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'cust_main-packages-years',
+    'section'     => 'UI',
+    'description' => 'Number of years to show old (cancelled and one-time charge) packages by default.  Currently defaults to 2.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'cust_main-use_comments',
     'section'     => 'UI',
-- 
cgit v1.2.1


From 3b5ccffae54e59c012eb1ebb348207510ca1d5ce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 00:32:03 +0000
Subject: part_pkg caching should speedup display of lots of packages, RT#5083

---
 FS/FS/cust_pkg.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index f2e0005d7..44e1210fe 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1220,8 +1220,10 @@ L<FS::part_pkg>).
 
 =cut
 
+use Carp qw(cluck);
 sub part_pkg {
   my $self = shift;
+  cluck "part_pkg called" if $DEBUG > 1 && ! $self->{'_pkgpart'};
   #exists( $self->{'_pkgpart'} )
   $self->{'_pkgpart'}
     ? $self->{'_pkgpart'}
-- 
cgit v1.2.1


From 4a525836ffb9fa8a941c11247637543d931733b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 01:05:04 +0000
Subject: forget caching, instead scoop up cust_pkg and part_pkg in one query,
 RT#5083

---
 FS/FS/cust_main.pm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 73cf826ab..1766b4542 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1809,7 +1809,7 @@ sub has_ship_address {
   scalar( grep { $self->getfield("ship_$_") ne '' } $self->addr_fields );
 }
 
-=item all_pkgs
+=item all_pkgs [ EXTRA_QSEARCH_PARAMS_HASHREF ]
 
 Returns all packages (see L<FS::cust_pkg>) for this customer.
 
@@ -1817,14 +1817,19 @@ Returns all packages (see L<FS::cust_pkg>) for this customer.
 
 sub all_pkgs {
   my $self = shift;
+  my $extra_qsearch = ref($_[0]) ? shift : {};
 
-  return $self->num_pkgs unless wantarray;
+  return $self->num_pkgs unless wantarray; #XXX doesn't work w/$extra_qsearch
 
   my @cust_pkg = ();
   if ( $self->{'_pkgnum'} ) {
     @cust_pkg = values %{ $self->{'_pkgnum'}->cache };
   } else {
-    @cust_pkg = qsearch( 'cust_pkg', { 'custnum' => $self->custnum });
+    @cust_pkg = qsearch({
+      %$extra_qsearch,
+      'table'   => 'cust_pkg',
+      'hashref' => { 'custnum' => $self->custnum },
+    });
   }
 
   sort sort_packages @cust_pkg;
@@ -1851,7 +1856,7 @@ sub cust_location {
   qsearch('cust_location', { 'custnum' => $self->custnum } );
 }
 
-=item ncancelled_pkgs
+=item ncancelled_pkgs [ EXTRA_QSEARCH_PARAMS_HASHREF ]
 
 Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
 
@@ -1859,6 +1864,7 @@ Returns all non-cancelled packages (see L<FS::cust_pkg>) for this customer.
 
 sub ncancelled_pkgs {
   my $self = shift;
+  my $extra_qsearch = ref($_[0]) ? shift : {};
 
   return $self->num_ncancelled_pkgs unless wantarray;
 
@@ -1877,16 +1883,13 @@ sub ncancelled_pkgs {
          $self->custnum. "\n"
       if $DEBUG > 1;
 
-    @cust_pkg =
-      qsearch( 'cust_pkg', {
-                             'custnum' => $self->custnum,
-                             'cancel'  => '',
-                           });
-    push @cust_pkg,
-      qsearch( 'cust_pkg', {
-                             'custnum' => $self->custnum,
-                             'cancel'  => 0,
-                           });
+    @cust_pkg = qsearch({
+      %$extra_qsearch,
+      'table'     => 'cust_pkg',
+      'hashref'   => { 'custnum' => $self->custnum },
+      'extra_sql' => ' AND ( cancel IS NULL OR cancel = 0 ) ',
+    });
+
   }
 
   sort sort_packages @cust_pkg;
-- 
cgit v1.2.1


From c13fb7ce1d8cba28ae0d56802b71856b0b7995ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 03:47:13 +0000
Subject: didn't need this, but more future-proof, RT#5083

---
 FS/FS/cust_main.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1766b4542..256eb732f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1883,11 +1883,12 @@ sub ncancelled_pkgs {
          $self->custnum. "\n"
       if $DEBUG > 1;
 
+    $extra_qsearch->{'extra_sql'} .= ' AND ( cancel IS NULL OR cancel = 0 ) ';
+
     @cust_pkg = qsearch({
       %$extra_qsearch,
       'table'     => 'cust_pkg',
       'hashref'   => { 'custnum' => $self->custnum },
-      'extra_sql' => ' AND ( cancel IS NULL OR cancel = 0 ) ',
     });
 
   }
-- 
cgit v1.2.1


From 613f320ae076de8612ff80fc99c516b544ff3897 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 04:15:56 +0000
Subject: try not to search for nothing in cust_svc so much, RT#5083

---
 FS/FS/cust_pkg.pm | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 44e1210fe..78f4bedb9 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2,6 +2,7 @@ package FS::cust_pkg;
 
 use strict;
 use vars qw(@ISA $disable_agentcheck $DEBUG);
+use Carp qw(cluck);
 use Scalar::Util qw( blessed );
 use List::Util qw(max);
 use Tie::IxHash;
@@ -1220,14 +1221,11 @@ L<FS::part_pkg>).
 
 =cut
 
-use Carp qw(cluck);
 sub part_pkg {
   my $self = shift;
-  cluck "part_pkg called" if $DEBUG > 1 && ! $self->{'_pkgpart'};
-  #exists( $self->{'_pkgpart'} )
-  $self->{'_pkgpart'}
-    ? $self->{'_pkgpart'}
-    : qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
+  return $self->{'_pkgpart'} if $self->{'_pkgpart'};
+  cluck "cust_pkg->part_pkg called" if $DEBUG > 1;
+  qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 }
 
 =item old_cust_pkg
@@ -1417,6 +1415,8 @@ services.
 sub cust_svc {
   my $self = shift;
 
+  cluck "cust_pkg->cust_svc called" if $DEBUG > 1;
+
   if ( @_ ) {
     return qsearch( 'cust_svc', { 'pkgnum'  => $self->pkgnum,
                                   'svcpart' => shift,          } );
@@ -1442,7 +1442,8 @@ is specified, return only the matching services.
 
 sub overlimit {
   my $self = shift;
-  grep { $_->overlimit } $self->cust_svc;
+  return () unless $self->num_cust_svc(@_);
+  grep { $_->overlimit } $self->cust_svc(@_);
 }
 
 =item h_cust_svc END_TIMESTAMP [ START_TIMESTAMP ] 
@@ -1491,9 +1492,15 @@ specified, counts only the matching services.
 
 sub num_cust_svc {
   my $self = shift;
+
+  return $self->{'_num_cust_svc'}
+    if !@_ && exists($self->{'_num_cust_svc'})
+           && $self->{'_num_cust_svc'} =~ /\d/;
+
   my $sql = 'SELECT COUNT(*) FROM cust_svc WHERE pkgnum = ?';
   $sql .= ' AND svcpart = ?' if @_;
-  my $sth = dbh->prepare($sql) or die dbh->errstr;
+
+  my $sth = dbh->prepare($sql)     or die  dbh->errstr;
   $sth->execute($self->pkgnum, @_) or die $sth->errstr;
   $sth->fetchrow_arrayref->[0];
 }
@@ -1550,7 +1557,8 @@ sub part_svc {
     $part_svc->{'Hash'}{'num_cust_svc'} = $num_cust_svc; #more evil
     $part_svc->{'Hash'}{'num_avail'}    =
       max( 0, $pkg_svc->quantity - $num_cust_svc );
-    $part_svc->{'Hash'}{'cust_pkg_svc'} = [ $self->cust_svc($part_svc->svcpart) ];
+    $part_svc->{'Hash'}{'cust_pkg_svc'} =
+      $num_cust_svc ? [ $self->cust_svc($part_svc->svcpart) ] : [];
     $part_svc;
   } $self->part_pkg->pkg_svc;
 
@@ -1560,7 +1568,8 @@ sub part_svc {
     my $num_cust_svc = $self->num_cust_svc($part_svc->svcpart);
     $part_svc->{'Hash'}{'num_cust_svc'} = $num_cust_svc; #speak no evail
     $part_svc->{'Hash'}{'num_avail'}    = 0; #0-$num_cust_svc ?
-    $part_svc->{'Hash'}{'cust_pkg_svc'} = [ $self->cust_svc($part_svc->svcpart) ];
+    $part_svc->{'Hash'}{'cust_pkg_svc'} =
+      $num_cust_svc ? [ $self->cust_svc($part_svc->svcpart) ] : [];
     $part_svc;
   } $self->extra_part_svc;
 
-- 
cgit v1.2.1


From 259747e66fcb16f3b84bf4a0e9673517f4ccd1d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 04:50:13 +0000
Subject: and hopefully actually using the count will finally do it, RT#5083

---
 FS/FS/cust_pkg.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 78f4bedb9..86ce25566 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1415,13 +1415,15 @@ services.
 sub cust_svc {
   my $self = shift;
 
-  cluck "cust_pkg->cust_svc called" if $DEBUG > 1;
-
   if ( @_ ) {
     return qsearch( 'cust_svc', { 'pkgnum'  => $self->pkgnum,
                                   'svcpart' => shift,          } );
   }
 
+  return () unless $self->num_cust_svc;
+
+  cluck "cust_pkg->cust_svc called" if $DEBUG > 1;
+
   #if ( $self->{'_svcnum'} ) {
   #  values %{ $self->{'_svcnum'}->cache };
   #} else {
-- 
cgit v1.2.1


From 5a66188aae7af4c05345c358f181b523fb2270fa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 05:08:53 +0000
Subject: and hopefully actually using the count will finally do it, RT#5083

---
 FS/FS/cust_pkg.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 86ce25566..348b1e498 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1415,14 +1415,14 @@ services.
 sub cust_svc {
   my $self = shift;
 
+  return () unless $self->num_cust_svc(@_);
+
   if ( @_ ) {
     return qsearch( 'cust_svc', { 'pkgnum'  => $self->pkgnum,
                                   'svcpart' => shift,          } );
   }
 
-  return () unless $self->num_cust_svc;
-
-  cluck "cust_pkg->cust_svc called" if $DEBUG > 1;
+  cluck "cust_pkg->cust_svc called" if $DEBUG > 2;
 
   #if ( $self->{'_svcnum'} ) {
   #  values %{ $self->{'_svcnum'}->cache };
@@ -1496,8 +1496,9 @@ sub num_cust_svc {
   my $self = shift;
 
   return $self->{'_num_cust_svc'}
-    if !@_ && exists($self->{'_num_cust_svc'})
-           && $self->{'_num_cust_svc'} =~ /\d/;
+    if !scalar(@_)
+       && exists($self->{'_num_cust_svc'})
+       && $self->{'_num_cust_svc'} =~ /\d/;
 
   my $sql = 'SELECT COUNT(*) FROM cust_svc WHERE pkgnum = ?';
   $sql .= ' AND svcpart = ?' if @_;
-- 
cgit v1.2.1


From cec41a47c4cbb9eda007713e376970addc9ac626 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 30 Mar 2009 06:10:18 +0000
Subject: okay.  counts are needed for the package sort, so push the embedded
 counting into cust_main.pm.  sure hope this does it. RT#5083

---
 FS/FS/cust_main.pm | 43 +++++++++++++++++++++++++++++--------------
 FS/FS/cust_pkg.pm  |  3 +++
 2 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 256eb732f..cc399838e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1819,17 +1819,13 @@ sub all_pkgs {
   my $self = shift;
   my $extra_qsearch = ref($_[0]) ? shift : {};
 
-  return $self->num_pkgs unless wantarray; #XXX doesn't work w/$extra_qsearch
+  return $self->num_pkgs unless wantarray || keys(%$extra_qsearch);
 
   my @cust_pkg = ();
   if ( $self->{'_pkgnum'} ) {
     @cust_pkg = values %{ $self->{'_pkgnum'}->cache };
   } else {
-    @cust_pkg = qsearch({
-      %$extra_qsearch,
-      'table'   => 'cust_pkg',
-      'hashref' => { 'custnum' => $self->custnum },
-    });
+    @cust_pkg = $self->_cust_pkg($extra_qsearch);
   }
 
   sort sort_packages @cust_pkg;
@@ -1885,11 +1881,7 @@ sub ncancelled_pkgs {
 
     $extra_qsearch->{'extra_sql'} .= ' AND ( cancel IS NULL OR cancel = 0 ) ';
 
-    @cust_pkg = qsearch({
-      %$extra_qsearch,
-      'table'     => 'cust_pkg',
-      'hashref'   => { 'custnum' => $self->custnum },
-    });
+    @cust_pkg = $self->_cust_pkg($extra_qsearch);
 
   }
 
@@ -1897,6 +1889,27 @@ sub ncancelled_pkgs {
 
 }
 
+sub _cust_pkg {
+  my $self = shift;
+  my $extra_qsearch = ref($_[0]) ? shift : {};
+
+  $extra_qsearch->{'select'} ||= '*';
+  $extra_qsearch->{'select'} .=
+   ',( SELECT COUNT(*) FROM cust_svc WHERE cust_pkg.pkgnum = cust_svc.pkgnum )
+     AS _num_cust_svc';
+
+  map {
+        $_->{'_num_cust_svc'} = $_->get('_num_cust_svc');
+        $_;
+      }
+  qsearch({
+    %$extra_qsearch,
+    'table'   => 'cust_pkg',
+    'hashref' => { 'custnum' => $self->custnum },
+  });
+
+}
+
 # This should be generalized to use config options to determine order.
 sub sort_packages {
   
@@ -1906,11 +1919,13 @@ sub sort_packages {
     #shouldn't get here...
     return 0;
   } else {
+    my $a_num_cust_svc = $a->num_cust_svc;
+    my $b_num_cust_svc = $b->num_cust_svc;
+    return 0  if !$a_num_cust_svc && !$b_num_cust_svc;
+    return -1 if  $a_num_cust_svc && !$b_num_cust_svc;
+    return 1  if !$a_num_cust_svc &&  $b_num_cust_svc;
     my @a_cust_svc = $a->cust_svc;
     my @b_cust_svc = $b->cust_svc;
-    return 0  if !scalar(@a_cust_svc) && !scalar(@b_cust_svc);
-    return -1 if  scalar(@a_cust_svc) && !scalar(@b_cust_svc);
-    return 1  if !scalar(@a_cust_svc) &&  scalar(@b_cust_svc);
     $a_cust_svc[0]->svc_x->label cmp $b_cust_svc[0]->svc_x->label;
   }
 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 348b1e498..902b1d325 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1500,6 +1500,9 @@ sub num_cust_svc {
        && exists($self->{'_num_cust_svc'})
        && $self->{'_num_cust_svc'} =~ /\d/;
 
+  cluck "cust_pkg->num_cust_svc called, _num_cust_svc:".$self->{'_num_cust_svc'}
+    if $DEBUG > 2;
+
   my $sql = 'SELECT COUNT(*) FROM cust_svc WHERE pkgnum = ?';
   $sql .= ' AND svcpart = ?' if @_;
 
-- 
cgit v1.2.1


From c46d0f3d030f71a21a6d459100b29d7454f8627b Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 30 Mar 2009 16:33:44 +0000
Subject: schema and module should agree on column names

---
 FS/FS/cust_tax_location.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index b7437a08b..7c6989c65 100644
--- a/FS/FS/cust_tax_location.pm
+++ b/FS/FS/cust_tax_location.pm
@@ -119,7 +119,7 @@ sub check {
     || $self->ut_text('state')
     || $self->ut_numbern('plus4hi')
     || $self->ut_numbern('plus4lo')
-    || $self->ut_enum('default', [ '', ' ', 'Y' ] ) # wtf?
+    || $self->ut_enum('default_location', [ '', 'Y' ] )
     || $self->ut_enum('cityflag', [ '', 'I', 'O', 'B' ] )
     || $self->ut_alpha('geocode')
   ;
@@ -179,7 +179,7 @@ sub batch_import {
   }
 
   if ( $format eq 'cch' || $format eq 'cch-update' ) {
-    @fields = qw( zip state plus4lo plus4hi geocode default );
+    @fields = qw( zip state plus4lo plus4hi geocode default_location );
     push @fields, 'actionflag' if $format eq 'cch-update';
 
     $imported++ if $format eq 'cch-update'; #empty file ok
@@ -188,6 +188,7 @@ sub batch_import {
       my $hash = shift;
 
       $hash->{'data_vendor'} = 'cch';
+      $hash->{'default_location'} =~ s/ //g;
 
       if (exists($hash->{actionflag}) && $hash->{actionflag} eq 'D') {
         delete($hash->{actionflag});
@@ -210,7 +211,7 @@ sub batch_import {
     };
 
   } elsif ( $format eq 'cch-zip' || $format eq 'cch-update-zip' ) {
-    @fields = qw( zip city county state postalcity countyfips countydef default geocode cityflag unique );
+    @fields = qw( zip city county state postalcity countyfips countydef default_location geocode cityflag unique );
     push @fields, 'actionflag' if $format eq 'cch-update-zip';
 
     $imported++ if $format eq 'cch-update'; #empty file ok
@@ -222,6 +223,7 @@ sub batch_import {
       delete($hash->{$_}) foreach qw( countyfips countydef unique );
 
       $hash->{'cityflag'} =~ s/ //g;
+      $hash->{'default_location'} =~ s/ //g;
 
       if (exists($hash->{actionflag}) && $hash->{actionflag} eq 'D') {
         delete($hash->{actionflag});
-- 
cgit v1.2.1


From 8d6784828998dc848eede30cef4a38bfd30fc3d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Mar 2009 19:46:00 +0000
Subject: fix impending billing notification for Pg 8.3's more strict type
 checking

---
 FS/FS/Cron/notify.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm
index 23cf920b2..c67fcc19a 100644
--- a/FS/FS/Cron/notify.pm
+++ b/FS/FS/Cron/notify.pm
@@ -35,7 +35,7 @@ sub notify_flat_delay {
                 and 0 < ( select count(*) from part_pkg_option
                             where part_pkg.pkgpart = part_pkg_option.pkgpart
                               and part_pkg_option.optionname = 'recur_notify'
-                              and part_pkg_option.optionvalue > 0
+                              and CAST( part_pkg_option.optionvalue AS INTEGER ) > 0
                               and 0 <= ( $time
                                          + CAST( part_pkg_option.optionvalue AS $integer )
                                            * 86400
-- 
cgit v1.2.1


From 432ab2af40034d4f63f7771eff6207c73b057959 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Mar 2009 19:47:35 +0000
Subject: quiet warning: Argument "" isn't numeric in numeric eq (==) at
 /usr/local/share/perl/5.10.0/FS/part_pkg/voip_cdr.pm line 201

---
 FS/FS/part_pkg/voip_cdr.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index a691fdad6..fe05b684a 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -199,7 +199,8 @@ sub calc_recur {
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
+    if $self->option('recur_temporality', 1) eq 'preceding'
+    && ( $last_bill eq '' || $last_bill == 0 );
 
   my $ratenum = $cust_pkg->part_pkg->option('ratenum');
 
-- 
cgit v1.2.1


From 7889bec2b0f951c053b06ef45fbc60dacd3f8a88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Mar 2009 19:51:54 +0000
Subject: really fix notify for Pg 8.3

---
 FS/FS/Cron/notify.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm
index c67fcc19a..5b0e186ad 100644
--- a/FS/FS/Cron/notify.pm
+++ b/FS/FS/Cron/notify.pm
@@ -62,7 +62,7 @@ END
       0 = ( select count(*) from cust_pkg_option
               where cust_pkg.pkgnum = cust_pkg_option.pkgnum
                 and cust_pkg_option.optionname = 'impending_recur_notification_sent'
-                and cust_pkg_option.optionvalue = 1
+                and CAST( cust_pkg_option.optionvalue AS INTEGER ) = 1
           )
 END
   
-- 
cgit v1.2.1


From 2b8f2f7d7c2fa79072f7404865691239f23fa5ba Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Apr 2009 03:44:34 +0000
Subject: add options to skip CDRs under a defined length and with specific
 lastapp

---
 FS/FS/part_pkg/voip_cdr.pm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index fe05b684a..7c5272edc 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -119,6 +119,12 @@ tie my %temporalities, 'Tie::IxHash',
     'skip_dstchannel_prefix' => { 'name' => 'Do not charge for CDRs where the dstchannel starts with:',
                                 },
 
+    'skip_dst_length_less' => { 'name' => 'Do not charge for CDRs where the destination is less than this many digits:',
+                              },
+
+    'skip_lastapp' => { 'name' => 'Do not charge for CDRs where the lastapp matches this value',
+                      },
+
     'use_duration'   => { 'name' => 'Calculate usage based on the duration field instead of the billsec field',
                           'type' => 'checkbox',
                         },
@@ -555,7 +561,9 @@ sub check_chargable {
     use_carrierid
     use_cdrtypenum
     skip_dcontext
-    skip_dstchannel_prefix;
+    skip_dstchannel_prefix
+    skip_dst_length_less
+    skip_lastapp
   );
   foreach my $opt (grep !exists($flags{option_cache}->{$_}), @opt ) {
     $flags{option_cache}->{$opt} = $self->option($opt);
@@ -584,10 +592,17 @@ sub check_chargable {
     if $opt{'skip_dcontext'} =~ /\S/
     && grep { $cdr->dcontext eq $_ } split(/\s*,\s*/, $opt{'skip_dcontext'});
 
-  my $len = length($opt{'skip_dstchannel_prefix'});
+  my $len_prefix = length($opt{'skip_dstchannel_prefix'});
   return "dstchannel starts with $opt{'skip_dstchannel_prefix'}"
-    if $len
-    && substr($cdr->dstchannel, 0, $len) eq $opt{'skip_dstchannel_prefix'};
+    if $len_prefix
+    && substr($cdr->dstchannel,0,$len_prefix) eq $opt{'skip_dstchannel_prefix'};
+
+  my $dst_length = $opt{'skip_dst_length_less'};
+  return "destination less than $dst_length digits"
+    if $dst_length && length($cdr->dst) < $dst_length;
+
+  return "lastapp is $opt{'skip_lastapp'}"
+    if length($opt{'skip_lastapp'}) && $cdr->lastapp eq $opt{'skip_lastapp'};
 
   #all right then, rate it
   '';
-- 
cgit v1.2.1


From af49b2c54c13b14189e23765a9a7102bcf59cb06 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Apr 2009 03:51:19 +0000
Subject: add options to skip CDRs under a defined length and with specific
 lastapp

---
 FS/FS/part_pkg/voip_cdr.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 7c5272edc..f14f14402 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -183,6 +183,7 @@ tie my %temporalities, 'Tie::IxHash',
                        use_amaflags use_disposition
                        use_disposition_taqua use_carrierid use_cdrtypenum
                        skip_dcontext skip_dstchannel_prefix
+                       skip_dst_length_less skip_lastapp
                        use_duration
                        411_rewrite
                        output_format summarize_usage usage_section
-- 
cgit v1.2.1


From 9483773ebd5056d28ca55fa0895492dd255c2542 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Apr 2009 04:27:25 +0000
Subject: show post-granularity duration if available for all export formats

---
 FS/FS/cdr.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 2d9200143..35bb71cf6 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -470,6 +470,15 @@ my %export_names = (
   },
 );
 
+my $duration_sub = sub {
+  my($cdr, %opt) = @_;
+  if ( $opt{minutes} ) {
+    $opt{minutes}. ( $opt{granularity} ? 'm' : ' call' );
+  } else {
+    sprintf('%.2fm', $cdr->billsec / 60 );
+  }
+};
+
 my %export_formats = (
   'convergent' => [
     'carriername', #CARRIER
@@ -491,7 +500,7 @@ my %export_formats = (
     sub { time2str('%r', shift->calldate_unix ) },   #TIME
     'userfield',                                     #USER
     'dst',                                           #NUMBER_DIALED
-    sub { sprintf('%.2fm', shift->billsec / 60 ) },  #DURATION
+    $duration_sub,                                   #DURATION
     #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
     sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE
   ],
@@ -501,7 +510,7 @@ my %export_formats = (
     #'userfield',                                     #USER
     'dst',                                           #NUMBER_DIALED
     'src',                                           #called from
-    sub { sprintf('%.2fm', shift->billsec / 60 ) },  #DURATION
+    $duration_sub,                                   #DURATION
     #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
     sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE
   ],
@@ -522,9 +531,7 @@ my %export_formats = (
     sub { my($cdr, %opt) = @_; $opt{dst_regionname}; },
 
     #DURATION
-    sub { my($cdr, %opt) = @_;
-          $opt{minutes}. ( $opt{granularity} ? 'm' : ' call' );
-        },
+    $duration_sub,
 
     #PRICE
     sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; },
-- 
cgit v1.2.1


From f319a3e27955cc3351f04c12a663f978a6e3d2a3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Apr 2009 02:36:41 +0000
Subject: more than you ever wanted to know about rounding. 
 http://en.wikipedia.org/wiki/Rounding  RT#4666

---
 FS/FS/part_pkg/voip_cdr.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index f14f14402..c745283d1 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -457,9 +457,11 @@ sub calc_recur {
           $included_min{$regionnum} -= $minutes;
 
           if ( $included_min{$regionnum} < 0 ) {
-            my $charge_min = 0 - $included_min{$regionnum};
+            my $charge_min = 0 - $included_min{$regionnum}; #XXX should preserve
+                                                            #(display?) this
             $included_min{$regionnum} = 0;
-            $charge = sprintf('%.2f', $rate_detail->min_charge * $charge_min );
+            $charge = sprintf('%.2f', ( $rate_detail->min_charge * $charge_min )
+                                      + 0.00000001 ); #so 1.005 rounds to 1.01
             $charges += $charge;
           }
 
-- 
cgit v1.2.1


From 97e26f757913f1c7e7c717690a693e7beeb2b530 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 2 Apr 2009 05:27:24 +0000
Subject: noise reduction

---
 FS/FS/part_pkg_taxrate.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index 197bf0fc4..aaf7f60a2 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -248,8 +248,8 @@ sub batch_import {
 
         $part_pkg_taxproduct{'description'} = 
           join(' : ', (map{ $hash->{$_} } qw(groupdesc itemdesc)),
-                      $providers{$hash->{'provider'}},
-                      $customers{$hash->{'customer'}},
+                      $providers{$hash->{'provider'}} || '',
+                      $customers{$hash->{'customer'}} || '',
               );
         $part_pkg_taxproduct = new FS::part_pkg_taxproduct \%part_pkg_taxproduct;
         my $error = $part_pkg_taxproduct->insert;
-- 
cgit v1.2.1


From c8ed7ae4cf496300bba2a9a69e2224c5819d2572 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 2 Apr 2009 15:46:49 +0000
Subject: prorating for the fixed recurring portion of voip

---
 FS/FS/part_pkg/voip_cdr.pm | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index c745283d1..e08050950 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -12,7 +12,7 @@ use FS::rate;
 use FS::rate_prefix;
 use FS::rate_detail;
 
-@ISA = qw(FS::part_pkg::flat);
+@ISA = qw(FS::part_pkg::prorate);
 
 $DEBUG = 0;
 
@@ -55,6 +55,11 @@ tie my %temporalities, 'Tie::IxHash',
                          'type' => 'checkbox',
                        },
 
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating.  Leave'.
+                                   ' blank to charge full first month instead.',
+                         'default' => '',
+                       },
+
     'rating_method' => { 'name' => 'Region rating method',
                          'type' => 'radio',
                          'options' => \%rating_method,
@@ -175,7 +180,7 @@ tie my %temporalities, 'Tie::IxHash',
   },
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
-                       rating_method ratenum ignore_unrateable
+                       cutoff_day rating_method ratenum ignore_unrateable
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
@@ -200,7 +205,8 @@ sub calc_setup {
 
 #false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
 sub calc_recur {
-  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
 
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
@@ -544,8 +550,13 @@ sub calc_recur {
 
   } #if ( $spool_cdr && length($downstream_cdr) )
 
-  $charges += $self->option('recur_fee')
-    if $param->{'increment_next_bill'};
+  if ($param->{'increment_next_bill'}) {
+    if ( $self->option('cutoff_day', 1) ) {
+      $charges += $self->SUPER::calc_recur(@_);
+    } else {
+      $charges += $self->option('recur_fee')
+    }
+  }
 
   $charges;
 }
-- 
cgit v1.2.1


From 6d63ac7337203c5ea73aebce87d93d663606f386 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 2 Apr 2009 17:47:33 +0000
Subject: separate checkbox for enabling prorate feature

---
 FS/FS/part_pkg/voip_cdr.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index e08050950..34b5571e6 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -55,9 +55,12 @@ tie my %temporalities, 'Tie::IxHash',
                          'type' => 'checkbox',
                        },
 
-    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating.  Leave'.
-                                   ' blank to charge full first month instead.',
-                         'default' => '',
+    'enable_prorate' => { 'name' => 'Enable prorating of the first month',
+                          'type' => 'checkbox',
+                        },
+
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating ',
+                         'default' => '1',
                        },
 
     'rating_method' => { 'name' => 'Region rating method',
@@ -180,7 +183,8 @@ tie my %temporalities, 'Tie::IxHash',
   },
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
-                       cutoff_day rating_method ratenum ignore_unrateable
+                       enable_prorate cutoff_day
+                       rating_method ratenum ignore_unrateable
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
@@ -551,7 +555,7 @@ sub calc_recur {
   } #if ( $spool_cdr && length($downstream_cdr) )
 
   if ($param->{'increment_next_bill'}) {
-    if ( $self->option('cutoff_day', 1) ) {
+    if ( $self->option('enable_prorate', 1) ) {
       $charges += $self->SUPER::calc_recur(@_);
     } else {
       $charges += $self->option('recur_fee')
-- 
cgit v1.2.1


From a9393a0c1e6f1c6a5dc319238ae5fefb092604fc Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 3 Apr 2009 16:57:17 +0000
Subject: add option for available rather than provisioned svc_phones as unit
 count

---
 FS/FS/part_pkg/voip_cdr.pm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 34b5571e6..2325e6975 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -157,6 +157,10 @@ tie my %temporalities, 'Tie::IxHash',
                            'type' => 'checkbox',
                          },
 
+    'count_available_phones' => { 'name' => 'Consider for tax purposes the number of lines to be svc_phones that may be provisioned rather than those that actually are.',
+                           'type' => 'checkbox',
+                         },
+
     #XXX also have option for an external db
 #    'cdr_location' => { 'name' => 'CDR database location'
 #                        'type' => 'select',
@@ -197,6 +201,7 @@ tie my %temporalities, 'Tie::IxHash',
                        411_rewrite
                        output_format summarize_usage usage_section
                        bill_every_call
+                       count_available_phones
                      )
                   ],
   'weight' => 40,
@@ -639,7 +644,16 @@ sub base_recur {
 #  to indicate it represents a line
 sub calc_units {    
   my($self, $cust_pkg ) = @_;
-  scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
+  my $count = 0;
+  if ( $self->option('count_available_phones', 1)) {
+    map { $count += ( $_->quantity || 0 ) }
+      grep { $_->part_svc->svcdb eq 'svc_phone' }
+      $cust_pkg->part_pkg->pkg_svc;
+  } else {
+    $count = 
+      scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
+  }
+  $count;
 }
 
 1;
-- 
cgit v1.2.1


From e6f3d047e87488badad86b71508b1f4d07c981f9 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 4 Apr 2009 16:22:19 +0000
Subject: correct bad schema bug in cust_bill_pkg_detail

---
 FS/FS/Schema.pm               |  2 +-
 FS/FS/cust_bill_pkg_detail.pm | 46 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 59abbda8a..e4076b13d 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -531,7 +531,7 @@ sub tables_hashref {
         'invnum',  'int', 'NULL', '', '', '',           # deprecated
         'amount',  @money_typen, '', '', 
         'format',  'char', 'NULL', 1, '', '',
-        'classnum', 'char', 'NULL', 1, '', '',
+        'classnum', 'int', 'NULL', '', '', '',
         'detail',  'varchar', '', 255, '', '', 
       ],
       'primary_key' => 'detailnum',
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 8a4888894..f40ce5869 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -1,8 +1,8 @@
 package FS::cust_bill_pkg_detail;
 
 use strict;
-use vars qw( @ISA $me $DEBUG );
-use FS::Record qw( qsearch qsearchs dbdef );
+use vars qw( @ISA $me $DEBUG %GetInfoType );
+use FS::Record qw( qsearch qsearchs dbdef dbh );
 use FS::cust_bill_pkg;
 
 @ISA = qw(FS::Record);
@@ -121,6 +121,48 @@ sub _upgrade_data { # class method
 
   warn "$me upgrading $class\n" if $DEBUG;
 
+  my $columndef = dbdef->table($class->table)->column('classnum');
+  unless ($columndef->type eq 'int4') {
+
+    my $dbh = dbh;
+    if ( $dbh->{Driver}->{Name} eq 'Pg' ) {
+
+      eval "use DBI::Const::GetInfoType;";
+      die $@ if $@;
+
+      my $major_version = 0;
+      $dbh->get_info( $GetInfoType{SQL_DBMS_VER} ) =~ /^(\d{2})/
+        && ( $major_version = sprintf("%d", $1) );
+
+      if ( $major_version > 7 ) {
+
+        # ideally this would be supported in DBIx-DBSchema and friends
+
+        foreach my $table ( qw( cust_bill_pkg_detail h_cust_bill_pkg_detail ) ){
+
+          warn "updating $table column classnum to integer\n" if $DEBUG;
+          my $sql = "ALTER TABLE $table ALTER classnum TYPE int USING ".
+            "int4(classnum)";
+          my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+        }
+
+      } else {
+
+        die "cust_bill_pkg_detail classnum upgrade unsupported for this Pg version\n";
+
+      }
+
+    } else {
+
+      die "cust_bill_pkg_detail classnum upgrade only supported for Pg 8+\n";
+
+    }
+
+  }
+
+
   if ( defined( dbdef->table($class->table)->column('billpkgnum') ) &&
        defined( dbdef->table($class->table)->column('invnum') ) &&
        defined( dbdef->table($class->table)->column('pkgnum') ) 
-- 
cgit v1.2.1


From 4d9f43b90460175581aaa976e9b9937f20ccc434 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 5 Apr 2009 23:18:57 +0000
Subject: cleanup tax-pkg_location tax on tax fallout

---
 FS/FS/cust_main.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cc399838e..e696e1bc9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2533,20 +2533,20 @@ sub bill {
     my $tax_object = shift @{ $totlisthash{$tax} };
     warn "found previously found taxed tax ". $tax_object->taxname. "\n"
       if $DEBUG > 2;
-    my $listref_or_error =
+    my $hashref_or_error =
       $tax_object->taxline( $totlisthash{$tax},
                             'custnum'      => $self->custnum,
                             'invoice_time' => $invoice_time
                           );
-    unless (ref($listref_or_error)) {
+    unless (ref($hashref_or_error)) {
       $dbh->rollback if $oldAutoCommit;
-      return $listref_or_error;
+      return $hashref_or_error;
     }
 
-    warn "adding taxed tax amount ". $listref_or_error->[1].
+    warn "adding taxed tax amount ". $hashref_or_error->{'amount'}.
          " as ". $tax_object->taxname. "\n"
       if $DEBUG;
-    $tax{ $tax } += $listref_or_error->[1];
+    $tax{ $tax } += $hashref_or_error->{'amount'};
   }
   
   #consolidate and create tax line items
@@ -2939,7 +2939,7 @@ sub _handle_taxes {
 
     foreach my $tax ( @taxes ) {
 
-      my $taxname = ref( $tax ). ' taxnum'. $tax->taxnum;
+      my $taxname = ref( $tax ). ' '. $tax->taxnum;
 #      $taxname .= ' pkgnum'. $cust_pkg->pkgnum.
 #                  ' locationnum'. $cust_pkg->locationnum
 #        if $conf->exists('tax-pkg_address') && $cust_pkg->locationnum;
-- 
cgit v1.2.1


From be924ea50c9fc5710bb3f587c492861c42cbdac8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 6 Apr 2009 18:31:11 +0000
Subject: calltype 6 is international

---
 FS/FS/cdr/taqua.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 3052f83e5..5d6c6945a 100644
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -22,7 +22,16 @@ use FS::cdr qw(_cdr_date_parser_maker);
     'uniqueid',                           #SequenceNumber
     'accountcode',                        #SessionNumber
     'src',                                #CallingPartyNumber
-    'dst',                                #CalledPartyNumber
+    #'dst',                                #CalledPartyNumber
+    #CalledPartyNumber
+    sub {
+      my( $cdr, $field, $conf ) = @_;
+      if ( $cdr->calltypenum == 6 && $cdr->cdrtypenum == 0 ) {
+        $cdr->dst("+$field");
+      } else {
+        $cdr->dst($field);
+      }
+    },
 
     #10
     _cdr_date_parser_maker('startdate'),  #CallArrivalTime
-- 
cgit v1.2.1


From ba06d25a6e19e6d5534e90619cf233306fa2f49c Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 6 Apr 2009 23:19:34 +0000
Subject: better auto toll free regex

---
 FS/FS/part_pkg/voip_cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 2325e6975..9f6dd0111 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -308,7 +308,7 @@ sub calc_recur {
           ###
 
           my( $to_or_from, $number );
-          if ( $cdr->dst =~ /^(\+?1)?8([02-8])\1/
+          if ( $cdr->dst =~ /^(\+?1)?8(8|[02-7]{2})/
                && ! $disable_tollfree
               )
           { #tollfree call
-- 
cgit v1.2.1


From 1a588ca640701eac6e6f1c9dcd31fdc48d93fc9e Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 7 Apr 2009 01:20:38 +0000
Subject: correct taqua toll free handling and hasten cdr import (skip
 uninteresting records)

---
 FS/FS/Record.pm            |  5 ++++-
 FS/FS/cdr.pm               | 13 ++++++++++++-
 FS/FS/cdr/taqua.pm         | 10 ++++++++--
 FS/FS/part_pkg/voip_cdr.pm |  4 +---
 4 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 7019cb99c..168984555 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1708,11 +1708,14 @@ sub batch_import {
 
     my $record = $class->new( \%hash );
 
+    my $param = {};
     while ( scalar(@later) ) {
       my $sub = shift @later;
       my $data = shift @later;
-      &{$sub}($record, $data, $conf);  # $record->&{$sub}($data, $conf); 
+      &{$sub}($record, $data, $conf, $param); # $record->&{$sub}($data, $conf);
+      last if exists( $param->{skiprow} );
     }
+    next if exists( $param->{skiprow} );
 
     my $error = $record->insert;
 
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 35bb71cf6..5f467394c 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -269,6 +269,17 @@ sub check {
   $self->SUPER::check;
 }
 
+=item is_tollfree
+
+  Returns true when the cdr represents a toll free number and false otherwise.
+
+=cut
+
+sub is_tollfree {
+  my $self = shift;
+  ( $self->dst =~ /^(\+?1)?8(8|[02-7]{2})/ ) ? 1 : 0;
+}
+
 =item set_charged_party
 
 If the charged_party field is already set, does nothing.  Otherwise:
@@ -294,7 +305,7 @@ sub set_charged_party {
 
     } else {
 
-      if ( $self->dst =~ /^(\+?1)?8[02-8]{2}/ ) {
+      if ( $self->is_tollfree ) {
         $self->charged_party($self->dst);
       } else {
         $self->charged_party($self->src);
diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 5d6c6945a..44e274729 100644
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -13,7 +13,13 @@ use FS::cdr qw(_cdr_date_parser_maker);
   'import_fields' => [  #some of these are kind arbitrary...
 
     #0
-    'cdrtypenum',                         #RecordType
+    #RecordType
+    sub {
+      my($cdr, $field, $conf, $hashref) = @_;
+      $hashref->{skiprow} = 1 unless ($field == 0 && $cdr->disposition == 100);
+      $cdr->cdrtypenum($field);
+    },
+
     sub { my($cdr, $field) = @_; },             #all10#RecordVersion
     sub { my($cdr, $field) = @_; },       #OrigShelfNumber
     sub { my($cdr, $field) = @_; },       #OrigCardNumber
@@ -88,7 +94,7 @@ use FS::cdr qw(_cdr_date_parser_maker);
           return;
         }
       }
-      $cdr->charged_party($field);
+      '';
     },
 
     sub { my($cdr, $field) = @_; },       #SubscriberNumber
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 9f6dd0111..e25bba5b4 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -308,9 +308,7 @@ sub calc_recur {
           ###
 
           my( $to_or_from, $number );
-          if ( $cdr->dst =~ /^(\+?1)?8(8|[02-7]{2})/
-               && ! $disable_tollfree
-              )
+          if ( $cdr->is_tollfree && ! $disable_tollfree )
           { #tollfree call
             $to_or_from = 'from';
             $number = $cdr->src;
-- 
cgit v1.2.1


From fee9be55f0a94bd0187e370253ec2b261944602c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Apr 2009 02:18:16 +0000
Subject: stop smoking crack

---
 FS/FS/cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 5f467394c..bc5bb8d4e 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -277,7 +277,7 @@ sub check {
 
 sub is_tollfree {
   my $self = shift;
-  ( $self->dst =~ /^(\+?1)?8(8|[02-7]{2})/ ) ? 1 : 0;
+  ( $self->dst =~ /^(\+?1)?8([02-8])\1/ ) ? 1 : 0;
 }
 
 =item set_charged_party
-- 
cgit v1.2.1


From 792155f15ac9c520dac7b72fdbddd894bd2b3133 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 7 Apr 2009 02:50:46 +0000
Subject: a tollfree regex that captures 88x and works with +1

---
 FS/FS/cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index bc5bb8d4e..0230adcd8 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -277,7 +277,7 @@ sub check {
 
 sub is_tollfree {
   my $self = shift;
-  ( $self->dst =~ /^(\+?1)?8([02-8])\1/ ) ? 1 : 0;
+  ( $self->dst =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0;
 }
 
 =item set_charged_party
-- 
cgit v1.2.1


From 6ec8ff467b97a07dcf353631809d69485fb9958a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Apr 2009 18:15:15 +0000
Subject: truncate long labels that are TOO long... RT#3519

---
 FS/FS/svc_acct.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 7bcd0e7d2..9d14b84af 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -459,9 +459,12 @@ history records.
 
 sub label_long {
   my $self = shift;
-  ( $self->finger =~ /\S/ )
-    ? $self->finger. ' <'.$self->label(@_).'>'
-    : $self->label(@_);
+  my $label = $self->label(@_);
+  my $finger = $self->finger;
+  return $label unless $finger =~ /\S/;
+  my $maxlen = 40 - length($label) - length($self->cust_svc->part_svc->svc);
+  $finger = substr($finger, 0, $maxlen-3).'...' if length($finger) > $maxlen;
+  "$finger <$label>";
 }
 
 =item insert [ , OPTION => VALUE ... ]
-- 
cgit v1.2.1


From 84cb979c86a35805cfc6c4530ad4505243b7cfd0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Apr 2009 18:20:43 +0000
Subject: add a config to allow colon in usernames, RT#5145

---
 FS/FS/Conf.pm     |  7 +++++++
 FS/FS/svc_acct.pm | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 17da9def9..0c9dd6577 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1195,6 +1195,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  { 
+    'key'         => 'username-colon',
+    'section'     => 'username',
+    'description' => 'Allow the colon character (:) in usernames.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'safe-part_bill_event',
     'section'     => 'UI',
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9d14b84af..9ab90349f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -6,7 +6,7 @@ use vars qw( @ISA $DEBUG $me $conf $skip_fuzzyfiles
              $usernamemax $passwordmin $passwordmax
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_nounderscore $username_nodash
-             $username_uppercase $username_percent
+             $username_uppercase $username_percent $username_colon
              $password_noampersand $password_noexclamation
              $warning_template $warning_from $warning_subject $warning_mimetype
              $warning_cc
@@ -65,6 +65,7 @@ FS::UID->install_callback( sub {
   $username_uppercase = $conf->exists('username-uppercase');
   $username_ampersand = $conf->exists('username-ampersand');
   $username_percent = $conf->exists('username-percent');
+  $username_colon = $conf->exists('username-colon');
   $password_noampersand = $conf->exists('password-noexclamation');
   $password_noexclamation = $conf->exists('password-noexclamation');
   $dirhash = $conf->config('dirhash') || 0;
@@ -1026,11 +1027,11 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&\%]{$usernamemin,$ulen})$/i
+    $recref->{username} =~ /^([a-z0-9_\-\.\&\%\:]{$usernamemin,$ulen})$/i
       or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   } else {
-    $recref->{username} =~ /^([a-z0-9_\-\.\&\%]{$usernamemin,$ulen})$/
+    $recref->{username} =~ /^([a-z0-9_\-\.\&\%\:]{$usernamemin,$ulen})$/
       or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
     $recref->{username} = $1;
   }
@@ -1055,6 +1056,9 @@ sub check {
   unless ( $username_percent ) {
     $recref->{username} =~ /\%/ and return gettext('illegal_username');
   }
+  unless ( $username_colon ) {
+    $recref->{username} =~ /\:/ and return gettext('illegal_username');
+  }
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;
-- 
cgit v1.2.1


From aea149aa0ee7d7cae6e0c701ac6d105d615bb4e6 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 7 Apr 2009 20:45:14 +0000
Subject: quick option to allow importing gmt cdrs

---
 FS/FS/cdr.pm       | 10 ++++++++--
 FS/FS/cdr/taqua.pm |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 0230adcd8..b640bc63e 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -681,10 +681,11 @@ sub _cdr_min_parse {
 
 sub _cdr_date_parser_maker {
   my $field = shift;
+  my %options = @_;
   my @fields = ref($field) ? @$field : ($field);
   return sub {
     my( $cdr, $datestring ) = @_;
-    my $unixdate = eval { _cdr_date_parse($datestring) };
+    my $unixdate = eval { _cdr_date_parse($datestring, %options) };
     die "error parsing date for @fields from $datestring: $@\n" if $@;
     $cdr->$_($unixdate) foreach @fields;
   };
@@ -692,6 +693,7 @@ sub _cdr_date_parser_maker {
 
 sub _cdr_date_parse {
   my $date = shift;
+  my %options = @_;
 
   return '' unless length($date); #that's okay, it becomes NULL
 
@@ -711,7 +713,11 @@ sub _cdr_date_parse {
   return '' if $year == 1900 && $mon == 1 && $day == 1
             && $hour == 0    && $min == 0 && $sec == 0;
 
-  timelocal($sec, $min, $hour, $day, $mon-1, $year);
+  if ($options{gmt}) {
+    timegm($sec, $min, $hour, $day, $mon-1, $year);
+  } else {
+    timelocal($sec, $min, $hour, $day, $mon-1, $year);
+  }
 }
 
 =item batch_import HASHREF
diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 44e274729..3e9840074 100644
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -40,8 +40,8 @@ use FS::cdr qw(_cdr_date_parser_maker);
     },
 
     #10
-    _cdr_date_parser_maker('startdate'),  #CallArrivalTime
-    _cdr_date_parser_maker('enddate'),    #CallCompletionTime
+    _cdr_date_parser_maker('startdate', 'gmt' => 1),  #CallArrivalTime
+    _cdr_date_parser_maker('enddate', 'gmt' => 1),    #CallCompletionTime
 
     #Disposition
     #sub { my($cdr, $d ) = @_; $cdr->disposition( $disposition{$d}): },
@@ -57,7 +57,7 @@ use FS::cdr qw(_cdr_date_parser_maker);
                                           # 201 => '',
                                           # 203 => '',
 
-    _cdr_date_parser_maker('answerdate'), #DispositionTime
+    _cdr_date_parser_maker('answerdate', 'gmt' => 1), #DispositionTime
     sub { my($cdr, $field) = @_; },       #TCAP
     sub { my($cdr, $field) = @_; },       #OutboundCarrierConnectTime
     sub { my($cdr, $field) = @_; },       #OutboundCarrierDisconnectTime
-- 
cgit v1.2.1


From fdbee9ee821385bfbd9578f940eeb8ca74cb9eff Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Apr 2009 07:32:24 +0000
Subject: eliminate all trace of cvv from history records, RT#5093

---
 FS/FS/Record.pm    | 12 +++++++-----
 FS/FS/Upgrade.pm   |  3 +++
 FS/FS/cust_main.pm | 11 +++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 168984555..3e3af524c 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1747,16 +1747,18 @@ sub _h_statement {
 
   $time ||= time;
 
+  my %nohistory = map { $_=>1 } $self->nohistory_fields;
+
   my @fields =
-    grep { defined($self->getfield($_)) && $self->getfield($_) ne "" }
+    grep { defined($self->get($_)) && $self->get($_) ne "" && ! $nohistory{$_} }
     real_fields($self->table);
   ;
 
-  # If we're encrypting then don't ever store the payinfo or CVV2 in the history....
-  # You can see if it changed by the paymask...
-  if ($conf && $conf->exists('encryption') ) {
-    @fields = grep  $_ ne 'payinfo' && $_ ne 'cvv2', @fields;
+  # If we're encrypting then don't store the payinfo in the history
+  if ( $conf && $conf->exists('encryption') ) {
+    @fields = grep { $_ ne 'payinfo' } @fields;
   }
+
   my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
 
   "INSERT INTO h_". $self->table. " ( ".
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 5abfa6940..7cf4051aa 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -91,6 +91,9 @@ sub upgrade_data {
 
   tie my %hash, 'Tie::IxHash', 
 
+    #cust_main (remove paycvv from history)
+    'cust_main' => [],
+
     #msgcat
     'msgcat' => [],
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e696e1bc9..a39ac34c9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -76,6 +76,8 @@ $skip_fuzzyfiles = 0;
 $ignore_expired_card = 0;
 
 @encrypted_fields = ('payinfo', 'paycvv');
+sub nohistory_fields { ('paycvv'); }
+
 @paytypes = ('', 'Personal checking', 'Personal savings', 'Business checking', 'Business savings');
 
 #ask FS::UID to run this stuff for us later
@@ -8429,6 +8431,15 @@ sub queued_bill {
       );
 }
 
+sub _upgrade_data { #class method
+  my ($class, %opts) = @_;
+
+  my $sql = 'UPDATE h_cust_main SET paycvv = NULL';
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From bc5eaa0c8d078da493d6101cbd98c7319003f748 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Apr 2009 08:08:34 +0000
Subject: don't want to throw false positives, RT#5101

---
 FS/FS/Cron/check.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index e23d62bb4..7e4655f75 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -72,7 +72,7 @@ sub check_apache {
 }
 
 #and now for something entirely different...
-my $num_consecutive_bop_failures = 30;
+my $num_consecutive_bop_failures = 40;
 sub check_bop_failures {
 
   return 1 if grep { $_->statustext eq 'captured' }
-- 
cgit v1.2.1


From 459732179018e21f4ff78cf334ad509050576835 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Apr 2009 22:42:33 +0000
Subject: fix 'agent X can't purchase pkgpart YY' error w/agent packages,
 RT#5119

---
 FS/FS/cust_pkg.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 902b1d325..25899364e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -480,10 +480,10 @@ sub check {
     unless ( $disable_agentcheck ) {
       my $agent =
         qsearchs( 'agent', { 'agentnum' => $self->cust_main->agentnum } );
-      my $pkgpart_href = $agent->pkgpart_hashref;
-      return "agent ". $agent->agentnum.
+      return "agent ". $agent->agentnum. ':'. $agent->agent.
              " can't purchase pkgpart ". $self->pkgpart
-        unless $pkgpart_href->{ $self->pkgpart };
+        unless $agent->pkgpart_hashref->{ $self->pkgpart }
+            || $agent->agentnum == $self->part_pkg->agentnum;
     }
 
     $error = $self->ut_foreign_key('pkgpart', 'part_pkg', 'pkgpart' );
-- 
cgit v1.2.1


From 0946eacb6b3a00cc8ccfcbb2623f63b821ba5321 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 9 Apr 2009 22:51:35 +0000
Subject: used BillingNumber and not CallingPartyNumber for non-toll-free calls

---
 FS/FS/cdr/taqua.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr/taqua.pm b/FS/FS/cdr/taqua.pm
index 3e9840074..26c0bda62 100644
--- a/FS/FS/cdr/taqua.pm
+++ b/FS/FS/cdr/taqua.pm
@@ -94,7 +94,11 @@ use FS::cdr qw(_cdr_date_parser_maker);
           return;
         }
       }
-      '';
+      if ( $cdr->is_tollfree ) {        # thankfully this is already available
+        $cdr->charged_party($cdr->dst); # and this
+      } else {
+        $cdr->charged_party($field);
+      }
     },
 
     sub { my($cdr, $field) = @_; },       #SubscriberNumber
-- 
cgit v1.2.1


From f3ccf427a76015d690cb089f369bf8e5509c05a3 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 10 Apr 2009 03:43:00 +0000
Subject: orders of magnitude faster

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a39ac34c9..b828542a7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -8434,7 +8434,7 @@ sub queued_bill {
 sub _upgrade_data { #class method
   my ($class, %opts) = @_;
 
-  my $sql = 'UPDATE h_cust_main SET paycvv = NULL';
+  my $sql = 'UPDATE h_cust_main SET paycvv = NULL WHERE paycvv IS NOT NULL';
   my $sth = dbh->prepare($sql) or die dbh->errstr;
   $sth->execute or die $sth->errstr;
 
-- 
cgit v1.2.1


From 8a58ae3af817dd6f6d326fd934ce9feb90d6f800 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Apr 2009 19:33:29 +0000
Subject: better description for enable_taxproducts and a warning about
 tax-pkg_address with it

---
 FS/FS/Conf.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0c9dd6577..9d8c3f20e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1506,7 +1506,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'enable_taxproducts',
     'section'     => 'billing',
-    'description' => 'Enable per-package mapping to new style tax classes',
+    'description' => 'Enable per-package mapping to vendor tax data from CCH or elsewhere.',
     'type'        => 'checkbox',
   },
 
@@ -2071,7 +2071,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'tax-pkg_address',
     'section'     => 'billing',
-    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).',
+    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).  Note that this option is currently incompatible with vendor data taxation enabled by enable_taxproducts.',
     'type'        => 'checkbox',
   },
 
-- 
cgit v1.2.1


From 62cc660119e445d90f5dccf2bdfd661dbbe70ac9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Apr 2009 20:51:32 +0000
Subject: don't run configuration update when -s is used for schema-only slony
 slave update

---
 FS/bin/freeside-upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index c988e130a..24f577f11 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -127,7 +127,7 @@ $FS::UID::AutoCommit = 0;
 $FS::UID::callback_hack = 1;
 $dbh = adminsuidsetup($user);
 $FS::UID::callback_hack = 0;
-unless ( $DRY_RUN ) {
+unless ( $DRY_RUN || $opt_s ) {
   my $dir = "%%%FREESIDE_CONF%%%/conf.". datasrc;
   if (!scalar(qsearch('conf', {}))) {
     my $error = FS::Conf::init_config($dir);
-- 
cgit v1.2.1


From b4cb5e5d2d4faca16911e1992fbda8fa1528ed4e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Apr 2009 21:29:42 +0000
Subject: add cust_bill_email action

---
 FS/FS/part_event/Action/cust_bill_email.pm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 FS/FS/part_event/Action/cust_bill_email.pm

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_email.pm b/FS/FS/part_event/Action/cust_bill_email.pm
new file mode 100644
index 000000000..a5cd86145
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_bill_email.pm
@@ -0,0 +1,23 @@
+package FS::part_event::Action::cust_bill_email;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { 'Send invoice (email only)'; }
+
+sub eventtable_hashref {
+  { 'cust_bill' => 1 };
+}
+
+sub default_weight { 51; }
+
+sub do_action {
+  my( $self, $cust_bill ) = @_;
+
+  #my $cust_main = $self->cust_main($cust_bill);
+  my $cust_main = $cust_bill->cust_main;
+
+  $cust_bill->email;
+}
+
+1;
-- 
cgit v1.2.1


From 8a79ead8b600494b214d7492dab043d5dfc96587 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 11 Apr 2009 21:42:52 +0000
Subject: migrate send_email, suspend_if_balance and credit events, RT#3905

---
 FS/FS/part_event/Action/writeoff.pm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 FS/FS/part_event/Action/writeoff.pm

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/writeoff.pm b/FS/FS/part_event/Action/writeoff.pm
new file mode 100644
index 000000000..fdea897fa
--- /dev/null
+++ b/FS/FS/part_event/Action/writeoff.pm
@@ -0,0 +1,33 @@
+package FS::part_event::Action::writeoff;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { 'Write off bad debt with a credit entry.'; }
+
+sub option_fields {
+  ( 
+    #'charge' => { label=>'Amount', type=>'money', }, # size=>7, },
+    'reasonnum' => { 'label'        => 'Reason',
+                     'type'         => 'select-reason',
+                     'reason_class' => 'R',
+                   },
+  );
+}
+
+sub default_weight { 65; }
+
+sub do_action {
+  my( $self, $cust_object ) = @_;
+
+  my $cust_main = $self->cust_main($cust_object);
+
+  my $error = $cust_main->credit( $cust_main->balance,
+                                  $self->option('reasonnum'),
+                                );
+  die $error if $error;
+
+  '';
+}
+
+1;
-- 
cgit v1.2.1


From 8fb243091939f37e24163925be78f4e9f3485978 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Apr 2009 06:14:00 +0000
Subject: add svc_phone on new customer first package, RT#4315

---
 FS/FS/part_pkg.pm | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 8cf7d0ca1..8cfd6143c 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -613,25 +613,49 @@ Returns the svcpart of the primary service definition (see L<FS::part_svc>)
 associated with this package definition (see L<FS::pkg_svc>).  Returns
 false if there not a primary service definition or exactly one service
 definition with quantity 1, or if SVCDB is specified and does not match the
-svcdb of the service definition, 
+svcdb of the service definition.  SVCDB can be specified as a scalar table
+name, such as 'svc_acct', or as an arrayref of possible table names.
 
 =cut
 
 sub svcpart {
+  my $pkg_svc = shift->_primary_pkg_svc(@_);
+  $pkg_svc ? $pkg_svc->svcpart : '';
+}
+
+=item part_svc [ SVCDB ]
+
+Like the B<svcpart> method, but returns the FS::part_svc object (see
+L<FS::part_svc>).
+
+=cut
+
+sub part_svc {
+  my $pkg_svc = shift->_primary_pkg_svc(@_);
+  $pkg_svc ? $pkg_svc->part_svc : '';
+}
+
+sub _primary_pkg_svc {
   my $self = shift;
-  my $svcdb = scalar(@_) ? shift : '';
+
+  my $svcdb = scalar(@_) ? shift : [];
+  $svcdb = ref($svcdb) ? $svcdb : [ $svcdb ];
+  my %svcdb = map { $_=>1 } @$svcdb;
+
   my @svcdb_pkg_svc =
-    grep { ( $svcdb eq $_->part_svc->svcdb || !$svcdb ) } $self->pkg_svc;
+    grep { !scalar(@$svcdb) || $svcdb{ $_->part_svc->svcdb } }
+         $self->pkg_svc;
+
   my @pkg_svc = grep { $_->primary_svc =~ /^Y/i } @svcdb_pkg_svc;
   @pkg_svc = grep {$_->quantity == 1 } @svcdb_pkg_svc
     unless @pkg_svc;
   return '' if scalar(@pkg_svc) != 1;
-  $pkg_svc[0]->svcpart;
+  $pkg_svc[0];
 }
 
 =item svcpart_unique_svcdb SVCDB
 
-Returns the svcpart of the a service definition (see L<FS::part_svc>) matching
+Returns the svcpart of a service definition (see L<FS::part_svc>) matching
 SVCDB associated with this package definition (see L<FS::pkg_svc>).  Returns
 false if there not a primary service definition for SVCDB or there are multiple
 service definitions for SVCDB.
-- 
cgit v1.2.1


From a640ee92f7a90fffc1060bf0d499a83ddae4fc2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Apr 2009 23:37:08 +0000
Subject: debugging

---
 FS/FS/cust_main.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b828542a7..9aac1db7b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2459,6 +2459,7 @@ sub bill {
   foreach my $tax ( keys %taxlisthash ) {
     my $tax_object = shift @{ $taxlisthash{$tax} };
     warn "found ". $tax_object->taxname. " as $tax\n" if $DEBUG > 2;
+    warn " ". join('/', @{ $taxlisthash{$tax} } ). "\n" if $DEBUG > 2;
     my $hashref_or_error =
       $tax_object->taxline( $taxlisthash{$tax},
                             'custnum'      => $self->custnum,
-- 
cgit v1.2.1


From 470bbdfd0bf8c62a1b7ff124bc18ba718ab0c628 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Apr 2009 00:09:31 +0000
Subject: add configuration option to control recurring_flag behavior, RT#3843

---
 FS/FS/Conf.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9d8c3f20e..6403fb7bc 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1660,6 +1660,17 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'credit_card-recurring_billing_flag',
+    'section'     => 'billing',
+    'description' => 'This controls when the system passes the "recurring_billing" flag on credit card transactions.  If supported by your processor (and the Business::OnlinePayment processor module), passing the flag indicates this is a recurring transaction and may turn off the CVV requirement. ',
+    'type'        => 'select',
+    'select_hash' => [
+                       'actual_oncard' => 'Default/classic behavior: set the flag if a customer has actual previous charges on the card.',
+		       'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
+                     ],
+  },
+
   {
     'key'         => 'cvv-save',
     'section'     => 'billing',
-- 
cgit v1.2.1


From 8c804ba59c8b284e1294e9928b5412fdf31e412c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Apr 2009 17:16:16 +0000
Subject: add configuration option to control recurring_flag behavior, RT#3843

---
 FS/FS/Conf.pm      |   7 +++
 FS/FS/Schema.pm    |   1 +
 FS/FS/agent.pm     |  15 ++++--
 FS/FS/cust_main.pm | 154 +++++++++++++++++++++++++++++++++++++----------------
 4 files changed, 125 insertions(+), 52 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6403fb7bc..7be0dd0ca 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1671,6 +1671,13 @@ worry that config_items is freeside-specific and icky.
                      ],
   },
 
+  {
+    'key'         => 'credit_card-recurring_billing_acct_code',
+    'section'     => 'billing',
+    'description' => 'When the "recurring billing" flag is set, also set the "acct_code" to "rebill".  Useful for reporting purposes with supported gateways (PlugNPay, others?)',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'cvv-save',
     'section'     => 'billing',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e4076b13d..c7bbf614c 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -847,6 +847,7 @@ sub tables_hashref {
         'payinfo',      'varchar', 'NULL', 512, '', '', #see cust_main above
 	'paymask',      'varchar', 'NULL', $char_d, '', '', 
         'paydate',      'varchar', 'NULL', 10, '', '', 
+        'recurring_billing', 'varchar', 'NULL', $char_d, '', '',
         #'paybatch',     'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
         'payunique',    'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage
 
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index e471e04a5..5fbe2c46d 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -225,16 +225,21 @@ sub payment_gateway {
 
   my $taxclass = '';
   if ( $options{invnum} ) {
+
     my $cust_bill = qsearchs('cust_bill', { 'invnum' => $options{invnum} } );
     die "invnum ". $options{'invnum'}. " not found" unless $cust_bill;
-    my @taxclasses =
-      map  { $_->part_pkg->taxclass }
+
+    my @part_pkg =
+      map  { $_->part_pkg }
       grep { $_ }
       map  { $_->cust_pkg }
       $cust_bill->cust_bill_pkg;
-    unless ( grep { $taxclasses[0] ne $_ } @taxclasses ) { #unless there are
-                                                           #different taxclasses      $taxclass = $taxclasses[0];
-    }
+
+    my @taxclasses = map $_->taxclass, @part_pkg;
+
+    $taxclass = $taxclasses[0]
+      unless grep { $taxclasses[0] ne $_ } @taxclasses; #unless there are
+                                                        #different taxclasses
   }
 
   #look for an agent gateway override first
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9aac1db7b..a62987b32 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3503,24 +3503,35 @@ sub realtime_bop {
   return "Banned credit card" if $ban;
 
   ###
-  # select a gateway
+  # set taxclass and trans_is_recur based on invnum if there is one
   ###
 
   my $taxclass = '';
+  my $trans_is_recur = 0;
   if ( $options{'invnum'} ) {
+
     my $cust_bill = qsearchs('cust_bill', { 'invnum' => $options{'invnum'} } );
     die "invnum ". $options{'invnum'}. " not found" unless $cust_bill;
-    my @taxclasses =
-      map  { $_->part_pkg->taxclass }
+
+    my @part_pkg =
+      map  { $_->part_pkg }
       grep { $_ }
       map  { $_->cust_pkg }
       $cust_bill->cust_bill_pkg;
-    unless ( grep { $taxclasses[0] ne $_ } @taxclasses ) { #unless there are
-                                                           #different taxclasses
-      $taxclass = $taxclasses[0];
-    }
+
+    my @taxclasses = map $_->taxclass, @part_pkg;
+    $taxclass = $taxclasses[0]
+      unless grep { $taxclasses[0] ne $_ } @taxclasses; #unless there are
+                                                        #different taxclasses
+    $trans_is_recur = 1
+      if grep { $_->freq ne '0' } @part_pkg;
+
   }
 
+  ###
+  # select a gateway
+  ###
+
   #look for an agent gateway override first
   my $cardtype;
   if ( $method eq 'CC' ) {
@@ -3648,16 +3659,15 @@ sub realtime_bop {
                            : $self->payissue;
     $content{issue_number} = $payissue if $payissue;
 
-    $content{recurring_billing} = 'YES'
-      if qsearch('cust_pay', { 'custnum' => $self->custnum,
-                               'payby'   => 'CARD',
-                               'payinfo' => $payinfo,
-                             } )
-      || qsearch('cust_pay', { 'custnum' => $self->custnum,
-                               'payby'   => 'CARD',
-                               'paymask' => $self->mask_payinfo('CARD', $payinfo),
-                             } );
-
+    if ( $self->_bop_recurring_billing( 'payinfo'        => $payinfo,
+                                        'trans_is_recur' => $trans_is_recur,
+                                      )
+       )
+    {
+      $content{recurring_billing} = 'YES';
+      $content{acct_code} = 'rebill'
+        if $conf->exists('credit_card-recurring_billing_acct_code');
+    }
 
   } elsif ( $method eq 'ECHECK' ) {
     ( $content{account_number}, $content{routing_code} ) =
@@ -3716,15 +3726,16 @@ sub realtime_bop {
   #okay, good to go, if we're a duplicate, cust_pay_pending will kick us out
 
   my $cust_pay_pending = new FS::cust_pay_pending {
-    'custnum'    => $self->custnum,
-    #'invnum'     => $options{'invnum'},
-    'paid'       => $amount,
-    '_date'      => '',
-    'payby'      => $method2payby{$method},
-    'payinfo'    => $payinfo,
-    'paydate'    => $paydate,
-    'status'     => 'new',
-    'gatewaynum' => ( $payment_gateway ? $payment_gateway->gatewaynum : '' ),
+    'custnum'           => $self->custnum,
+    #'invnum'            => $options{'invnum'},
+    'paid'              => $amount,
+    '_date'             => '',
+    'payby'             => $method2payby{$method},
+    'payinfo'           => $payinfo,
+    'paydate'           => $paydate,
+    'recurring_billing' => $content{recurring_billing},
+    'status'            => 'new',
+    'gatewaynum'        => ( $payment_gateway ? $payment_gateway->gatewaynum : '' ),
   };
   $cust_pay_pending->payunique( $options{payunique} )
     if defined($options{payunique}) && length($options{payunique});
@@ -4010,6 +4021,34 @@ sub realtime_bop {
 
 }
 
+sub _bop_recurring_billing {
+  my( $self, %opt ) = @_;
+
+  my $method = $conf->config('credit_card-recurring_billing_flag');
+
+  if ( $method eq 'transaction_is_recur' ) {
+
+    return 1 if $opt{'trans_is_recur'};
+
+  } else {
+
+    my %hash = ( 'custnum' => $self->custnum,
+                 'payby'   => 'CARD',
+               );
+
+    return 1 
+      if qsearch('cust_pay', { %hash, 'payinfo' => $opt{'payinfo'} } )
+      || qsearch('cust_pay', { %hash, 'paymask' => $self->mask_payinfo('CARD',
+                                                               $opt{'payinfo'} )
+                             } );
+
+  }
+
+  return 0;
+
+}
+
+
 =item realtime_refund_bop METHOD [ OPTION => VALUE ... ]
 
 Refunds a realtime credit card, ACH (electronic check) or phone bill transaction
@@ -4561,6 +4600,27 @@ sub _new_realtime_bop {
 
   $self->_bop_defaults(\%options);
 
+  ###
+  # set trans_is_recur based on invnum if there is one
+  ###
+
+  my $trans_is_recur = 0;
+  if ( $options{'invnum'} ) {
+
+    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $options{'invnum'} } );
+    die "invnum ". $options{'invnum'}. " not found" unless $cust_bill;
+
+    my @part_pkg =
+      map  { $_->part_pkg }
+      grep { $_ }
+      map  { $_->cust_pkg }
+      $cust_bill->cust_bill_pkg;
+
+    $trans_is_recur = 1
+      if grep { $_->freq ne '0' } @part_pkg;
+
+  }
+
   ###
   # select a gateway
   ###
@@ -4637,16 +4697,15 @@ sub _new_realtime_bop {
                            : $self->payissue;
     $content{issue_number} = $payissue if $payissue;
 
-    $content{recurring_billing} = 'YES'
-      if qsearch('cust_pay', { 'custnum' => $self->custnum,
-                               'payby'   => 'CARD',
-                               'payinfo' => $options{payinfo},
-                             } )
-      || qsearch('cust_pay', { 'custnum' => $self->custnum,
-                               'payby'   => 'CARD',
-                               'paymask' => $self->mask_payinfo('CARD', $options{payinfo}),
-                             } );
-
+    if ( $self->_bop_recurring_billing( 'payinfo'        => $options{'payinfo'},
+                                        'trans_is_recur' => $trans_is_recur,
+                                      )
+       )
+    {
+      $content{recurring_billing} = 'YES';
+      $content{acct_code} = 'rebill'
+        if $conf->exists('credit_card-recurring_billing_acct_code');
+    }
 
   } elsif ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'ECHECK' ){
     ( $content{account_number}, $content{routing_code} ) =
@@ -4708,17 +4767,18 @@ sub _new_realtime_bop {
   #okay, good to go, if we're a duplicate, cust_pay_pending will kick us out
 
   my $cust_pay_pending = new FS::cust_pay_pending {
-    'custnum'    => $self->custnum,
-    #'invnum'     => $options{'invnum'},
-    'paid'       => $options{amount},
-    '_date'      => '',
-    'payby'      => $bop_method2payby{$options{method}},
-    'payinfo'    => $options{payinfo},
-    'paydate'    => $paydate,
-    'status'     => 'new',
-    'gatewaynum' => $payment_gateway->gatewaynum || '',
-    'session_id' => $options{session_id} || '',
-    'jobnum'     => $options{depend_jobnum} || '',
+    'custnum'           => $self->custnum,
+    #'invnum'            => $options{'invnum'},
+    'paid'              => $options{amount},
+    '_date'             => '',
+    'payby'             => $bop_method2payby{$options{method}},
+    'payinfo'           => $options{payinfo},
+    'paydate'           => $paydate,
+    'recurring_billing' => $content{recurring_billing},
+    'status'            => 'new',
+    'gatewaynum'        => $payment_gateway->gatewaynum || '',
+    'session_id'        => $options{session_id} || '',
+    'jobnum'            => $options{depend_jobnum} || '',
   };
   $cust_pay_pending->payunique( $options{payunique} )
     if defined($options{payunique}) && length($options{payunique});
-- 
cgit v1.2.1


From dae1709465dafbd941ffd326117bc59b898352df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Apr 2009 02:15:45 +0000
Subject: this should fix credits pushing typeset invoices off the right

---
 FS/FS/cust_bill.pm | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 77f0dd30f..408da9930 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2281,6 +2281,7 @@ sub print_generic {
     # credits
     my $credittotal = 0;
     foreach my $credit ( $self->_items_credits ) {
+
       my $total;
       $total->{'total_item'} = &$escape_function($credit->{'description'});
       $credittotal += $credit->{'amount'};
@@ -2297,26 +2298,15 @@ sub print_generic {
           product_code => '',
           section      => $adjust_section,
         };
-      }else{
+      } else {
         push @total_items, $total;
       }
+
+      push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
+
     }
     $invoice_data{'credittotal'} = sprintf('%.2f', $credittotal);
   
-    # credits (again)
-    foreach ( $self->cust_credited ) {
-  
-      #something more elaborate if $_->amount ne $_->cust_credit->credited ?
-
-      my $reason = substr($_->cust_credit->reason,0,32);
-      $reason .= '...' if length($reason) < length($_->cust_credit->reason);
-      $reason = " ($reason) " if $reason;
-      push @buf,[
-        "Credit #". $_->crednum. " (". time2str("%x",$_->cust_credit->_date) .")".        $reason,
-        $money_char. sprintf("%10.2f",$_->amount)
-      ];
-    }
-
     # payments
     my $paymenttotal = 0;
     foreach my $payment ( $self->_items_payments ) {
@@ -2936,10 +2926,10 @@ sub _items_credits {
 
     #something more elaborate if $_->amount ne $_->cust_credit->credited ?
 
-    my $reason = $_->cust_credit->reason;
-    #my $reason = substr($_->cust_credit->reason,0,32);
-    #$reason .= '...' if length($reason) < length($_->cust_credit->reason);
+    my $reason = substr($_->cust_credit->reason,0,32);
+    $reason .= '...' if length($reason) < length($_->cust_credit->reason);
     $reason = " ($reason) " if $reason;
+
     push @b, {
       #'description' => 'Credit ref\#'. $_->crednum.
       #                 " (". time2str("%x",$_->cust_credit->_date) .")".
@@ -2949,12 +2939,6 @@ sub _items_credits {
       'amount'      => sprintf("%.2f",$_->amount),
     };
   }
-  #foreach ( @cr_cust_credit ) {
-  #  push @buf,[
-  #    "Credit #". $_->crednum. " (" . time2str("%x",$_->_date) .")",
-  #    $money_char. sprintf("%10.2f",$_->credited)
-  #  ];
-  #}
 
   @b;
 
-- 
cgit v1.2.1


From 4cd4bc31a0ceb17ac9e8b0162450dd26f315a4fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Apr 2009 02:29:36 +0000
Subject: show 60 chars on typeset invoices but only 32 on plaintext, RT#3905

---
 FS/FS/cust_bill.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 408da9930..071b89cd0 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2280,7 +2280,7 @@ sub print_generic {
   
     # credits
     my $credittotal = 0;
-    foreach my $credit ( $self->_items_credits ) {
+    foreach my $credit ( $self->_items_credits('trim_len'=>60) ) {
 
       my $total;
       $total->{'total_item'} = &$escape_function($credit->{'description'});
@@ -2302,10 +2302,13 @@ sub print_generic {
         push @total_items, $total;
       }
 
-      push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
-
     }
     $invoice_data{'credittotal'} = sprintf('%.2f', $credittotal);
+
+    #credits (again)
+    foreach my $credit ( $self->_items_credits('trim_len'=>32) ) {
+      push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
+    }
   
     # payments
     my $paymenttotal = 0;
@@ -2918,7 +2921,8 @@ sub _items_cust_bill_pkg {
 }
 
 sub _items_credits {
-  my $self = shift;
+  my( $self, %opt ) = @_;
+  my $trim_len = $opt{'trim_len'} || 60;
 
   my @b;
   #credits
@@ -2926,7 +2930,7 @@ sub _items_credits {
 
     #something more elaborate if $_->amount ne $_->cust_credit->credited ?
 
-    my $reason = substr($_->cust_credit->reason,0,32);
+    my $reason = substr($_->cust_credit->reason, 0, $trim_len);
     $reason .= '...' if length($reason) < length($_->cust_credit->reason);
     $reason = " ($reason) " if $reason;
 
-- 
cgit v1.2.1


From 48fdda923dd0c3227190da57ad0fca704725fb43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Apr 2009 02:44:11 +0000
Subject: fix 1.7->1.9 upgrade glitch with self-service where process_payment
 required "payby" instead of defaulting to CARD, RT#3905

---
 FS/FS/ClientAPI/MyAccount.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 564acb1a6..d64c72c0e 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -451,6 +451,7 @@ sub process_payment {
     or return { 'error' => gettext('illegal_text'). " paybatch: ". $p->{'paybatch'} };
   my $paybatch = $1;
 
+  $p->{'payby'} ||= 'CARD';
   $p->{'payby'} =~ /^([A-Z]{4})$/
     or return { 'error' => "illegal_payby " . $p->{'payby'} };
   my $payby = $1;
-- 
cgit v1.2.1


From 3e51d644757efe3ffa7eff41e50adfcb4b5e62e7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 2009 07:21:32 +0000
Subject: add invoice number to PDF filename in email attachments, RT#3403

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 071b89cd0..29b52ceac 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -796,7 +796,7 @@ sub mimebuild_pdf {
     'Encoding'    => 'base64',
     'Data'        => [ $self->print_pdf(@_) ],
     'Disposition' => 'attachment',
-    'Filename'    => 'invoice.pdf',
+    'Filename'    => 'invoice-'. $self->invnum. '.pdf',
   );
 }
 
-- 
cgit v1.2.1


From 3fa7c14e5c734c4f650d3cb2663b6cedc62a673c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 2009 19:20:00 +0000
Subject: backport freeside-daily -m and cust_main::bill_and_collect to 1.7,
 RT#4412

---
 FS/bin/freeside-daily | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 13079b4f9..d42e5248b 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -6,7 +6,7 @@ use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nm", \%opt);
+getopts("p:a:d:vl:sy:nmk", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -16,15 +16,21 @@ bill(%opt);
 
 #what to do about the below when using -m?  that is the question.
 
-use FS::Cron::notify qw(notify_flat_delay);
-notify_flat_delay(%opt);
-
+#you don't want to skip this, besides, it should be cheap
 use FS::Cron::expire_user_pref qw(expire_user_pref);
 expire_user_pref();
 
-use FS::Cron::vacuum qw(vacuum);
-vacuum();
+unless ( $opt{k} ) {
+
+  use FS::Cron::notify qw(notify_flat_delay);
+  notify_flat_delay(%opt);
+
+  use FS::Cron::vacuum qw(vacuum);
+  vacuum();
 
+}
+
+#you can skip this just by not having the config
 use FS::Cron::backup qw(backup_scp);
 backup_scp();
 
@@ -42,7 +48,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
 }
 
 ###
@@ -55,7 +61,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -89,6 +95,8 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
 
+  -k: skip notify_flat_delay and vacuum
+
 user: From the mapsecrets file - see config.html from the base documentation
 
 custnum: if one or more customer numbers are specified, only bills those
-- 
cgit v1.2.1


From 8a5bf08dfcc3e44ac3c5e8015ccce494d991025e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 2009 19:21:04 +0000
Subject: 1 helps alot

---
 FS/FS/Cron/bill.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index ad6498c74..633405693 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -144,3 +144,5 @@ END
   }
 
 }
+
+1;
-- 
cgit v1.2.1


From 4ee28b411fa819a420926b8a6e60be043fdb1d2e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 2009 19:50:11 +0000
Subject: add priority to job queue so billing jobs don't don't drown out
 provisioning jobs

---
 FS/FS/Cron/bill.pm     | 5 +++--
 FS/FS/Schema.pm        | 1 +
 FS/bin/freeside-queued | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 633405693..2e432cd27 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -129,8 +129,9 @@ END
 
       #add job to queue that calls bill_and_collect with options
       my $queue = new FS::queue {
-        'job'    => 'FS::cust_main::queued_bill',
-        'secure' => 'Y',
+        'job'      => 'FS::cust_main::queued_bill',
+        'secure'   => 'Y',
+        'priority' => 99, #don't get in the way of provisioning jobs
       };
       my $error = $queue->insert( 'custnum'=>$custnum, %args );
 
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index c7bbf614c..66be8b6d4 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1504,6 +1504,7 @@ sub tables_hashref {
         'svcnum',         'int', 'NULL',      '', '', '', 
         'custnum',        'int', 'NULL',      '', '', '',
         'secure',        'char', 'NULL',       1, '', '',
+        'priority',       'int', 'NULL',      '', '', '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index d4f09c18d..8c07638b3 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -84,9 +84,12 @@ while (1) {
   my $nodepend = 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
                  '           WHERE queue_depend.jobnum = queue.jobnum )';
 
-  my $order_by = "ORDER BY jobnum ". ( driver_name eq 'mysql'
-                                         ? 'LIMIT 1 FOR UPDATE'
-                                         : 'FOR UPDATE LIMIT 1' );
+  #anything with a priority goes after stuff without one
+  my $order_by = ' ORDER BY COALESCE(priority,0) ASC, jobnum ASC ';
+
+  $order_by .= ( driver_name eq 'mysql'
+                   ? ' LIMIT 1 FOR UPDATE '
+                   : ' FOR UPDATE LIMIT 1 ' );
 
   my $job = qsearchs({
     'table'     => 'queue',
-- 
cgit v1.2.1


From fb64abae07da986319e65ce5d027d2dab60c34fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Apr 2009 16:57:23 +0000
Subject: add cust_main.archived field, skip billing if Y, RT#4412

---
 FS/FS/Cron/bill.pm | 2 ++
 FS/FS/Schema.pm    | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 2e432cd27..772a9efcc 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -28,6 +28,8 @@ sub bill {
 
   my @search = ();
 
+  push @search, "cust_main.archived != 'Y' "; #disable?
+
   push @search, "cust_main.payby    = '". $opt{'p'}. "'"
     if $opt{'p'};
   push @search, "cust_main.agentnum =  ". $opt{'a'}
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 66be8b6d4..bce04e6f0 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -678,6 +678,7 @@ sub tables_hashref {
         'spool_cdr','char', 'NULL', 1, '', '', 
         'squelch_cdr','char', 'NULL', 1, '', '', 
         'invoice_terms', 'varchar', 'NULL', $char_d, '', '',
+        'archived', 'char', 'NULL', 1, '', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [ 'agentnum', 'agent_custid' ] ],
@@ -696,6 +697,7 @@ sub tables_hashref {
                    [ 'ship_county' ], [ 'ship_state' ], [ 'ship_country' ],
                    [ 'ship_zip' ],
                    [ 'ship_daytime' ], [ 'ship_night' ], [ 'ship_fax' ],
+                   [ 'archived' ],
                  ],
     },
 
-- 
cgit v1.2.1


From d1f55c07f2a8a0d0e62c7141807803cf1c85f528 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Apr 2009 16:58:31 +0000
Subject: add cust_main.archived field, skip billing if Y, RT#4412

---
 FS/FS/Schema.pm    | 2 +-
 FS/FS/cust_main.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index bce04e6f0..0aed3ccbe 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -687,6 +687,7 @@ sub tables_hashref {
                    [ 'agentnum' ], [ 'refnum' ], [ 'custbatch' ],
                    [ 'referral_custnum' ],
                    [ 'payby' ], [ 'paydate' ],
+                   [ 'archived' ],
                    #billing
                    [ 'last' ], [ 'company' ],
                    [ 'county' ], [ 'state' ], [ 'country' ],
@@ -697,7 +698,6 @@ sub tables_hashref {
                    [ 'ship_county' ], [ 'ship_state' ], [ 'ship_country' ],
                    [ 'ship_zip' ],
                    [ 'ship_daytime' ], [ 'ship_night' ], [ 'ship_fax' ],
-                   [ 'archived' ],
                  ],
     },
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a62987b32..3296cf543 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1774,7 +1774,7 @@ sub check {
     $self->payname($1);
   }
 
-  foreach my $flag (qw( tax spool_cdr squelch_cdr )) {
+  foreach my $flag (qw( tax spool_cdr squelch_cdr archived )) {
     $self->$flag() =~ /^(Y?)$/ or return "Illegal $flag: ". $self->$flag();
     $self->$flag($1);
   }
-- 
cgit v1.2.1


From 8f548b7139b1bd093c2e23eafcd1e29e64f8e8b7 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 21 Apr 2009 02:23:13 +0000
Subject: more descriptive progress popups

---
 FS/FS/UI/Web.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 3c52ca547..14af6a467 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -585,7 +585,9 @@ sub job_status {
 
   my @return;
   if ( $job && $job->status ne 'failed' ) {
-    @return = ( 'progress', $job->statustext );
+    my ($progress, $action) = split ',', $job->statustext, 2; 
+    $action ||= 'Server processing job';
+    @return = ( 'progress', $progress, $action );
   } elsif ( !$job ) { #handle job gone case : job successful
                       # so close popup, redirect parent window...
     @return = ( 'complete' );
-- 
cgit v1.2.1


From 95f6c0c2a08b6fd3662bfd419a34c265883b87d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Apr 2009 16:42:25 +0000
Subject: yow.  fix fallout from cust_main.archived stuff causing nothing to
 bill.  RT#4412

---
 FS/FS/Cron/bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 772a9efcc..312f337a7 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -28,7 +28,7 @@ sub bill {
 
   my @search = ();
 
-  push @search, "cust_main.archived != 'Y' "; #disable?
+  push @search, "( cust_main.archived != 'Y' OR archived IS NULL )"; #disable?
 
   push @search, "cust_main.payby    = '". $opt{'p'}. "'"
     if $opt{'p'};
-- 
cgit v1.2.1


From af9bb255aac1218f029fb164c8a3499208e1d6b2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Apr 2009 00:54:03 +0000
Subject: have the big query find customers in batches.  this should be way
 more efficient in multi-process mode, can start billing before the big query
 completes.  RT#4412

---
 FS/FS/Cron/bill.pm | 105 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 59 insertions(+), 46 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 312f337a7..653701822 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -95,52 +95,65 @@ END
 
   push @search, "( $where_pkg OR $where_event )";
 
-  ###
-  # get a list of custnums
-  ###
-
-  warn "searching for customers:\n". join("\n", @search). "\n"
-    if $opt{'v'} || $opt{'l'};
-
-  my $sth = dbh->prepare(
-    "SELECT custnum FROM cust_main".
-    " WHERE ". join(' AND ', @search)
-  ) or die dbh->errstr;
-
-  $sth->execute or die $sth->errstr;
-
-  my @custnums = map { $_->[0] } @{ $sth->fetchall_arrayref };
-
-  ###
-  # for each custnum, queue or make one customer object and bill
-  # (one at a time, to reduce memory footprint with large #s of customers)
-  ###
-  
-  foreach my $custnum ( @custnums ) {
-  
-    my %args = (
-        'time'         => $time,
-        'invoice_time' => $invoice_time,
-        'actual_time'  => $^T, #when freeside-bill was started
-                               #(not, when using -m, freeside-queued)
-        'check_freq'   => $check_freq,
-        'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
-    );
-
-    if ( $opt{'m'} ) {
-
-      #add job to queue that calls bill_and_collect with options
-      my $queue = new FS::queue {
-        'job'      => 'FS::cust_main::queued_bill',
-        'secure'   => 'Y',
-        'priority' => 99, #don't get in the way of provisioning jobs
-      };
-      my $error = $queue->insert( 'custnum'=>$custnum, %args );
-
-    } else {
-
-      my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
-      $cust_main->bill_and_collect( %args, 'debug' => $debug );
+  my $prev_custnum = 0;
+  while ( 1 ) {
+
+    ###
+    # get a list of custnums
+    ###
+
+    warn "searching for customers:\n".
+           join("\n", @search).
+           "custnum > $prev_custnum\n"
+      if $opt{'v'} || $opt{'l'};
+
+    my $sth = dbh->prepare(
+      "SELECT custnum FROM cust_main".
+      " WHERE ". join(' AND ', @search).
+      " AND custnum > $prev_custnum ".
+      " ORDER BY custnum LIMIT 100 "
+    ) or die dbh->errstr;
+
+    $sth->execute or die $sth->errstr;
+
+    my @custnums = map { $_->[0] } @{ $sth->fetchall_arrayref };
+
+    last unless scalar(@custnums);
+
+    $prev_custnum = $custnums[-1];
+
+    ###
+    # for each custnum, queue or make one customer object and bill
+    # (one at a time, to reduce memory footprint with large #s of customers)
+    ###
+    
+    foreach my $custnum ( @custnums ) {
+    
+      my %args = (
+          'time'         => $time,
+          'invoice_time' => $invoice_time,
+          'actual_time'  => $^T, #when freeside-bill was started
+                                 #(not, when using -m, freeside-queued)
+          'check_freq'   => $check_freq,
+          'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
+      );
+
+      if ( $opt{'m'} ) {
+
+        #add job to queue that calls bill_and_collect with options
+        my $queue = new FS::queue {
+          'job'      => 'FS::cust_main::queued_bill',
+          'secure'   => 'Y',
+          'priority' => 99, #don't get in the way of provisioning jobs
+        };
+        my $error = $queue->insert( 'custnum'=>$custnum, %args );
+
+      } else {
+
+        my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
+        $cust_main->bill_and_collect( %args, 'debug' => $debug );
+
+      }
 
     }
 
-- 
cgit v1.2.1


From c9021dc97f2d50e9818afa685c9da37ae3b57df4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Apr 2009 06:52:13 +0000
Subject: perhaps a happier medium, RT#4412

---
 FS/FS/Cron/bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 653701822..899b117b3 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -111,7 +111,7 @@ END
       "SELECT custnum FROM cust_main".
       " WHERE ". join(' AND ', @search).
       " AND custnum > $prev_custnum ".
-      " ORDER BY custnum LIMIT 100 "
+      " ORDER BY custnum LIMIT 1000 "
     ) or die dbh->errstr;
 
     $sth->execute or die $sth->errstr;
-- 
cgit v1.2.1


From 8ca05344a5b3254ea0615e721e0b7f621e00137e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 22 Apr 2009 20:24:52 +0000
Subject: hopefully better performance running the big query once and then
 fetching results with a cursor, rather than running it multiple times with an
 OFFSET and LIMIT, RT#4412

---
 FS/FS/Cron/bill.pm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 899b117b3..4e8817343 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -95,24 +95,23 @@ END
 
   push @search, "( $where_pkg OR $where_event )";
 
-  my $prev_custnum = 0;
-  while ( 1 ) {
+  ###
+  # get a list of custnums
+  ###
 
-    ###
-    # get a list of custnums
-    ###
+  warn "searching for customers:\n". join("\n", @search). "\n"
+    if $opt{'v'} || $opt{'l'};
+
+  dbh->do(
+    "DECLARE cron_bill_cursor CURSOR WITH HOLD FOR ". #no WITH HOLD for mysql?
+    "  SELECT custnum FROM cust_main ".
+    "    WHERE ". join(' AND ', @search).
+    "    ORDER BY custnum " #LIMIT 1000 "
+  ) or die dbh->errstr;
 
-    warn "searching for customers:\n".
-           join("\n", @search).
-           "custnum > $prev_custnum\n"
-      if $opt{'v'} || $opt{'l'};
+  while ( 1 ) {
 
-    my $sth = dbh->prepare(
-      "SELECT custnum FROM cust_main".
-      " WHERE ". join(' AND ', @search).
-      " AND custnum > $prev_custnum ".
-      " ORDER BY custnum LIMIT 1000 "
-    ) or die dbh->errstr;
+    my $sth = dbh->prepare('FETCH 1000 FROM cron_bill_cursor'); #mysql?
 
     $sth->execute or die $sth->errstr;
 
@@ -120,8 +119,6 @@ END
 
     last unless scalar(@custnums);
 
-    $prev_custnum = $custnums[-1];
-
     ###
     # for each custnum, queue or make one customer object and bill
     # (one at a time, to reduce memory footprint with large #s of customers)
-- 
cgit v1.2.1


From 9f9bf2008844e95b0d93c73626ea134b7f97a2f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Apr 2009 04:14:54 +0000
Subject: does pg try to finish the query when the job addition is committed? 
 well, if this works, that answers that.  RT#4412

---
 FS/FS/Cron/bill.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 4e8817343..5101e0dad 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA @EXPORT_OK );
 use Exporter;
 use Date::Parse;
+use DBI 1.33; #The "clone" method was added in DBI 1.33. 
 use FS::UID qw(dbh);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
@@ -102,16 +103,18 @@ END
   warn "searching for customers:\n". join("\n", @search). "\n"
     if $opt{'v'} || $opt{'l'};
 
-  dbh->do(
-    "DECLARE cron_bill_cursor CURSOR WITH HOLD FOR ". #no WITH HOLD for mysql?
+  my $cursor_dbh = dbh->clone;
+
+  $cursor_dbh->do(
+    "DECLARE cron_bill_cursor CURSOR FOR ".
     "  SELECT custnum FROM cust_main ".
     "    WHERE ". join(' AND ', @search).
     "    ORDER BY custnum " #LIMIT 1000 "
-  ) or die dbh->errstr;
+  ) or die $cursor_dbh->errstr;
 
   while ( 1 ) {
 
-    my $sth = dbh->prepare('FETCH 1000 FROM cron_bill_cursor'); #mysql?
+    my $sth = $cursor_dbh->prepare('FETCH 100 FROM cron_bill_cursor'); #mysql?
 
     $sth->execute or die $sth->errstr;
 
@@ -156,6 +159,8 @@ END
 
   }
 
+  $cursor_dbh->commit or die $cursor_dbh->errstr;
+
 }
 
 1;
-- 
cgit v1.2.1


From 6fd4495cfb983901c1f7cb7ff15410048bda05d7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Apr 2009 04:57:05 +0000
Subject: we don't actually need the results ordered, and i'm sure it doesn't
 help the planner get us results sooner.  last chance to try and get cursor
 approach working?  RT#4412

---
 FS/FS/Cron/bill.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 5101e0dad..225b372f2 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -107,9 +107,7 @@ END
 
   $cursor_dbh->do(
     "DECLARE cron_bill_cursor CURSOR FOR ".
-    "  SELECT custnum FROM cust_main ".
-    "    WHERE ". join(' AND ', @search).
-    "    ORDER BY custnum " #LIMIT 1000 "
+    "  SELECT custnum FROM cust_main WHERE ". join(' AND ', @search)
   ) or die $cursor_dbh->errstr;
 
   while ( 1 ) {
-- 
cgit v1.2.1


From ec71691725b6c5211b6967323cbc56a03038385d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 23 Apr 2009 20:31:26 +0000
Subject: autodownload and update of cch tax data

---
 FS/FS/Conf.pm              |   7 ++
 FS/FS/cust_tax_location.pm |  16 ++-
 FS/FS/part_pkg_taxrate.pm  |   2 +-
 FS/FS/tax_class.pm         |   6 +-
 FS/FS/tax_rate.pm          | 295 ++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 313 insertions(+), 13 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7be0dd0ca..ac3b1eacb 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1510,6 +1510,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'taxdatadirectdownload',
+    'section'     => 'billing',  #well
+    'description' => 'Enable downloading tax data directly from the vendor site',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'ignore_incalculable_taxes',
     'section'     => 'billing',
diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index 7c6989c65..161a6547b 100644
--- a/FS/FS/cust_tax_location.pm
+++ b/FS/FS/cust_tax_location.pm
@@ -125,19 +125,25 @@ sub check {
   ;
   return $error if $error;
 
-  #ugh!  cch canada weirdness
-  if ($self->state eq 'CN') {
+  #ugh!  cch canada weirdness and more
+  if ($self->state eq 'CN' && $self->data_vendor eq 'cch-zip' ) {
     $error = "Illegal cch canadian zip"
      unless $self->zip =~ /^[A-Z]$/;
+  } elsif ($self->state =~ /^E([B-DFGILNPR-UW])$/ && $self->data_vendor eq 'cch-zip' ) {
+    $error = "Illegal cch european zip"
+     unless $self->zip =~ /^E$1$/;
   } else {
     $error = $self->ut_number('zip', $self->state eq 'CN' ? 'CA' : 'US');
   }
   return $error if $error;
 
-  #ugh!  cch canada weirdness
+  #ugh!  cch canada weirdness and more
   return "must specify either city/county or plus4lo/plus4hi"
     unless ( $self->plus4lo && $self->plus4hi || 
-             ($self->city || $self->state eq 'CN') && $self->county
+             ( $self->city ||
+               $self->state eq 'CN' ||
+               $self->state =~ /^E([B-DFGILNPR-UW])$/
+             ) && $self->county
            );
 
   $self->SUPER::check;
@@ -277,7 +283,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing locations"
         );
         die $error if $error;
         $last = time;
diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index aaf7f60a2..bc1047ee2 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -353,7 +353,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax matrix"
         );
         die $error if $error;
         $last = time;
diff --git a/FS/FS/tax_class.pm b/FS/FS/tax_class.pm
index 480fa10a6..4f0396982 100644
--- a/FS/FS/tax_class.pm
+++ b/FS/FS/tax_class.pm
@@ -246,7 +246,7 @@ sub batch_import {
           if ( $job ) {  # progress bar
             if ( time - $min_sec > $last ) {
               my $error = $job->update_statustext(
-                int( 100 * $imported / $count )
+                int( 100 * $imported / $count ). ",Importing tax classes"
               );
               die $error if $error;
               $last = time;
@@ -270,7 +270,7 @@ sub batch_import {
           if ( $job ) {  # progress bar
             if ( time - $min_sec > $last ) {
               my $error = $job->update_statustext(
-                int( 100 * $imported / $count )
+                int( 100 * $imported / $count ). ",Importing tax classes"
               );
               die $error if $error;
               $last = time;
@@ -319,7 +319,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax classes"
         );
         die $error if $error;
         $last = time;
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 3323e0060..dfa7d5f44 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -6,6 +6,11 @@ use vars qw( @ISA $DEBUG $me
              %tax_passtypes %GetInfoType );
 use Date::Parse;
 use Storable qw( thaw );
+use IO::File;
+use File::Temp;
+use LWP::UserAgent;
+use HTTP::Request;
+use HTTP::Response;
 use MIME::Base64;
 use DBIx::DBSchema;
 use DBIx::DBSchema::Table;
@@ -678,7 +683,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax rates"
         );
         die $error if $error;
         $last = time;
@@ -722,7 +727,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax rates"
         );
         die $error if $error;
         $last = time;
@@ -746,7 +751,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax rates"
         );
         die $error if $error;
         $last = time;
@@ -780,7 +785,7 @@ sub batch_import {
     if ( $job ) {  # progress bar
       if ( time - $min_sec > $last ) {
         my $error = $job->update_statustext(
-          int( 100 * $imported / $count )
+          int( 100 * $imported / $count ). ",Importing tax rates"
         );
         die $error if $error;
         $last = time;
@@ -986,6 +991,288 @@ sub process_batch_import {
 
 }
 
+=item process_download_and_update
+
+Download and process a tax update as a queued JSRPC job
+
+=cut
+
+sub process_download_and_update {
+  my $job = shift;
+
+  my $param = thaw(decode_base64(shift));
+  my $format = $param->{'format'};        #well... this is all cch specific
+
+  my ( $count, $last, $min_sec, $imported ) = (0, time, 5, 0); #progressbar
+  $count = 100;
+
+  if ( $job ) {  # progress bar
+    my $error = $job->update_statustext( int( 100 * $imported / $count ) );
+    die $error if $error;
+  }
+
+  my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/taxdata';
+  unless (-d $dir) {
+    mkdir $dir or die "can't create $dir: $!\n";
+  }
+
+  if ($format eq 'cch') {
+
+    eval "use Text::CSV_XS;";
+    die $@ if $@;
+
+    eval "use XBase;";
+    die $@ if $@;
+
+    my $conffile = '%%%FREESIDE_CONF%%%/cchconf';
+    my $conffh = new IO::File "<$conffile" or die "can't open $conffile: $!\n";
+    my ( $urls, $secret, $states ) =
+      map { /^(.*)$/ or die "bad config line in $conffile: $_\n"; $1 }
+          <$conffh>;
+
+    $dir .= '/cch';
+
+    my $oldAutoCommit = $FS::UID::AutoCommit;
+    local $FS::UID::AutoCommit = 0;
+    my $dbh = dbh;
+    my $error = '';
+
+    # really should get a table EXCLUSIVE lock here
+    # check if initial import or update
+    
+    my $sql = "SELECT count(*) from tax_rate WHERE data_vendor='$format'";
+    my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+    $sth->execute() or die $sth->errstr;
+    my $upgrade = $sth->fetchrow_arrayref->[0];
+
+    # create cache and/or rotate old tax data
+
+    if (-d $dir) {
+
+      if (-d "$dir.4") {
+        opendir(my $dirh, $dir) or die "failed to open $dir.4: $!\n";
+        foreach my $file (readdir($dirh)) {
+          unlink "$dir.4/$file" if (-f "$dir.4/$file");
+        }
+        closedir($dirh);
+        rmdir "$dir.4";
+      }
+
+      for (3, 2, 1) {
+        if ( -e "$dir.$_" ) {
+          rename "$dir.$_", "$dir.". ($_+1) or die "can't rename $dir.$_: $!\n";
+        }
+      }
+      rename "$dir", "$dir.1" or die "can't rename $dir: $!\n";
+
+    } else {
+
+      die "can't find previous tax data\n" if $upgrade;
+
+    }
+
+    mkdir "$dir.new" or die "can't create $dir.new: $!\n";
+    
+    # fetch and unpack the zip files
+
+    my $ua = new LWP::UserAgent;
+    foreach my $url (split ',', $urls) {
+      my @name = split '/', $url;  #somewhat restrictive
+      my $name = pop @name;
+      $name =~ /(.*)/; # untaint that which we trust;
+      $name = $1;
+      
+      open my $taxfh, ">$dir.new/$name" or die "Can't open $dir.new/$name: $!\n";
+     
+      my $res = $ua->request(
+        new HTTP::Request( GET => $url),
+        sub { #my ($data, $response_object) = @_;
+              print $taxfh $_[0] or die "Can't write to $dir.new/$name: $!\n";
+              my $content_length = $_[1]->content_length;
+              $imported += length($_[0]);
+              if ( time - $min_sec > $last ) {
+                my $error = $job->update_statustext(
+                  ($content_length ? int(100 * $imported/$content_length) : 0 ).
+                  ",Downloading data from CCH"
+                );
+                die $error if $error;
+                $last = time;
+              }
+        },
+      );
+      die "download of $url failed: ". $res->status_line
+        unless $res->is_success;
+      
+      close $taxfh;
+      my $error = $job->update_statustext( "0,Unpacking data" );
+      die $error if $error;
+      $secret =~ /(.*)/; # untaint that which we trust;
+      $secret = $1;
+      system('unzip', "-P", $secret, "-d", "$dir.new",  "$dir.new/$name") == 0
+        or die "unzip -P $secret -d $dir.new $dir.new/$name failed";
+      #unlink "$dir.new/$name";
+    }
+ 
+    # extract csv files from the dbf files
+
+    foreach my $name ( qw( code detail geocode plus4 txmatrix zip ) ) {
+      my $error = $job->update_statustext( "0,Unpacking $name" );
+      die $error if $error;
+      warn "opening $dir.new/$name.dbf\n" if $DEBUG;
+      my $table = new XBase 'name' => "$dir.new/$name.dbf";
+      die "failed to access $dir.new/$name.dbf: ". XBase->errstr
+        unless defined($table);
+      $count = $table->last_record; # approximately;
+      $imported = 0;
+      open my $csvfh, ">$dir.new/$name.txt"
+        or die "failed to open $dir.new/$name.txt: $!\n";
+
+      my $csv = new Text::CSV_XS { 'always_quote' => 1 };
+      my @fields = $table->field_names;
+      my $cursor = $table->prepare_select;
+      my $format_date =
+        sub { my $date = shift;
+              $date =~ /^(\d{4})(\d{2})(\d{2})$/ && ($date = "$2/$3/$1");
+              $date;
+            };
+      while (my $row = $cursor->fetch_hashref) {
+        $csv->combine( map { ($table->field_type($_) eq 'D')
+                             ? &{$format_date}($row->{$_}) 
+                             : $row->{$_}
+                           }
+                       @fields
+        );
+        print $csvfh $csv->string, "\n";
+        $imported++;
+        if ( time - $min_sec > $last ) {
+          my $error = $job->update_statustext(
+            int(100 * $imported/$count).  ",Unpacking $name"
+          );
+          die $error if $error;
+          $last = time;
+        }
+      }
+      $table->close;
+      close $csvfh;
+    }
+
+    # generate the diff files
+
+    my @insert_list = ();
+    my @delete_list = ();
+
+    my @list = (
+                 # 'geocode',  \&FS::tax_rate_location::batch_import, 
+                 'code',     \&FS::tax_class::batch_import,
+                 'plus4',    \&FS::cust_tax_location::batch_import,
+                 'zip',      \&FS::cust_tax_location::batch_import,
+                 'txmatrix', \&FS::part_pkg_taxrate::batch_import,
+                 'detail',   \&FS::tax_rate::batch_import,
+               );
+
+    while( scalar(@list) ) {
+      my ( $name, $method ) = ( shift @list, shift @list );
+      my %oldlines = ();
+
+      my $error = $job->update_statustext( "0,Comparing to previous $name" );
+      die $error if $error;
+
+      warn "processing $dir.new/$name.txt\n" if $DEBUG;
+
+      if ($upgrade) {
+        open my $oldcsvfh, "$dir.1/$name.txt"
+          or die "failed to open $dir.1/$name.txt: $!\n";
+
+        while(<$oldcsvfh>) {
+          chomp;
+          $oldlines{$_} = 1;
+        }
+        close $oldcsvfh;
+      }
+
+      open my $newcsvfh, "$dir.new/$name.txt"
+        or die "failed to open $dir.new/$name.txt: $!\n";
+    
+      my $ifh = new File::Temp( TEMPLATE => "$name.insert.XXXXXXXX",
+                                DIR      => "$dir.new",
+                                UNLINK   => 0,     #meh
+                              ) or die "can't open temp file: $!\n";
+
+      my $dfh = new File::Temp( TEMPLATE => "$name.delete.XXXXXXXX",
+                                DIR      => "$dir.new",
+                                UNLINK   => 0,     #meh
+                              ) or die "can't open temp file: $!\n";
+
+      while(<$newcsvfh>) {
+        chomp;
+        if (exists($oldlines{$_})) {
+          $oldlines{$_} = 0;
+        } else {
+          print $ifh $_, ',"I"', "\n";
+        }
+      }
+      close $newcsvfh;
+
+      if ($name eq 'detail') {
+        for (keys %oldlines) {  # one file for rate details
+          print $ifh $_, ',"D"', "\n" if $oldlines{$_};
+        }
+      } else {
+        for (keys %oldlines) {
+          print $dfh $_, ',"D"', "\n" if $oldlines{$_};
+        }
+      }
+      %oldlines = ();
+
+      push @insert_list, $name, $ifh->filename, $method;
+      unshift @delete_list, $name, $dfh->filename, $method
+        unless $name eq 'detail';
+
+      close $dfh;
+      close $ifh;
+    }
+
+    while( scalar(@insert_list) ) {
+      my ($name, $file, $method) =
+        (shift @insert_list, shift @insert_list, shift @insert_list);
+
+      my $fmt = "$format-update";
+      $fmt = $fmt. ( $name eq 'zip' ? '-zip' : '' );
+      open my $fh, "< $file" or $error ||= "Can't open $name file $file: $!";
+      $error ||=
+        &{$method}({ 'filehandle' => $fh, 'format' => $fmt }, $job);
+      close $fh;
+      #unlink $file or warn "Can't delete $file: $!";
+    }
+    
+    while( scalar(@delete_list) ) {
+      my ($name, $file, $method) =
+        (shift @delete_list, shift @delete_list, shift @delete_list);
+
+      my $fmt = "$format-update";
+      $fmt = $fmt. ( $name eq 'zip' ? '-zip' : '' );
+      open my $fh, "< $file" or $error ||= "Can't open $name file $file: $!";
+      $error ||=
+        &{$method}({ 'filehandle' => $fh, 'format' => $fmt }, $job);
+      close $fh;
+      #unlink $file or warn "Can't delete $file: $!";
+    }
+    
+    if ($error) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die $error;
+    }else{
+      $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    }
+
+    rename "$dir.new", "$dir"
+      or die "cch tax update processed, but can't rename $dir.new: $!\n";
+
+  }else{
+    die "Unknown format: $format";
+  }
+}
+
 =item browse_queries PARAMS
 
 Returns a list consisting of a hashref suited for use as the argument
-- 
cgit v1.2.1


From 2f7258c405692391d07ae96efef2e471a71849f9 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 23 Apr 2009 20:34:13 +0000
Subject: add subscription option to voip_cdr

---
 FS/FS/Upgrade.pm           |  3 +++
 FS/FS/part_pkg/voip_cdr.pm | 50 ++++++++++++++++++++++++++++++++++++----------
 FS/FS/part_pkg_option.pm   |  7 ++++++-
 3 files changed, 49 insertions(+), 11 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 7cf4051aa..7aecf45d8 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -132,6 +132,9 @@ sub upgrade_data {
     #change tax_rate column types
     'tax_rate' => [],
 
+    #change recur_flat and enable_prorate
+    'part_pkg_option' => [],
+
   ;
 
   \%hash;
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index e25bba5b4..d89a68440 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw(@ISA $DEBUG %info);
 use Date::Format;
 use Tie::IxHash;
+use Time::Local;
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
 use FS::part_pkg::flat;
@@ -22,6 +23,12 @@ tie my %rating_method, 'Tie::IxHash',
   'upstream_simple' => 'Simply pass through and charge the "upstream_price" amount.',
 ;
 
+tie my %recur_method, 'Tie::IxHash',
+  'anniversary' => 'Charge the recurring fee at the frequency specified above',
+  'prorate' => 'Charge a prorated fee the first time (selectable billing date)',
+  'subscription' => 'Charge the full fee for the first partial period (selectable billing date)',
+;
+
 #tie my %cdr_location, 'Tie::IxHash',
 #  'internal' => 'Internal: CDR records imported into the internal CDR table',
 #  'external' => 'External: CDR records queried directly from an external '.
@@ -55,14 +62,18 @@ tie my %temporalities, 'Tie::IxHash',
                          'type' => 'checkbox',
                        },
 
-    'enable_prorate' => { 'name' => 'Enable prorating of the first month',
-                          'type' => 'checkbox',
-                        },
-
-    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating ',
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating or '.
+                                   'subscription',
                          'default' => '1',
                        },
 
+    'recur_method'  => { 'name' => 'Recurring fee method',
+                         #'type' => 'radio',
+                         #'options' => \%recur_method,
+                         'type' => 'select',
+                         'select_options' => \%recur_method,
+                       },
+
     'rating_method' => { 'name' => 'Region rating method',
                          'type' => 'radio',
                          'options' => \%rating_method,
@@ -187,7 +198,7 @@ tie my %temporalities, 'Tie::IxHash',
   },
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
-                       enable_prorate cutoff_day
+                       recur_method cutoff_day
                        rating_method ratenum ignore_unrateable
                        default_prefix
                        disable_src
@@ -558,12 +569,31 @@ sub calc_recur {
   } #if ( $spool_cdr && length($downstream_cdr) )
 
   if ($param->{'increment_next_bill'}) {
-    if ( $self->option('enable_prorate', 1) ) {
+    my $recur_method = $self->option('recur_method', 1) || 'anniversary';
+                  
+    if ( $recur_method eq 'prorate' ) {
+
       $charges += $self->SUPER::calc_recur(@_);
+
     } else {
-      $charges += $self->option('recur_fee')
-    }
-  }
+
+      $charges += $self->option('recur_fee');
+
+      if ( $recur_method eq 'subscription' ) {
+
+        my $cutoff_day = $self->option('cutoff_day', 1) || 1;
+        my ($day, $mon, $year) = ( localtime($$sdate) )[ 3..5 ];
+
+        if ( $day < $cutoff_day ) {
+          if ( $mon == 0 ) { $mon=11; $year--; }
+          else { $mon--; }
+        }
+
+        $$sdate = timelocal(0, 0, 0, $cutoff_day, $mon, $year);
+
+      }#$recur_method eq 'subscription'
+    }#$recur_method eq 'prorate'
+  }#increment_next_bill
 
   $charges;
 }
diff --git a/FS/FS/part_pkg_option.pm b/FS/FS/part_pkg_option.pm
index 9708f11bc..3cb330b1f 100644
--- a/FS/FS/part_pkg_option.pm
+++ b/FS/FS/part_pkg_option.pm
@@ -127,11 +127,16 @@ sub check {
 sub _upgrade_data {  # class method
   my ($class, %opts) = @_;
 
-  my $sql = "UPDATE part_pkg_option SETUP optionname = 'recur_fee'".
+  my $sql = "UPDATE part_pkg_option SET optionname = 'recur_fee'".
             " WHERE optionname = 'recur_flat'";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
   $sth->execute or die $sth->errstr;
 
+  $sql = "UPDATE part_pkg_option SET optionname = 'recur_method',".
+            "optionvalue = 'prorate'  WHERE optionname = 'enable_prorate'";
+  $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
   '';
 
 }
-- 
cgit v1.2.1


From f8f8613866ba3df9a571922046978623943ccb14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Apr 2009 22:42:40 +0000
Subject: add dry run to multi-process mode for testing, RT#4412

---
 FS/FS/Cron/bill.pm    | 18 +++++++++++-------
 FS/bin/freeside-daily |  6 ++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 225b372f2..2b5fab476 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -138,13 +138,17 @@ END
 
       if ( $opt{'m'} ) {
 
-        #add job to queue that calls bill_and_collect with options
-        my $queue = new FS::queue {
-          'job'      => 'FS::cust_main::queued_bill',
-          'secure'   => 'Y',
-          'priority' => 99, #don't get in the way of provisioning jobs
-        };
-        my $error = $queue->insert( 'custnum'=>$custnum, %args );
+        if ( $opt{'r'} ) {
+          warn "DRY RUN: would add custnum $custnum for queued_bill\n";
+        } else {
+          #add job to queue that calls bill_and_collect with options
+          my $queue = new FS::queue {
+            'job'      => 'FS::cust_main::queued_bill',
+            'secure'   => 'Y',
+            'priority' => 99, #don't get in the way of provisioning jobs
+          };
+          my $error = $queue->insert( 'custnum'=>$custnum, %args );
+        }
 
       } else {
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index d42e5248b..bda42f025 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -6,7 +6,7 @@ use FS::UID qw(adminsuidsetup);
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmk", \%opt);
+getopts("p:a:d:vl:sy:nmrk", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -61,7 +61,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -95,6 +95,8 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
 
+  -r: Multi-process mode dry run option
+
   -k: skip notify_flat_delay and vacuum
 
 user: From the mapsecrets file - see config.html from the base documentation
-- 
cgit v1.2.1


From 21f8f34bda87bf8a51e97a898229e53e0b78b99d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Apr 2009 23:09:21 +0000
Subject: add a config option for max # of queued kids, RT#4412

---
 FS/FS/Conf.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ac3b1eacb..279a17058 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2758,6 +2758,14 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'queued-max_kids',
+    'section'     => '',
+    'description' => 'Maximum number of queued processes.  Defaults to 10.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
+
-- 
cgit v1.2.1


From a80720cc443697b1be73e0570fa40d592ccbe8bd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Apr 2009 23:19:13 +0000
Subject: start small jobs more efficiently, RT#4412

---
 FS/bin/freeside-queued | 164 +++++++++++++++++++++++++------------------------
 1 file changed, 84 insertions(+), 80 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 8c07638b3..2188dd404 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -6,7 +6,8 @@ use POSIX qw(:sys_wait_h);
 use IO::File;
 use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh myconnect);
 use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
-use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
+use FS::Record qw(qsearch);
 use FS::queue;
 use FS::queue_depend;
 
@@ -15,7 +16,6 @@ use Net::SSH 0.07;
 
 $DEBUG = 0;
 
-$max_kids = '10'; #guess it should be a config file...
 $kids = 0;
 
 my $user = shift or die &usage;
@@ -27,7 +27,6 @@ daemonize1('freeside-queued');
 warn "dropping privledges\n" if $DEBUG;
 drop_root();
 
-
 $ENV{HOME} = (getpwuid($>))[7]; #for ssh
 
 warn "connecting to database\n" if $DEBUG;
@@ -48,6 +47,9 @@ daemonize2();
 
 #--
 
+my $conf = new FS::Conf;
+$max_kids = $conf->config('queued-max_kids') || 10;
+
 my $warnkids=0;
 while (1) {
 
@@ -81,117 +83,119 @@ while (1) {
   #  local $FS::UID::AutoCommit = 0;
   $FS::UID::AutoCommit = 0;
 
-  my $nodepend = 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
+  my $nodepend = 'AND NOT EXISTS( SELECT 1 FROM queue_depend'.
                  '           WHERE queue_depend.jobnum = queue.jobnum )';
 
   #anything with a priority goes after stuff without one
   my $order_by = ' ORDER BY COALESCE(priority,0) ASC, jobnum ASC ';
 
+  my $limit = $max_kids - $kids;
+
   $order_by .= ( driver_name eq 'mysql'
-                   ? ' LIMIT 1 FOR UPDATE '
-                   : ' FOR UPDATE LIMIT 1 ' );
+                   ? " LIMIT $limit FOR UPDATE "
+                   : " FOR UPDATE LIMIT $limit " );
 
-  my $job = qsearchs({
+  my @jobs = qsearch({
     'table'     => 'queue',
     'hashref'   => { 'status' => 'new' },
     'extra_sql' => $nodepend,
     'order_by'  => $order_by,
-  }) or do {
-    # if $oldAutoCommit {
+  });
+
+  unless ( @jobs ) {
     dbh->commit or do {
       warn "WARNING: database error, closing connection: ". dbh->errstr;
       undef $FS::UID::dbh;
       next;
     };
-    # }
     sleep 1;
     next;
-  };
-
-  my %hash = $job->hash;
-  $hash{'status'} = 'locked';
-  my $ljob = new FS::queue ( \%hash );
-  my $error = $ljob->replace($job);
-  if ( $error ) {
-    warn "WARNING: database error locking job, closing connection: ".
-         dbh->errstr;
-    undef $FS::UID::dbh;
-    next;
   }
 
-  # if $oldAutoCommit {
-  dbh->commit or do {
-    warn "WARNING: database error, closing connection: ". dbh->errstr;
-    undef $FS::UID::dbh;
-    next;
-  };
-  # }
-
-  $FS::UID::AutoCommit = 1;
-  #} 
-
-  my @args = $ljob->args;
-  splice @args, 0, 1, $ljob if $args[0] eq '_JOB';
+  foreach my $job ( @jobs ) {
 
-  defined( my $pid = fork ) or do {
-    warn "WARNING: can't fork: $!\n";
     my %hash = $job->hash;
-    $hash{'status'} = 'failed';
-    $hash{'statustext'} = "[freeside-queued] can't fork: $!";
+    $hash{'status'} = 'locked';
     my $ljob = new FS::queue ( \%hash );
     my $error = $ljob->replace($job);
-    die $error if $error;
-    next; #don't increment the kid counter
-  };
-
-  if ( $pid ) {
-    $kids++;
-    $kids{$pid} = 1;
-  } else { #kid time
-
-    #get new db handle
-    $FS::UID::dbh->{InactiveDestroy} = 1;
-
-    forksuidsetup($user);
-
-    #auto-use classes...
-    #if ( $ljob->job =~ /(FS::part_export::\w+)::/ ) {
-    if (    $ljob->job =~ /(FS::(part_export|cust_main)::\w+)::/
-         || $ljob->job =~ /(FS::\w+)::/
-       )
-    {
-      my $class = $1;
-      eval "use $class;";
+    if ( $error ) {
+      warn "WARNING: database error locking job, closing connection: ".
+           dbh->errstr;
+      undef $FS::UID::dbh;
+      next;
+    }
+
+    dbh->commit or do {
+      warn "WARNING: database error, closing connection: ". dbh->errstr;
+      undef $FS::UID::dbh;
+      next;
+    };
+
+    $FS::UID::AutoCommit = 1;
+
+    my @args = $ljob->args;
+    splice @args, 0, 1, $ljob if $args[0] eq '_JOB';
+
+    defined( my $pid = fork ) or do {
+      warn "WARNING: can't fork: $!\n";
+      my %hash = $job->hash;
+      $hash{'status'} = 'failed';
+      $hash{'statustext'} = "[freeside-queued] can't fork: $!";
+      my $ljob = new FS::queue ( \%hash );
+      my $error = $ljob->replace($job);
+      die $error if $error;
+      next; #don't increment the kid counter
+    };
+
+    if ( $pid ) {
+      $kids++;
+      $kids{$pid} = 1;
+    } else { #kid time
+
+      #get new db handle
+      $FS::UID::dbh->{InactiveDestroy} = 1;
+
+      forksuidsetup($user);
+
+      #auto-use classes...
+      if (    $ljob->job =~ /(FS::(part_export|cust_main)::\w+)::/
+           || $ljob->job =~ /(FS::\w+)::/
+         )
+      {
+        my $class = $1;
+        eval "use $class;";
+        if ( $@ ) {
+          warn "job use $class failed";
+          my %hash = $ljob->hash;
+          $hash{'status'} = 'failed';
+          $hash{'statustext'} = $@;
+          my $fjob = new FS::queue( \%hash );
+          my $error = $fjob->replace($ljob);
+          die $error if $error;
+          exit; #end-of-kid
+        };
+      }
+
+      my $eval = "&". $ljob->job. '(@args);';
+      warn 'running "&'. $ljob->job. '('. join(', ', @args). ")\n" if $DEBUG;
+      eval $eval; #throw away return value?  suppose so
       if ( $@ ) {
-        warn "job use $class failed";
+        warn "job $eval failed";
         my %hash = $ljob->hash;
         $hash{'status'} = 'failed';
         $hash{'statustext'} = $@;
         my $fjob = new FS::queue( \%hash );
         my $error = $fjob->replace($ljob);
         die $error if $error;
-        exit; #end-of-kid
-      };
-    }
+      } else {
+        $ljob->delete;
+      }
 
-    my $eval = "&". $ljob->job. '(@args);';
-    warn 'running "&'. $ljob->job. '('. join(', ', @args). ")\n" if $DEBUG;
-    eval $eval; #throw away return value?  suppose so
-    if ( $@ ) {
-      warn "job $eval failed";
-      my %hash = $ljob->hash;
-      $hash{'status'} = 'failed';
-      $hash{'statustext'} = $@;
-      my $fjob = new FS::queue( \%hash );
-      my $error = $fjob->replace($ljob);
-      die $error if $error;
-    } else {
-      $ljob->delete;
+      exit;
+      #end-of-kid
     }
 
-    exit;
-    #end-of-kid
-  }
+  } #foreach my $job
 
 } continue {
   if ( sigterm() ) {
-- 
cgit v1.2.1


From 03f48dbf4e5621efc428a1e7c3bbd64d0f533f29 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Apr 2009 23:43:34 +0000
Subject: would help to have an index on priority if we're going to order based
 on it

---
 FS/FS/Schema.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 0aed3ccbe..5d5331ab4 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1510,7 +1510,9 @@ sub tables_hashref {
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],
-      'index'       => [ [ 'job' ], [ 'svcnum' ], [ 'custnum' ], [ 'status' ] ],
+      'index'       => [ [ 'secure' ], [ 'priority' ],
+                         [ 'job' ], [ 'svcnum' ], [ 'custnum' ], [ 'status' ],
+                       ],
     },
 
     'queue_arg' => {
-- 
cgit v1.2.1


From 470172a907f493754063645effa9b3155e9ef775 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 Apr 2009 23:01:16 +0000
Subject: refuse to run w/CGI.pm 3.38.  all lenny upgrades will need
 libcgi-pm-perl removed, suck

---
 FS/FS/Mason.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index bcdc2fe8e..a567236c9 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -38,6 +38,13 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use strict;
   use vars qw( %session );
   use CGI 3.29 qw(-private_tempfiles); #3.29 to fix RT attachment problems
+
+  #breaks quick payment entry
+  #http://rt.cpan.org/Public/Bug/Display.html?id=37365
+  die "CGI.pm v3.38 is broken, use any other version >= 3.29".
+      " (Debian 5.0?  aptitude remove ligcgi-pm-perl)"
+    if $CGI::VERSION == 3.38;
+
   #use CGI::Carp qw(fatalsToBrowser);
   use CGI::Cookie;
   use List::Util qw( max min );
-- 
cgit v1.2.1


From 6091686905d1457950805c075c41580d6ac70288 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 Apr 2009 23:06:08 +0000
Subject: typo

---
 FS/FS/Mason.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index a567236c9..90c865775 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -42,7 +42,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   #breaks quick payment entry
   #http://rt.cpan.org/Public/Bug/Display.html?id=37365
   die "CGI.pm v3.38 is broken, use any other version >= 3.29".
-      " (Debian 5.0?  aptitude remove ligcgi-pm-perl)"
+      " (Debian 5.0?  aptitude remove libcgi-pm-perl)"
     if $CGI::VERSION == 3.38;
 
   #use CGI::Carp qw(fatalsToBrowser);
-- 
cgit v1.2.1


From 16401012b02d1cb1bd16296f8437041dd9363996 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Apr 2009 04:14:23 +0000
Subject: add cancelled_cust-noevents flag to emulate SG billing-daily -r
 behavior

---
 FS/FS/Conf.pm      |  7 +++++++
 FS/FS/cust_main.pm | 55 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 37 insertions(+), 25 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 279a17058..cf4c43908 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2765,6 +2765,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'cancelled_cust-noevents',
+    'section'     => 'billing',
+    'description' => "Don't run events for cancelled customers",
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3296cf543..92cf92485 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2225,18 +2225,36 @@ Debugging level.  Default is 0 (no debugging), or can be set to 1 (passed-in opt
 sub bill_and_collect {
   my( $self, %options ) = @_;
 
-  ###
-  # cancel packages
-  ###
-
   #$options{actual_time} not $options{time} because freeside-daily -d is for
   #pre-printing invoices
-  my @cancel_pkgs = grep { $_->expire && $_->expire <= $options{actual_time} }
+  $self->cancel_expired_pkgs( $options{actual_time} );
+  $self->suspend_adjourned_pkgs( $options{actual_time} );
+
+  my $error = $self->bill( %options );
+  warn "Error billing, custnum ". $self->custnum. ": $error" if $error;
+
+  $self->apply_payments_and_credits;
+
+  unless ( $conf->config('cancelled_cust-noevents')
+           && ! $self->num_ncancelled_pkgs
+  ) {
+
+    $error = $self->collect( %options );
+    warn "Error collecting, custnum". $self->custnum. ": $error" if $error;
+
+  }
+
+}
+
+sub cancel_expired_pkgs {
+  my ( $self, $time ) = @_;
+
+  my @cancel_pkgs = grep { $_->expire && $_->expire <= $time }
                          $self->ncancelled_pkgs;
 
   foreach my $cust_pkg ( @cancel_pkgs ) {
     my $cpr = $cust_pkg->last_cust_pkg_reason('expire');
-    my $error = $cust_pkg->cancel($cpr ? ( 'reason' => $cpr->reasonnum,
+    my $error = $cust_pkg->cancel($cpr ? ( 'reason'        => $cpr->reasonnum,
                                            'reason_otaker' => $cpr->otaker
                                          )
                                        : ()
@@ -2246,20 +2264,19 @@ sub bill_and_collect {
       if $error;
   }
 
-  ###
-  # suspend packages
-  ###
+}
+
+sub suspend_adjourned_pkgs {
+  my ( $self, $time ) = @_;
 
-  #$options{actual_time} not $options{time} because freeside-daily -d is for
-  #pre-printing invoices
   my @susp_pkgs = 
     grep { ! $_->susp
            && (    (    $_->part_pkg->is_prepaid
                      && $_->bill
-                     && $_->bill < $options{actual_time}
+                     && $_->bill < $time
                    )
                 || (    $_->adjourn
-                    && $_->adjourn <= $options{actual_time}
+                    && $_->adjourn <= $time
                   )
               )
          }
@@ -2279,18 +2296,6 @@ sub bill_and_collect {
       if $error;
   }
 
-  ###
-  # bill and collect
-  ###
-
-  my $error = $self->bill( %options );
-  warn "Error billing, custnum ". $self->custnum. ": $error" if $error;
-
-  $self->apply_payments_and_credits;
-
-  $error = $self->collect( %options );
-  warn "Error collecting, custnum". $self->custnum. ": $error" if $error;
-
 }
 
 =item bill OPTIONS
-- 
cgit v1.2.1


From 51fbac65c94702756e052712de02fc4cbce183fc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Apr 2009 04:36:31 +0000
Subject: add cancelled_cust-noevents flag to emulate SG billing-daily -r
 behavior, RT#4412

---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 92cf92485..51a190248 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2235,7 +2235,7 @@ sub bill_and_collect {
 
   $self->apply_payments_and_credits;
 
-  unless ( $conf->config('cancelled_cust-noevents')
+  unless ( $conf->exists('cancelled_cust-noevents')
            && ! $self->num_ncancelled_pkgs
   ) {
 
-- 
cgit v1.2.1


From 8ec90cfede14acdd48e6a31c32cc911404b849d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 1 May 2009 02:08:32 +0000
Subject: fix re-print/email from event page, yow.  RT#5293

---
 FS/FS/cust_event.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm
index 5ca816752..6df2faaa1 100644
--- a/FS/FS/cust_event.pm
+++ b/FS/FS/cust_event.pm
@@ -350,7 +350,7 @@ sub re_X {
 
   my $from = 'LEFT JOIN part_event USING ( eventpart )';
 
-              # yuck!  hardcoed *AND* sequential scans!
+              # yuck!  hardcoded *AND* sequential scans!
   my $where = " WHERE action LIKE 'cust_bill_send%'".
               "   AND cust_event._date >= $beginning".
               "   AND cust_event._date <= $ending";
@@ -367,10 +367,9 @@ sub re_X {
   my( $num, $last, $min_sec ) = (0, time, 5); #progresbar foo
   foreach my $cust_event ( @cust_event ) {
 
-    # XXX 
-    $cust_event->cust_bill->$method(
+    $cust_event->cust_X->$method(
       $cust_event->part_event->templatename
-      || $cust_event->cust_main->agent_template
+      || $cust_event->cust_X->agent_template
     );
 
     if ( $job ) { #progressbar foo
-- 
cgit v1.2.1


From c8548769a1e468aaf0cf84b7788044fa75e424ae Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 1 May 2009 20:21:42 +0000
Subject: calculate tax on tax per line and not on aggregate

---
 FS/FS/cust_main.pm | 94 +++++++++++++++++++++++-------------------------------
 1 file changed, 40 insertions(+), 54 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 51a190248..6f05fd5aa 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2503,60 +2503,13 @@ sub bill {
   my %packagemap = map { $_->pkgnum => $_ } @cust_bill_pkg;
   foreach my $tax ( keys %taxlisthash ) {
     foreach ( @{ $taxlisthash{$tax} }[1 ... scalar(@{ $taxlisthash{$tax} })] ) {
-      next unless ref($_) eq 'FS::cust_bill_pkg'; # shouldn't happen
+      next unless ref($_) eq 'FS::cust_bill_pkg';
 
       push @{ $packagemap{$_->pkgnum}->_cust_tax_exempt_pkg }, 
         splice( @{ $_->_cust_tax_exempt_pkg } );
     }
   }
 
-  #some taxes are taxed
-  my %totlisthash;
-  
-  warn "finding taxed taxes...\n" if $DEBUG > 2;
-  foreach my $tax ( keys %taxlisthash ) {
-    my $tax_object = shift @{ $taxlisthash{$tax} };
-    warn "found possible taxed tax ". $tax_object->taxname. " we call $tax\n"
-      if $DEBUG > 2;
-    next unless $tax_object->can('tax_on_tax');
-
-    foreach my $tot ( $tax_object->tax_on_tax( $self ) ) {
-      my $totname = ref( $tot ). ' '. $tot->taxnum;
-
-      warn "checking $totname which we call ". $tot->taxname. " as applicable\n"
-        if $DEBUG > 2;
-      next unless exists( $taxlisthash{ $totname } ); # only increase
-                                                      # existing taxes
-      warn "adding $totname to taxed taxes\n" if $DEBUG > 2;
-      if ( exists( $totlisthash{ $totname } ) ) {
-        push @{ $totlisthash{ $totname  } }, $tax{ $tax };
-      }else{
-        $totlisthash{ $totname } = [ $tot, $tax{ $tax } ];
-      }
-    }
-  }
-
-  warn "having a look at taxed taxes...\n" if $DEBUG > 2;
-  foreach my $tax ( keys %totlisthash ) {
-    my $tax_object = shift @{ $totlisthash{$tax} };
-    warn "found previously found taxed tax ". $tax_object->taxname. "\n"
-      if $DEBUG > 2;
-    my $hashref_or_error =
-      $tax_object->taxline( $totlisthash{$tax},
-                            'custnum'      => $self->custnum,
-                            'invoice_time' => $invoice_time
-                          );
-    unless (ref($hashref_or_error)) {
-      $dbh->rollback if $oldAutoCommit;
-      return $hashref_or_error;
-    }
-
-    warn "adding taxed tax amount ". $hashref_or_error->{'amount'}.
-         " as ". $tax_object->taxname. "\n"
-      if $DEBUG;
-    $tax{ $tax } += $hashref_or_error->{'amount'};
-  }
-  
   #consolidate and create tax line items
   warn "consolidating and generating...\n" if $DEBUG > 2;
   foreach my $taxname ( keys %taxname ) {
@@ -2639,7 +2592,7 @@ sub _make_lines {
   my $total_recur = $params{recur} or die "no recur accumulator specified";
   my $taxlisthash = $params{tax_matrix} or die "no tax accumulator specified";
   my $time = $params{'time'} or die "no time specified";
-  my (%options) = %{$params{options}};  #hmmm  only for 'resetup'
+  my (%options) = %{$params{options}};
 
   my $dbh = dbh;
   my $real_pkgpart = $cust_pkg->pkgpart;
@@ -2818,7 +2771,7 @@ sub _make_lines {
       ###
 
       my $error = 
-        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg);
+        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time});
       return $error if $error;
 
       push @$cust_bill_pkgs, $cust_bill_pkg;
@@ -2837,6 +2790,7 @@ sub _handle_taxes {
   my $taxlisthash = shift;
   my $cust_bill_pkg = shift;
   my $cust_pkg = shift;
+  my $invoice_time = shift;
 
   my %cust_bill_pkg = ();
   my %taxes = ();
@@ -2945,6 +2899,7 @@ sub _handle_taxes {
     my @taxes = @{ $taxes{$key} || [] };
     my $tax_cust_bill_pkg = $tax_cust_bill_pkg{$key};
 
+    my %localtaxlisthash = ();
     foreach my $tax ( @taxes ) {
 
       my $taxname = ref( $tax ). ' '. $tax->taxnum;
@@ -2952,12 +2907,43 @@ sub _handle_taxes {
 #                  ' locationnum'. $cust_pkg->locationnum
 #        if $conf->exists('tax-pkg_address') && $cust_pkg->locationnum;
 
-      if ( exists( $taxlisthash->{ $taxname } ) ) {
-        push @{ $taxlisthash->{ $taxname  } }, $tax_cust_bill_pkg;
-      }else{
-        $taxlisthash->{ $taxname } = [ $tax, $tax_cust_bill_pkg ];
+      $taxlisthash->{ $taxname } ||= [ $tax ];
+      push @{ $taxlisthash->{ $taxname  } }, $tax_cust_bill_pkg;
+
+      $localtaxlisthash{ $taxname } ||= [ $tax ];
+      push @{ $localtaxlisthash{ $taxname  } }, $tax_cust_bill_pkg;
+
+    }
+
+    warn "finding taxed taxes...\n" if $DEBUG > 2;
+    foreach my $tax ( keys %localtaxlisthash ) {
+      my $tax_object = shift @{ $localtaxlisthash{$tax} };
+      warn "found possible taxed tax ". $tax_object->taxname. " we call $tax\n"
+        if $DEBUG > 2;
+      next unless $tax_object->can('tax_on_tax');
+
+      foreach my $tot ( $tax_object->tax_on_tax( $self ) ) {
+        my $totname = ref( $tot ). ' '. $tot->taxnum;
+
+        warn "checking $totname which we call ". $tot->taxname. " as applicable\n"
+          if $DEBUG > 2;
+        next unless exists( $localtaxlisthash{ $totname } ); # only increase
+                                                             # existing taxes
+        warn "adding $totname to taxed taxes\n" if $DEBUG > 2;
+        my $hashref_or_error = 
+          $tax_object->taxline( $localtaxlisthash{$tax},
+                                'custnum'      => $self->custnum,
+                                'invoice_time' => $invoice_time,
+                              );
+        return $hashref_or_error
+          unless ref($hashref_or_error);
+        
+        $taxlisthash->{ $totname } ||= [ $tot ];
+        push @{ $taxlisthash->{ $totname  } }, $hashref_or_error->{amount};
+
       }
     }
+
   }
 
   '';
-- 
cgit v1.2.1


From 5bdd15fbc33d0e273e787a49bfdeb014cf83481d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 2 May 2009 22:11:45 +0000
Subject: fix eps preview

---
 FS/FS/Misc/eps2png.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Misc/eps2png.pm b/FS/FS/Misc/eps2png.pm
index c175b3be8..aa8e5729a 100644
--- a/FS/FS/Misc/eps2png.pm
+++ b/FS/FS/Misc/eps2png.pm
@@ -31,7 +31,7 @@ my $mono = 0;			# produce BW images if non-zero
 my $format;			# output format
 my $gs_format;			# GS output type
 my $output;			# output, defaults to STDOUT
-my $antialias = 8; #4;              # antialiasing
+my $antialias = 4;              # antialiasing
 my $DEF_width;			# desired widht
 my $DEF_height;		# desired height
 #my $DEF_width = 90;			# desired widht
-- 
cgit v1.2.1


From 53cadf47dea115cf804d07beb58c7de67429873f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 May 2009 01:11:50 +0000
Subject: add ability to remove suffix-ed config items, RT#5218

---
 FS/FS/Conf.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cf4c43908..d3bd81762 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -92,6 +92,7 @@ sub _usecompat {
   $compat->$method(@_);
 }
 
+# needs a non _ name, called externally by config-view now (and elsewhere?)
 sub _config {
   my($self,$name,$agentnum)=@_;
   my $hashref = { 'name' => $name };
@@ -451,11 +452,12 @@ sub _orbase_items {
           die "don't know about $base items" unless $proto->key eq $base;
 
           map { new FS::ConfItem { 
-                                   'key' => $_,
-                                   'section' => $proto->section,
-                                   'description' => 'Alternate ' . $proto->description . '  See the <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Invoice_templates">billing documentation</a> for details.',
-                                   'type' => $proto->type,
-                                 };
+                  'key'         => $_,
+                  'base_key'    => $proto->key,
+                  'section'     => $proto->section,
+                  'description' => 'Alternate ' . $proto->description . '  See the <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Invoice_templates">billing documentation</a> for details.',
+                  'type'        => $proto->type,
+                };
               } &$listmaker($base);
         } @base_items,
   );
-- 
cgit v1.2.1


From d557c2a3bf895d17c7d9fcfa2f5fb0c99b9e989f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 May 2009 18:34:09 +0000
Subject: add "Redownload resolved batches" ACL for s1, RT#4271

---
 FS/FS/AccessRight.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 93660e236..af480dfa7 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -221,6 +221,7 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'Time queue', global=>1 },
     { rightname=>'Process batches', global=>1 },
     { rightname=>'Reprocess batches', global=>1 },
+    { rightname=>'Redownload resolved batches', global=>1 },
     { rightname=>'Import', global=>1 }, #some of these are ag-virt'ed now?  give em their own ACLs
     { rightname=>'Export', global=>1 },
     { rightname=> 'Edit rating data', desc=>'Delete CDRs', global=>1 },
-- 
cgit v1.2.1


From e9b930f5813d6df9e13d89c36ca0d7fc7973d2bc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 4 May 2009 01:17:24 +0000
Subject: eliminate Argument "" isn't numeric in addition (+) warning

---
 FS/FS/svc_acct.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9ab90349f..955547b73 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1711,7 +1711,7 @@ my %op2condition = (
                $self->$column - $amount <= 0;
              },
   '+' => sub { my($self, $column, $amount) = @_;
-               $self->$column + $amount > 0;
+               ($self->$column || 0) + $amount > 0;
              },
 );
 my %op2warncondition = (
@@ -1720,7 +1720,7 @@ my %op2warncondition = (
                $self->$column - $amount <= $self->$threshold + 0;
              },
   '+' => sub { my($self, $column, $amount) = @_;
-               $self->$column + $amount > 0;
+               ($self->$column || 0) + $amount > 0;
              },
 );
 
-- 
cgit v1.2.1


From 791b34f7cb476e7c645d8eb7019dde9fdf5cf663 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 May 2009 10:40:15 +0000
Subject: finish the import portion of excel rate edit, RT#5108

---
 FS/FS/rate_detail.pm | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 343 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/rate_detail.pm b/FS/FS/rate_detail.pm
index 62c0fa1ec..b7b23babe 100644
--- a/FS/FS/rate_detail.pm
+++ b/FS/FS/rate_detail.pm
@@ -1,14 +1,17 @@
 package FS::rate_detail;
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
+use vars qw( @ISA $DEBUG $me );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::rate;
 use FS::rate_region;
 use Tie::IxHash;
 
 @ISA = qw(FS::Record);
 
+$DEBUG = 0;
+$me = '[FS::rate_detail]';
+
 =head1 NAME
 
 FS::rate_detail - Object methods for rate_detail records
@@ -229,6 +232,344 @@ sub granularities {
   %granularities;
 }
 
+use Storable qw(thaw);
+use Data::Dumper;
+use MIME::Base64;
+sub process_edit_import {
+  my $job = shift;
+
+  #do we actually belong in rate_detail, like 'table' says?  even though we
+  # can possible create new rate records, that's a side effect, mostly we
+  # do edit rate_detail records in batch...
+
+  my $opt = { 'table'          => 'rate_detail',
+              'params'         => [], #required, apparantly
+              'formats'        => { 'default' => [
+                'dest_regionnum',
+                '', #regionname
+                '', #country
+                '', #prefixes
+                #loop these
+                'min_included',
+                'min_charge',
+                sub {
+                  my( $rate_detail, $g ) = @_;
+                  $g  = 0  if $g =~ /^\s*(per-)?call\s*$/i;
+                  $g  = 60 if $g =~ /^\s*minute\s*$/i;
+                  $g  =~ /^(\d+)/ or die "can't parse granularity: $g".
+                                         " for record ". Dumper($rate_detail);
+                  $rate_detail->sec_granularity($1);
+                },
+                'classnum',
+              ] },
+              'format_headers' => { 'default' => 1, },
+              'format_types'   => { 'default' => 'xls' },
+            };
+
+  #false laziness w/
+  #FS::Record::process_batch_import( $job, $opt, @_ );
+  
+  my $table = $opt->{table};
+  my @pass_params = @{ $opt->{params} };
+  my %formats = %{ $opt->{formats} };
+
+  my $param = thaw(decode_base64(shift));
+  warn Dumper($param) if $DEBUG;
+  
+  my $files = $param->{'uploaded_files'}
+    or die "No files provided.\n";
+
+  my (%files) = map { /^(\w+):([\.\w]+)$/ ? ($1,$2):() } split /,/, $files;
+
+  my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/';
+  my $file = $dir. $files{'file'};
+
+  my $error =
+    #false laziness w/
+    #FS::Record::batch_import( {
+    FS::rate_detail::edit_import( {
+      #class-static
+      table                      => $table,
+      formats                    => \%formats,
+      format_types               => $opt->{format_types},
+      format_headers             => $opt->{format_headers},
+      format_sep_chars           => $opt->{format_sep_chars},
+      format_fixedlength_formats => $opt->{format_fixedlength_formats},
+      #per-import
+      job                        => $job,
+      file                       => $file,
+      #type                       => $type,
+      format                     => $param->{format},
+      params                     => { map { $_ => $param->{$_} } @pass_params },
+      #?
+      default_csv                => $opt->{default_csv},
+    } );
+
+  unlink $file;
+
+  die "$error\n" if $error;
+
+}
+
+#false laziness w/ #FS::Record::batch_import, grep "edit_import" for differences
+#could be turned into callbacks or something
+use Text::CSV_XS;
+sub edit_import {
+  my $param = shift;
+
+  warn "$me edit_import call with params: \n". Dumper($param)
+    if $DEBUG;
+
+  my $table   = $param->{table};
+  my $formats = $param->{formats};
+
+  my $job     = $param->{job};
+  my $file    = $param->{file};
+  my $format  = $param->{'format'};
+  my $params  = $param->{params} || {};
+
+  die "unknown format $format" unless exists $formats->{ $format };
+
+  my $type = $param->{'format_types'}
+             ? $param->{'format_types'}{ $format }
+             : $param->{type} || 'csv';
+
+  unless ( $type ) {
+    if ( $file =~ /\.(\w+)$/i ) {
+      $type = lc($1);
+    } else {
+      #or error out???
+      warn "can't parse file type from filename $file; defaulting to CSV";
+      $type = 'csv';
+    }
+    $type = 'csv'
+      if $param->{'default_csv'} && $type ne 'xls';
+  }
+
+  my $header = $param->{'format_headers'}
+                 ? $param->{'format_headers'}{ $param->{'format'} }
+                 : 0;
+
+  my $sep_char = $param->{'format_sep_chars'}
+                   ? $param->{'format_sep_chars'}{ $param->{'format'} }
+                   : ',';
+
+  my $fixedlength_format =
+    $param->{'format_fixedlength_formats'}
+      ? $param->{'format_fixedlength_formats'}{ $param->{'format'} }
+      : '';
+
+  my @fields = @{ $formats->{ $format } };
+
+  my $row = 0;
+  my $count;
+  my $parser;
+  my @buffer = ();
+  my @header = (); #edit_import
+  if ( $type eq 'csv' || $type eq 'fixedlength' ) {
+
+    if ( $type eq 'csv' ) {
+
+      my %attr = ();
+      $attr{sep_char} = $sep_char if $sep_char;
+      $parser = new Text::CSV_XS \%attr;
+
+    } elsif ( $type eq 'fixedlength' ) {
+
+      eval "use Parse::FixedLength;";
+      die $@ if $@;
+      $parser = new Parse::FixedLength $fixedlength_format;
+ 
+    } else {
+      die "Unknown file type $type\n";
+    }
+
+    @buffer = split(/\r?\n/, slurp($file) );
+    splice(@buffer, 0, ($header || 0) );
+    $count = scalar(@buffer);
+
+  } elsif ( $type eq 'xls' ) {
+
+    eval "use Spreadsheet::ParseExcel;";
+    die $@ if $@;
+
+    eval "use DateTime::Format::Excel;";
+    #for now, just let the error be thrown if it is used, since only CDR
+    # formats bill_west and troop use it, not other excel-parsing things
+    #die $@ if $@;
+
+    my $excel = Spreadsheet::ParseExcel::Workbook->new->Parse($file);
+
+    $parser = $excel->{Worksheet}[0]; #first sheet
+
+    $count = $parser->{MaxRow} || $parser->{MinRow};
+    $count++;
+
+    $row = $header || 0;
+
+    #edit_import - need some magic to parse the header
+    if ( $header ) {
+      my @header_row = @{ $parser->{Cells}[$0] };
+      @header = map $_->{Val}, @header_row;
+    }
+
+  } else {
+    die "Unknown file type $type\n";
+  }
+
+  #my $columns;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  #edit_import - use the header to setup looping over different rates
+  my @rate = ();
+  if ( @header ) {
+    splice(@header,0,4); # # Region Country Prefixes
+    while ( my @next = splice(@header,0,4) ) {
+      my $rate;
+      if ( $next[0] =~ /^(\d+):\s*([^:]+):/ ) {
+        $rate = qsearchs('rate', { 'ratenum' => $1 } )
+          or die "unknown ratenum $1";
+      } elsif ( $next[0] =~ /^(NEW:)?\s*([^:]+)/i ) {
+        $rate = new FS::rate { 'ratename' => $2 };
+        my $error = $rate->insert;
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "error inserting new rate: $error\n";
+        }
+      }
+      push @rate, $rate;
+    }
+  }
+  die unless @rate;
+  
+  my $line;
+  my $imported = 0;
+  my( $last, $min_sec ) = ( time, 5 ); #progressbar foo
+  while (1) {
+
+    my @columns = ();
+    if ( $type eq 'csv' ) {
+
+      last unless scalar(@buffer);
+      $line = shift(@buffer);
+
+      $parser->parse($line) or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't parse: ". $parser->error_input();
+      };
+      @columns = $parser->fields();
+
+    } elsif ( $type eq 'fixedlength' ) {
+
+      @columns = $parser->parse($line);
+
+    } elsif ( $type eq 'xls' ) {
+
+      last if $row > ($parser->{MaxRow} || $parser->{MinRow})
+           || ! $parser->{Cells}[$row];
+
+      my @row = @{ $parser->{Cells}[$row] };
+      @columns = map $_->{Val}, @row;
+
+      #my $z = 'A';
+      #warn $z++. ": $_\n" for @columns;
+
+    } else {
+      die "Unknown file type $type\n";
+    }
+
+    #edit_import loop
+
+    my @repeat = @columns[0..3];
+
+    foreach my $rate ( @rate ) {
+
+      my @later = ();
+      my %hash = %$params;
+
+      foreach my $field ( @fields ) {
+
+        my $value = shift @columns;
+       
+        if ( ref($field) eq 'CODE' ) {
+          #&{$field}(\%hash, $value);
+          push @later, $field, $value;
+        #} else {
+        } elsif ($field) { #edit_import
+          #??? $hash{$field} = $value if length($value);
+          $hash{$field} = $value if defined($value) && length($value);
+        }
+
+      }
+
+      unshift @columns, @repeat; #edit_import put these back on for next time
+
+      my $class = "FS::$table";
+
+      my $record = $class->new( \%hash );
+
+      $record->ratenum($rate->ratenum); #edit_import
+
+      #edit_improt n/a my $param = {};
+      while ( scalar(@later) ) {
+        my $sub = shift @later;
+        my $data = shift @later;
+        #&{$sub}($record, $data, $conf, $param);# $record->&{$sub}($data, $conf);
+        &{$sub}($record, $data); #edit_import - don't have $conf
+        #edit_import wrong loop last if exists( $param->{skiprow} );
+      }
+      #edit_import wrong loop next if exists( $param->{skiprow} );
+
+      #edit_import update or insert, not just insert
+      my $old = qsearchs({
+        'table'   => $table,
+        'hashref' => { map { $_ => $record->$_() } qw(ratenum dest_regionnum) },
+      });
+
+      my $error;
+      if ( $old ) {
+        $record->ratedetailnum($old->ratedetailnum);
+        $error = $record->replace($old)
+      } else {
+        $record->insert;
+      }
+
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't insert record". ( $line ? " for $line" : '' ). ": $error";
+      }
+
+    }
+
+    $row++;
+    $imported++;
+
+    if ( $job && time - $min_sec > $last ) { #progress bar
+      $job->update_statustext( int(100 * $imported / $count) );
+      $last = time;
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;;
+
+  return "Empty file!" unless $imported || $param->{empty_ok};
+
+  ''; #no error
+
+}
+
+
 
 =back
 
-- 
cgit v1.2.1


From 638bbb4726bfa9bc26280b6addbf6077d2005745 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 May 2009 17:58:50 +0000
Subject: add company_name to payment receipt

---
 FS/FS/cust_pay.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 583a72410..0caba7574 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -225,13 +225,14 @@ sub insert {
         'to'      => \@invoicing_list,
         'subject' => 'Payment receipt',
         'body'    => [ $receipt_template->fill_in( HASH => {
-                       'date'    => time2str("%a %B %o, %Y", $self->_date),
-                       'name'    => $cust_main->name,
-                       'paynum'  => $self->paynum,
-                       'paid'    => sprintf("%.2f", $self->paid),
-                       'payby'   => ucfirst(lc($payby)),
-                       'payinfo' => $payinfo,
-                       'balance' => $cust_main->balance,
+                       'date'         => time2str("%a %B %o, %Y", $self->_date),
+                       'name'         => $cust_main->name,
+                       'paynum'       => $self->paynum,
+                       'paid'         => sprintf("%.2f", $self->paid),
+                       'payby'        => ucfirst(lc($payby)),
+                       'payinfo'      => $payinfo,
+                       'balance'      => $cust_main->balance,
+                       'company_name' => $conf->config('company_name'),
                      } ) ],
       );
 
-- 
cgit v1.2.1


From b45292bc0dcdf4604a97fca130dc2a3bc54a9f49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 5 May 2009 22:02:28 +0000
Subject: hide agent.invoice_template edit by default, with a config to turn
 back on, RT#5218

---
 FS/FS/Conf.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d3bd81762..ebfad2c36 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2774,6 +2774,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'agent-invoice_template',
+    'section'     => 'billing',
+    'description' => 'Enable display/edit of old-style per-agent invoice template selection',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
-- 
cgit v1.2.1


From f920fdb29a19105c9102d29e532f8cbb40dd1171 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 May 2009 00:39:13 +0000
Subject: add ability to configure service labels per-package (still need to
 actually use the labels), RT#4081

---
 FS/FS/Schema.pm          |  1 +
 FS/FS/part_svc.pm        | 75 +++++++++++++++++++++++++++++-------------------
 FS/FS/part_svc_column.pm |  5 +++-
 FS/FS/svc_acct.pm        | 18 ++++++------
 4 files changed, 59 insertions(+), 40 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 5d5331ab4..e70a12c1e 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1268,6 +1268,7 @@ sub tables_hashref {
         'columnnum',   'serial',         '', '', '', '', 
         'svcpart',     'int',         '', '', '', '', 
         'columnname',  'varchar',     '', 64, '', '', 
+        'columnlabel', 'varchar', 'NULL', $char_d, '', '',
         'columnvalue', 'varchar', 'NULL', $char_d, '', '', 
         'columnflag',  'char',    'NULL', 1, '', '', 
       ],
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 580038be2..e57efe4d0 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -133,7 +133,8 @@ sub insert {
 #        fields('part_svc');
   foreach my $field (
     grep { $_ ne 'svcnum'
-           && defined( $self->getfield($svcdb.'__'.$_.'_flag') )
+           && ( defined( $self->getfield($svcdb.'__'.$_.'_flag') )
+                || $self->getfield($svcdb.'__'.$_.'_label') !~ /^\s*$/ )
          } (fields($svcdb), @fields)
   ) {
     my $part_svc_column = $self->part_svc_column($field);
@@ -142,20 +143,28 @@ sub insert {
       'columnname' => $field,
     } );
 
-    my $flag = $self->getfield($svcdb.'__'.$field.'_flag');
-    #if ( uc($flag) =~ /^([DFMAX])$/ ) {
-    if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
-      my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
-                   || sub { shift };
-      $part_svc_column->setfield('columnflag', $1);
-      $part_svc_column->setfield('columnvalue',
-        &$parser($self->getfield($svcdb.'__'.$field))
-      );
+    my $flag  = $self->getfield($svcdb.'__'.$field.'_flag');
+    my $label = $self->getfield($svcdb.'__'.$field.'_label');
+    if ( uc($flag) =~ /^([A-Z])$/ || $label !~ /^\s*$/ ) {
+
+      if ( uc($flag) =~ /^([A-Z])$/ ) {
+        my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
+                     || sub { shift };
+        $part_svc_column->setfield('columnflag', $1);
+        $part_svc_column->setfield('columnvalue',
+          &$parser($self->getfield($svcdb.'__'.$field))
+        );
+      }
+
+      $part_svc_column->setfield('columnlabel', $label)
+        if $label !~ /^\s*$/;
+
       if ( $previous ) {
         $error = $part_svc_column->replace($previous);
       } else {
         $error = $part_svc_column->insert;
       }
+
     } else {
       $error = $previous ? $previous->delete : '';
     }
@@ -254,7 +263,8 @@ sub replace {
     my $svcdb = $new->svcdb;
     foreach my $field (
       grep { $_ ne 'svcnum'
-             && defined( $new->getfield($svcdb.'__'.$_.'_flag') )
+             && ( defined( $new->getfield($svcdb.'__'.$_.'_flag') )
+                  || $new->getfield($svcdb.'__'.$_.'_label') !~ /^\s*$/ )
            } (fields($svcdb),@fields)
     ) {
       my $part_svc_column = $new->part_svc_column($field);
@@ -263,15 +273,23 @@ sub replace {
         'columnname' => $field,
       } );
 
-      my $flag = $new->getfield($svcdb.'__'.$field.'_flag');
-      #if ( uc($flag) =~ /^([DFMAX])$/ ) {
-      if ( uc($flag) =~ /^([A-Z])$/ ) { #part_svc_column will test it
-        my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
+      my $flag  = $new->getfield($svcdb.'__'.$field.'_flag');
+      my $label = $new->getfield($svcdb.'__'.$field.'_label');
+ 
+      if ( uc($flag) =~ /^([A-Z])$/ || $label !~ /^\s*$/ ) {
+
+        if ( uc($flag) =~ /^([A-Z])$/ ) {
+          my $parser = FS::part_svc->svc_table_fields($svcdb)->{$field}->{parse}
                      || sub { shift };
-        $part_svc_column->setfield('columnflag', $1);
-        $part_svc_column->setfield('columnvalue',
-          &$parser($new->getfield($svcdb.'__'.$field))
-        );
+          $part_svc_column->setfield('columnflag', $1);
+          $part_svc_column->setfield('columnvalue',
+            &$parser($new->getfield($svcdb.'__'.$field))
+          );
+        }
+
+        $part_svc_column->setfield('columnlabel', $label)
+          if $label !~ /^\s*$/;
+
         if ( $previous ) {
           $error = $part_svc_column->replace($previous);
         } else {
@@ -713,17 +731,16 @@ sub process {
               push @fields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge
 
               map {
-                    if ( $param->{ $svcdb.'__'.$_.'_flag' } =~ /^[MA]$/ ) {
-                      $param->{ $svcdb.'__'.$_ } =
-                        delete( $param->{ $svcdb.'__'.$_.'_classnum' } );
+                    my $f = $svcdb.'__'.$_;
+                    if ( $param->{ $f.'_flag' } =~ /^[MA]$/ ) {
+                      $param->{ $f } = delete( $param->{ $f.'_classnum' } );
                     }
-		    if ( $param->{ $svcdb.'__'.$_.'_flag' } =~ /^S$/ ) {
-                      $param->{ $svcdb.'__'.$_} =
-                        ref($param->{ $svcdb.'__'.$_})
-                          ? join(',', @{$param->{ $svcdb.'__'.$_ }} )
-                          : $param->{ $svcdb.'__'.$_ };
+		    if ( $param->{ $f.'_flag' } =~ /^S$/ ) {
+                      $param->{ $f } = ref($param->{ $f })
+                                         ? join(',', @{$param->{ $f }} )
+                                         : $param->{ $f };
 		    }
-                    ( $svcdb.'__'.$_, $svcdb.'__'.$_.'_flag' );
+                    ( $f, $f.'_flag', $f.'_label' );
                   }
                   @fields;
 
@@ -738,7 +755,7 @@ sub process {
   my $error;
   if ( $param->{'svcpart'} ) {
     $error = $new->replace( $old,
-                            '1.3-COMPAT',
+                            '1.3-COMPAT',    #totally bunk, as jeff noted
                             [ 'usergroup' ],
                             \%exportnums,
                             $job
diff --git a/FS/FS/part_svc_column.pm b/FS/FS/part_svc_column.pm
index d2b8fd91b..f5b39c049 100644
--- a/FS/FS/part_svc_column.pm
+++ b/FS/FS/part_svc_column.pm
@@ -39,6 +39,8 @@ fields are currently supported:
 
 =item columnname - column name in part_svc.svcdb table
 
+=item columnlabel - label for the column
+
 =item columnvalue - default or fixed value for the column
 
 =item columnflag - null or empty (no default), `D' for default, `F' for fixed (unchangeable), `S' for selectable choice, `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
@@ -87,11 +89,12 @@ sub check {
     $self->ut_numbern('columnnum')
     || $self->ut_number('svcpart')
     || $self->ut_alpha('columnname')
+    || $self->ut_textn('columnlabel')
     || $self->ut_anything('columnvalue')
   ;
   return $error if $error;
 
-  $self->columnflag =~ /^([DFSMAX])$/
+  $self->columnflag =~ /^([DFSMAX]?)$/
     or return "illegal columnflag ". $self->columnflag;
   $self->columnflag(uc($1));
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 955547b73..8b5c7b9c9 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -215,9 +215,9 @@ sub table_info {
     'fields' => {
         'dir'       => 'Home directory',
         'uid'       => {
-                         label     => 'UID',
-		         def_label => 'UID (set to fixed and blank for no UIDs)',
-		         type      => 'text',
+                         label    => 'UID',
+		         def_info => 'set to fixed and blank for no UIDs',
+		         type     => 'text',
 		       },
         'slipip'    => 'IP address',
     #    'popnum'    => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
@@ -244,15 +244,14 @@ sub table_info {
                        },
         '_password' => 'Password',
         'gid'       => {
-                         label     => 'GID',
-		         def_label => 'GID (when blank, defaults to UID)',
-		         type      => 'text',
+                         label    => 'GID',
+		         def_info => 'when blank, defaults to UID',
+		         type     => 'text',
 		       },
         'shell'     => {
-                         #desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
 		         label    => 'Shell',
-                         def_label=> 'Shell (set to blank for no shell tracking)',
-                         type     =>'select',
+                         def_info => 'set to blank for no shell tracking',
+                         type     => 'select',
                          #select_list => [ $conf->config('shells') ],
                          select_list => [ $conf ? $conf->config('shells') : () ],
                          disable_inventory => 1,
@@ -261,7 +260,6 @@ sub table_info {
         'finger'    => 'Real name', # (GECOS)',
         'domsvc'    => {
                          label     => 'Domain',
-                         #def_label => 'svcnum from svc_domain',
                          type      => 'select',
                          select_table => 'svc_domain',
                          select_key   => 'svcnum',
-- 
cgit v1.2.1


From a70e4bb88f298f93292380d1e2feb80e1baa13f8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 May 2009 07:56:38 +0000
Subject: add cdr-charged_party-truncate_{length,prefix} in order to trim
 charged_party to a certain length, RT#4081

---
 FS/FS/Conf.pm | 16 +++++++++++++++-
 FS/FS/cdr.pm  | 12 ++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ebfad2c36..e86ed0d15 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2718,10 +2718,24 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cdr-charged_party-truncate_prefix',
+    'section'     => '',
+    'description' => 'If the charged_party field has this prefix, truncate it to the length in cdr-charged_party-truncate_length.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'cdr-charged_party-truncate_length',
+    'section'     => '',
+    'description' => 'If the charged_party field has the prefix in cdr-charged_party-truncate_prefix, truncate it to this length.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'cdr-charged_party_rewrite',
     'section'     => '',
-    'description' => 'Do charged party rewriting in the freeside-cdrrewrited daemon; useful if CDRs are being dropped off directly in the database and require special charged_party processing such as cdr-charged_party-accountcode.',
+    'description' => 'Do charged party rewriting in the freeside-cdrrewrited daemon; useful if CDRs are being dropped off directly in the database and require special charged_party processing such as cdr-charged_party-accountcode or cdr-charged_party-truncate*.',
     'type'        => 'checkbox',
   },
 
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index b640bc63e..2a235cc41 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -295,9 +295,9 @@ or to the dst field if it is a toll free number.
 sub set_charged_party {
   my $self = shift;
 
-  unless ( $self->charged_party ) {
+  my $conf = new FS::Conf;
 
-    my $conf = new FS::Conf;
+  unless ( $self->charged_party ) {
 
     if ( $conf->exists('cdr-charged_party-accountcode') && $self->accountcode ){
 
@@ -315,6 +315,14 @@ sub set_charged_party {
 
   }
 
+  my $prefix = $conf->config('cdr-charged_party-truncate_prefix');
+  my $prefix_len = length($prefix);
+  my $trunc_len = $conf->config('cdr-charged_party-truncate_length');
+
+  $self->charged_party( substr($self->charged_party, 0, $trunc_len) )
+    if $prefix_len && $trunc_len
+    && substr($self->charged_party, 0, $prefix_len) eq $prefix;
+
 }
 
 =item set_status_and_rated_price STATUS [ RATED_PRICE ]
-- 
cgit v1.2.1


From 521acd4c79757036fd2630f0a84e334be6b70484 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 May 2009 23:54:58 +0000
Subject: move cdr-sftp_and_import script to FS/bin, add -p option, RT#4081

---
 FS/bin/freeside-cdr-sftp_and_import | 143 ++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100755 FS/bin/freeside-cdr-sftp_and_import

(limited to 'FS')

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
new file mode 100755
index 000000000..5786774d2
--- /dev/null
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+use strict;
+use Getopt::Std;
+use Net::SFTP::Foreign;
+use FS::UID qw(adminsuidsetup datasrc);
+use FS::cdr;
+
+###
+# parse command line
+###
+
+use vars qw( $opt_p $opt_e $opt_d $opt_v );
+getopts('p:e:d:v');
+
+$opt_e ||= 'csv';
+#$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
+$opt_e =~ s/^\.//;
+
+$opt_p ||= '';
+
+my $user = shift or die &usage;
+adminsuidsetup $user;
+
+# %%%FREESIDE_CACHE%%%
+my $cachedir = '/usr/local/etc/freeside/cache.'. datasrc. '/cdrs';
+mkdir $cachedir unless -d $cachedir;
+
+my $format = shift or die &usage;
+
+use vars qw( $servername );
+$servername = shift or die &usage;
+
+###
+# get the file list
+###
+
+warn "Retreiving directory listing\n" if $opt_v;
+
+my $ls_sftp = sftp();
+
+my $ls = $ls_sftp->ls('.', wanted => qr/^$opt_p.*\.$opt_e$/i );
+
+###
+# import each file
+###
+
+foreach my $file ( @$ls ) {
+
+  my $filename = $file->{filename};
+  warn "Downloading $filename\n" if $opt_v;
+
+  #get the file
+  my $get_sftp = sftp();
+  $get_sftp->get($filename, "$cachedir/$filename")
+    or die "Can't get $filename: ". $get_sftp->error;
+
+  warn "Processing $filename\n" if $opt_v;
+
+  my $error = FS::cdr::batch_import( {
+    'file'     => "$cachedir/$filename",
+    'format'   => $format,
+    'params'   => { 'cdrbatch' => $filename, },
+    'empty_ok' => 1,
+  } );
+  die $error if $error;
+
+  if ( $opt_d ) {
+    my $mv_sftp = sftp();
+    $mv_sftp->rename($filename, "$opt_d/$filename")
+      or die "can't move $filename to $opt_d: ". $mv_sftp->error;
+  }
+
+  unlink "$cachedir/$filename";
+
+}
+
+###
+# subs
+###
+
+sub usage {
+  "Usage: \n  cdr.import user format servername\n";
+}
+
+use vars qw( $sftp );
+
+sub sftp {
+
+  #reuse connections
+  return $sftp if $sftp && $sftp->cwd;
+
+  my %sftp = ( host => $servername );
+
+  #XXX remove these
+  $sftp{port} = 10022;
+  #$sftp{more} = '-v';
+
+  $sftp = Net::SFTP::Foreign->new(%sftp);
+  $sftp->error and die "SFTP connection failed: ". $sftp->error;
+
+  $sftp;
+}
+
+=head1 NAME
+
+cdr.sftp_and_import - Download CDR files from a remote server via SFTP
+
+=head1 SYNOPSIS
+
+  cdr.sftp_and_import [ -p prefix ] [ -e extension ] [ -d donefolder ] [ -v ] user format [sftpuser@]servername
+
+=head1 DESCRIPTION
+
+Command line tool to download CDR files from a remote server via SFTP and then
+import them into the database.
+
+-p: file prefix, if specified
+
+-e: file extension, defaults to .csv
+
+-d: if specified, moves files to the specified folder when done
+
+-v: verbose
+
+user: freeside username
+
+format: CDR format name
+
+[sftpuser@]servername: remote server
+
+=head1 BUGS
+
+Only supports SFTP right now.
+
+=head1 SEE ALSO
+
+L<FS::cdr>
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From eaf25d783191d2a6f14701442c491d78efd3b996 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 May 2009 00:45:33 +0000
Subject: label phone_name correctly

---
 FS/FS/svc_phone.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index ce767d5ee..73ea8e731 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -102,7 +102,7 @@ sub table_info {
                             disable_select => 1,
                           },
         'sip_password' => 'SIP password',
-        'name'         => 'Name',
+        'phone_name'   => 'Name',
     },
   };
 }
-- 
cgit v1.2.1


From 794a4505360fec404e2b9d5c6daf79f750186bfe Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 13 May 2009 22:27:42 +0000
Subject: improved taxproduct tax report RT#4783

---
 FS/FS/Schema.pm                          |  32 +++-
 FS/FS/cust_bill_pkg.pm                   |  13 ++
 FS/FS/cust_bill_pkg_tax_rate_location.pm | 136 ++++++++++++++
 FS/FS/cust_main.pm                       |  25 +++
 FS/FS/tax_rate.pm                        |  27 ++-
 FS/FS/tax_rate_location.pm               | 309 +++++++++++++++++++++++++++++++
 FS/MANIFEST                              |   4 +
 FS/t/cust_bill_pkg_tax_rate_location.t   |   5 +
 FS/t/tax_rate_location.t                 |   5 +
 9 files changed, 553 insertions(+), 3 deletions(-)
 create mode 100644 FS/FS/cust_bill_pkg_tax_rate_location.pm
 create mode 100644 FS/FS/tax_rate_location.pm
 create mode 100644 FS/t/cust_bill_pkg_tax_rate_location.t
 create mode 100644 FS/t/tax_rate_location.t

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e70a12c1e..a9b546940 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -560,7 +560,7 @@ sub tables_hashref {
         'billpkgtaxlocationnum', 'serial',      '', '', '', '',
         'billpkgnum',               'int',      '', '', '', '',
         'taxnum',                   'int',      '', '', '', '',
-        'taxtype',              'varchar', $char_d, '', '', '',
+        'taxtype',              'varchar',      '', $char_d, '', '',
         'pkgnum',                   'int',      '', '', '', '',
         'locationnum',              'int',      '', '', '', '', #redundant?
         'amount',                   @money_type,        '', '',
@@ -570,6 +570,21 @@ sub tables_hashref {
       'index'  => [ [ 'billpkgnum' ], [ 'taxnum' ], [ 'pkgnum' ], [ 'locationnum' ] ],
     },
 
+    'cust_bill_pkg_tax_rate_location' => {
+      'columns' => [
+        'billpkgtaxratelocationnum', 'serial',      '', '', '', '',
+        'billpkgnum',                   'int',      '', '', '', '',
+        'taxnum',                       'int',      '', '', '', '',
+        'taxtype',                  'varchar',      '', $char_d, '', '',
+        'locationtaxid',            'varchar',  'NULL', $char_d, '', '',
+        'taxratelocationnum',           'int',      '', '', '', '',
+        'amount',                       @money_type,        '', '',
+      ],
+      'primary_key' => 'billpkgtaxratelocationnum',
+      'unique' => [],
+      'index'  => [ [ 'billpkgnum' ], [ 'taxnum' ], [ 'taxratelocationnum' ] ],
+    },
+
     'cust_credit' => {
       'columns' => [
         'crednum',  'serial', '', '', '', '', 
@@ -805,6 +820,21 @@ sub tables_hashref {
       'index' => [ ['taxclassnum'], ['data_vendor', 'geocode'] ],
     },
 
+    'tax_rate_location' => { 
+      'columns' => [
+        'taxratelocationnum', 'serial',  '',     '', '', '', 
+        'data_vendor',        'varchar', 'NULL', $char_d, '', '',
+        'geocode',            'varchar', '',     20,      '', '', 
+        'city',               'varchar', 'NULL', $char_d, '', '',
+        'county',             'varchar', 'NULL', $char_d, '', '',
+        'state',              'char',    '',     2,  '', '', 
+        'disabled',           'char',    'NULL', 1, '', '',
+      ],
+      'primary_key' => 'taxratelocationnum',
+      'unique' => [],
+      'index' => [ [ 'data_vendor', 'geocode', 'disabled' ] ],
+    },
+
     'cust_tax_location' => { 
       'columns' => [
         'custlocationnum', 'serial',  '',     '', '', '', 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 6c0589a5c..6bd39d4b9 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -162,6 +162,19 @@ sub insert {
     }
   }
 
+  my $tax_rate_location = $self->get('cust_bill_pkg_tax_rate_location');
+  if ( $tax_rate_location ) {
+    foreach my $cust_bill_pkg_tax_rate_location ( @$tax_rate_location ) {
+      $cust_bill_pkg_tax_rate_location->billpkgnum($self->billpkgnum);
+      $error = $cust_bill_pkg_tax_rate_location->insert;
+      warn $error;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
diff --git a/FS/FS/cust_bill_pkg_tax_rate_location.pm b/FS/FS/cust_bill_pkg_tax_rate_location.pm
new file mode 100644
index 000000000..fc5734fc1
--- /dev/null
+++ b/FS/FS/cust_bill_pkg_tax_rate_location.pm
@@ -0,0 +1,136 @@
+package FS::cust_bill_pkg_tax_rate_location;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_bill_pkg;
+use FS::cust_pkg;
+use FS::cust_location;
+
+=head1 NAME
+
+FS::cust_bill_pkg_tax_rate_location - Object methods for cust_bill_pkg_tax_rate_location records
+
+=head1 SYNOPSIS
+
+  use FS::cust_bill_pkg_tax_rate_location;
+
+  $record = new FS::cust_bill_pkg_tax_rate_location \%hash;
+  $record = new FS::cust_bill_pkg_tax_rate_location { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_bill_pkg_tax_rate_location object represents an record of taxation
+based on package location.  FS::cust_bill_pkg_tax_rate_location inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item billpkgtaxratelocationnum
+
+billpkgtaxratelocationnum
+
+=item billpkgnum
+
+billpkgnum
+
+=item taxnum
+
+taxnum
+
+=item taxtype
+
+taxtype
+
+=item locationtaxid
+
+locationtaxid
+
+=item taxratelocationnum
+
+taxratelocationnum
+
+=item amount
+
+amount
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'cust_bill_pkg_tax_rate_location'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=item delete
+
+Delete this record from the database.
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('billpkgtaxratelocationnum')
+    || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg', 'billpkgnum' )
+    || $self->ut_number('taxnum') #cust_bill_pkg/tax_rate key, based on taxtype
+    || $self->ut_enum('taxtype', [ qw( FS::cust_main_county FS::tax_rate ) ] )
+    || $self->ut_textn('locationtaxid')
+    || $self->ut_foreign_key('taxratelocationnum', 'tax_rate_location', 'taxratelocationnum' )
+    || $self->ut_money('amount')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 6f05fd5aa..a1bb926b3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -30,6 +30,7 @@ use FS::cust_bill;
 use FS::cust_bill_pkg;
 use FS::cust_bill_pkg_display;
 use FS::cust_bill_pkg_tax_location;
+use FS::cust_bill_pkg_tax_rate_location;
 use FS::cust_pay;
 use FS::cust_pay_pending;
 use FS::cust_pay_void;
@@ -40,6 +41,7 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::cust_location;
 use FS::tax_rate;
+use FS::tax_rate_location;
 use FS::cust_tax_location;
 use FS::part_pkg_taxrate;
 use FS::agent;
@@ -2461,6 +2463,10 @@ sub bill {
   # values are listrefs of cust_bill_pkg_tax_location hashrefs
   my %tax_location = ();
 
+  # keys are taxlisthash keys (internal identifiers)
+  # values are listrefs of cust_bill_pkg_tax_rate_location hashrefs
+  my %tax_rate_location = ();
+
   foreach my $tax ( keys %taxlisthash ) {
     my $tax_object = shift @{ $taxlisthash{$tax} };
     warn "found ". $tax_object->taxname. " as $tax\n" if $DEBUG > 2;
@@ -2497,6 +2503,20 @@ sub bill {
         };
     }
 
+    $tax_rate_location{ $tax } ||= [];
+    if ( ref($tax_object) eq 'FS::tax_rate' ) {
+      my $taxratelocationnum =
+        $tax_object->tax_rate_location->taxratelocationnum;
+      push @{ $tax_rate_location{ $tax }  },
+        {
+          'taxnum'             => $tax_object->taxnum, 
+          'taxtype'            => ref($tax_object),
+          'amount'             => sprintf('%.2f', $amount ),
+          'locationtaxid'      => $tax_object->location,
+          'taxratelocationnum' => $taxratelocationnum,
+        };
+    }
+
   }
 
   #move the cust_tax_exempt_pkg records to the cust_bill_pkgs we will commit
@@ -2516,6 +2536,7 @@ sub bill {
     my $tax = 0;
     my %seen = ();
     my @cust_bill_pkg_tax_location = ();
+    my @cust_bill_pkg_tax_rate_location = ();
     warn "adding $taxname\n" if $DEBUG > 1;
     foreach my $taxitem ( @{ $taxname{$taxname} } ) {
       next if $seen{$taxitem}++;
@@ -2524,6 +2545,9 @@ sub bill {
       push @cust_bill_pkg_tax_location,
         map { new FS::cust_bill_pkg_tax_location $_ }
             @{ $tax_location{ $taxitem } };
+      push @cust_bill_pkg_tax_rate_location,
+        map { new FS::cust_bill_pkg_tax_rate_location $_ }
+            @{ $tax_rate_location{ $taxitem } };
     }
     next unless $tax;
 
@@ -2538,6 +2562,7 @@ sub bill {
       'edate'    => '',
       'itemdesc' => $taxname,
       'cust_bill_pkg_tax_location' => \@cust_bill_pkg_tax_location,
+      'cust_bill_pkg_tax_rate_location' => \@cust_bill_pkg_tax_rate_location,
     };
 
   }
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index dfa7d5f44..80a0f4b11 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -19,6 +19,7 @@ use FS::Record qw( qsearch qsearchs dbh dbdef );
 use FS::tax_class;
 use FS::cust_bill_pkg;
 use FS::cust_tax_location;
+use FS::tax_rate_location;
 use FS::part_pkg_taxrate;
 use FS::cust_main;
 use FS::Misc qw( csv_from_fixed );
@@ -538,6 +539,26 @@ sub tax_on_tax {
 
 }
 
+=item tax_rate_location
+
+Returns an object representing the location associated with this tax
+(see L<FS::tax_rate_location>)
+
+=cut
+
+sub tax_rate_location {
+  my $self = shift;
+
+  qsearchs({ 'table'     => 'tax_rate_location',
+             'hashref'   => { 'data_vendor' => $self->data_vendor, 
+                              'geocode'     => $self->geocode,
+                              'disabled'    => '',
+                            },
+          }) ||
+  new FS::tax_rate_location;
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -845,7 +866,8 @@ sub process_batch_import {
     my $error = '';
     my $have_location = 0;
 
-    my @list = ( 'CODE',     'codefile',  \&FS::tax_class::batch_import,
+    my @list = ( 'GEOCODE',  'geofile',   \&FS::tax_rate_location::batch_import,
+                 'CODE',     'codefile',  \&FS::tax_class::batch_import,
                  'PLUS4',    'plus4file', \&FS::cust_tax_location::batch_import,
                  'ZIP',      'zipfile',   \&FS::cust_tax_location::batch_import,
                  'TXMATRIX', 'txmatrix',  \&FS::part_pkg_taxrate::batch_import,
@@ -887,7 +909,8 @@ sub process_batch_import {
     my @insert_list = ();
     my @delete_list = ();
 
-    my @list = ( 'CODE',     'codefile',  \&FS::tax_class::batch_import,
+    my @list = ( 'GEOCODE',  'geofile',   \&FS::tax_rate_location::batch_import,
+                 'CODE',     'codefile',  \&FS::tax_class::batch_import,
                  'PLUS4',    'plus4file', \&FS::cust_tax_location::batch_import,
                  'ZIP',      'zipfile',   \&FS::cust_tax_location::batch_import,
                  'TXMATRIX', 'txmatrix',  \&FS::part_pkg_taxrate::batch_import,
diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
new file mode 100644
index 000000000..65bef7bf7
--- /dev/null
+++ b/FS/FS/tax_rate_location.pm
@@ -0,0 +1,309 @@
+package FS::tax_rate_location;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs dbh );
+
+=head1 NAME
+
+FS::tax_rate_location - Object methods for tax_rate_location records
+
+=head1 SYNOPSIS
+
+  use FS::tax_rate_location;
+
+  $record = new FS::tax_rate_location \%hash;
+  $record = new FS::tax_rate_location { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::tax_rate_location object represents an example.  FS::tax_rate_location inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item taxratelocationnum
+
+Primary key (assigned automatically for new tax_rate_locations)
+
+=item data_vendor
+
+The tax data vendor
+
+=item geocode
+
+A unique geographic location code provided by the data vendor
+
+=item city
+
+City
+
+=item county
+
+County
+
+=item state
+
+State
+
+=item disabled
+
+If 'Y' this record is no longer active.
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new tax rate location.  To add the record to the database, see
+ L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'tax_rate_location'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  return "Can't delete tax rate locations.  Set disable to 'Y' instead.";
+  # check that it is unused in any cust_bill_pkg_tax_location records instead?
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid tax rate location.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('taxratelocationnum')
+    || $self->ut_textn('data_vendor')
+    || $self->ut_alpha('geocode')
+    || $self->ut_textn('city')
+    || $self->ut_textn('county')
+    || $self->ut_textn('state')
+    || $self->ut_enum('disabled', [ '', 'Y' ])
+  ;
+  return $error if $error;
+
+  my $t = qsearchs( 'tax_rate_location',
+                    { map { $_ => $self->$_ } qw( data_vendor geocode ) },
+                  );
+
+  return "geocode already in use for this vendor"
+    if ( $t && $t->taxratelocationnum != $self->taxratelocationnum );
+
+  return "may only be disabled"
+    if ( $t && scalar( grep { $t->$_ ne $self->$_ } 
+                       grep { $_ ne 'disabled' }
+                       $self->fields
+                     )
+       );
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item batch_import
+
+=cut
+
+sub batch_import {
+  my ($param, $job) = @_;
+
+  my $fh = $param->{filehandle};
+  my $format = $param->{'format'};
+
+  my %insert = ();
+  my %delete = ();
+
+  my @fields;
+  my $hook;
+
+  my @column_lengths = ();
+  my @column_callbacks = ();
+  if ( $format eq 'cch-fixed' || $format eq 'cch-fixed-update' ) {
+    $format =~ s/-fixed//;
+    my $trim = sub { my $r = shift; $r =~ s/^\s*//; $r =~ s/\s*$//; $r };
+    push @column_lengths, qw( 28 25 2 10 );
+    push @column_lengths, 1 if $format eq 'cch-update';
+    push @column_callbacks, $trim foreach (@column_lengths);
+  }
+
+  my $line;
+  my ( $count, $last, $min_sec ) = (0, time, 5); #progressbar
+  if ( $job || scalar(@column_callbacks) ) {
+    my $error =
+      csv_from_fixed(\$fh, \$count, \@column_lengths, \@column_callbacks);
+    return $error if $error;
+  }
+
+  if ( $format eq 'cch' || $format eq 'cch-update' ) {
+    @fields = qw( city county state geocode );
+    push @fields, 'actionflag' if $format eq 'cch-update';
+
+    $hook = sub {
+      my $hash = shift;
+
+      $hash->{'data_vendor'} ='cch';
+
+      if (exists($hash->{'actionflag'}) && $hash->{'actionflag'} eq 'D') {
+        delete($hash->{actionflag});
+
+        $hash->{deleted} = '';
+        my $tax_rate_location = qsearchs('tax_rate_location', $hash);
+        return "Can't find tax_rate_location to delete: ".
+               join(" ", map { "$_ => ". $hash->{$_} } @fields)
+          unless $tax_rate_location;
+
+        $tax_rate_location->disabled('Y');
+        my $error = $tax_rate_location->replace;
+        return $error if $error;
+
+        delete($hash->{$_}) foreach (keys %$hash);
+      }
+
+      delete($hash->{'actionflag'});
+
+      '';
+
+    };
+
+  } elsif ( $format eq 'extended' ) {
+    die "unimplemented\n";
+    @fields = qw( );
+    $hook = sub {};
+  } else {
+    die "unknown format $format";
+  }
+
+  eval "use Text::CSV_XS;";
+  die $@ if $@;
+
+  my $csv = new Text::CSV_XS;
+
+  my $imported = 0;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  while ( defined($line=<$fh>) ) {
+    $csv->parse($line) or do {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't parse: ". $csv->error_input();
+    };
+
+    if ( $job ) {  # progress bar
+      if ( time - $min_sec > $last ) {
+        my $error = $job->update_statustext(
+          int( 100 * $imported / $count )
+        );
+        die $error if $error;
+        $last = time;
+      }
+    }
+
+    my @columns = $csv->fields();
+
+    my %tax_rate_location = ();
+    foreach my $field ( @fields ) {
+      $tax_rate_location{$field} = shift @columns;
+    }
+    if ( scalar( @columns ) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Unexpected trailing columns in line (wrong format?): $line";
+    }
+
+    my $error = &{$hook}(\%tax_rate_location);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+
+    if (scalar(keys %tax_rate_location)) { #inserts only
+
+      my $tax_rate_location = new FS::tax_rate_location( \%tax_rate_location );
+      $error = $tax_rate_location->insert;
+
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't insert tax_rate for $line: $error";
+      }
+
+    }
+
+    $imported++;
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  return "Empty file!" unless ($imported || $format eq 'cch-update');
+
+  ''; #no error
+
+}
+
+=head1 BUGS
+
+Currently somewhat specific to CCH supplied data.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4b9fd91b5..b5c9046a6 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -434,3 +434,7 @@ FS/cust_location.pm
 t/cust_location.t
 FS/cust_bill_pkg_tax_location.pm
 t/cust_bill_pkg_tax_location.t
+FS/tax_rate_location.pm
+t/tax_rate_location.t
+FS/cust_bill_pkg_tax_rate_location.pm
+t/cust_bill_pkg_tax_rate_location.t
diff --git a/FS/t/cust_bill_pkg_tax_rate_location.t b/FS/t/cust_bill_pkg_tax_rate_location.t
new file mode 100644
index 000000000..3250db9b5
--- /dev/null
+++ b/FS/t/cust_bill_pkg_tax_rate_location.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_bill_pkg_tax_rate_location;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/tax_rate_location.t b/FS/t/tax_rate_location.t
new file mode 100644
index 000000000..f4ee910a0
--- /dev/null
+++ b/FS/t/tax_rate_location.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::tax_rate_location;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From ad84bf7cfdb56aa1fe268ea315b7a2f7dd768db2 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Fri, 15 May 2009 19:41:34 +0000
Subject: Simple domain registration at Tucows OpenSRS using an export based on
 Net::OpenSRS. When a domain is added and the export runs, it will register
 the domain or initiate a transfer.  You can also choose no action. There's
 currently no provision for revoking domains or renewing registrations.
 Depending on the settings at OpenSRS, orders may look like they've succeeded
 in Freeside but actually be queued pending input by the reseller at OpenSRS.
 The part_export CGIs were modified to allow a multi-valued select to be used
 to control which TLDs are enabled for registration.

---
 FS/FS/part_export/domreg_opensrs.pm | 245 ++++++++++++++++++++++++++++++++++++
 FS/FS/svc_domain.pm                 |   1 -
 2 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/part_export/domreg_opensrs.pm

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
new file mode 100644
index 000000000..ec73d3ce5
--- /dev/null
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -0,0 +1,245 @@
+package FS::part_export::domreg_opensrs;
+
+use vars qw(@ISA %info %options $conf);
+use Tie::IxHash;
+use FS::Record qw(qsearchs qsearch);
+use FS::Conf;
+use FS::part_export::null;
+use FS::svc_domain;
+use FS::part_pkg;
+use Net::OpenSRS;
+
+=head1 NAME
+
+FS::part_export::domreg_opensrs - Register or transfer domains with Tucows OpenSRS
+
+=head1 DESCRIPTION
+
+This module handles registering and transferring domains using a registration service provider (RSP) account
+at Tucows OpenSRS, an ICANN-approved domain registrar.
+
+As a part_export, this module can be designated for use with svc_domain services.  When the svc_domain object
+is inserted into the Freeside database, registration or transferring of the domain may be initiated, depending
+on the setting of the svc_domain's action field.
+
+=over 4
+
+=item N - Register the domain
+
+=item M - Transfer the domain
+
+=item I - Ignore the domain for registration purposes
+
+=back
+
+=cut
+
+@ISA = qw(FS::part_export::null);
+
+my @tldlist = qw/com net org biz info name mobi at be ca cc ch cn de dk es eu fr it mx nl tv uk us/;
+
+tie %options, 'Tie::IxHash',
+  'username'     => { label => 'Reseller user name at OpenSRS',
+                      },
+  'privatekey'   => { label => 'Private key',
+                      },
+  'password'     => { label => 'Password for management account',
+                      },
+  'masterdomain' => { label => 'Master domain at OpenSRS',
+                      },
+  'debug_level'  => { label => 'Net::OpenSRS debug level',
+                      type => 'select',
+                      options => [ 0, 1, 2, 3 ],
+		      default => 0 },
+  'register'     => { label => 'Use for registration',
+                      type => 'checkbox',
+                      default => '1' },
+  'transfer'     => { label => 'Use for transfer',
+                      type => 'checkbox',
+                      default => '1' },
+  'tlds'         => { label => 'Use this export for these top-level domains (TLDs)',
+                      type => 'select',
+                      multi => 1,
+                      size => scalar(@tldlist),
+                      options => [ @tldlist ],
+		      default => 'com net org' },
+;
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    => 'Domain registration via Tucows OpenSRS',
+  'options' => \%options,
+  'notes'   => <<'END'
+Registers and transfers domains via the <a href="http://opensrs.com/">Tucows OpenSRS</a> registrar (using <a href="http://search.cpan.org/dist/Net-OpenSRS">Net::OpenSRS</a>).
+All of the Net::OpenSRS restrictions apply:
+<UL>
+  <LI>You must have a reseller account with Tucows.
+  <LI>You must add the public IP address of the Freeside server to the 'Script API allow' list in the OpenSRS web interface.
+  <LI>You must generate an API access key in the OpenSRS web interface and enter it below.
+  <LI>All domains are managed using the same user name and password, but you can create sub-accounts for clients.
+  <LI>The user name must be the same as your OpenSRS reseller ID.
+  <LI>You must enter a master domain that all other domains are associated with.  That domain must be registered through your OpenSRS account.
+</UL>
+Some top-level domains offered by OpenSRS have additional business rules not supported by this export. These TLDs cannot be registered or transfered with this export.
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="OpenSRS Live System (rr-n1-tor.opensrs.net)" onClick='
+      document.dummy.machine.value = "rr-n1-tor.opensrs.net";
+      this.form.machine.value = "rr-n1-tor.opensrs.net";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="OpenSRS Test System (horizon.opensrs.net)" onClick='
+      document.dummy.machine.value = "horizon.opensrs.net";
+      this.form.machine.value = "horizon.opensrs.net";
+    '>
+</UL>
+END
+);
+
+install_callback FS::UID sub { 
+  $conf = new FS::Conf;
+};
+
+=head1 METHODS
+
+=over 4
+
+=item format_tel
+
+Reformats a phone number according to registry rules.  Currently Freeside stores phone numbers
+in NANPA format and the registry prefers "+CCC.NPANPXNNNN"
+
+=cut
+
+sub format_tel {
+  my $tel = shift;
+
+  #if ($tel =~ /^(\d{3})-(\d{3})-(\d{4})( x(\d+))?$/) {
+  if ($tel =~ /^(\d{3})-(\d{3})-(\d{4})$/) {
+    $tel = "+1.$1$2$3";
+#    if $tel .= "$4" if $4;
+  }
+  return $tel;
+}
+
+sub gen_contact_info
+{
+  my ($co)=@_;
+
+  my @invoicing_list = $co->invoicing_list_emailonly;
+  if ( $conf->exists('emailinvoiceautoalways')
+       || $conf->exists('emailinvoiceauto') && ! @invoicing_list
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $co->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my $c = {
+    firstname => $co->first,
+    lastname  => $co->last,
+    company   => $co->company,
+    address   => $co->address1,
+    city      => $co->city(),
+    state     => $co->state(),
+    zip       => $co->zip(),
+    country   => uc($co->country()),
+    email     => $email,
+    #phone     => format_tel($co->daytime()),
+    phone     => $co->daytime() || $co->night,
+  };
+  return $c;
+}
+
+sub testmode {
+  my $self = shift;
+
+  return 'live' if $self->machine eq "rr-n1-tor.opensrs.net";
+  return 'test' if $self->machine eq "horizon.opensrs.net";
+  undef;
+}
+
+sub _export_insert {
+  my( $self, $svc_domain ) = ( shift, shift );
+
+  return if $svc_domain->action eq 'I';  # Ignoring registration, just doing DNS
+
+  # Get the TLD of the new domain
+  my @bits = split /\./, $svc_domain->domain;
+
+  return "Can't register subdomains: " . $svc_domain->domain if scalar(@bits) != 2;
+
+  my $tld = pop @bits;
+
+  # See if it's one this export supports
+  my @tlds = split /\s+/, $self->option('tlds');
+  @tlds =  map { s/\.//; $_ } @tlds;
+  return "Can't register top-level domain $tld, restricted to: " . $self->option('tlds') if ! grep { $_ eq $tld } @tlds;
+
+  my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+
+  my $c = gen_contact_info($cust_main);
+
+  my $srs = Net::OpenSRS->new();
+
+  $srs->debug_level( $self->option('debug_level') ); # Output should be in the Apache error log
+
+  $srs->environment( $self->testmode() );
+  $srs->set_key( $self->option('privatekey') );
+
+  $srs->set_manage_auth( $self->option('username'), $self->option('password') );
+
+  my $cookie = $srs->get_cookie( $self->option('masterdomain') );
+  if (!$cookie) {
+     return "Unable to get cookie at OpenSRS: " . $srs->last_response();
+  }
+
+  if ($svc_domain->action eq 'N') {
+    return "Domain registration not enabled" if !$self->option('register');
+    return $srs->last_response() if !$srs->register_domain( $svc_domain->domain, $c);
+  } elsif ($svc_domain->action eq 'M') {
+    return "Domain transfer not enabled" if !$self->option('transfer');
+    return $srs->last_response() if !$srs->transfer_domain( $svc_domain->domain, $c);
+  } else {
+    return "Unknown domain action " . $svc_domain->action;
+  }
+
+  return ''; # Should only get here if register or transfer succeeded
+
+}
+
+## Domain registration exports do nothing on replace.  Mainly because we haven't decided what they should do.
+#sub _export_replace {
+#  my( $self, $new, $old ) = (shift, shift, shift);
+#
+#  return '';
+#
+#}
+
+## Domain registration exports do nothing on delete.  You're just removing the domain from Freeside, not the registry
+#sub _export_delete {
+#  my( $self, $svc_domain ) = ( shift, shift );
+#
+#  return '';
+#}
+
+sub registrar {
+  return {
+  	name => 'OpenSRS',
+  };
+}
+
+=back
+
+=head1 SEE ALSO
+
+L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_domain>,
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 47aa8f32e..dd4f2c52f 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -388,7 +388,6 @@ sub check {
     or $self->ut_numbern('setup_date')
     or $self->ut_numbern('renewal_interval')
     or $self->ut_numbern('expiration_date')
-    or $self->ut_textn('purpose')
     or $self->SUPER::check;
 
 }
-- 
cgit v1.2.1


From 4f1256b03a041ddf12faa8e7891065ad5e1e9399 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Sat, 16 May 2009 02:29:54 +0000
Subject: Provide better diagnostics when the cust_main owning this domain does
 not provide fields required for use as a contact handle in the domain
 registration record. Also temporarily disable the ability to have the export
 do only registration or only transfers.

---
 FS/FS/part_export/domreg_opensrs.pm | 45 ++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
index ec73d3ce5..5d5c59530 100644
--- a/FS/FS/part_export/domreg_opensrs.pm
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -51,12 +51,12 @@ tie %options, 'Tie::IxHash',
                       type => 'select',
                       options => [ 0, 1, 2, 3 ],
 		      default => 0 },
-  'register'     => { label => 'Use for registration',
-                      type => 'checkbox',
-                      default => '1' },
-  'transfer'     => { label => 'Use for transfer',
-                      type => 'checkbox',
-                      default => '1' },
+#  'register'     => { label => 'Use for registration',
+#                      type => 'checkbox',
+#                      default => '1' },
+#  'transfer'     => { label => 'Use for transfer',
+#                      type => 'checkbox',
+#                      default => '1' },
   'tlds'         => { label => 'Use this export for these top-level domains (TLDs)',
                       type => 'select',
                       multi => 1,
@@ -154,6 +154,32 @@ sub gen_contact_info
   return $c;
 }
 
+sub validate_contact_info {
+  my $c = shift;
+
+  my %fields = (
+    firstname => "first name",
+    lastname => "last name",
+    address => "street address",
+    city => "city", 
+    state => "state",
+    zip => "ZIP/postal code",
+    country => "country",
+    email => "email address",
+    phone => "phone number",
+  );
+  my @err = ();
+  foreach (keys %fields) {
+    if (!defined($c->{$_}) || !$c->{$_}) {
+      push @err, $fields{$_};
+    }
+  }
+  if (scalar(@err) > 0) {
+    return "Contact information needs: " . join(', ', @err);
+  }
+  undef;
+}
+
 sub testmode {
   my $self = shift;
 
@@ -183,6 +209,9 @@ sub _export_insert {
 
   my $c = gen_contact_info($cust_main);
 
+  my $err = validate_contact_info($c);
+  return $err if $err;
+
   my $srs = Net::OpenSRS->new();
 
   $srs->debug_level( $self->option('debug_level') ); # Output should be in the Apache error log
@@ -198,10 +227,10 @@ sub _export_insert {
   }
 
   if ($svc_domain->action eq 'N') {
-    return "Domain registration not enabled" if !$self->option('register');
+#    return "Domain registration not enabled" if !$self->option('register');
     return $srs->last_response() if !$srs->register_domain( $svc_domain->domain, $c);
   } elsif ($svc_domain->action eq 'M') {
-    return "Domain transfer not enabled" if !$self->option('transfer');
+#    return "Domain transfer not enabled" if !$self->option('transfer');
     return $srs->last_response() if !$srs->transfer_domain( $svc_domain->domain, $c);
   } else {
     return "Unknown domain action " . $svc_domain->action;
-- 
cgit v1.2.1


From c196542418599a740405d37454b529d5c98276be Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Sat, 16 May 2009 19:27:44 +0000
Subject: Defer use of Net::OpenSRS so that failure to install the module
 doesn't stop Apache from starting.  (This causes attempts to register domains
 to fail instead.)

---
 FS/FS/part_export/domreg_opensrs.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
index 5d5c59530..df8b40006 100644
--- a/FS/FS/part_export/domreg_opensrs.pm
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -7,7 +7,6 @@ use FS::Conf;
 use FS::part_export::null;
 use FS::svc_domain;
 use FS::part_pkg;
-use Net::OpenSRS;
 
 =head1 NAME
 
@@ -193,6 +192,9 @@ sub _export_insert {
 
   return if $svc_domain->action eq 'I';  # Ignoring registration, just doing DNS
 
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
   # Get the TLD of the new domain
   my @bits = split /\./, $svc_domain->domain;
 
-- 
cgit v1.2.1


From 63f161eddc1d6a832ef07a43e1bc232770f5f598 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Sat, 16 May 2009 20:07:01 +0000
Subject: Added information on common failure causes to the perldoc.

---
 FS/FS/part_export/domreg_opensrs.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
index df8b40006..0ef371a7b 100644
--- a/FS/FS/part_export/domreg_opensrs.pm
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -31,6 +31,10 @@ on the setting of the svc_domain's action field.
 
 =back
 
+This export uses Net::OpenSRS.  Registration and transfer attempts will fail unless Net::OpenSRS is installed
+and LWP::UserAgent is able to make HTTPS posts.  You can turn on debugging messages and use the OpenSRS test
+gateway when setting up this export.
+
 =cut
 
 @ISA = qw(FS::part_export::null);
@@ -267,9 +271,10 @@ sub registrar {
 
 =head1 SEE ALSO
 
-L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_domain>,
+L<Net::OpenSRS>, L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_domain>,
 L<FS::Record>, schema.html from the base documentation.
 
+
 =cut
 
 1;
-- 
cgit v1.2.1


From f6dd863ff944a162b2f135e820c7932b2615e332 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 May 2009 04:56:15 +0000
Subject: handle dates before 1970

---
 FS/FS/part_pkg_taxrate.pm | 11 +++++++++--
 FS/FS/tax_rate.pm         | 12 ++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg_taxrate.pm b/FS/FS/part_pkg_taxrate.pm
index bc1047ee2..5a1e7baa9 100644
--- a/FS/FS/part_pkg_taxrate.pm
+++ b/FS/FS/part_pkg_taxrate.pm
@@ -3,6 +3,8 @@ package FS::part_pkg_taxrate;
 use strict;
 use vars qw( @ISA );
 use Date::Parse;
+use DateTime;
+use DateTime::Format::Strptime;
 use FS::UID qw(dbh);
 use FS::Record qw( qsearch qsearchs );
 use FS::part_pkg_taxproduct;
@@ -181,7 +183,7 @@ sub batch_import {
   if ( $format eq 'cch-fixed' || $format eq 'cch-fixed-update' ) {
     $format =~ s/-fixed//;
     my $date_format = sub { my $r='';
-                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$1/$2/$3");
+                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$3/$2/$1");
                             $r;
                           };
     $column_callbacks[16] = $date_format;
@@ -286,7 +288,12 @@ sub batch_import {
         delete($hash->{$_}) foreach @{$map{$item}};
       }
 
-      $hash->{'effdate'} = str2time($hash->{'effdate'});
+      my $parser = new DateTime::Format::Strptime( pattern => "%m/%d/%Y",
+                                                   time_zone => 'floating',
+                                                 );
+      my $dt = $parser->parse_datetime( $hash->{'effdate'} );
+      $hash->{'effdate'} = $dt ? $dt->epoch : '';
+ 
       $hash->{'country'} = 'US'; # CA is available
 
       delete($hash->{'taxable'}) if ($hash->{'taxable'} eq 'N');
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 80a0f4b11..887c9af2c 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -5,6 +5,8 @@ use vars qw( @ISA $DEBUG $me
              %tax_unittypes %tax_maxtypes %tax_basetypes %tax_authorities
              %tax_passtypes %GetInfoType );
 use Date::Parse;
+use DateTime;
+use DateTime::Format::Strptime;
 use Storable qw( thaw );
 use IO::File;
 use File::Temp;
@@ -586,7 +588,7 @@ sub batch_import {
   if ( $format eq 'cch-fixed' || $format eq 'cch-fixed-update' ) {
     $format =~ s/-fixed//;
     my $date_format = sub { my $r='';
-                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$1/$2/$3");
+                            /^(\d{4})(\d{2})(\d{2})$/ && ($r="$3/$2/$1");
                             $r;
                           };
     my $trim = sub { my $r = shift; $r =~ s/^\s*//; $r =~ s/\s*$//; $r };
@@ -617,7 +619,13 @@ sub batch_import {
 
       $hash->{'actionflag'} ='I' if ($hash->{'data_vendor'} eq 'cch');
       $hash->{'data_vendor'} ='cch';
-      $hash->{'effective_date'} = str2time($hash->{'effective_date'});
+      my $parser = new DateTime::Format::Strptime( pattern => "%m/%d/%Y",
+                                                   time_zone => 'floating',
+                                                 );
+      my $dt = $parser->parse_datetime( $hash->{'effective_date'} );
+      $hash->{'effective_date'} = $dt ? $dt->epoch : '';
+
+      $hash->{$_} = sprintf("%.2f", $hash->{$_}) foreach qw( taxbase taxmax );
 
       my $taxclassid =
         join(':', map{ $hash->{$_} } qw(taxtype taxcat) );
-- 
cgit v1.2.1


From e5ed992c003ce75def88da5f40f0ed2096461348 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 May 2009 08:40:00 +0000
Subject: it would help to use the correct port, RT#4081

---
 FS/bin/freeside-cdr-sftp_and_import | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 5786774d2..c4484f1d4 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -92,10 +92,6 @@ sub sftp {
 
   my %sftp = ( host => $servername );
 
-  #XXX remove these
-  $sftp{port} = 10022;
-  #$sftp{more} = '-v';
-
   $sftp = Net::SFTP::Foreign->new(%sftp);
   $sftp->error and die "SFTP connection failed: ". $sftp->error;
 
-- 
cgit v1.2.1


From aab3bdd971c21f6d422b7708ecf8ba7cb5ec0fea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 May 2009 09:55:30 +0000
Subject: basic CDR viewing from self-service, RT#4018

---
 FS/FS/ClientAPI/MyAccount.pm | 128 +++++++++++++++++++++++++++++--------------
 FS/FS/UI/bytecount.pm        |   7 ++-
 FS/FS/cust_svc.pm            |  38 ++++++++++---
 3 files changed, 125 insertions(+), 48 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index d64c72c0e..ab5096891 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -10,7 +10,7 @@ use Business::CreditCard;
 use Time::Duration;
 use FS::UI::Web::small_custview qw(small_custview); #less doh
 use FS::UI::Web;
-use FS::UI::bytecount;
+use FS::UI::bytecount qw( display_bytecount );
 use FS::Conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::Msgcat qw(gettext);
@@ -772,8 +772,14 @@ sub list_svcs {
                          : $cust_main->unsuspended_pkgs ) {
     push @cust_svc, @{[ $cust_pkg->cust_svc ]}; #@{[ ]} to force array context
   }
-  @cust_svc = grep { $_->part_svc->svcdb eq $p->{'svcdb'} } @cust_svc
-    if $p->{'svcdb'};
+  if ( $p->{'svcdb'} ) {
+    my $svcdb = ref($p->{'svcdb'}) eq 'HASH'
+                  ? $p->{'svcdb'}
+                  : ref($p->{'svcdb'}) eq 'ARRAY'
+                    ? { map { $_=>1 } @{ $p->{'svcdb'} } }
+                    : { $p->{'svcdb'} => 1 };
+    @cust_svc = grep $svcdb->{ $_->part_svc->svcdb }, @cust_svc
+  }
 
   #@svc_x = sort { $a->domain cmp $b->domain || $a->username cmp $b->username }
   #              @svc_x;
@@ -781,30 +787,51 @@ sub list_svcs {
   { 
     #no#'svcnum'   => $session->{'svcnum'},
     'custnum'  => $custnum,
-    'svcs'     => [ map { 
-                          my $svc_x = $_->svc_x;
-                          my($label, $value) = $_->label;
-                          my $part_pkg = $svc_x->cust_svc->cust_pkg->part_pkg;
-
-                          { 'svcnum'    => $_->svcnum,
-                            'label'     => $label,
-                            'value'     => $value,
-                            'username'  => $svc_x->username,
-                            'email'     => $svc_x->email,
-                            'seconds'   => $svc_x->seconds,
-                            'upbytes'   => FS::UI::bytecount::display_bytecount($svc_x->upbytes),
-                            'downbytes' => FS::UI::bytecount::display_bytecount($svc_x->downbytes),
-                            'totalbytes'=> FS::UI::bytecount::display_bytecount($svc_x->totalbytes),
-                            'recharge_amount' => $part_pkg->option('recharge_amount', 1),
-                            'recharge_seconds' => $part_pkg->option('recharge_seconds', 1),
-                            'recharge_upbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_upbytes', 1)),
-                            'recharge_downbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_downbytes', 1)),
-                            'recharge_totalbytes' => FS::UI::bytecount::display_bytecount($part_pkg->option('recharge_totalbytes', 1)),
-                            # more...
-                          };
-                        }
-                        @cust_svc
-                  ],
+    'svcs'     => [
+      map { 
+            my $svc_x = $_->svc_x;
+            my($label, $value) = $_->label;
+            my $svcdb = $_->part_svc->svcdb;
+            my $part_pkg = $_->cust_pkg->part_pkg;
+
+            my %hash = (
+              'svcnum' => $_->svcnum,
+              'svcdb'  => $svcdb,
+              'label'  => $label,
+              'value'  => $value,
+            );
+
+            if ( $svcdb eq 'svc_acct' ) {
+              %hash = (
+                %hash,
+                'username'   => $svc_x->username,
+                'email'      => $svc_x->email,
+                'seconds'    => $svc_x->seconds,
+                'upbytes'    => display_bytecount($svc_x->upbytes),
+                'downbytes'  => display_bytecount($svc_x->downbytes),
+                'totalbytes' => display_bytecount($svc_x->totalbytes),
+
+                'recharge_amount'  => $part_pkg->option('recharge_amount',1),
+                'recharge_seconds' => $part_pkg->option('recharge_seconds',1),
+                'recharge_upbytes'    =>
+                  display_bytecount($part_pkg->option('recharge_upbytes',1)),
+                'recharge_downbytes'  =>
+                  display_bytecount($part_pkg->option('recharge_downbytes',1)),
+                'recharge_totalbytes' =>
+                  display_bytecount($part_pkg->option('recharge_totalbytes',1)),
+                # more...
+              );
+
+            } elsif ( $svcdb eq 'svc_phone' ) {
+              %hash = (
+                %hash,
+              );
+            }
+
+            \%hash;
+          }
+          @cust_svc
+    ],
   };
 
 }
@@ -814,9 +841,8 @@ sub _list_svc_usage {
   my @usage = ();
   foreach my $part_export ( 
     map { qsearch ( 'part_export', { 'exporttype' => $_ } ) }
-    qw (sqlradius sqlradius_withdomain')
+    qw( sqlradius sqlradius_withdomain )
   ) {
-
     push @usage, @ { $part_export->usage_sessions($begin, $end, $svc_acct) };
   }
   (@usage);
@@ -849,29 +875,50 @@ sub list_support_usage {
   _usage_details(\&_list_support_usage, @_);
 }
 
+sub _list_cdr_usage {
+  my($svc_phone, $begin, $end) = @_;
+  map [ $_->downstream_csv('format' => 'default') ], #XXX config for format
+      $svc_phone->cust_svc->get_cdrs( 'begin'=>$begin, 'end'=>$end, );
+}
+
+sub list_cdr_usage {
+  my $p = shift;
+  _usage_details( \&_list_cdr_usage, $p,
+                  'svcdb' => 'svc_phone',
+                );
+}
+
 sub _usage_details {
-  my ($callback, $p) = (shift,shift);
+  my($callback, $p, %opt) = @_;
 
   my($context, $session, $custnum) = _custoragent_session_custnum($p);
   return { 'error' => $session } if $context eq 'error';
 
   my $search = { 'svcnum' => $p->{'svcnum'} };
   $search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
-  my $svc_acct = qsearchs ( 'svc_acct', $search );
+
+  my $svcdb = $opt{'svcdb'} || 'svc_acct';
+
+  my $svc_x = qsearchs( $svcdb, $search );
   return { 'error' => 'No service selected in list_svc_usage' } 
-    unless $svc_acct;
+    unless $svc_x;
 
-  my $freq   = $svc_acct->cust_svc->cust_pkg->part_pkg->freq;
-  my $start  = $svc_acct->cust_svc->cust_pkg->setup;
-  #my $end    = $svc_acct->cust_svc->cust_pkg->bill; # or time?
-  my $end    = time;
+  my $header = $svcdb eq 'svc_phone'
+                 ? [ split(',', FS::cdr::invoice_header('default') ) ]  #XXX
+                 : [];
 
-  unless($p->{beginning}){
-    $p->{beginning} = $svc_acct->cust_svc->cust_pkg->last_bill;
-    $p->{ending} = $end;
+  my $cust_pkg = $svc_x->cust_svc->cust_pkg;
+  my $freq     = $cust_pkg->part_pkg->freq;
+  my $start    = $cust_pkg->setup;
+  #my $end      = $cust_pkg->bill; # or time?
+  my $end      = time;
+
+  unless ( $p->{beginning} ) {
+    $p->{beginning} = $cust_pkg->last_bill;
+    $p->{ending}    = $end;
   }
 
-  my (@usage) = &$callback($svc_acct,$p->{beginning},$p->{ending});
+  my (@usage) = &$callback($svc_x, $p->{beginning}, $p->{ending});
 
   #kinda false laziness with FS::cust_main::bill, but perhaps
   #we should really change this bit to DateTime and DateTime::Duration
@@ -914,6 +961,7 @@ sub _usage_details {
     'ending'    => $p->{ending},
     'previous'  => ($previous > $start) ? $previous : $start,
     'next'      => ($next < $end) ? $next : $end,
+    'header'    => $header,
     'usage'     => \@usage,
   };
 }
diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm
index 0ddc7545c..7e78bf501 100644
--- a/FS/FS/UI/bytecount.pm
+++ b/FS/FS/UI/bytecount.pm
@@ -1,10 +1,15 @@
 package FS::UI::bytecount;
 
 use strict;
-use vars qw($DEBUG $me);
+use vars qw($DEBUG $me @ISA @EXPORT_OK);
+use Exporter;
 use FS::Conf;
 use Number::Format 1.50;
 
+@ISA = qw( Exporter );
+
+@EXPORT_OK = qw( bytecount_unexact parse_bytecount display_bytecount );
+
 $DEBUG = 0;
 $me = '[FS::UID::bytecount]';
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index c4a75f77a..fe831381f 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -692,32 +692,56 @@ CDRs are associated with svc_phone services via svc_phone.phonenum
 =cut
 
 sub get_cdrs_for_update {
+  my $self = shift;
+  $self->get_cdrs( 'freesidestatus' => '',
+                   'for_update'     => 1,
+                   @_,
+                 );
+}
+
+sub get_cdrs {
   my($self, %options) = @_;
 
   my @fields = ( 'charged_party' );
   push @fields, 'src' unless $options{'disable_src'};
 
-  #CDRs are now associated with svc_phone services via svc_phone.phonenum
+  my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
+
+  my %hash = ();
+  $hash{'freesidestatus'} = $options{'freesidestatus'}
+    if exists($options{'freesidestatus'});
+
+  #CDRs are associated with svc_phone services via svc_phone.phonenum
+
   #return () unless $self->svc_x->isa('FS::svc_phone');
   return () unless $self->part_svc->svcdb eq 'svc_phone';
   my $number = $self->svc_x->phonenum;
 
   my $prefix = $options{'default_prefix'};
 
-  my @where =  map " $_ = '$number'        ", @fields;
-  push @where, map " $_ = '$prefix$number' ", @fields
+  my @orwhere =  map " $_ = '$number'        ", @fields;
+  push @orwhere, map " $_ = '$prefix$number' ", @fields
     if length($prefix);
   if ( $prefix =~ /^\+(\d+)$/ ) {
-    push @where, map " $_ = '$1$number' ", @fields
+    push @orwhere, map " $_ = '$1$number' ", @fields
+  }
+
+  my @where = ( ' ( '. join(' OR ', @orwhere ). ' ) ' );
+
+  if ( $options{'begin'} ) {
+    push @where, 'startdate >= '. $options{'begin'};
+  }
+  if ( $options{'end'} ) {
+    push @where, 'startdate < '.  $options{'end'};
   }
 
-  my $extra_sql = ' AND ( '. join(' OR ', @where ). ' ) ';
+  my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where );
 
   my @cdrs =
     qsearch( {
       'table'      => 'cdr',
-      'hashref'    => { 'freesidestatus' => '', },
-      'extra_sql'  => "$extra_sql FOR UPDATE",
+      'hashref'    => \%hash,
+      'extra_sql'  => "$extra_sql $for_update",
     } );
 
   @cdrs;
-- 
cgit v1.2.1


From c6ba0fa6271880599ce3d60dcd23de248526f0b8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 May 2009 18:21:38 +0000
Subject: prevent death on meritless sqlradius upgrade attempts

---
 FS/bin/freeside-upgrade | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 24f577f11..7ee35c68d 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_d $opt_s $opt_q $opt_v);
+use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r);
 use vars qw($DEBUG $DRY_RUN);
 use Getopt::Std;
 use DBIx::DBSchema 0.31;
@@ -17,7 +17,7 @@ my $start = time;
 
 die "Not running uid freeside!" unless checkeuid();
 
-getopts("dqs");
+getopts("dqrs");
 
 $DEBUG = !$opt_q;
 #$DEBUG = $opt_v;
@@ -153,7 +153,7 @@ warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
 $start = time;
 
 upgrade_sqlradius()
-  unless $DRY_RUN || $opt_s;
+  unless $DRY_RUN || $opt_s || $opt_r;
 
 warn "SQL RADIUS updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
 $start = time;
@@ -172,7 +172,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade [ -d ] [ -s ] [ -q | -v ] user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] user\n"; 
 }
 
 =head1 NAME
@@ -181,7 +181,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -s ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
@@ -203,6 +203,9 @@ Also performs other upgrade functions:
 
   [ -q ]: Run quietly.  This may become the default at some point.
 
+  [ -r ]: Skip sqlradius updates.  Useful for occassions where the sqlradius
+          databases may be inaccessible.
+
   [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
           current default.
 
-- 
cgit v1.2.1


From c866a1f8480b05f87230579a19c9e0fe0a5e7ac1 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 May 2009 19:21:36 +0000
Subject: allow empty state

---
 FS/FS/Schema.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index a9b546940..e9861f8d1 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -827,7 +827,7 @@ sub tables_hashref {
         'geocode',            'varchar', '',     20,      '', '', 
         'city',               'varchar', 'NULL', $char_d, '', '',
         'county',             'varchar', 'NULL', $char_d, '', '',
-        'state',              'char',    '',     2,  '', '', 
+        'state',              'char',    'NULL',       2, '', '', 
         'disabled',           'char',    'NULL', 1, '', '',
       ],
       'primary_key' => 'taxratelocationnum',
-- 
cgit v1.2.1


From b3f5d82f666ad38799cae84f0b50bad2b0450d40 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 18 May 2009 19:23:27 +0000
Subject: miss use

---
 FS/FS/tax_rate_location.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index 65bef7bf7..0e0dafebb 100644
--- a/FS/FS/tax_rate_location.pm
+++ b/FS/FS/tax_rate_location.pm
@@ -3,6 +3,7 @@ package FS::tax_rate_location;
 use strict;
 use base qw( FS::Record );
 use FS::Record qw( qsearch qsearchs dbh );
+use FS::Misc qw( csv_from_fixed );
 
 =head1 NAME
 
-- 
cgit v1.2.1


From 2b968bffd937b19d2314aa5e304fccc8ec1e1350 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 May 2009 01:06:41 +0000
Subject: first pass at netsapiens integration, RT#5226

---
 FS/FS/part_export/netsapiens.pm | 198 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 FS/FS/part_export/netsapiens.pm

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
new file mode 100644
index 000000000..10b53ef51
--- /dev/null
+++ b/FS/FS/part_export/netsapiens.pm
@@ -0,0 +1,198 @@
+package FS::part_export::netsapiens;
+
+use vars qw(@ISA %info);
+use URI;
+use MIME::Base64;
+use Tie::IxHash;
+use FS::part_export;
+
+@ISA = qw(FS::part_export);
+
+tie my %options, 'Tie::IxHash',
+  'login'         => { label=>'NetSapiens tac2 API username' },
+  'password'      => { label=>'NetSapiens tac2 API password' },
+  'url'           => { label=>'NetSapiens tac2 URL' },
+  'domain'        => { label=>'NetSapiens Domain' },
+;
+
+%info = (
+  'svc'      => 'svc_phone',
+  'desc'     => 'Provision phone numbers to NetSapiens',
+  'options'  => \%options,
+  'notes'    => <<'END'
+Requires installation of
+<a href="http://search.cpan.org/dist/REST-Client">REST::Client</a>
+from CPAN.
+END
+);
+
+sub rebless { shift; }
+
+sub ns_command {
+  my( $self, $method, $command, @args ) = @_;
+
+  eval 'use REST::Client';
+  die $@ if $@;
+
+  my $ns = new REST::Client 'host'=>$self->option('url');
+
+  my $content = $method eq 'PUT' ? $ns->buildQuery( { @args } ) : '';
+  $content =~ s/^\?//;
+
+  warn $content;
+
+  my $auth =
+    encode_base64( $self->option('login'). ':'. $self->option('password') );
+
+  $ns->$method( $command, $content, { 'Authorization' => "Basic $auth" } );
+
+  $ns;
+}
+
+sub ns_subscriber {
+  my($self, $svc_phone) = (shift, shift);
+
+  my $domain = $self->option('domain');
+  my $phonenum = $svc_phone->phonenum;
+
+  "/domains_config/$domain/subscriber_config/$phonenum";
+}
+
+sub ns_create_or_update {
+  my($self, $svc_phone, $dial_policy) = (shift, shift, shift);
+
+  my $domain = $self->option('domain');
+  my $phonenum = $svc_phone->phonenum;
+
+  my( $firstname, $lastname );
+  if ( $svc_phone->phone_name =~ /^\s*(\S+)\s+(\S.*\S)\s*$/ ) {
+    $firstname = $1;
+    $lastname  = $2;
+  } else {
+    #deal w/unaudited netsapiens services?
+    my $cust_main = $svc_phone->cust_svc->cust_pkg->cust_main;
+    $firstname = $cust_main->get('first');
+    $lastname  = $cust_main->get('last');
+  }
+
+  my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 
+                                'subscriber_login' => $phonenum.'@'.$domain,
+                                'firstname'        => $firstname, #4?
+                                'lastname'         => $lastname,  #5?
+                                'subscriber_pin'   => $svc_phone->pin, #6?
+                                'dial_plan'        => 'Default',    #config? #7?
+                                'dial_policy'      => $dial_policy, #8?
+#no_answer_timeout30   
+#  simultaneous_ringyes   
+#  gmt_offset-8   
+#  aor_schemesip:   
+#  do_not_disturbyes   
+#  email_vmail   
+#  data_limit0   
+#  screen   
+#  last_update2008-10-01 12:19:01.0   
+#  domain_diryes   
+#  callid_name[*]   
+#  admin_vmailyes   
+#  subscriber_name   
+#  rcv_broadcast   
+#  directory_order1   
+#  accept   
+#  rating_required   
+#  date_created2008-02-22 08:38:01   
+#  message_waiting   
+#  rate   
+#  directory_listingno   
+#  time_zoneUS/Pacific   
+#  forward_no_answeryes   
+#  vmail_sort_lifo   
+#  modeover-capacity   
+#  subscriber_groupn/a   
+#  vmail_say_time   
+#  presenceinactive   
+#  directory_match826   
+#  language   
+#  forward_busyyes   
+#  callid_nmbr[*]   
+#  vmail   
+#  subscriber_login1007@vbox.netsapiens.com   
+#  rejectyes   
+#  forwardyes   
+#  vmail_say_cidno   
+#  email_address   
+#  greeting_index
+                            );
+
+  if ( $ns->responseCode !~ /^2/ ) {
+     return $ns->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns->responseContent ) );
+  }
+
+  '';
+}
+
+sub ns_delete {
+  my($self, $svc_phone) = (shift, shift);
+
+  my $ns = $self->ns_command( 'DELETE', $self->ns_subscriber($svc_phone) );
+
+  if ( $ns->responseCode !~ /^2/ ) {
+     return $ns->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns->responseContent ) );
+  }
+
+  '';
+
+}
+
+sub ns_parse_response {
+  my( $self, $content ) = ( shift, shift );
+
+  tie my %hash, Tie::IxHash;
+  #while ( $content =~ s/^.*?<p>\s*<b>(.+?)<\/b>\s*<(\w+)>(.+?)<\/\2><\/p>//i ) {
+  while ( $content =~ s/^.*?<p>\s*<b>(.+?)<\/b>\s*(.+?)\s*<\/p>//is ) {
+    ( $hash{$1} = $2 ) =~ s/^\s*<(\w+)>(.+?)<\/\1>/$2/is;
+  }
+
+  #warn $content; #probably useless
+
+  %hash;
+}
+
+sub _export_insert {
+  my($self, $svc_phone) = (shift, shift);
+  $self->ns_create_or_update($svc_phone, 'Permit All');
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return "can't change phonenum with NetSapiens (unprovision and reprovision?)"
+    if $old->phonenum ne $new->phonenum;
+  $self->_export_insert($new);
+}
+
+sub _export_delete {
+  my( $self, $svc_phone ) = (shift, shift);
+
+  $self->ns_delete($svc_phone);
+}
+
+sub _export_suspend {
+  my( $self, $svc_phone ) = (shift, shift);
+  $self->ns_create_or_udpate($svc_phone, 'Deny');
+}
+
+sub _export_unsuspend {
+  my( $self, $svc_phone ) = (shift, shift);
+  #$self->ns_create_or_update($svc_phone, 'Permit All');
+  $self->_export_insert($svc_phone);
+}
+
+sub export_links {
+  my($self, $svc_phone, $arrayref) = (shift, shift, shift);
+  #push @$arrayref, qq!<A HREF="http://example.com/~!. $svc_phone->username.
+  #                 qq!">!. $svc_phone->username. qq!</A>!;
+  '';
+}
+
+1;
-- 
cgit v1.2.1


From 2fd929f5185673c55f46cca2e8c846c47e7cf959 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 May 2009 08:27:39 +0000
Subject: get subscriber deletion working and remove devel cruft, RT#5226

---
 FS/FS/part_export/netsapiens.pm | 68 +++++++++--------------------------------
 1 file changed, 15 insertions(+), 53 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 10b53ef51..e19e95cb4 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -29,23 +29,26 @@ END
 sub rebless { shift; }
 
 sub ns_command {
-  my( $self, $method, $command, @args ) = @_;
+  my( $self, $method, $command ) = splice(@_,0,3);
 
   eval 'use REST::Client';
   die $@ if $@;
 
   my $ns = new REST::Client 'host'=>$self->option('url');
 
-  my $content = $method eq 'PUT' ? $ns->buildQuery( { @args } ) : '';
-  $content =~ s/^\?//;
+  my @args = ( $command );
 
-  warn $content;
+  if ( $method eq 'PUT' ) {
+    my $content = $method eq 'PUT' ? $ns->buildQuery( { @_ } ) : '';
+    $content =~ s/^\?//;
+    push @args, $content;
+  }
 
   my $auth =
     encode_base64( $self->option('login'). ':'. $self->option('password') );
+  push @args, { 'Authorization' => "Basic $auth" };
 
-  $ns->$method( $command, $content, { 'Authorization' => "Basic $auth" } );
-
+  $ns->$method( @args );
   $ns;
 }
 
@@ -77,50 +80,11 @@ sub ns_create_or_update {
 
   my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 
                                 'subscriber_login' => $phonenum.'@'.$domain,
-                                'firstname'        => $firstname, #4?
-                                'lastname'         => $lastname,  #5?
-                                'subscriber_pin'   => $svc_phone->pin, #6?
-                                'dial_plan'        => 'Default',    #config? #7?
-                                'dial_policy'      => $dial_policy, #8?
-#no_answer_timeout30   
-#  simultaneous_ringyes   
-#  gmt_offset-8   
-#  aor_schemesip:   
-#  do_not_disturbyes   
-#  email_vmail   
-#  data_limit0   
-#  screen   
-#  last_update2008-10-01 12:19:01.0   
-#  domain_diryes   
-#  callid_name[*]   
-#  admin_vmailyes   
-#  subscriber_name   
-#  rcv_broadcast   
-#  directory_order1   
-#  accept   
-#  rating_required   
-#  date_created2008-02-22 08:38:01   
-#  message_waiting   
-#  rate   
-#  directory_listingno   
-#  time_zoneUS/Pacific   
-#  forward_no_answeryes   
-#  vmail_sort_lifo   
-#  modeover-capacity   
-#  subscriber_groupn/a   
-#  vmail_say_time   
-#  presenceinactive   
-#  directory_match826   
-#  language   
-#  forward_busyyes   
-#  callid_nmbr[*]   
-#  vmail   
-#  subscriber_login1007@vbox.netsapiens.com   
-#  rejectyes   
-#  forwardyes   
-#  vmail_say_cidno   
-#  email_address   
-#  greeting_index
+                                'firstname'        => $firstname,
+                                'lastname'         => $lastname,
+                                'subscriber_pin'   => $svc_phone->pin,
+                                'dial_plan'        => 'Default', #config?
+                                'dial_policy'      => $dial_policy,
                             );
 
   if ( $ns->responseCode !~ /^2/ ) {
@@ -148,14 +112,12 @@ sub ns_delete {
 sub ns_parse_response {
   my( $self, $content ) = ( shift, shift );
 
+  #try to screen-scrape something useful
   tie my %hash, Tie::IxHash;
-  #while ( $content =~ s/^.*?<p>\s*<b>(.+?)<\/b>\s*<(\w+)>(.+?)<\/\2><\/p>//i ) {
   while ( $content =~ s/^.*?<p>\s*<b>(.+?)<\/b>\s*(.+?)\s*<\/p>//is ) {
     ( $hash{$1} = $2 ) =~ s/^\s*<(\w+)>(.+?)<\/\1>/$2/is;
   }
 
-  #warn $content; #probably useless
-
   %hash;
 }
 
-- 
cgit v1.2.1


From 98901e4ef499dfb983bbd0d467eca3a0534bc3e9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 May 2009 15:27:17 +0000
Subject: add "manage device" link & config, RT#5438

---
 FS/FS/Conf.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e86ed0d15..87e8517de 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2795,6 +2795,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_broadband-manage_link',
+    'section'     => 'UI',
+    'description' => 'URL for svc_broadband "Manage Device" link.  The following substitutions are available: $ip_addr.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
-- 
cgit v1.2.1


From 0d8c19f122f9f7331aa707192f3bffa473f069a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 May 2009 03:02:54 +0000
Subject: add ability to report on packages w/status "not yet billed" as well,
 RT#5409

---
 FS/FS/cust_pkg.pm | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 25899364e..93aec6d38 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1683,8 +1683,8 @@ tie my %statuscolor, 'Tie::IxHash',
 
 sub statuses {
   my $self = shift; #could be class...
-  grep { $_ !~ /^(not yet billed)$/ } #this is a dumb status anyway
-                                      # mayble split btw one-time vs. recur
+  #grep { $_ !~ /^(not yet billed)$/ } #this is a dumb status anyway
+  #                                    # mayble split btw one-time vs. recur
     keys %statuscolor;
 }
 
@@ -2087,6 +2087,18 @@ sub active_sql { "
   AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
 "; }
 
+=item not_yet_billed_sql
+
+Returns an SQL expression identifying packages which have not yet been billed.
+
+=cut
+
+sub not_yet_billed_sql { "
+      ( cust_pkg.setup  IS NULL OR cust_pkg.setup  = 0 )
+  AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
+  AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
+"; }
+
 =item inactive_sql
 
 Returns an SQL expression identifying inactive packages (one-time packages
@@ -2096,6 +2108,7 @@ that are otherwise unsuspended/uncancelled).
 
 sub inactive_sql { "
   ". $_[0]->onetime_sql(). "
+  AND cust_pkg.setup IS NOT NULL AND cust_pkg.setup != 0
   AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
   AND ( cust_pkg.susp   IS NULL OR cust_pkg.susp   = 0 )
 "; }
@@ -2220,8 +2233,13 @@ sub search_sql {
 
     push @where, FS::cust_pkg->active_sql();
 
-  } elsif (    $params->{'magic'}  eq 'inactive'
-            || $params->{'status'} eq 'inactive' ) {
+  } elsif (    $params->{'magic'}  eq 'not yet billed'
+            || $params->{'status'} eq 'not yet billed' ) {
+
+    push @where, FS::cust_pkg->not_yet_billed_sql();
+
+  } elsif (    $params->{'magic'}  =~ /^(one-time charge|inactive)/
+            || $params->{'status'} =~ /^(one-time charge|inactive)/ ) {
 
     push @where, FS::cust_pkg->inactive_sql();
 
@@ -2235,10 +2253,6 @@ sub search_sql {
 
     push @where, FS::cust_pkg->cancelled_sql();
 
-  } elsif ( $params->{'status'} =~ /^(one-time charge|inactive)$/ ) {
-
-    push @where, FS::cust_pkg->inactive_sql();
-
   }
 
   ###
-- 
cgit v1.2.1


From aa6c509c76c647d05d7bc94ca58effa845cac245 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 May 2009 03:22:38 +0000
Subject: commit before sqlradius upgrade so sqlradius upgrade errors from
 permissions can be ignored for now

---
 FS/bin/freeside-upgrade | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 7ee35c68d..97babbd68 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -149,6 +149,8 @@ $start = time;
 upgrade()
   unless $DRY_RUN || $opt_s;
 
+$dbh->commit or die $dbh->errstr;
+
 warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
 $start = time;
 
@@ -161,7 +163,7 @@ $start = time;
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
-warn "Commit and disconnection completed in ". (time-$start). " seconds; upgrade done!\n"; # if $DEBUG;
+warn "Final commit and disconnection completed in ". (time-$start). " seconds; upgrade done!\n"; # if $DEBUG;
 
 ###
 
-- 
cgit v1.2.1


From d6b6f81e383f9d876e67e9704914e887a331012e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 May 2009 01:49:34 +0000
Subject: international self-service payments, RT#1592

---
 FS/FS/ClientAPI/MasonComponent.pm | 44 +++++++++++++++++++++++++++++++++++++--
 FS/FS/ClientAPI/MyAccount.pm      |  7 ++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm
index 78ea9bd4f..d158ce842 100644
--- a/FS/FS/ClientAPI/MasonComponent.pm
+++ b/FS/FS/ClientAPI/MasonComponent.pm
@@ -1,9 +1,13 @@
 package FS::ClientAPI::MasonComponent;
 
 use strict;
-use vars qw($DEBUG $me);
+use vars qw( $cache $DEBUG $me );
+use subs qw( _cache );
 use FS::Mason qw( mason_interps );
 use FS::Conf;
+use FS::ClientAPI_SessionCache;
+use FS::Record qw(qsearchs);
+use FS::cust_main;
 
 $DEBUG = 0;
 $me = '[FS::ClientAPI::MasonComponent]';
@@ -13,6 +17,24 @@ my %allowed_comps = map { $_=>1 } qw(
   /misc/areacodes.cgi
   /misc/exchanges.cgi
   /misc/phonenums.cgi
+  /misc/states.cgi
+  /misc/counties.cgi
+);
+
+my %session_comps = map { $_=>1 } qw(
+  /elements/location.html
+);
+
+my %session_callbacks = (
+  '/elements/location.html' => sub {
+    my( $custnum, $argsref ) = @_;
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+      or return "unknown custnum $custnum";
+    my %args = @$argsref;
+    $args{object} = $cust_main;
+    @$argsref = ( %args );
+    return ''; #no error
+  },
 );
 
 my $outbuf;
@@ -24,12 +46,23 @@ sub mason_comp {
   warn "$me mason_comp called on $packet\n" if $DEBUG;
 
   my $comp = $packet->{'comp'};
-  unless ( $allowed_comps{$comp} ) {
+  unless ( $allowed_comps{$comp} || $session_comps{$comp} ) {
     return { 'error' => 'Illegal component' };
   }
 
   my @args = $packet->{'args'} ? @{ $packet->{'args'} } : ();
 
+  if ( $session_comps{$comp} ) {
+
+    my $session = _cache->get($packet->{'session_id'})
+      or return ( 'error' => "Can't resume session" ); #better error message
+    my $custnum = $session->{'custnum'};
+
+    my $error = &{ $session_callbacks{$comp} }( $custnum, \@args );
+    return { 'error' => $error } if $error;
+
+  }
+
   my $conf = new FS::Conf;
   $FS::Mason::Request::FSURL = $conf->config('selfservice_server-base_url');
   $FS::Mason::Request::QUERY_STRING = $packet->{'query_string'} || '';
@@ -43,4 +76,11 @@ sub mason_comp {
 
 }
 
+#hmm
+sub _cache {
+  $cache ||= new FS::ClientAPI_SessionCache( {
+               'namespace' => 'FS::ClientAPI::MyAccount',
+             } );
+}
+
 1;
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index ab5096891..48a6ba940 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -506,7 +506,8 @@ sub process_payment {
   }
 
   my %payby2fields = (
-    'CARD' => [ qw( paystart_month paystart_year payissue address1 address2 city state zip payip ) ],
+    'CARD' => [ qw( paystart_month paystart_year payissue payip
+                    address1 address2 city state zip country    ) ],
     'CHEK' => [ qw( ss paytype paystate stateid stateid_state payip ) ],
   );
 
@@ -527,8 +528,8 @@ sub process_payment {
     my $new = new FS::cust_main { $cust_main->hash };
     if ($payby eq 'CARD' || $payby eq 'DCRD') {
       $new->set( $_ => $p->{$_} )
-        foreach qw( payname paystart_month paystart_year payissue payip
-                    address1 address2 city state zip payinfo );
+        foreach qw( payinfo payname paystart_month paystart_year payissue payip
+                    address1 address2 city state zip country );
       $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
     } elsif ($payby eq 'CHEK' || $payby eq 'DCHK') {
       $new->set( $_ => $p->{$_} )
-- 
cgit v1.2.1


From 8d9be02c9965db4c4a48a2221455160685a95462 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 May 2009 01:35:16 +0000
Subject: add a config option for some basic tax grouping by name, RT#5446

---
 FS/FS/Conf.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 87e8517de..8b27610a7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1380,7 +1380,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'selfservice_server-base_url',
     'section'     => '',
-    'description' => 'Base URL for the self-service web interface - necessary for special provisioning widgets to find their way.',
+    'description' => 'Base URL for the self-service web interface - necessary for some widgets to find their way, including retrieval of non-US state information and phone number provisioning.',
     'type'        => 'text',
   },
 
@@ -2802,6 +2802,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'tax-report_groups',
+    'section'     => '',
+    'description' => 'List of grouping possibilities for tax names on reports, one per line, "label op value" (op can be = or !=).',
+    'type'        => 'textarea',
+  },
+
 );
 
 1;
-- 
cgit v1.2.1


From 15e57a4859d967a13113602b112c4aa197ca6002 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 27 May 2009 07:50:40 +0000
Subject: bulk provisioning via ftp and SOAP #5202

---
 FS/FS/ClientAPI/Bulk.pm            | 384 +++++++++++++++++++++++++++++++++++++
 FS/FS/Conf.pm                      |  18 ++
 FS/FS/Schema.pm                    |  26 +++
 FS/FS/cust_main.pm                 |  13 +-
 FS/FS/cust_pkg.pm                  |  32 ++++
 FS/FS/cust_recon.pm                | 193 +++++++++++++++++++
 FS/FS/part_pkg/voip_cdr.pm         |   2 +-
 FS/FS/svc_acct.pm                  |  15 ++
 FS/MANIFEST                        |   2 +
 FS/bin/freeside-selfservice-server |  23 +++
 FS/t/cust_recon.t                  |   5 +
 11 files changed, 711 insertions(+), 2 deletions(-)
 create mode 100644 FS/FS/ClientAPI/Bulk.pm
 create mode 100644 FS/FS/cust_recon.pm
 create mode 100644 FS/t/cust_recon.t

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Bulk.pm b/FS/FS/ClientAPI/Bulk.pm
new file mode 100644
index 000000000..ec617df76
--- /dev/null
+++ b/FS/FS/ClientAPI/Bulk.pm
@@ -0,0 +1,384 @@
+package FS::ClientAPI::Bulk;
+
+use strict;
+
+use vars qw( $DEBUG $cache );
+use Date::Parse;
+use FS::Record qw( qsearchs );
+use FS::Conf;
+use FS::ClientAPI_SessionCache;
+use FS::cust_main;
+use FS::cust_pkg;
+use FS::cust_svc;
+use FS::svc_acct;
+use FS::svc_external;
+use FS::cust_recon;
+use Data::Dumper;
+
+$DEBUG = 1;
+
+sub _cache {
+  $cache ||= new FS::ClientAPI_SessionCache ( {
+               'namespace' => 'FS::ClientAPI::Agent', #yes, share session_ids
+             } );
+}
+
+sub _izoom_ftp_row_fixup {
+  my $hash = shift;
+
+  my @addr_fields = qw( address1 address2 city state zip );
+  my @fields = ( qw( agent_custid username _password first last ),
+                 @addr_fields,
+                 map { "ship_$_" } @addr_fields );
+
+  $hash->{$_} =~ s/[&\/\*'"]/_/g foreach @fields;
+
+  #$hash->{action} = '' if $hash->{action} eq 'R'; #unsupported for ftp
+
+  $hash->{refnum} = 1;  #ahem
+  $hash->{country} = 'US';
+  $hash->{ship_country} = 'US';
+  $hash->{payby} = 'LECB';
+  $hash->{payinfo} = $hash->{daytime};
+  $hash->{ship_fax} = '' if ( !$hash->{sms} ||  $hash->{sms} eq 'F' );
+
+  my $has_ship =
+    grep { $hash->{"ship_$_"} &&
+           (! $hash->{$_} || $hash->{"ship_$_"} ne $hash->{$_} )
+         }
+    ( @addr_fields, 'fax' );
+
+  if ( $has_ship )  {
+    foreach ( @addr_fields, qw( first last ) ) {
+      $hash->{"ship_$_"} = $hash->{$_} unless $hash->{"ship_$_"};
+    }
+  }
+    
+  delete $hash->{sms};
+
+  '';
+
+};
+
+sub _izoom_ftp_result {
+  my ($hash, $error) = @_;
+  my $cust_main =
+      qsearchs( 'cust_main', { 'agent_custid' => $hash->{agent_custid},
+                               'agentnum'     => $hash->{agentnum}
+                             }
+              );
+
+  my $custnum = $cust_main ? $cust_main->custnum : '';
+  my @response = ( $hash->{action}, $hash->{agent_custid}, $custnum );
+
+  if ( $error ) {
+    push @response, ( 'ERROR', $error );
+  } else {
+    push @response, ( 'OK', 'OK' );
+  }
+
+  join( ',', @response );
+
+}
+
+sub _izoom_ftp_badaction {
+  "Invalid action: $_[0] record: @_ ";
+}
+
+sub _izoom_soap_row_fixup { _izoom_ftp_row_fixup(@_) };
+
+sub _izoom_soap_result {
+  my ($hash, $error) = @_;
+
+  if ( $hash->{action} eq 'R' ) {
+    if ( $error ) {
+      return "Please check errors:\n $error"; # odd extra space
+    } else {
+      return join(' ', "Everything ok.", $hash->{pkg}, $hash->{adjourn} );
+    }
+  }
+
+  my $pkg = $hash->{pkg} || $hash->{saved_pkg} || '';
+  if ( $error ) {
+    return join(' ', $hash->{agent_custid}, $error );
+  } else {
+    return join(' ', $hash->{agent_custid}, $pkg, $hash->{adjourn} );
+  }
+
+}
+
+sub _izoom_soap_badaction {
+  "Unknown action '$_[13]' ";
+}
+
+my %format = (
+  'izoom-ftp'  => {
+                    'fields' => [ qw ( action agent_custid username _password
+                                       daytime ship_fax sms first last
+                                       address1 address2 city state zip
+                                       pkg adjourn ship_address1 ship_address2
+                                       ship_city ship_state ship_zip ) ],
+                    'fixup'  =>  sub { _izoom_ftp_row_fixup(@_) },
+                    'result' =>  sub { _izoom_ftp_result(@_) },
+                    'action' =>  sub { _izoom_ftp_badaction(@_) },
+                  },
+  'izoom-soap' => {
+                    'fields' => [ qw ( agent_custid username _password
+                                       daytime first last address1 address2
+                                       city state zip pkg action adjourn
+                                       ship_fax sms ship_address1 ship_address2
+                                       ship_city ship_state ship_zip ) ],
+                    'fixup'  =>  sub { _izoom_soap_row_fixup(@_) },
+                    'result' =>  sub { _izoom_soap_result(@_) },
+                    'action' =>  sub { _izoom_soap_badaction(@_) },
+                  },
+);
+
+sub processrow {
+  my $p = shift;
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $conf = new FS::Conf;
+  my $format = $conf->config('selfservice-bulk_format', $session->{agentnum})
+               || 'izoom-soap';
+  my ( @row ) = @{ $p->{row} };
+
+  warn "processrow called with '". join("' '", @row). "'\n" if $DEBUG;
+
+  return { 'error' => "unknown format: $format" }
+    unless exists $format{$format};
+
+  return { 'error' => "Invalid record record length: ". scalar(@row).
+                      "record: @row " #sic
+         }
+    unless scalar(@row) == scalar(@{$format{$format}{fields}});
+
+  my %hash = ( 'agentnum' => $session->{agentnum} );
+  my $error;
+
+  foreach my $field ( @{ $format{ $format }{ fields } } ) {
+    $hash{$field} = shift @row;
+  }
+
+  $error ||= &{ $format{ $format }{ fixup } }( \%hash );
+  
+  # put in the fixup routine?
+  if ( 'R' eq $hash{action} ) {
+    warn "processing reconciliation\n" if $DEBUG;
+    $error ||= process_recon($hash{agentnum}, $hash{agent_custid});
+  } elsif ( 'P' eq $hash{action} ) {
+    #  do nothing
+  } elsif( 'D' eq $hash{action} ) {
+    $hash{promo_pkg} = 'disk-1-'. $session->{agent};
+  } elsif ( 'S' eq $hash{action} ) {
+    $hash{promo_pkg} = 'disk-2-'. $session->{agent};
+    $hash{saved_pkg} = $hash{pkg};
+    $hash{pkg} = '';
+  } else {
+    $error ||= &{ $format{ $format }{ action } }( @row );
+  }
+
+  warn "processing provision\n" if ($DEBUG && !$error && $hash{action} ne 'R');
+  $error ||= provision( %hash ) unless $hash{action} eq 'R';
+
+  my $result =  &{ $format{ $format }{ result } }( \%hash, $error );
+
+  warn "processrow returning '". join("' '", $result, $error). "'\n"
+    if $DEBUG;
+
+  return { 'error' => $error, 'message' => $result };
+
+}
+
+sub provision {
+  my %args = ( @_ );
+
+  delete $args{action};
+
+  my $cust_main =
+    qsearchs( 'cust_main',
+              { map { $_ => $args{$_} } qw ( agent_custid agentnum ) },
+            );
+
+  unless ( $cust_main ) {
+    $cust_main = new FS::cust_main { %args };
+    my $error = $cust_main->insert;
+    return $error if $error;
+  }
+
+  my @pkgs = grep { $_->part_pkg->freq } $cust_main->ncancelled_pkgs;
+  if ( scalar(@pkgs) > 1 ) {
+    return "Invalid account, should not be more then one active package ". #sic
+           "but found: ". scalar(@pkgs). " packages.";
+  }
+
+  my $part_pkg = qsearchs( 'part_pkg', { 'pkg' => $args{pkg} } ) 
+    or return "Unknown pkgpart: $args{pkg}"
+    if $args{pkg};
+
+
+  my $create_package = $args{pkg};        
+  if ( scalar(@pkgs) && $create_package ) {        
+    my $pkg = pop(@pkgs);
+        
+    if ( $part_pkg->pkgpart != $pkg->pkgpart ) {
+      my @cust_bill_pkg = $pkg->cust_bill_pkg();
+      if ( 1 == scalar(@cust_bill_pkg) ) {
+        my $cbp= pop(@cust_bill_pkg);
+        my $cust_bill = $cbp->cust_bill;
+        $cust_bill->delete();  #really?  wouldn't a credit be better?
+      }
+      $pkg->cancel();
+    } else {
+      $create_package = '';
+      $pkg->setfield('adjourn', str2time($args{adjourn}));
+      my $error = $pkg->replace();
+      return $error if $error;
+    }
+  }
+
+  if ( $create_package ) {
+    my $cust_pkg = new FS::cust_pkg ( {
+        'pkgpart' => $part_pkg->pkgpart,
+        'adjourn' => str2time( $args{adjourn} ),
+    } );
+
+    my $svcpart = $part_pkg->svcpart('svc_acct');
+
+    my $svc_acct = new FS::svc_acct ( {
+        'svcpart'   => $svcpart,
+        'username'  => $args{username},
+        '_password' => $args{_password},
+    } );
+
+    my $error = $cust_main->order_pkg( cust_pkg => $cust_pkg,
+                                       svcs     => [ $svc_acct ],
+    );
+    return $error if $error;
+  }
+    
+  if ( $args{promo_pkg} ) {
+    my $part_pkg =
+    qsearchs( 'part_pkg', { 'promo_code' =>  $args{promo_pkg} } )
+      or return "unknown pkgpart: $args{promo_pkg}";
+            
+    my $svcpart = $part_pkg->svcpart('svc_external')
+      or return "unknown svcpart: svc_external";
+
+    my $cust_pkg = new FS::cust_pkg ( {
+      'svcpart' => $svcpart,
+      'pkgpart' => $part_pkg->pkgpart,
+    } );
+
+    my $svc_ext = new FS::svc_external ( { 'svcpart'   => $svcpart } );
+    
+    my $ticket_subject = 'Send setup disk to customer '. $cust_main->custnum;
+    my $error = $cust_main->order_pkg ( cust_pkg       => $cust_pkg,
+                                        svcs           => [ $svc_ext ],
+                                        noexport       => 1,
+                                        ticket_subject => $ticket_subject,
+                                        ticket_queue   => "disk-$args{agentnum}",
+    );
+    return $error if $error;
+  }
+
+  my $error = $cust_main->bill();
+  return $error if $error;
+}
+
+sub process_recon {
+  my ( $agentnum, $id ) = @_;
+  my @recs = split /;/, $id;
+  my $err = '';
+  foreach my $rec ( @recs ) {
+    my @record = split /,/, $rec;
+    my $result = process_recon_record(@record, $agentnum);
+    $err .= "$result\n" if $result;
+  }
+  return $err;
+}
+
+sub process_recon_record {
+  my ( $agent_custid, $username, $_password, $daytime, $first, $last, $address1, $address2, $city, $state, $zip, $pkg, $adjourn, $agentnum) = @_;
+
+  warn "process_recon_record called with '". join("','", @_). "'\n" if $DEBUG;
+
+  my ($cust_pkg, $package);
+
+  my $cust_main =
+    qsearchs( 'cust_main',
+              { 'agent_custid' => $agent_custid, 'agentnum' => $agentnum },
+            );
+
+  my $comments = '';
+  if ( $cust_main ) {
+    my @cust_pkg = grep { $_->part_pkg->freq } $cust_main->ncancelled_pkgs;
+    if ( scalar(@cust_pkg) == 1) {
+      $cust_pkg = pop(@cust_pkg);
+      $package = $cust_pkg->part_pkg->pkg;
+      $comments = "$agent_custid wrong package, expected: $pkg found: $package"
+        if ( $pkg ne $package );
+    } else {
+      $comments = "invalid account, should be one active package but found: ".
+                 scalar(@cust_pkg). " packages.";
+    }
+  } else {
+    $comments =
+      "Customer not found agent_custid=$agent_custid, agentnum=$agentnum";
+  }
+
+  my $cust_recon = new FS::cust_recon( {
+    'recondate'     => time,
+    'agentnum'      => $agentnum,
+    'first'         => $first,
+    'last'          => $last,
+    'address1'      => $address1,
+    'address2'      => $address2,
+    'city'          => $city,
+    'state'         => $state,
+    'zip'           => $zip,
+    'custnum'       => $cust_main ? $cust_main->custnum : '', #really?
+    'status'        => $cust_main ? $cust_main->status : '',
+    'pkg'           => $package,
+    'adjourn'       => $cust_pkg ? $cust_pkg->adjourn : '',
+    'agent_custid'  => $agent_custid, # redundant?
+    'agent_pkg'     => $pkg,
+    'agent_adjourn' => str2time($adjourn),
+    'comments'      => $comments,
+  } );
+
+  warn Dumper($cust_recon) if $DEBUG;
+  my $error = $cust_recon->insert;
+  return $error if $error;
+
+  warn "process_recon_record returning $comments\n" if $DEBUG;
+
+  $comments;
+
+}
+
+sub check_username {
+  my $p = shift;
+
+  my $session = _cache->get($p->{'session_id'})
+    or return { 'error' => "Can't resume session" }; #better error message
+
+  my $svc_domain = qsearchs( 'svc_domain', { 'domain' => $p->{domain} } )
+    or return { 'error' => 'Unknown domain '. $p->{domain} };
+
+  my $svc_acct = qsearchs( 'svc_acct', { 'username' => $p->{user},
+                                         'domsvc'   => $svc_domain->svcnum,
+                                       },
+                         );
+
+  return { 'error' => $p->{user}. '@'. $p->{domain}. " alerady in use" } # sic
+    if $svc_acct;
+
+  return { 'error'   => '',
+           'message' => $p->{user}. '@'. $p->{domain}. " is free"
+  };
+}
+
+1;
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8b27610a7..cb53ef7d1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1153,6 +1153,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'username',
     'description' => 'Usernames must contain at least one letter',
     'type'        => 'checkbox',
+    'per_agent'   => 1,
   },
 
   {
@@ -2669,6 +2670,23 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'selfservice-bulk_format',
+    'section'     => '',
+    'description' => 'Parameter arrangement for selfservice bulk features',
+    'type'        => 'select',
+    'select_enum' => [ '', 'izoom-soap', 'izoom-ftp' ],
+    'per_agent'   => 1,
+  },
+
+  {
+    'key'         => 'selfservice-bulk_ftp_dir',
+    'section'     => '',
+    'description' => 'Enable bulk ftp provisioning in this folder',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'signup-no_company',
     'section'     => '',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e9861f8d1..238058374 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -716,6 +716,32 @@ sub tables_hashref {
                  ],
     },
 
+    'cust_recon' => {  # what purpose does this serve?
+      'columns' => [
+        'reconid',      'serial',  '',          '', '', '', 
+        'recondate',    @date_type,                 '', '', 
+        'custnum',      'int'   ,  '',          '', '', '', 
+        'agentnum',     'int',     '',          '', '', '', 
+        'last',         'varchar', '',     $char_d, '', '', 
+        'first',        'varchar', '',     $char_d, '', '', 
+        'address1',     'varchar', '',     $char_d, '', '', 
+        'address2',     'varchar', 'NULL', $char_d, '', '', 
+        'city',         'varchar', '',     $char_d, '', '', 
+        'state',        'varchar', 'NULL', $char_d, '', '', 
+        'zip',          'varchar', 'NULL',      10, '', '', 
+        'pkg',          'varchar', 'NULL', $char_d, '', '', 
+        'adjourn',      @date_type,                 '', '',
+        'status',       'varchar', 'NULL',      10, '', '', 
+        'agent_custid', 'varchar',  '',    $char_d, '', '',
+        'agent_pkg',    'varchar', 'NULL', $char_d, '', '', 
+        'agent_adjourn', @date_type,                '', '',
+        'comments',     'text',    'NULL',      '', '', '', 
+      ],
+      'primary_key' => 'reconid',
+      'unique' => [],
+      'index' => [],
+    },
+
     #eventually use for billing & ship from cust_main too
     #for now, just cust_pkg locations
     'cust_location' => {
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a1bb926b3..72b84504f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -709,6 +709,14 @@ jobs will have a dependancy on the supplied job (they will not run until the
 specific job completes).  This can be used to defer provisioning until some
 action completes (such as running the customer's credit card successfully).
 
+=item ticket_subject
+
+Optional subject for a ticket created and attached to this customer
+
+=item ticket_subject
+
+Optional queue name for ticket additions
+
 =back
 
 =cut
@@ -728,6 +736,9 @@ sub order_pkg {
   $svc_options{'depend_jobnum'} = $opt->{'depend_jobnum'}
     if exists($opt->{'depend_jobnum'}) && $opt->{'depend_jobnum'};
 
+  my %insert_params = map { $opt->{$_} ? ( $_ => $opt->{$_} ) : () }
+                          qw( ticket_subject ticket_queue );
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -751,7 +762,7 @@ sub order_pkg {
 
   $cust_pkg->custnum( $self->custnum );
 
-  my $error = $cust_pkg->insert;
+  my $error = $cust_pkg->insert( %insert_params );
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "inserting cust_pkg (transaction rolled back): $error";
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 93aec6d38..0e5f3b7ca 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -6,6 +6,7 @@ use Carp qw(cluck);
 use Scalar::Util qw( blessed );
 use List::Util qw(max);
 use Tie::IxHash;
+use MIME::Entity;
 use FS::UID qw( getotaker dbh );
 use FS::Misc qw( send_email );
 use FS::Record qw( qsearch qsearchs );
@@ -229,6 +230,14 @@ If set true, supresses any referral credit to a referring customer.
 
 cust_pkg_option records will be created
 
+=item ticket_subject
+
+a ticket will be added to this customer with this subject
+
+=item ticket_queue
+
+an optional queue name for ticket additions
+
 =back
 
 =cut
@@ -271,6 +280,29 @@ sub insert {
 
   my $conf = new FS::Conf;
 
+  if ( $conf->config('ticket_system') && $options{ticket_subject} ) {
+    eval '
+      use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" );
+      use RT;
+    ';
+    die $@ if $@;
+
+    RT::LoadConfig();
+    RT::Init();
+    my $q = new RT::Queue($RT::SystemUser);
+    $q->Load($options{ticket_queue}) if $options{ticket_queue};
+    my $t = new RT::Ticket($RT::SystemUser);
+    my $mime = new MIME::Entity;
+    $mime->build( Type => 'text/plain', Data => $options{ticket_subject} );
+    $t->Create( $options{ticket_queue} ? (Queue => $q) : (),
+                Subject => $options{ticket_subject},
+                MIMEObj => $mime,
+              );
+    $t->AddLink( Type   => 'MemberOf',
+                 Target => 'freeside://freeside/cust_main/'. $self->custnum,
+               );
+  }
+
   if ($conf->config('welcome_letter') && $self->cust_main->num_pkgs == 1) {
     my $queue = new FS::queue {
       'job'     => 'FS::cust_main::queueable_print',
diff --git a/FS/FS/cust_recon.pm b/FS/FS/cust_recon.pm
new file mode 100644
index 000000000..0a1ca3ae2
--- /dev/null
+++ b/FS/FS/cust_recon.pm
@@ -0,0 +1,193 @@
+package FS::cust_recon;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+
+=head1 NAME
+
+FS::cust_recon - Object methods for cust_recon records
+
+=head1 SYNOPSIS
+
+  use FS::cust_recon;
+
+  $record = new FS::cust_recon \%hash;
+  $record = new FS::cust_recon { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_recon object represents a customer reconcilation.  FS::cust_recon
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item reconid
+
+primary key
+
+=item recondate
+
+recondate
+
+=item custnum
+
+custnum
+
+=item agentnum
+
+agentnum
+
+=item last
+
+last
+
+=item first
+
+first
+
+=item address1
+
+address1
+
+=item address2
+
+address2
+
+=item city
+
+city
+
+=item state
+
+state
+
+=item zip
+
+zip
+
+=item pkg
+
+pkg
+
+=item adjourn
+
+adjourn
+
+=item status
+
+status
+
+=item agent_custid
+
+agent_custid
+
+=item agent_pkg
+
+agent_pkg
+
+=item agent_adjourn
+
+agent_adjourn
+
+=item comments
+
+comments
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new customer reconcilation.  To add the reconcilation to the database,
+see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'cust_recon'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid reconcilation.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('reconid')
+    || $self->ut_numbern('recondate')
+    || $self->ut_number('custnum')
+    || $self->ut_number('agentnum')
+    || $self->ut_text('last')
+    || $self->ut_text('first')
+    || $self->ut_text('address1')
+    || $self->ut_textn('address2')
+    || $self->ut_text('city')
+    || $self->ut_textn('state')
+    || $self->ut_textn('zip')
+    || $self->ut_textn('pkg')
+    || $self->ut_numbern('adjourn')
+    || $self->ut_textn('status')
+    || $self->ut_text('agent_custid')
+    || $self->ut_textn('agent_pkg')
+    || $self->ut_numbern('agent_adjourn')
+    || $self->ut_textn('comments')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+Possibly the existance of this module.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index d89a68440..1195b1694 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -617,7 +617,7 @@ sub check_chargable {
     skip_lastapp
   );
   foreach my $opt (grep !exists($flags{option_cache}->{$_}), @opt ) {
-    $flags{option_cache}->{$opt} = $self->option($opt);
+    $flags{option_cache}->{$opt} = $self->option($opt, 1);
   }
   my %opt = %{ $flags{option_cache} };
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 8b5c7b9c9..1a42e6517 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1023,6 +1023,21 @@ sub check {
   ;
   return $error if $error;
 
+  my $cust_pkg;
+  local $username_letter = $username_letter;
+  if ($self->svcnum) {
+    my $cust_svc = $self->cust_svc
+      or return "no cust_svc record found for svcnum ". $self->svcnum;
+    my $cust_pkg = $cust_svc->cust_pkg;
+  }
+  if ($self->pkgnum) {
+    $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $self->pkgnum } );#complain?
+  }
+  if ($cust_pkg) {
+    $username_letter =
+      $conf->exists('username-letter', $cust_pkg->cust_main->agentnum);
+  }
+
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
   if ( $username_uppercase ) {
     $recref->{username} =~ /^([a-z0-9_\-\.\&\%\:]{$usernamemin,$ulen})$/i
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b5c9046a6..b77d5d892 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -438,3 +438,5 @@ FS/tax_rate_location.pm
 t/tax_rate_location.t
 FS/cust_bill_pkg_tax_rate_location.pm
 t/cust_bill_pkg_tax_rate_location.t
+FS/cust_recon.pm
+t/cust_recon.t
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 2087e7130..544f307ee 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -15,9 +15,11 @@ use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
 use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::ClientAPI;
 use FS::ClientAPI_SessionCache;
+use FS::Record qw( qsearch qsearchs );
 
 use FS::Conf;
 use FS::cust_svc;
+use FS::agent;
 
 $FREESIDE_LOG = "%%%FREESIDE_LOG%%%";
 $FREESIDE_LOCK = "%%%FREESIDE_LOCK%%%";
@@ -97,7 +99,28 @@ while (1) {
       if ( $keepalives && $keepalive_count++ > 10 ) {
         $keepalive_count = 0;
         lock_write;
+
         nstore_fd( { _token => '_keepalive' }, $writer );
+        foreach my $agent ( qsearch( 'agent', { disabled => '' } ) ) {
+          my $config = qsearchs( 'conf', { name  => 'selfservice-bulk_ftp_dir',
+                                           agentnum => $agent->agentnum,
+                               } )
+            or next;
+
+          my $session =
+            FS::ClientAPI->dispatch( 'Agent/agent_login',
+                                     { username => $agent->username,
+                                       password => $agent->_password,
+                                     }
+            );
+
+          nstore_fd( { _token     => '_ftp_scan',
+                       dir        => $config->value,
+                       session_id => $session->{session_id},
+                     },
+                     $writer
+          );
+        }
         unlock_write;
       }
       next;
diff --git a/FS/t/cust_recon.t b/FS/t/cust_recon.t
new file mode 100644
index 000000000..3724736f4
--- /dev/null
+++ b/FS/t/cust_recon.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_recon;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From ea34c834e4d9915a97730113d78b1b43ccd7684d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 29 May 2009 04:43:55 +0000
Subject: correct description to reflect previous changes

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cb53ef7d1..b1bc97ab6 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -916,7 +916,7 @@ worry that config_items is freeside-specific and icky.
   { 
     'key'         => 'invoice_sections',
     'section'     => 'billing',
-    'description' => 'Split invoice into sections and label according to package class when enabled.',
+    'description' => 'Split invoice into sections and label according to package category when enabled.',
     'type'        => 'checkbox',
   },
 
-- 
cgit v1.2.1


From deba223d89f516851d24d535d785cc2b39b7784c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 29 May 2009 23:17:24 +0000
Subject: fixup pivot code handling in netcentrex CDR handling, RT#4081

---
 FS/FS/Conf.pm           | 26 +++++++++++++-------------
 FS/FS/cdr.pm            | 14 +++++++-------
 FS/FS/cdr/netcentrex.pm | 43 ++++++++++++++++++++-----------------------
 3 files changed, 40 insertions(+), 43 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b1bc97ab6..cf7e49fe5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2736,19 +2736,19 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
-  {
-    'key'         => 'cdr-charged_party-truncate_prefix',
-    'section'     => '',
-    'description' => 'If the charged_party field has this prefix, truncate it to the length in cdr-charged_party-truncate_length.',
-    'type'        => 'text',
-  },
-
-  {
-    'key'         => 'cdr-charged_party-truncate_length',
-    'section'     => '',
-    'description' => 'If the charged_party field has the prefix in cdr-charged_party-truncate_prefix, truncate it to this length.',
-    'type'        => 'text',
-  },
+#  {
+#    'key'         => 'cdr-charged_party-truncate_prefix',
+#    'section'     => '',
+#    'description' => 'If the charged_party field has this prefix, truncate it to the length in cdr-charged_party-truncate_length.',
+#    'type'        => 'text',
+#  },
+#
+#  {
+#    'key'         => 'cdr-charged_party-truncate_length',
+#    'section'     => '',
+#    'description' => 'If the charged_party field has the prefix in cdr-charged_party-truncate_prefix, truncate it to this length.',
+#    'type'        => 'text',
+#  },
 
   {
     'key'         => 'cdr-charged_party_rewrite',
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 2a235cc41..421fd2bb8 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -315,13 +315,13 @@ sub set_charged_party {
 
   }
 
-  my $prefix = $conf->config('cdr-charged_party-truncate_prefix');
-  my $prefix_len = length($prefix);
-  my $trunc_len = $conf->config('cdr-charged_party-truncate_length');
-
-  $self->charged_party( substr($self->charged_party, 0, $trunc_len) )
-    if $prefix_len && $trunc_len
-    && substr($self->charged_party, 0, $prefix_len) eq $prefix;
+#  my $prefix = $conf->config('cdr-charged_party-truncate_prefix');
+#  my $prefix_len = length($prefix);
+#  my $trunc_len = $conf->config('cdr-charged_party-truncate_length');
+#
+#  $self->charged_party( substr($self->charged_party, 0, $trunc_len) )
+#    if $prefix_len && $trunc_len
+#    && substr($self->charged_party, 0, $prefix_len) eq $prefix;
 
 }
 
diff --git a/FS/FS/cdr/netcentrex.pm b/FS/FS/cdr/netcentrex.pm
index 7ccc3df83..0cd5c7b34 100644
--- a/FS/FS/cdr/netcentrex.pm
+++ b/FS/FS/cdr/netcentrex.pm
@@ -29,8 +29,8 @@ use FS::cdr qw(_cdr_date_parser_maker);
     _cdr_date_parser_maker('startdate'),  #05 Authorize timestamp
     _cdr_date_parser_maker('answerdate'), #06 Start timestamp
     'billsec', #'duration', #07 Duration
-    _e164_parser_maker('src'), #08 Caller
-    _e164_parser_maker('dst'), #09 Callee
+    _e164_parser_maker('src',      'charged_party'),                 #08 Caller
+    _e164_parser_maker('dcontext', 'dst', 'norewrite_pivotonly'=>1) ,#09 Callee
     'channel', #10 Source IP
     'dstchannel', #11 Destination IP
     'userfield', #12 selector Tag
@@ -80,43 +80,40 @@ use FS::cdr qw(_cdr_date_parser_maker);
 );
 
 sub _e164_parser_maker {
-  my $field = shift;
+  my( $field, $pivot_field, %opt ) = @_;
   return sub {
     my( $cdr, $e164 ) = @_;
-    eval { $cdr->$field( _e164_parse($e164) ); };
-    die "error parsing e164 for $field from $e164: $@\n" if $@;
+    my( $pivot, $number ) = _e164_parse($e164);
+    if ( $opt{'norewrite_pivotonly'} && ! $pivot ) { 
+      $cdr->$pivot_field( $number );
+    } else {
+      $cdr->$field( $number );
+      $cdr->$pivot_field( $pivot );
+    }
   };
 }
 
-my %e164_types = (
-  '000000' => '',
-  '100005' => '',
-  '100009' => '',
-  '100012' => '',
-  '100014' => '',
-  '100015' => '',
-  '100016' => '',
-  '300000' => '',
-);
-
 sub _e164_parse {
   my $e164 = shift;
 
   $e164 =~ s/^e164://;
 
-  my ($type, $number);
+  my ($pivot, $number);
   if ( $e164 =~ /^O(\d+)$/ ) {
-    $type = ''; #?
+    $pivot = ''; #?
     $number = $1;
-  } elsif ( $e164 =~ /^(\d{6})(\d+)$/ ) {
-    $type = $1;
+  } elsif ( $e164 =~ /^000000(\d+)$/ ) {
+    $pivot = '';
+    $number = $1;
+  } elsif ( $e164 =~ /^(1\d{5})(\d+)$/ ) {
+    $pivot = $1;
     $number = $2;
   } else {
-    $type = '';
+    $pivot = '';
     $number = $e164; #unparsable...
   }
-  #$type...?
-  $number;
+
+  ( $pivot, $number );
 }
 
 1;
-- 
cgit v1.2.1


From e13421f071b4a7b872e6d40205ca736125cb294d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 02:31:39 +0000
Subject: require svc_acct-usage_threshold to be set explicitly, don't default
 to 80%

---
 FS/FS/Conf.pm     | 2 +-
 FS/FS/svc_acct.pm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cf7e49fe5..0664c1444 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2014,7 +2014,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'svc_acct-usage_threshold',
     'section'     => 'billing',
-    'description' => 'The threshold (expressed as percentage) of acct.seconds or acct.up|down|totalbytes at which a warning message is sent to a service holder.  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.  Defaults to 80.',
+    'description' => 'The threshold (expressed as percentage) of acct.seconds or acct.up|down|totalbytes at which a warning message is sent to a service holder.  Typically used in conjunction with prepaid packages and freeside-sqlradius-radacctd.',
     'type'        => 'text',
   },
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 1a42e6517..e5be29473 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -539,12 +539,13 @@ sub insert {
       my %values = $part_pkg->usage_valuehash;
       my $multiplier = $conf->exists('svc_acct-usage_threshold') 
                          ? 1 - $conf->config('svc_acct-usage_threshold')/100
-                         : 0.20;
+                         : 0.20; #doesn't matter
 
       foreach ( keys %values ) {
         next if $self->getfield($_);
         $self->setfield( $_, $values{$_} );
-        $self->setfield( $_. '_threshold', int( $values{$_} * $multiplier ) );
+        $self->setfield( $_. '_threshold', int( $values{$_} * $multiplier ) )
+          if $conf->exists('svc_acct-usage_threshold');
       }
 
     }
-- 
cgit v1.2.1


From 467b269c5cacef3e8486e2288f1b0eeec8fea088 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 03:14:13 +0000
Subject: add ability for prepaid packages to have usage limits and cancel if
 they're hit, RT#4995

---
 FS/FS/part_pkg/flat.pm    | 78 +++++++++++++++++++++++++++++------------------
 FS/FS/part_pkg/prepaid.pm | 16 +++++++++-
 FS/FS/svc_acct.pm         | 22 +++++++++++++
 3 files changed, 85 insertions(+), 31 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 009e54c78..171885770 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -1,7 +1,10 @@
 package FS::part_pkg::flat;
 
 use strict;
-use vars qw(@ISA %info);
+use vars qw( @ISA %info
+             %usage_fields %usage_recharge_fields
+             @usage_fieldorder @usage_recharge_fieldorder
+           );
 use Tie::IxHash;
 #use FS::Record qw(qsearch);
 use FS::UI::bytecount;
@@ -14,30 +17,8 @@ tie my %temporalities, 'Tie::IxHash',
   'preceding' => "Preceding (past)",
 ;
 
-%info = (
-  'name' => 'Flat rate (anniversary billing)',
-  'shortname' => 'Anniversary',
-  'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_fee'     => { 'name' => 'Recurring fee for this package',
-                         'default' => 0,
-                       },
-
-    #false laziness w/voip_cdr.pm
-    'recur_temporality' => { 'name' => 'Charge recurring fee for period',
-                             'type' => 'select',
-                             'select_options' => \%temporalities,
-                           },
+%usage_fields = (
 
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'externalid' => { 'name'   => 'Optional External ID',
-                      'default' => '',
-                    },
     'seconds'       => { 'name' => 'Time limit for this package',
                          'default' => '',
                          'check' => sub { shift =~ /^\d*$/ },
@@ -60,6 +41,10 @@ tie my %temporalities, 'Tie::IxHash',
                          'format' => \&FS::UI::bytecount::display_bytecount,
                          'parse' => \&FS::UI::bytecount::parse_bytecount,
                        },
+);
+
+%usage_recharge_fields = (
+
     'recharge_amount'       => { 'name' => 'Cost of recharge for this package',
                          'default' => '',
                          'check' => sub { shift =~ /^\d*(\.\d{2})?$/ },
@@ -94,13 +79,46 @@ tie my %temporalities, 'Tie::IxHash',
                                     'package recharge',
                           'type' => 'checkbox',
                         },
+);
+
+@usage_fieldorder = qw( seconds upbytes downbytes totalbytes );
+@usage_recharge_fieldorder = qw(
+  recharge_amount recharge_seconds recharge_upbytes
+  recharge_downbytes recharge_totalbytes
+  usage_rollover recharge_reset
+);
+
+%info = (
+  'name' => 'Flat rate (anniversary billing)',
+  'shortname' => 'Anniversary',
+  'fields' => {
+    'setup_fee'     => { 'name' => 'Setup fee for this package',
+                         'default' => 0,
+                       },
+    'recur_fee'     => { 'name' => 'Recurring fee for this package',
+                         'default' => 0,
+                       },
+
+    #false laziness w/voip_cdr.pm
+    'recur_temporality' => { 'name' => 'Charge recurring fee for period',
+                             'type' => 'select',
+                             'select_options' => \%temporalities,
+                           },
+
+    %usage_fields,
+    %usage_recharge_fields,
+
+    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
+                                   ' of service at cancellation',
+                         'type' => 'checkbox',
+                       },
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
   },
-  'fieldorder' => [qw( setup_fee recur_fee recur_temporality unused_credit
-                       seconds upbytes downbytes totalbytes
-                       recharge_amount recharge_seconds recharge_upbytes
-                       recharge_downbytes recharge_totalbytes
-                       usage_rollover recharge_reset externalid
-                    )
+  'fieldorder' => [ qw( setup_fee recur_fee recur_temporality unused_credit ),
+                    @usage_fieldorder, @usage_recharge_fieldorder,
+                    qw( externalid ),
                   ],
   'weight' => 10,
 );
diff --git a/FS/FS/part_pkg/prepaid.pm b/FS/FS/part_pkg/prepaid.pm
index 4499d0e52..23d340167 100644
--- a/FS/FS/part_pkg/prepaid.pm
+++ b/FS/FS/part_pkg/prepaid.pm
@@ -12,6 +12,11 @@ tie %recur_action, 'Tie::IxHash',
   'cancel'  => 'cancel',
 ;
 
+tie my %overlimit_action, 'Tie::IxHash',
+  'overlimit' => 'Default overlimit processing',
+  'cancel'    => 'Cancel',
+;
+
 %info = (
   'name' => 'Prepaid, flat rate',
   #'name' => 'Prepaid (no automatic recurring)', #maybe use it here too
@@ -27,8 +32,17 @@ tie %recur_action, 'Tie::IxHash',
                         'type' => 'select',
 			'select_options' => \%recur_action,
 	              },
+    %FS::part_pkg::flat::usage_fields,
+    'overlimit_action' => { 'name' => 'Action to take upon reaching a usage limit.',
+                            'type' => 'select',
+                            'select_options' => \%overlimit_action,
+	              },
+    #XXX if you set overlimit_action to 'cancel', should also have the ability
+    # to select a reason
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'recur_action', ],
+  'fieldorder' => [ qw( setup_fee recur_fee recur_action ),
+                    @FS::part_pkg::flat::usage_fieldorder,
+                  ],
   'weight' => 25,
 );
 
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e5be29473..4669588d5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1772,6 +1772,28 @@ sub _op_usage {
   die "Can't update $column for svcnum". $self->svcnum
     if $rv == 0;
 
+  #overlimit_action eq 'cancel' handling
+  my $cust_pkg = $self->cust_svc->cust_pkg;
+  if ( $cust_pkg
+       && $cust_pkg->part_pkg->option('overlimit_action', 1) eq 'cancel' 
+       && $op eq '-' && &{$op2condition{$op}}($self, $column, $amount)
+     )
+  {
+
+    my $error = $cust_pkg->cancel; #XXX should have a reason
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error cancelling: $error";
+    }
+
+    #nothing else is relevant if we're cancelling, so commit & return success
+    warn "$me update successful; committing\n"
+      if $DEBUG;
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    return '';
+
+  }
+
   my $action = $op2action{$op};
 
   if ( &{$op2condition{$op}}($self, $column, $amount) &&
-- 
cgit v1.2.1


From 29615c5145652c3f0bc293d468493709517b9fd9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 03:40:12 +0000
Subject: and enable overlimit_action, RT#4995

---
 FS/FS/part_pkg/prepaid.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/prepaid.pm b/FS/FS/part_pkg/prepaid.pm
index 23d340167..cff165a5d 100644
--- a/FS/FS/part_pkg/prepaid.pm
+++ b/FS/FS/part_pkg/prepaid.pm
@@ -41,7 +41,7 @@ tie my %overlimit_action, 'Tie::IxHash',
     # to select a reason
   },
   'fieldorder' => [ qw( setup_fee recur_fee recur_action ),
-                    @FS::part_pkg::flat::usage_fieldorder,
+                    @FS::part_pkg::flat::usage_fieldorder, 'overlimit_action',
                   ],
   'weight' => 25,
 );
-- 
cgit v1.2.1


From a0b2c1a1ac9da3b33bc088dab0af77f6555428f7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 10:45:43 +0000
Subject: add transnexus format, RT#5229

---
 FS/FS/cdr.pm            |  2 +-
 FS/FS/cdr/transnexus.pm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/cdr/transnexus.pm

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 421fd2bb8..ab87a6893 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -710,7 +710,7 @@ sub _cdr_date_parse {
   #$date =~ /^\s*(\d{4})[\-\/]\(\d{1,2})[\-\/](\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s*$/
   #taqua  #2007-10-31 08:57:24.113000000
 
-  if ( $date =~ /^\s*(\d{4})\D(\d{1,2})\D(\d{1,2})\s+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) {
+  if ( $date =~ /^\s*(\d{4})\D(\d{1,2})\D(\d{1,2})\D+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) {
     ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 );
   } elsif ( $date  =~ /^\s*(\d{1,2})\D(\d{1,2})\D(\d{4})\s+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) {
     ($mon, $day, $year, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 );
diff --git a/FS/FS/cdr/transnexus.pm b/FS/FS/cdr/transnexus.pm
new file mode 100644
index 000000000..573a8b16d
--- /dev/null
+++ b/FS/FS/cdr/transnexus.pm
@@ -0,0 +1,65 @@
+package FS::cdr::transnexus;
+
+use strict;
+use base qw( FS::cdr );
+use vars qw( %info );
+use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+
+%info = (
+  'name'          => 'Transnexus',
+  'weight'        => 18,
+  'type'          => 'csv',
+  'sep_char'      => "\t",
+
+  #listref of what to do with each field from the CDR, in order
+  'import_fields' => [
+
+    _cdr_date_parser_maker('startddate'), #O_CallStartTime
+    'src',            #CallingNumberReported
+    'dst',            #CalledNumberReported
+    'channel',        #SourceDeviceName      / O_ReportingDeviceName
+    'dstchannel',     #O_ReportingDeviceName / DestinationDeviceName
+    'clid',           #CallId
+    'uniqueid',       #TransactionId
+    'duration',       #RatedDuration
+    'billsec',        #O_BillingDuration
+    'upstream_price', #O_BillingAmountCustCurr
+  ],
+);
+
+1;
+
+__END__
+
+O_CallStartTime - Date and time stamp of the call setup as reported in the CDR from the source device.
+
+CallingNumberReported - Calling number from the source device reported in authorization request to the OSPrey server.
+
+CalledNumberReported - Called number from the source device reported in authorization request to the OSPrey server.
+
+----
+1.1.1 Customer CDR Archive File
+
+SourceDeviceName - The IP address or Domain Name of the device which is the call source.
+
+O_ReportingDeviceName - IP address or Domain Name of the source (Originating) device reporting the CDR to the OSPrey Server. If a proxy is used, (such as SIP proxy for signaling or FreeRADIUS for CDR reporting) this field is the IP address of the proxy device, not the actual source device.
+
+---
+or 1.1.2 Provider CDR Archive File
+
+O_ReportingDeviceName - IP address or Domain Name of the source (Originating) device reporting the CDR to the OSPrey Server. If a proxy is used, (such as SIP proxy for signaling or FreeRADIUS for CDR reporting) this field is the IP address of the proxy device, not the actual source device.  
+
+DestinationDeviceName - The IP address or Domain Name of the destination device.
+
+----
+
+CallId - The Call Identifier generated by the source VoIP device.
+
+TransactionId - The unique Transaction Identification number created by the OSPrey server for each call
+
+RatedDuration - The rateable duration calculated by NexOSS.
+
+O_BillingDuration - The duration used to calculate the billable amount for a call from the source (Originating) network. This value is derived from RatedDuration and rounded up based on the ¿First Increment¿ or ¿Next Increment¿ rules defined in the Product or Customer Rate Plan used to rate the call.
+
+O_BillingAmountCustCurr - Amount billable to the source (Originating) Customer. Provided in the currency of the Product or Customer Rate Plan.  
+
-- 
cgit v1.2.1


From 69fe663ff9595ed47a77826920ffdda8a45a4d23 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 11:21:01 +0000
Subject: clid is base-64 encoded, huh, RT#5229

---
 FS/FS/cdr/transnexus.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cdr/transnexus.pm b/FS/FS/cdr/transnexus.pm
index 573a8b16d..0ed7ad4ef 100644
--- a/FS/FS/cdr/transnexus.pm
+++ b/FS/FS/cdr/transnexus.pm
@@ -3,6 +3,7 @@ package FS::cdr::transnexus;
 use strict;
 use base qw( FS::cdr );
 use vars qw( %info );
+use MIME::Base64;
 use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
 
 %info = (
@@ -14,12 +15,12 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
   #listref of what to do with each field from the CDR, in order
   'import_fields' => [
 
-    _cdr_date_parser_maker('startddate'), #O_CallStartTime
+    _cdr_date_parser_maker('startddate'),        #O_CallStartTime
     'src',            #CallingNumberReported
     'dst',            #CalledNumberReported
     'channel',        #SourceDeviceName      / O_ReportingDeviceName
     'dstchannel',     #O_ReportingDeviceName / DestinationDeviceName
-    'clid',           #CallId
+    sub { $_[0]->clid( decode_base64($_[1]) ); }, #CallId
     'uniqueid',       #TransactionId
     'duration',       #RatedDuration
     'billsec',        #O_BillingDuration
-- 
cgit v1.2.1


From d40b234aeb9d77f3a780d919e7367e155d8d2a36 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 30 May 2009 12:15:23 +0000
Subject: very long transnexus filenames, RT#5229

---
 FS/FS/Schema.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 238058374..1f8fa8fa1 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2091,7 +2091,7 @@ sub tables_hashref {
         #NULL, done (or something)
         'freesiderewritestatus', 'varchar',   'NULL',     32,   '', '', 
 
-        'cdrbatch', 'varchar', 'NULL', $char_d, '', '',
+        'cdrbatch', 'varchar', 'NULL', 255, '', '',
 
       ],
       'primary_key' => 'acctid',
-- 
cgit v1.2.1


From 6ef8f43327f534f8e6f03265ecd97bd654730c07 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 31 May 2009 04:57:00 +0000
Subject: necessary for bin/cdr-netsapeins.import

---
 FS/FS/part_export/netsapiens.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index e19e95cb4..172f7b053 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -39,9 +39,11 @@ sub ns_command {
   my @args = ( $command );
 
   if ( $method eq 'PUT' ) {
-    my $content = $method eq 'PUT' ? $ns->buildQuery( { @_ } ) : '';
+    my $content = $ns->buildQuery( { @_ } );
     $content =~ s/^\?//;
     push @args, $content;
+  } elsif ( $method eq 'GET' ) {
+    $args[0] .= $ns->buildQuery( { @_ } );
   }
 
   my $auth =
-- 
cgit v1.2.1


From 82d6819f70a08ee9e210718a3d96ef9cd80b801f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 31 May 2009 09:45:03 +0000
Subject: don't fallback to 'Payable upon receipt' invoice terms anymore.  or
 in other words, honor setting 'invoice_default_terms' blank, like in 1.7. 
 RT#5415

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 29b52ceac..a6a8e68fa 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2578,8 +2578,8 @@ sub terms {
   return $self->cust_main->invoice_terms
     if $self->cust_main->invoice_terms;
 
-  #use configured default or default default
-  $conf->config('invoice_default_terms') || 'Payable upon receipt';
+  #use configured default
+  $conf->config('invoice_default_terms');
 }
 
 sub due_date {
-- 
cgit v1.2.1


From bbac9227cd1dc41358fdad933997a113373d3e49 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 31 May 2009 09:57:46 +0000
Subject: wtf

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a6a8e68fa..51b97668e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2579,7 +2579,7 @@ sub terms {
     if $self->cust_main->invoice_terms;
 
   #use configured default
-  $conf->config('invoice_default_terms');
+  $conf->config('invoice_default_terms') || '';
 }
 
 sub due_date {
-- 
cgit v1.2.1


From bc521ca75f4189ebd6d927aa263bdcce500150a5 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 1 Jun 2009 05:43:11 +0000
Subject: a 'start over' function for the taxproduct based tax data loading

---
 FS/FS/part_pkg_taxproduct.pm |   9 +-
 FS/FS/tax_rate.pm            | 237 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 242 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg_taxproduct.pm b/FS/FS/part_pkg_taxproduct.pm
index c66fb8c90..56e63b668 100644
--- a/FS/FS/part_pkg_taxproduct.pm
+++ b/FS/FS/part_pkg_taxproduct.pm
@@ -1,10 +1,11 @@
 package FS::part_pkg_taxproduct;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $delete_kludge );
 use FS::Record qw( qsearch );
 
 @ISA = qw(FS::Record);
+$delete_kludge = 0;
 
 =head1 NAME
 
@@ -85,8 +86,10 @@ sub delete {
   return "Can't delete a tax product which has attached package tax rates!"
     if qsearch( 'part_pkg_taxrate', { 'taxproductnum' => $self->taxproductnum } );
 
-  return "Can't delete a tax product which has attached packages!"
-    if qsearch( 'part_pkg', { 'taxproductnum' => $self->taxproductnum } );
+  unless ( $delete_kludge ) {
+    return "Can't delete a tax product which has attached packages!"
+      if qsearch( 'part_pkg', { 'taxproductnum' => $self->taxproductnum } );
+  }
 
   $self->SUPER::delete(@_);
 }
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 887c9af2c..2808c6ef8 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -23,6 +23,7 @@ use FS::cust_bill_pkg;
 use FS::cust_tax_location;
 use FS::tax_rate_location;
 use FS::part_pkg_taxrate;
+use FS::part_pkg_taxproduct;
 use FS::cust_main;
 use FS::Misc qw( csv_from_fixed );
 
@@ -1022,6 +1023,240 @@ sub process_batch_import {
 
 }
 
+=item process_download_and_reload
+
+Download and process a tax update as a queued JSRPC job after wiping the
+existing wipable tax data.
+
+=cut
+
+sub process_download_and_reload {
+  my $job = shift;
+
+  my $param = thaw(decode_base64($_[0]));
+  my $format = $param->{'format'};        #well... this is all cch specific
+
+  my ( $count, $last, $min_sec, $imported ) = (0, time, 5, 0); #progressbar
+  $count = 100;
+
+  if ( $job ) {  # progress bar
+    my $error = $job->update_statustext( int( 100 * $imported / $count ) );
+    die $error if $error;
+  }
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+  my $error = '';
+
+  my $sql =
+    "SELECT count(*) FROM part_pkg_taxoverride JOIN tax_class ".
+    "USING (taxclassnum) WHERE data_vendor = '$format'";
+  my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+  $sth->execute
+    or die "Unexpected error executing statement $sql: ". $sth->errstr;
+  die "Don't (yet) know how to handle part_pkg_taxoverride records."
+    if $sth->fetchrow_arrayref->[0];
+
+  # really should get a table EXCLUSIVE lock here
+
+  #remember disabled taxes
+  my %disabled_tax_rate = ();
+  foreach my $tax_rate ( qsearch( { table   => 'tax_rate',
+                                    hashref => { disabled => 'Y',
+                                                 data_vendor => $format,
+                                               },
+                                    select  => 'geocode, taxclassnum',
+                                  }
+                                 )
+                       )
+  {
+    my $tax_class =
+      qsearchs( 'tax_class', { taxclassnum => $tax_rate->taxclassnum } );
+    unless ( $tax_class ) {
+      warn "failed to find tax_class ". $tax_rate->taxclassnum;
+      next;
+    }
+    $disabled_tax_rate{$tax_rate->geocode. ':'. $tax_class->taxclass} = 1;
+  }
+
+  #remember tax products
+  # XXX FIXME  this loop only works when cch is the only data provider
+  my %taxproduct = ();
+  my $extra_sql = "WHERE taxproductnum IS NOT NULL OR ".
+                  "0 < ( SELECT count(*) from part_pkg_option WHERE ".
+                  "       part_pkg_option.pkgpart = part_pkg.pkgpart AND ".
+                  "       optionname LIKE 'usage_taxproductnum_%' AND ".
+                  "       optionvalue != '' )";
+  foreach my $part_pkg ( qsearch( { table => 'part_pkg',
+                                    select  => 'DISTINCT pkgpart,taxproductnum',
+                                    hashref => {},
+                                    extra_sql => $extra_sql,
+                                  }
+                                )
+                       )
+  {
+    warn "working with package part ". $part_pkg->pkgpart.
+      "which has a taxproductnum of ". $part_pkg->taxproductnum. "\n" if $DEBUG;
+    my $part_pkg_taxproduct = $part_pkg->taxproduct('');
+    $taxproduct{$part_pkg->pkgpart}{''} = $part_pkg_taxproduct->taxproduct
+      if $part_pkg_taxproduct;
+
+    foreach my $option ( $part_pkg->part_pkg_option ) {
+      next unless $option->optionname =~ /^usage_taxproductnum_(\w)$/;
+      my $class = $1;
+
+      $part_pkg_taxproduct = $part_pkg->taxproduct($class);
+      $taxproduct{$part_pkg->pkgpart}{$class} = $part_pkg_taxproduct->taxproduct
+        if $part_pkg_taxproduct;
+    }
+  }
+
+  #wipe out the old data
+  foreach my $tax_rate_location ( qsearch( 'tax_rate_location',
+                                           { data_vendor => $format,
+                                             disabled    => '',
+                                           }
+                                         )
+                                )
+  {
+    $tax_rate_location->disabled('Y');
+    my $error = $tax_rate_location->replace;
+    if ( $error ) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die $error;
+    }
+  }
+
+  local $FS::part_pkg_taxproduct::delete_kludge = 1;
+  my @table = qw(
+    tax_rate part_pkg_taxrate part_pkg_taxproduct tax_class cust_tax_location
+  );
+  foreach my $table ( @table ) {
+    foreach my $row ( qsearch( $table, { data_vendor => $format } ) ) {
+      my $error = $row->delete;
+      if ( $error ) {
+        $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+        die $error;
+      }
+    }
+  }
+
+  if ( $format eq 'cch' ) {
+    foreach my $cust_tax_location ( qsearch( 'cust_tax_location',
+                                             { data_vendor => "$format-zip" }
+                                           )
+                                  )
+    {
+      my $error = $cust_tax_location->delete;
+      if ( $error ) {
+        $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+        die $error;
+      }
+    }
+  }
+
+  #import new data
+  process_download_and_update($job, @_);
+
+  #restore taxproducts
+  foreach my $pkgpart ( keys %taxproduct ) {
+    warn "restoring taxproductnums on pkgpart $pkgpart\n" if $DEBUG;
+
+    my $part_pkg = qsearchs('part_pkg', { pkgpart => $pkgpart } );
+    unless ( $part_pkg ) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die "somehow failed to find part_pkg with pkgpart $pkgpart!\n";
+    }
+
+    my %options = $part_pkg->options;
+    my %pkg_svc = map { $_->svcpart => $_->quantity } $part_pkg->pkg_svc;
+    my $primary_svc = $part_pkg->svcpart;
+    my $new = new FS::part_pkg { $part_pkg->hash };
+
+    foreach my $class ( keys %{ $taxproduct{$pkgpart} } ) {
+      warn "working with class '$class'\n" if $DEBUG;
+      my $part_pkg_taxproduct =
+        qsearchs( 'part_pkg_taxproduct',
+                  { taxproduct  => $taxproduct{$pkgpart}{$class},
+                    data_vendor => $format,
+                  }
+                );
+
+      unless ( $part_pkg_taxproduct ) {
+        $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+        die "failed to find part_pkg_taxproduct ($taxproduct{pkgpart}{$class})".
+            " for pkgpart $pkgpart\n";
+      }
+
+      if ( $class eq '' ) {
+        $new->taxproductnum($part_pkg_taxproduct->taxproductnum);
+        next;
+      }
+
+      $options{"usage_taxproductnum_$class"} =
+        $part_pkg_taxproduct->taxproductnum;
+
+    }
+
+    my $error = $new->replace( $part_pkg,
+                               'pkg_svc' => \%pkg_svc,
+                               'primary_svc' => $primary_svc,
+                               'options' => \%options,
+    );
+      
+    if ( $error ) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die $error;
+    }
+  }
+
+  #disable tax_rates
+  foreach my $key (keys %disabled_tax_rate) {
+    my ($geocode,$taxclass) = split /:/, $key, 2;
+    my @tax_class = qsearch( 'tax_class', { data_vendor => $format,
+                                            taxclass    => $taxclass,
+                                          } );
+    if (scalar(@tax_class) > 1) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die "found multiple tax_class records for format $format class $taxclass";
+    }
+      
+    unless (scalar(@tax_class)) {
+      warn "no tax_class for format $format class $taxclass\n";
+      next;
+    }
+
+    my @tax_rate =
+      qsearch('tax_rate', { data_vendor  => $format,
+                            geocode      => $geocode,
+                            taxclassnum  => $tax_class[0]->taxclassnum,
+                          }
+    );
+
+    if (scalar(@tax_rate) > 1) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die "found multiple tax_rate records for format $format geocode $geocode".
+          " and taxclass $taxclass ( taxclassnum ". $tax_class[0]->taxclassnum.
+          " )";
+    }
+      
+    if (scalar(@tax_rate)) {
+      $tax_rate[0]->disabled('Y');
+      my $error = $tax_rate[0]->replace;
+      if ( $error ) {
+        $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+        die $error;
+      }
+    }
+  }
+
+  #success!
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  
+}
+
 =item process_download_and_update
 
 Download and process a tax update as a queued JSRPC job
@@ -1193,7 +1428,7 @@ sub process_download_and_update {
     my @delete_list = ();
 
     my @list = (
-                 # 'geocode',  \&FS::tax_rate_location::batch_import, 
+                 'geocode',  \&FS::tax_rate_location::batch_import, 
                  'code',     \&FS::tax_class::batch_import,
                  'plus4',    \&FS::cust_tax_location::batch_import,
                  'zip',      \&FS::cust_tax_location::batch_import,
-- 
cgit v1.2.1


From e130d2a0fbcdff7825bcbef5709d1a5320e95147 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jun 2009 19:52:10 +0000
Subject: add a hack to set default schema, cf.
 http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration:PostgreSQL_Schema

---
 FS/FS/UID.pm | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 40d29c161..e3a4604b4 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -2,9 +2,9 @@ package FS::UID;
 
 use strict;
 use vars qw(
-  @ISA @EXPORT_OK $DEBUG $me $cgi $dbh $freeside_uid $user 
-  $conf_dir $cache_dir $secrets $datasrc $db_user $db_pass %callback @callback
-  $driver_name $AutoCommit $callback_hack $use_confcompat
+  @ISA @EXPORT_OK $DEBUG $me $cgi $freeside_uid $user $conf_dir $cache_dir
+  $secrets $datasrc $db_user $db_pass $schema $dbh $driver_name
+  $AutoCommit %callback @callback $callback_hack $use_confcompat
 );
 use subs qw(
   getsecrets cgisetotaker
@@ -150,12 +150,24 @@ sub forksuidsetup {
 }
 
 sub myconnect {
-  DBI->connect( getsecrets(@_), { 'AutoCommit'         => 0,
-                                  'ChopBlanks'         => 1,
-                                  'ShowErrorStatement' => 1,
-                                }
-              )
+  my $handle = DBI->connect( getsecrets(@_), { 'AutoCommit'         => 0,
+                                               'ChopBlanks'         => 1,
+                                               'ShowErrorStatement' => 1,
+                                             }
+                           )
     or die "DBI->connect error: $DBI::errstr\n";
+
+  if ( $schema ) {
+    use DBIx::DBSchema::_util qw(_load_driver ); #quelle hack
+    my $driver = _load_driver($handle);
+    if ( $driver =~ /^Pg/ ) {
+      no warnings 'redefine';
+      eval "sub DBIx::DBSchema::DBD::${driver}::default_db_schema {'$schema'}";
+      die $@ if $@;
+    }
+  }
+
+  $handle;
 }
 
 =item install_callback
@@ -325,10 +337,11 @@ sub getsecrets {
     $secrets = 'secrets';
   }
 
-  ($datasrc, $db_user, $db_pass) = 
+  ($datasrc, $db_user, $db_pass, $schema) = 
     map { /^(.*)$/; $1 } readline(new IO::File "$conf_dir/$secrets")
       or die "Can't get secrets: $conf_dir/$secrets: $!\n";
   undef $driver_name;
+
   ($datasrc, $db_user, $db_pass);
 }
 
-- 
cgit v1.2.1


From 2bf4bd2401c76ad784fe2abfa87bb8bacb7b01d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Jun 2009 00:02:27 +0000
Subject: eliminate harmless

  Argument "" isn't numeric in numeric comparison (<=>) at /usr/local/share/perl/5.8.8/FS/cust_main.pm line 6759.

warning, sort batched payments on a column that actually exists
---
 FS/FS/cust_main.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 72b84504f..124cbccca 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6756,7 +6756,7 @@ Returns all batched payments (see L<FS::cust_pay_void>) for this customer.
 
 sub cust_pay_batch {
   my $self = shift;
-  sort { $a->_date <=> $b->_date }
+  sort { $a->paybatchnum <=> $b->paybatchnum }
     qsearch( 'cust_pay_batch', { 'custnum' => $self->custnum } )
 }
 
-- 
cgit v1.2.1


From 121b02fd16385ae08338a7be911eef18598280a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Jun 2009 03:00:08 +0000
Subject: don't attempt to create h_queue indices, for SG upgradability

---
 FS/bin/freeside-upgrade | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 97babbd68..43cebd940 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -60,20 +60,24 @@ if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) {
 #from 1.3 to 1.4... if not, it needs to be hooked into -upgrade here or
 #you'll lose all the part_svc settings it migrates to part_svc_column
 
+my @statements =
+  grep { $_ !~ /^CREATE +INDEX +h_queue/ } #useless, holds up queue insertion
+       dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh )
+
 if ( $DRY_RUN ) {
   print
-    join(";\n", @bugfix, dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh ) ). ";\n";
+    join(";\n", @bugfix, @statements ). ";\n";
   exit;
 } else {
-  foreach my $statement ( @bugfix ) {
+  foreach my $statement ( @bugfix, @statements ) {
     $dbh->do( $statement )
       or die "Error: ". $dbh->errstr. "\n executing: $statement";
   }
 
-  warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG;
-  $start = time;
+#  warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+#  $start = time;
 
-  dbdef->update_schema( dbdef_dist(datasrc), $dbh );
+#  dbdef->update_schema( dbdef_dist(datasrc), $dbh );
 }
 
 warn "Schema upgrade completed in ". (time-$start). " seconds\n"; # if $DEBUG;
-- 
cgit v1.2.1


From fa71778349c136623f0755bf30ce9f65fbaabf14 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Jun 2009 03:06:21 +0000
Subject: doh, semicolon

---
 FS/bin/freeside-upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 43cebd940..6ced37297 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -62,7 +62,7 @@ if (dbdef->table('cust_main')->column('agent_custid') && ! $opt_s) {
 
 my @statements =
   grep { $_ !~ /^CREATE +INDEX +h_queue/ } #useless, holds up queue insertion
-       dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh )
+       dbdef->sql_update_schema( dbdef_dist(datasrc), $dbh );
 
 if ( $DRY_RUN ) {
   print
-- 
cgit v1.2.1


From 876eb5c57cbd2b6686ad875b84d9400a3418719c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Jun 2009 19:50:01 +0000
Subject: don't add another queued_bill job to the queue if there's already one
 waiting to run for a customer, RT#5572

---
 FS/FS/Cron/bill.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 2b5fab476..29f5f36c9 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -6,7 +6,8 @@ use Exporter;
 use Date::Parse;
 use DBI 1.33; #The "clone" method was added in DBI 1.33. 
 use FS::UID qw(dbh);
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs );
+use FS::queue;
 use FS::cust_main;
 use FS::part_event;
 use FS::part_event_condition;
@@ -141,6 +142,14 @@ END
         if ( $opt{'r'} ) {
           warn "DRY RUN: would add custnum $custnum for queued_bill\n";
         } else {
+
+          #avoid queuing another job if there's one still waiting to run
+          next if qsearch( 'queue', { 'job'     => 'FS::cust_main::queued_bill',
+                                      'custnum' => $custnum,
+                                      'status'  => 'new',
+                                    }
+                         );
+
           #add job to queue that calls bill_and_collect with options
           my $queue = new FS::queue {
             'job'      => 'FS::cust_main::queued_bill',
@@ -148,6 +157,7 @@ END
             'priority' => 99, #don't get in the way of provisioning jobs
           };
           my $error = $queue->insert( 'custnum'=>$custnum, %args );
+
         }
 
       } else {
-- 
cgit v1.2.1


From d72073a19a37641e1f8fb888b827be9d7ac74bed Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 10 Jun 2009 21:58:30 +0000
Subject: should hopefully fix old services showing up on invoices,
 RT#5451/RT#5514/RT#5564/RT#3032

---
 FS/FS/cust_bill.pm     |  6 +++++-
 FS/FS/cust_bill_pkg.pm | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 51b97668e..737f68cc1 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2861,8 +2861,12 @@ sub _items_cust_bill_pkg {
 
           #at least until cust_bill_pkg has "past" ranges in addition to
           #the "future" sdate/edate ones... see #3032
+          my @dates = ( $self->_date );
+          my $prev = $cust_bill_pkg->previous_cust_bill_pkg;
+          push @dates, $prev->sdate if $prev;
+
           push @d, map &{$escape_function}($_),
-                       $cust_pkg->h_labels_short($self->_date)
+                       $cust_pkg->h_labels_short(@dates)
                                                  #$cust_bill_pkg->edate,
                                                  #$cust_bill_pkg->sdate)
             unless $cust_pkg->part_pkg->hide_svc_detail
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 6bd39d4b9..bb071739e 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -276,6 +276,23 @@ sub cust_bill {
   qsearchs( 'cust_bill', { 'invnum' => $self->invnum } );
 }
 
+=item previous_cust_bill_pkg
+
+Returns the previous cust_bill_pkg for this package, if any.
+
+=cut
+
+sub previous_cust_bill_pkg {
+  my $self = shift;
+  qsearchs({
+    'table'    => 'cust_bill_pkg',
+    'hashref'  => { 'pkgnum' => $self->pkgnum,
+                    'sdate'  => { op=>'<', value=>$self->sdate },
+                  },
+    'order_by' => 'ORDER BY sdate DESC LIMIT 1',
+  });
+}
+
 =item details [ OPTION => VALUE ... ]
 
 Returns an array of detail information for the invoice line item.
-- 
cgit v1.2.1


From 0cbb171da2cf3c7059612c0f2fbcf4a8bb80ab58 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Mon, 15 Jun 2009 19:41:29 +0000
Subject: Add domain registration operations to the View Domain screen, if the
 domain has an associated export supporting registration.  Shows the domain
 status and allows registration, transfer, revocation, or renewal.  Revocation
 almost never works since the registries impose very short windows after
 initial registration. Also updated the OpenSRS registration export to support
 the additional operations.

---
 FS/FS/part_export/domreg_opensrs.pm | 287 ++++++++++++++++++++++++++++++++----
 1 file changed, 259 insertions(+), 28 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_opensrs.pm b/FS/FS/part_export/domreg_opensrs.pm
index 0ef371a7b..1799ed09e 100644
--- a/FS/FS/part_export/domreg_opensrs.pm
+++ b/FS/FS/part_export/domreg_opensrs.pm
@@ -126,6 +126,14 @@ sub format_tel {
   return $tel;
 }
 
+=item gen_contact_info
+
+Generates contact data for the domain based on the customer data.
+
+Currently relies on Net::OpenSRS to format the telephone number for OpenSRS.
+
+=cut
+
 sub gen_contact_info
 {
   my ($co)=@_;
@@ -157,6 +165,15 @@ sub gen_contact_info
   return $c;
 }
 
+=item validate_contact_info
+
+Attempts to validate contact data for the domain based on OpenSRS rules.
+
+Returns undef if the contact data is acceptable, an error message if the contact
+data lacks one or more required fields.
+
+=cut
+
 sub validate_contact_info {
   my $c = shift;
 
@@ -183,6 +200,13 @@ sub validate_contact_info {
   undef;
 }
 
+=item testmode
+
+Returns the Net::OpenSRS-required test mode string based on whether the export
+is configured to use the live or the test gateway.
+
+=cut
+
 sub testmode {
   my $self = shift;
 
@@ -191,13 +215,57 @@ sub testmode {
   undef;
 }
 
+=item _export_insert
+
+Attempts to "export" the domain, i.e. register or transfer it if the user selected
+that option when editing the domain.
+
+Returns an error message on failure or undef on success.
+
+May also return an error message if it cannot load the required Perl module Net::OpenSRS,
+or if the domain is not registerable, or if insufficient data is provided in the customer
+record to generate the required contact information to register or transfer the domain.
+
+=cut
+
 sub _export_insert {
   my( $self, $svc_domain ) = ( shift, shift );
 
   return if $svc_domain->action eq 'I';  # Ignoring registration, just doing DNS
 
-  eval "use Net::OpenSRS;";
-  return $@ if $@;
+  if ($svc_domain->action eq 'N') {
+    return $self->register( $svc_domain );
+  } elsif ($svc_domain->action eq 'M') {
+    return $self->transfer( $svc_domain );
+  } 
+  return "Unknown domain action " . $svc_domain->action;
+}
+
+## Domain registration exports do nothing on replace.  Mainly because we haven't decided what they should do.
+#sub _export_replace {
+#  my( $self, $new, $old ) = (shift, shift, shift);
+#
+#  return '';
+#
+#}
+
+## Domain registration exports do nothing on delete.  You're just removing the domain from Freeside, not the registry
+#sub _export_delete {
+#  my( $self, $svc_domain ) = ( shift, shift );
+#
+#  return '';
+#}
+
+=item is_supported_domain
+
+Return undef if the domain name uses a TLD or SLD that is supported by this registrar.
+Otherwise return an error message explaining what's wrong.
+
+=cut
+
+sub is_supported_domain {
+  my $self = shift;
+  my $svc_domain = shift;
 
   # Get the TLD of the new domain
   my @bits = split /\./, $svc_domain->domain;
@@ -210,13 +278,15 @@ sub _export_insert {
   my @tlds = split /\s+/, $self->option('tlds');
   @tlds =  map { s/\.//; $_ } @tlds;
   return "Can't register top-level domain $tld, restricted to: " . $self->option('tlds') if ! grep { $_ eq $tld } @tlds;
+  return undef;
+}
 
-  my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+=item get_srs
 
-  my $c = gen_contact_info($cust_main);
+=cut
 
-  my $err = validate_contact_info($c);
-  return $err if $err;
+sub get_srs {
+  my $self = shift;
 
   my $srs = Net::OpenSRS->new();
 
@@ -226,40 +296,201 @@ sub _export_insert {
   $srs->set_key( $self->option('privatekey') );
 
   $srs->set_manage_auth( $self->option('username'), $self->option('password') );
+  return $srs;
+}
+
+=item get_status
+
+Returns a reference to a hashref containing information on the domain's status.  The keys
+defined depend on the status.
+
+'unregistered' means the domain is not registered.
+
+Otherwise, if the domain is in an asynchronous operation such as a transfer, returns the state
+of that operation.
+
+Otherwise returns a value indicating if the domain can be managed through our reseller account.
+
+=cut
+
+sub get_status {
+  my ( $self, $svc_domain ) = @_;
+  my $rslt = {};
+
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
+  my $srs = $self->get_srs;
+
+  if ($srs->is_available( $svc_domain->domain )) {
+    $rslt->{'unregistered'} = 1;
+  } else {
+    $rslt = $srs->check_transfer( $svc_domain->domain );
+    if (defined($rslt->{'reason'})) {
+      my $rv = $srs->make_request(
+        {
+          action     => 'belongs_to_rsp',
+          object     => 'domain',
+          attributes => {
+            domain => $svc_domain->domain
+          }
+        }
+      );
+      if ($rv) {
+        $self->_set_response;
+        if ( $rv->{attributes}->{'domain_expdate'} ) {
+	  $rslt->{'expdate'} = $rv->{attributes}->{'domain_expdate'};
+        }
+      }
+    }
+  }
+
+  return $rslt; # Success
+}
+
+=item register
+
+Attempts to register the domain through the reseller account associated with this export.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub register {
+  my ( $self, $svc_domain, $years ) = @_;
+
+  return "Net::OpenSRS does not support period other than 1 year" if $years != 1;
+
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+
+  my $c = gen_contact_info($cust_main);
+
+  $err = validate_contact_info($c);
+  return $err if $err;
+
+  my $srs = $self->get_srs;
 
   my $cookie = $srs->get_cookie( $self->option('masterdomain') );
   if (!$cookie) {
      return "Unable to get cookie at OpenSRS: " . $srs->last_response();
   }
 
-  if ($svc_domain->action eq 'N') {
-#    return "Domain registration not enabled" if !$self->option('register');
-    return $srs->last_response() if !$srs->register_domain( $svc_domain->domain, $c);
-  } elsif ($svc_domain->action eq 'M') {
-#    return "Domain transfer not enabled" if !$self->option('transfer');
-    return $srs->last_response() if !$srs->transfer_domain( $svc_domain->domain, $c);
-  } else {
-    return "Unknown domain action " . $svc_domain->action;
+#  return "Domain registration not enabled" if !$self->option('register');
+  return $srs->last_response() if !$srs->register_domain( $svc_domain->domain, $c);
+
+  return ''; # Should only get here if register succeeded
+}
+
+=item transfer
+
+Attempts to transfer the domain into the reseller account associated with this export.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub transfer {
+  my ( $self, $svc_domain ) = @_;
+
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+
+  my $c = gen_contact_info($cust_main);
+
+  $err = validate_contact_info($c);
+  return $err if $err;
+
+  my $srs = $self->get_srs;
+
+  my $cookie = $srs->get_cookie( $self->option('masterdomain') );
+  if (!$cookie) {
+     return "Unable to get cookie at OpenSRS: " . $srs->last_response();
   }
 
-  return ''; # Should only get here if register or transfer succeeded
+#  return "Domain transfer not enabled" if !$self->option('transfer');
+  return $srs->last_response() if !$srs->transfer_domain( $svc_domain->domain, $c);
 
+  return ''; # Should only get here if transfer succeeded
 }
 
-## Domain registration exports do nothing on replace.  Mainly because we haven't decided what they should do.
-#sub _export_replace {
-#  my( $self, $new, $old ) = (shift, shift, shift);
-#
-#  return '';
-#
-#}
+=item renew
 
-## Domain registration exports do nothing on delete.  You're just removing the domain from Freeside, not the registry
-#sub _export_delete {
-#  my( $self, $svc_domain ) = ( shift, shift );
-#
-#  return '';
-#}
+Attempts to renew the domain for the specified number of years.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub renew {
+  my ( $self, $svc_domain, $years ) = @_;
+
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $srs = $self->get_srs;
+
+  my $cookie = $srs->get_cookie( $self->option('masterdomain') );
+  if (!$cookie) {
+     return "Unable to get cookie at OpenSRS: " . $srs->last_response();
+  }
+
+#  return "Domain renewal not enabled" if !$self->option('renew');
+  return $srs->last_response() if !$srs->renew_domain( $svc_domain->domain, $years );
+
+  return ''; # Should only get here if renewal succeeded
+}
+
+=item revoke
+
+Attempts to revoke the domain registration.  Only succeeds if invoked during the OpenSRS
+grace period immediately after registration.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub revoke {
+  my ( $self, $svc_domain ) = @_;
+
+  eval "use Net::OpenSRS;";
+  return $@ if $@;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $srs = $self->get_srs;
+
+  my $cookie = $srs->get_cookie( $self->option('masterdomain') );
+  if (!$cookie) {
+     return "Unable to get cookie at OpenSRS: " . $srs->last_response();
+  }
+
+#  return "Domain registration revocation not enabled" if !$self->option('revoke');
+  return $srs->last_response() if !$srs->revoke_domain( $svc_domain->domain);
+
+  return ''; # Should only get here if transfer succeeded
+}
+
+=item registrar
+
+Should return a full-blown object representing OpenSRS, but current just returns a hashref
+containing the registrar name.
+
+=cut
 
 sub registrar {
   return {
-- 
cgit v1.2.1


From 4dc5a3df393ecc08e34f820c22340146c2f386c8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 15 Jun 2009 20:43:57 +0000
Subject: check for need for postal fee before charging the customer, not after

---
 FS/FS/cust_main.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 124cbccca..1bbf92d17 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2429,18 +2429,18 @@ sub bill {
     return '';
   }
 
-  my $postal_pkg = $self->charge_postal_fee();
-  if ( $postal_pkg && !ref( $postal_pkg ) ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "can't charge postal invoice fee for customer ".
-      $self->custnum. ": $postal_pkg";
-  }
-  if ( $postal_pkg &&
-       ( scalar( grep { $_->recur && $_->recur > 0 } @cust_bill_pkg) ||
+  if ( scalar( grep { $_->recur && $_->recur > 0 } @cust_bill_pkg) ||
          !$conf->exists('postal_invoice-recurring_only')
-       )
      )
   {
+
+    my $postal_pkg = $self->charge_postal_fee();
+    if ( $postal_pkg && !ref( $postal_pkg ) ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "can't charge postal invoice fee for customer ".
+        $self->custnum. ": $postal_pkg";
+    }
+
     foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
       my $error =
         $self->_make_lines( 'part_pkg'            => $part_pkg,
-- 
cgit v1.2.1


From c7d6edd92281d39e6eb59656a5b79faf8454973d Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Mon, 15 Jun 2009 21:41:33 +0000
Subject: Add a new access right for managing domain registration (registering,
 transferring, revoking, renewing, etc.).

---
 FS/FS/AccessRight.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index af480dfa7..e29620dc5 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -140,6 +140,7 @@ tie my %rights, 'Tie::IxHash',
     'Edit www config', #NEW
     'Edit domain catchall', #NEW
     'Edit domain nameservice', #NEW
+    'Manage domain registration',
   
     { rightname=>'View/link unlinked services', global=>1 }, #not agent-virtualizable without more work
   ],
-- 
cgit v1.2.1


From 3a02c437eadd9a39f7e56056ca987a4846650209 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 17 Jun 2009 02:39:09 +0000
Subject: finish up initial work on customer view tabs (ensure links back to
 customer view call include show=packages if default view isn't jumbo or
 packages already), RT#5586

---
 FS/FS/Conf.pm        | 17 +++++++++++++++++
 FS/FS/access_user.pm | 28 ++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0664c1444..8065f3b47 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2827,6 +2827,23 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'cust_main-default_view',
+    'section'     => 'UI',
+    'description' => 'Default customer view, for users who have not selected a default view in their preferences.',
+    'type'        => 'select',
+    'select_hash' => [
+      #false laziness w/view/cust_main.cgi and pref/pref.html
+      'basics'          => 'Basics',
+      'notes'           => 'Notes',
+      'tickets'         => 'Tickets',
+      'packages'        => 'Packages',
+      'payment_history' => 'Payment History',
+      #''                => 'Change History',
+      'jumbo'           => 'Jumbo',
+    ],
+  },
+
 );
 
 1;
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index cf56fd8e3..e605c9035 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -1,7 +1,7 @@
 package FS::access_user;
 
 use strict;
-use vars qw( @ISA $DEBUG $me $htpasswd_file );
+use vars qw( @ISA $DEBUG $me $conf $htpasswd_file );
 use FS::UID;
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
@@ -19,7 +19,7 @@ $me = '[FS::access_user]';
 
 #kludge htpasswd for now (i hope this bootstraps okay)
 FS::UID->install_callback( sub {
-  my $conf = new FS::Conf;
+  $conf = new FS::Conf;
   $htpasswd_file = $conf->base_dir. '/htpasswd';
 } );
 
@@ -44,8 +44,8 @@ FS::access_user - Object methods for access_user records
 
 =head1 DESCRIPTION
 
-An FS::access_user object represents an internal access user.  FS::access_user inherits from
-FS::Record.  The following fields are currently supported:
+An FS::access_user object represents an internal access user.  FS::access_user
+inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
@@ -274,6 +274,9 @@ sub name {
 
 =item access_usergroup
 
+Returns links to the the groups this user is a part of, as FS::access_usergroup
+objects (see L<FS::access_usergroup).
+
 =cut
 
 sub access_usergroup {
@@ -467,6 +470,23 @@ sub access_right {
 
 }
 
+=item default_customer_view
+
+Returns the default customer view for this user, from the 
+"default_customer_view" user preference, the "cust_main-default_view" config,
+or the hardcoded default, "jumbo" (may change to "basics" in the near future).
+
+=cut
+
+sub default_customer_view {
+  my $self = shift;
+
+  $self->option('default_customer_view')
+    || $conf->config('cust_main-default_view')
+    || 'jumbo'; #'basics' in 1.9.1?
+
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 94ff0d1fe71494acad3cb252b1054c2768671c4a Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 17 Jun 2009 06:43:08 +0000
Subject: Added separate access right for receivables report

---
 FS/FS/AccessRight.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index e29620dc5..146b9fa4e 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -211,6 +211,7 @@ tie my %rights, 'Tie::IxHash',
   
     { rightname=> 'List rating data', desc=>'Usage reports', global=>1 },
     'Billing event reports',
+    'Receivables report',
     'Financial reports',
   ],
   
-- 
cgit v1.2.1


From 37c309cc6f31f6038c75641c6c21648a92337eb3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Jun 2009 10:07:29 +0000
Subject: uuh, don't bomb out if there *isn't* a postal fee package

---
 FS/FS/cust_main.pm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1bbf92d17..960c57024 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2436,28 +2436,33 @@ sub bill {
 
     my $postal_pkg = $self->charge_postal_fee();
     if ( $postal_pkg && !ref( $postal_pkg ) ) {
+
       $dbh->rollback if $oldAutoCommit;
       return "can't charge postal invoice fee for customer ".
         $self->custnum. ": $postal_pkg";
-    }
 
-    foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
-      my $error =
-        $self->_make_lines( 'part_pkg'            => $part_pkg,
-                            'cust_pkg'            => $postal_pkg,
-                            'precommit_hooks'     => \@precommit_hooks,
-                            'line_items'          => \@cust_bill_pkg,
-                            'setup'               => \$total_setup,
-                            'recur'               => \$total_recur,
-                            'tax_matrix'          => \%taxlisthash,
-                            'time'                => $time,
-                            'options'             => \%options,
-                          );
-      if ($error) {
-        $dbh->rollback if $oldAutoCommit;
-        return $error;
+    } elsif ( $postal_pkg ) {
+
+      foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
+        my $error =
+          $self->_make_lines( 'part_pkg'            => $part_pkg,
+                              'cust_pkg'            => $postal_pkg,
+                              'precommit_hooks'     => \@precommit_hooks,
+                              'line_items'          => \@cust_bill_pkg,
+                              'setup'               => \$total_setup,
+                              'recur'               => \$total_recur,
+                              'tax_matrix'          => \%taxlisthash,
+                              'time'                => $time,
+                              'options'             => \%options,
+                            );
+        if ($error) {
+          $dbh->rollback if $oldAutoCommit;
+          return $error;
+        }
       }
+
     }
+
   }
 
   warn "having a look at the taxes we found...\n" if $DEBUG > 2;
-- 
cgit v1.2.1


From 287bf810a8ae3528525fff354610afa606468299 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Jun 2009 11:03:34 +0000
Subject: add basic part_pkg cost columns for agent wholsale price plan,
 RT#4696

---
 FS/FS/Schema.pm   | 2 ++
 FS/FS/part_pkg.pm | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 1f8fa8fa1..d264fd01f 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1194,6 +1194,8 @@ sub tables_hashref {
         'taxclass',      'varchar', 'NULL', $char_d, '', '', 
         'classnum',      'int',     'NULL', '', '', '', 
         'taxproductnum', 'int',     'NULL', '', '', '', 
+        'setup_cost',    @money_typen,          '', '',
+        'recur_cost',    @money_typen,          '', '',
         'pay_weight',    'real',    'NULL', '', '', '',
         'credit_weight', 'real',    'NULL', '', '', '',
         'agentnum',      'int',     'NULL', '', '', '', 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 8cfd6143c..fe56c62e1 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -85,6 +85,10 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item disabled - Disabled flag, empty or `Y'
 
+=item setup_cost - for cost tracking
+
+=item recur_cost - for cost tracking
+
 =item pay_weight - Weight (relative to credit_weight and other package definitions) that controls payment application to specific line items.
 
 =item credit_weight - Weight (relative to other package definitions) that controls credit application to specific line items.
@@ -448,6 +452,10 @@ sub check {
     || $self->ut_enum('recurtax', [ '', 'Y' ] )
     || $self->ut_textn('taxclass')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
+    #|| $self->ut_moneyn('setup_cost')
+    #|| $self->ut_moneyn('recur_cost')
+    || $self->ut_floatn('setup_cost')
+    || $self->ut_floatn('recur_cost')
     || $self->ut_floatn('pay_weight')
     || $self->ut_floatn('credit_weight')
     || $self->ut_numbern('taxproductnum')
-- 
cgit v1.2.1


From 7c4b45d5b4dd70e91c187e7f82fa305c2e420dab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Jun 2009 11:04:14 +0000
Subject: add agent wholsale price plan, RT#4696

---
 FS/FS/part_pkg/agent.pm | 165 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 FS/FS/part_pkg/agent.pm

(limited to 'FS')

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
new file mode 100644
index 000000000..70ad2adf6
--- /dev/null
+++ b/FS/FS/part_pkg/agent.pm
@@ -0,0 +1,165 @@
+package FS::part_pkg::agent;
+
+use strict;
+use vars qw(@ISA $DEBUG $me %info);
+use Date::Format;
+use FS::Record qw( qsearch );
+use FS::agent;
+use FS::cust_main;
+
+#use FS::part_pkg::recur_Common;;
+#@ISA = qw(FS::part_pkg::recur_Common);
+use FS::part_pkg::prorate;
+@ISA = qw(FS::part_pkg::prorate);
+
+$DEBUG = 0;
+
+$me = '[FS::part_pkg::agent]';
+
+%info = (
+  'name'      => 'Wholesale bulk billing, for master customers of an agent.',
+  'shortname' => 'Wholesale bulk billing for agent.',
+
+  'fields' => {
+    'setup_fee'     => { 'name' => 'Setup fee for this package',
+                         'default' => 0,
+                       },
+    'recur_fee'     => { 'name' => 'Base recurring fee for this package',
+                         'default' => 0,
+                       },
+
+
+    #'recur_method'  => { 'name' => 'Recurring fee method',
+    #                     #'type' => 'radio',
+    #                     #'options' => \%recur_method,
+    #                     'type' => 'select',
+    #                     'select_options' => \%recur_Common::recur_method,
+    #                   },
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28)',
+                         'default' => '1',
+                       },
+  },
+
+  #'fieldorder' => [qw( setup_fee recur_fee recur_method cutoff_day ) ],
+  'fieldorder' => [qw( setup_fee recur_fee cutoff_day ) ],
+
+  'weight' => 51,
+
+);
+
+#some false laziness-ish w/bulk.pm...  not a lot
+sub calc_recur {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
+  my $last_bill = $cust_pkg->last_bill;
+
+  return sprintf("%.2f", $self->SUPER::calc_recur(@_) )
+    unless $$sdate > $last_bill;
+
+  my $conf = new FS::Conf;
+  my $money_char = $conf->config('money_char') || '$';
+
+  my $prorate_sdate = $$sdate;
+  
+  my $total_agent_charge = 0;
+
+  warn "$me billing for agent packages from ". time2str('%x', $last_bill).
+                                       " to ". time2str('%x', $$sdate).
+                                "prorated to". time2str('%x', $prorate_sdate ).
+       "\n"
+    if $DEBUG;
+
+  #almost always just one,
+  #unless you have multiple agents with same master customer0
+  my @agents = qsearch('agent', { 'agent_custnum' => $cust_pkg->custnum } );
+
+  foreach my $agent (@agents) {
+
+    warn "$me billing for agent ". $agent->agent. "\n"
+      if $DEBUG;
+
+    #not the most efficient to load them all into memory,
+    #but good enough for our current needs
+    my @cust_main = qsearch('cust_main', { 'agentnum' => $agent->agentnum } );
+
+    foreach my $cust_main (@cust_main) {
+
+      warn "$me billing agent charges for ". $cust_main->name_short. "\n"
+        if $DEBUG;
+
+      #make sure setup dates are filled in
+      my $error = $cust_main->bill; #options don't propogate from freeside-daily
+      die "Error pre-billing agent customer: $error" if $error;
+
+      my @cust_pkg = grep { my $setup  = $_->get('setup');
+                            my $cancel = $_->get('cancel');
+
+                            $setup < $$sdate  # END
+                            && ( ! $cancel || $cancel > $last_bill ) #START
+                          }
+                     $cust_main->all_pkgs;
+
+      foreach my $cust_pkg ( @cust_pkg ) {
+
+        warn "$me billing agent charges for pkgnum ". $cust_pkg->pkgnum. "\n"
+          if $DEBUG;
+
+        my $pkg_details = $cust_main->name_short. ': '; #name?
+        # + something to identify package... primary service probably
+
+        my $pkg_charge = 0;
+
+        my $part_pkg = $cust_pkg->part_pkg;
+        #option to not fallback? via options above
+        my $pkg_setup_fee  =
+          $part_pkg->setup_cost || $part_pkg->option('setup_fee');
+        my $pkg_base_recur =
+          $part_pkg->recur_cost || $part_pkg->base_recur_permonth;
+
+        my $pkg_start = $cust_pkg->get('setup');
+        if ( $pkg_start < $last_bill ) {
+          $pkg_start = $last_bill;
+        } elsif ( $pkg_setup_fee ) {
+          $pkg_charge += $pkg_setup_fee;
+          $pkg_details .= $money_char. sprintf('%.2f setup, ', $pkg_setup_fee );
+        }
+
+        my $pkg_end = $cust_pkg->get('cancel');
+        $pkg_end = ( !$pkg_end || $pkg_end > $$sdate ) ? $$sdate : $pkg_end;
+
+        my $recur_charge += $pkg_base_recur * ( $pkg_end - $pkg_start )
+                                            / ( $prorate_sdate  - $last_bill );
+
+        $pkg_details .= $money_char. sprintf('%.2f', $recur_charge ).
+                        ' ('.  time2str('%x', $pkg_start).
+                        ' - '. time2str('%x', $pkg_end  ). ')'
+          if $recur_charge;
+
+        $pkg_charge += $recur_charge;
+
+        push @$details, $pkg_details;
+        $total_agent_charge += $pkg_charge;
+
+      } #foreach $cust_pkg
+
+    } #foreach $cust_main
+
+  } #foreach $agent;
+
+  my $charges = $total_agent_charge + $self->SUPER::calc_recur(@_); #prorate
+
+  sprintf('%.2f', $charges );
+
+}
+
+sub hide_svc_detail {
+  1;
+}
+
+sub is_free {
+  0;
+}
+
+1;
+
-- 
cgit v1.2.1


From 3f812f8ad93a515d3c36c1a11a05391e05922679 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Jun 2009 11:07:04 +0000
Subject:  bulk price plan fix - don't omit setup fee

---
 FS/FS/part_pkg/bulk.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/bulk.pm b/FS/FS/part_pkg/bulk.pm
index 7c81138c1..1b52d9fc3 100644
--- a/FS/FS/part_pkg/bulk.pm
+++ b/FS/FS/part_pkg/bulk.pm
@@ -35,6 +35,7 @@ $me = '[FS::part_pkg::bulk]';
   'weight' => 50,
 );
 
+#some false laziness-ish w/agent.pm...  not a lot
 sub calc_recur {
   my($self, $cust_pkg, $sdate, $details ) = @_;
 
@@ -74,20 +75,23 @@ sub calc_recur {
     my $svc_end = $h_cust_svc->date_deleted;
     $svc_end = ( !$svc_end || $svc_end > $$sdate ) ? $$sdate : $svc_end;
 
-    $svc_charge = $self->option('svc_recur_fee') * ( $svc_end - $svc_start )
-                                                 / ( $$sdate  - $last_bill );
+    my $recur_charge =
+      $self->option('svc_recur_fee') * ( $svc_end - $svc_start )
+                                     / ( $$sdate  - $last_bill );
 
-    $svc_details .= $money_char. sprintf('%.2f', $svc_charge ).
+    $svc_details .= $money_char. sprintf('%.2f', $recur_charge ).
                     ' ('.  time2str('%x', $svc_start).
                     ' - '. time2str('%x', $svc_end  ). ')'
-      if $self->option('svc_recur_fee');
+      if $recur_charge;
+
+    $svc_charge += $recur_charge;
 
     push @$details, $svc_details;
     $total_svc_charge += $svc_charge;
 
   }
 
-  sprintf("%.2f", $self->base_recur($cust_pkg) + $total_svc_charge );
+  sprintf('%.2f', $self->base_recur($cust_pkg) + $total_svc_charge );
 }
 
 sub hide_svc_detail {
-- 
cgit v1.2.1


From c7328c352c9a88a3a685be06191c7bd9de1505a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 18 Jun 2009 11:09:28 +0000
Subject: omit listing spurious customer details

---
 FS/FS/part_pkg/agent.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index 70ad2adf6..880d135c2 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -138,7 +138,8 @@ sub calc_recur {
 
         $pkg_charge += $recur_charge;
 
-        push @$details, $pkg_details;
+        push @$details, $pkg_details
+          if $pkg_charge;
         $total_agent_charge += $pkg_charge;
 
       } #foreach $cust_pkg
-- 
cgit v1.2.1


From dadb0f39939a1e583df0cf49870e04ec406ef627 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Jun 2009 07:14:42 +0000
Subject: attempt to optimize the easy parts of billing run, RT#18737

---
 FS/FS/cust_main.pm | 53 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 960c57024..a428f8929 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2240,7 +2240,7 @@ sub bill_and_collect {
 
   #$options{actual_time} not $options{time} because freeside-daily -d is for
   #pre-printing invoices
-  $self->cancel_expired_pkgs( $options{actual_time} );
+  $self->cancel_expired_pkgs(    $options{actual_time} );
   $self->suspend_adjourned_pkgs( $options{actual_time} );
 
   my $error = $self->bill( %options );
@@ -2262,8 +2262,9 @@ sub bill_and_collect {
 sub cancel_expired_pkgs {
   my ( $self, $time ) = @_;
 
-  my @cancel_pkgs = grep { $_->expire && $_->expire <= $time }
-                         $self->ncancelled_pkgs;
+  my @cancel_pkgs = $self->ncancelled_pkgs( { 
+    'extra_sql' => " expire IS NOT NULL AND expire > 0 AND expire <= $time ",
+  } );
 
   foreach my $cust_pkg ( @cancel_pkgs ) {
     my $cpr = $cust_pkg->last_cust_pkg_reason('expire');
@@ -2282,18 +2283,27 @@ sub cancel_expired_pkgs {
 sub suspend_adjourned_pkgs {
   my ( $self, $time ) = @_;
 
-  my @susp_pkgs = 
-    grep { ! $_->susp
-           && (    (    $_->part_pkg->is_prepaid
-                     && $_->bill
-                     && $_->bill < $time
-                   )
-                || (    $_->adjourn
-                    && $_->adjourn <= $time
-                  )
-              )
+  my @susp_pkgs = $self->ncancelled_pkgs( {
+    'extra_sql' =>
+      " ( susp IS NULL OR susp = 0 )
+         AND (    ( bill    IS NOT NULL AND bill    != 0 AND bill    <  $time )
+               OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
+             )
+      ",
+  } );
+
+  #only because there's no SQL test for is_prepaid :/
+  @susp_pkgs = 
+    grep {     (    $_->part_pkg->is_prepaid
+                 && $_->bill
+                 && $_->bill < $time
+               )
+            || (    $_->adjourn
+                 && $_->adjourn <= $time
+               )
+           
          }
-         $self->ncancelled_pkgs;
+         @susp_pkgs;
 
   foreach my $cust_pkg ( @susp_pkgs ) {
     my $cpr = $cust_pkg->last_cust_pkg_reason('adjourn')
@@ -2382,11 +2392,7 @@ sub bill {
   my %taxlisthash;
   my @precommit_hooks = ();
 
-  my @cust_pkgs = qsearch('cust_pkg', { 'custnum' => $self->custnum } );
-  foreach my $cust_pkg (@cust_pkgs) {
-
-    #NO!! next if $cust_pkg->cancel;  
-    next if $cust_pkg->getfield('cancel');  
+  foreach my $cust_pkg ( $self->ncancelled_pkgs ) {
 
     warn "  bill package ". $cust_pkg->pkgnum. "\n" if $DEBUG > 1;
 
@@ -6714,7 +6720,14 @@ customer.
 
 sub open_cust_bill {
   my $self = shift;
-  grep { $_->owed > 0 } $self->cust_bill;
+
+  qsearch({
+    'table'     => 'cust_bill',
+    'hashref'   => { 'custnum' => $self->custnum, },
+    'extra_sql' => ' AND '. FS::cust_bill->owed_sql. ' > 0',
+    'order_by'  => 'ORDER BY _date ASC',
+  });
+
 }
 
 =item cust_credit
-- 
cgit v1.2.1


From 98e05f4fa66a6a131d3c0cc6d59c5fab128e4b7e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Jun 2009 07:46:29 +0000
Subject: AND helps alot, RT#5572 for real

---
 FS/FS/cust_main.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a428f8929..9f9ae1869 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2263,7 +2263,7 @@ sub cancel_expired_pkgs {
   my ( $self, $time ) = @_;
 
   my @cancel_pkgs = $self->ncancelled_pkgs( { 
-    'extra_sql' => " expire IS NOT NULL AND expire > 0 AND expire <= $time ",
+    'extra_sql' => " AND expire IS NOT NULL AND expire > 0 AND expire <= $time "
   } );
 
   foreach my $cust_pkg ( @cancel_pkgs ) {
@@ -2285,10 +2285,10 @@ sub suspend_adjourned_pkgs {
 
   my @susp_pkgs = $self->ncancelled_pkgs( {
     'extra_sql' =>
-      " ( susp IS NULL OR susp = 0 )
-         AND (    ( bill    IS NOT NULL AND bill    != 0 AND bill    <  $time )
-               OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
-             )
+      " AND ( susp IS NULL OR susp = 0 )
+        AND (    ( bill    IS NOT NULL AND bill    != 0 AND bill    <  $time )
+              OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
+            )
       ",
   } );
 
-- 
cgit v1.2.1


From 912d709f8b836911dd3d66eb66083af1f8662953 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 19 Jun 2009 12:08:27 +0000
Subject: fix the prorating for the package's first month (whew!) add an option
 not to prorate the accounts themselves

---
 FS/FS/part_pkg/agent.pm | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index 880d135c2..9bcf33da1 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -38,10 +38,15 @@ $me = '[FS::part_pkg::agent]';
     'cutoff_day'    => { 'name' => 'Billing Day (1 - 28)',
                          'default' => '1',
                        },
+
+    'no_pkg_prorate'   => { 'name' => 'Disable prorating bulk packages (charge full price for packages active only a portion of the month)',
+                            'type' => 'checkbox',
+                          },
+
   },
 
   #'fieldorder' => [qw( setup_fee recur_fee recur_method cutoff_day ) ],
-  'fieldorder' => [qw( setup_fee recur_fee cutoff_day ) ],
+  'fieldorder' => [qw( setup_fee recur_fee cutoff_day no_pkg_prorate ) ],
 
   'weight' => 51,
 
@@ -60,16 +65,16 @@ sub calc_recur {
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';
 
-  my $prorate_sdate = $$sdate;
-  
   my $total_agent_charge = 0;
 
   warn "$me billing for agent packages from ". time2str('%x', $last_bill).
-                                       " to ". time2str('%x', $$sdate).
-                                "prorated to". time2str('%x', $prorate_sdate ).
+                                       " to ". time2str('%x', $$sdate);
        "\n"
     if $DEBUG;
 
+  my $prorate_ratio =   ( $$sdate                     - $last_bill )
+                      / ( $self->add_freq($last_bill) - $last_bill );
+
   #almost always just one,
   #unless you have multiple agents with same master customer0
   my @agents = qsearch('agent', { 'agent_custnum' => $cust_pkg->custnum } );
@@ -128,8 +133,13 @@ sub calc_recur {
         my $pkg_end = $cust_pkg->get('cancel');
         $pkg_end = ( !$pkg_end || $pkg_end > $$sdate ) ? $$sdate : $pkg_end;
 
-        my $recur_charge += $pkg_base_recur * ( $pkg_end - $pkg_start )
-                                            / ( $prorate_sdate  - $last_bill );
+
+        my $pkg_recur_charge = $prorate_ratio * $pkg_base_recur;
+        $pkg_recur_charge *= ( $pkg_end - $pkg_start )
+                           / ( $$sdate  - $last_bill )
+          unless $self->option('no_pkg_prorate');
+
+        my $recur_charge += $pkg_recur_charge;
 
         $pkg_details .= $money_char. sprintf('%.2f', $recur_charge ).
                         ' ('.  time2str('%x', $pkg_start).
-- 
cgit v1.2.1


From 5826159b3b1272f763b67f05a0cc3a53913f7912 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 19 Jun 2009 21:49:03 +0000
Subject: support some older Pg when upgrading tax rates and
 cust_bill_pkg_details

---
 FS/FS/cust_bill_pkg_detail.pm | 31 ++++++++++++++++++++++++++++++
 FS/FS/tax_rate.pm             | 44 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index f40ce5869..9a90936ed 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -148,6 +148,37 @@ sub _upgrade_data { # class method
 
         }
 
+      } elsif ( $dbh->{pg_server_version} =~ /^704/ ) {  # earlier?
+
+        # ideally this would be supported in DBIx-DBSchema and friends
+
+        #  XXX_FIXME better locking
+
+        foreach my $table ( qw( cust_bill_pkg_detail h_cust_bill_pkg_detail ) ){
+
+          warn "updating $table column classnum to integer\n" if $DEBUG;
+
+          my $sql = "ALTER TABLE $table RENAME classnum TO old_classnum";
+          my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+          my $def = dbdef->table($table)->column('classnum');
+          $def->type('integer');
+          $def->length(''); 
+          $sql = "ALTER TABLE $table ADD COLUMN ". $def->line($dbh);
+          $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+          $sql = "UPDATE $table SET classnum = int4( text( old_classnum ) )";
+          $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+          $sql = "ALTER TABLE $table DROP old_classnum";
+          $sth = $dbh->prepare($sql) or die $dbh->errstr;
+          $sth->execute or die $sth->errstr;
+
+        }
+
       } else {
 
         die "cust_bill_pkg_detail classnum upgrade unsupported for this Pg version\n";
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 2808c6ef8..9a25f947b 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1664,6 +1664,50 @@ sub _upgrade_data {  # class method
         }
       }
 
+    } elsif ( $dbh->{pg_server_version} =~ /^704/ ) {
+
+      # ideally this would be supported in DBIx-DBSchema and friends
+
+      foreach my $column ( @column ) {
+        my $columndef = dbdef->table($self->table)->column($column);
+        unless ($columndef->type eq 'numeric') {
+
+          warn "updating tax_rate column $column to numeric\n" if $DEBUG;
+
+          foreach my $table ( qw( tax_rate h_tax_rate ) ) {
+
+            my $sql = "ALTER TABLE $table RENAME $column TO old_$column";
+            my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+            $sth->execute or die $sth->errstr;
+
+            my $def = dbdef->table($table)->column($column);
+            $def->type('numeric');
+            $def->length('14,8'); 
+            my $null = $def->null;
+            $def->null('NULL');
+
+            $sql = "ALTER TABLE $table ADD COLUMN ". $def->line($dbh);
+            $sth = $dbh->prepare($sql) or die $dbh->errstr;
+            $sth->execute or die $sth->errstr;
+
+            $sql = "UPDATE $table SET $column = CAST( old_$column AS numeric )";
+            $sth = $dbh->prepare($sql) or die $dbh->errstr;
+            $sth->execute or die $sth->errstr;
+
+            unless ( $null eq 'NULL' ) {
+              $sql = "ALTER TABLE $table ALTER $column SET NOT NULL";
+              $sth = $dbh->prepare($sql) or die $dbh->errstr;
+              $sth->execute or die $sth->errstr;
+            }
+
+            $sql = "ALTER TABLE $table DROP old_$column";
+            $sth = $dbh->prepare($sql) or die $dbh->errstr;
+            $sth->execute or die $sth->errstr;
+
+          }
+        }
+      }
+
     } else {
 
       warn "WARNING: tax_rate table upgrade unsupported for this Pg version\n";
-- 
cgit v1.2.1


From 04a69f9d197efee6fa396bd35d04ae553e669978 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 21 Jun 2009 15:21:32 +0000
Subject: CUSTOM packages/actual flag for custom packages #3988

---
 FS/FS/Schema.pm   |  1 +
 FS/FS/cust_pkg.pm | 10 ++++++++++
 FS/FS/part_pkg.pm | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 59 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index d264fd01f..69a96a99a 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1191,6 +1191,7 @@ sub tables_hashref {
         'plan',          'varchar', 'NULL', $char_d, '', '', 
         'plandata',      'text', 'NULL', '', '', '', 
         'disabled',      'char', 'NULL', 1, '', '', 
+        'custom',        'char', 'NULL', 1, '', '', 
         'taxclass',      'varchar', 'NULL', $char_d, '', '', 
         'classnum',      'int',     'NULL', '', '', '', 
         'taxproductnum', 'int',     'NULL', '', '', '', 
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0e5f3b7ca..a510c5245 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2193,6 +2193,10 @@ active, inactive, suspended, cancel (or cancelled)
 
 active, inactive, suspended, one-time charge, inactive, cancel (or cancelled)
 
+=item custom
+
+ boolean selects custom packages
+
 =item classnum
 
 =item pkgpart
@@ -2320,6 +2324,12 @@ sub search_sql {
   }
   #eslaf
 
+  ###
+  # parse custom
+  ###
+
+  push @where,  "part_pkg.custom = 'Y'" if $params->{custom};
+
   ###
   # parse part_pkg
   ###
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index fe56c62e1..0562a6d44 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -85,6 +85,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item disabled - Disabled flag, empty or `Y'
 
+=item custom - Custom flag, empty or `Y'
+
 =item setup_cost - for cost tracking
 
 =item recur_cost - for cost tracking
@@ -113,9 +115,8 @@ sub table { 'part_pkg'; }
 =item clone
 
 An alternate constructor.  Creates a new package definition by duplicating
-an existing definition.  A new pkgpart is assigned and `(CUSTOM) ' is prepended
-to the comment field.  To add the package definition to the database, see
-L<"insert">.
+an existing definition.  A new pkgpart is assigned and the custom flag is
+set to Y.  To add the package definition to the database, see L<"insert">.
 
 =cut
 
@@ -124,8 +125,7 @@ sub clone {
   my $class = ref($self);
   my %hash = $self->hash;
   $hash{'pkgpart'} = '';
-  $hash{'comment'} = "(CUSTOM) ". $hash{'comment'}
-    unless $hash{'comment'} =~ /^\(CUSTOM\) /;
+  $hash{'custom'} = 'Y';
   #new FS::part_pkg ( \%hash ); # ?
   new $class ( \%hash ); # ?
 }
@@ -452,6 +452,7 @@ sub check {
     || $self->ut_enum('recurtax', [ '', 'Y' ] )
     || $self->ut_textn('taxclass')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
+    || $self->ut_enum('custom', [ '', 'Y' ] )
     #|| $self->ut_moneyn('setup_cost')
     #|| $self->ut_moneyn('recur_cost')
     || $self->ut_floatn('setup_cost')
@@ -488,20 +489,30 @@ sub check {
   '';
 }
 
-=item pkg_comment
+=item pkg_comment [ OPTION => VALUE... ]
 
 Returns an (internal) string representing this package.  Currently,
 "pkgpart: pkg - comment", is returned.  "pkg - comment" may be returned in the
-future, omitting pkgpart.
+future, omitting pkgpart.  The comment will have '(CUSTOM) ' prepended if
+custom is Y.
+
+If the option nopkgpart is true then the "pkgpart: ' is omitted.
 
 =cut
 
 sub pkg_comment {
   my $self = shift;
+  my %opt = @_;
 
   #$self->pkg. ' - '. $self->comment;
   #$self->pkg. ' ('. $self->comment. ')';
-  $self->pkgpart. ': '. $self->pkg. ' - '. $self->comment;
+  my $pre = $opt{nopkgpart} ? '' : $self->pkgpart. ': ';
+  $pre. $self->pkg. ' - '. $self->custom_comment;
+}
+
+sub custom_comment {
+  my $self = shift;
+  ( $self->custom ? '(CUSTOM) ' : '' ). $self->comment;
 }
 
 =item pkg_class
@@ -1257,6 +1268,33 @@ sub _upgrade_data { # class method
 
   }
 
+  # now upgrade to the explicit custom flag
+
+  @part_pkg = qsearch({
+    'table'     => 'part_pkg',
+    'hashref'   => { disabled => 'Y', custom => '' },
+    'extra_sql' => "AND comment LIKE '(CUSTOM) %'",
+  });
+
+  foreach my $part_pkg (@part_pkg) {
+    my $new = new FS::part_pkg { $part_pkg->hash };
+    $new->custom('Y');
+    my $comment = $part_pkg->comment;
+    $comment =~ s/^\(CUSTOM\) //;
+    $new->comment($comment);
+
+    my $pkg_svc = { map { $_->svcpart => $_->quantity } $part_pkg->pkg_svc };
+    my $primary = $part_pkg->svcpart;
+    my $options = { $part_pkg->options };
+
+    my $error = $new->replace( $part_pkg,
+                               'pkg_svc'     => $pkg_svc,
+                               'primary_svc' => $primary,
+                               'options'     => $options,
+                             );
+    die $error if $error;
+  }
+
 }
 
 =item curuser_pkgs_sql
@@ -1379,6 +1417,8 @@ plandata should go
 
 part_pkg_taxrate is Pg specific
 
+replace should be smarter about managing the related tables (options, pkg_svc)
+
 =head1 SEE ALSO
 
 L<FS::Record>, L<FS::cust_pkg>, L<FS::type_pkgs>, L<FS::pkg_svc>, L<Safe>.
-- 
cgit v1.2.1


From 035d5509424c596582eea94866ee2af63c74de9f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 21 Jun 2009 15:42:33 +0000
Subject: link to docs #5855

---
 FS/FS/part_export/acct_plesk.pm | 2 +-
 FS/FS/part_export/www_plesk.pm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/acct_plesk.pm b/FS/FS/part_export/acct_plesk.pm
index 1be820a75..d8d70a30e 100644
--- a/FS/FS/part_export/acct_plesk.pm
+++ b/FS/FS/part_export/acct_plesk.pm
@@ -23,7 +23,7 @@ Real-time export to
 <a href="http://www.swsoft.com/">Plesk</a> managed server.
 Requires installation of
 <a href="http://search.cpan.org/dist/Net-Plesk">Net::Plesk</a>
-from CPAN.
+from CPAN and proper <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration:acct_plesk.pm">configuration</a>.
 END
 );
 
diff --git a/FS/FS/part_export/www_plesk.pm b/FS/FS/part_export/www_plesk.pm
index 82d555761..ccf9b3e17 100644
--- a/FS/FS/part_export/www_plesk.pm
+++ b/FS/FS/part_export/www_plesk.pm
@@ -26,7 +26,7 @@ Real-time export to
 <a href="http://www.swsoft.com/">Plesk</a> managed server.
 Requires installation of
 <a href="http://search.cpan.org/dist/Net-Plesk">Net::Plesk</a>
-from CPAN.
+from CPAN and proper <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration:www_plesk.pm">configuration</a>.
 END
 );
 
-- 
cgit v1.2.1


From 2f62e9125f1eb98db97a6ddff5b47bb258e6fc60 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 21 Jun 2009 22:00:06 +0000
Subject: eliminate leaky debugging and a warning about it

---
 FS/FS/part_pkg/agent.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index 9bcf33da1..2ebaf5807 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -68,8 +68,7 @@ sub calc_recur {
   my $total_agent_charge = 0;
 
   warn "$me billing for agent packages from ". time2str('%x', $last_bill).
-                                       " to ". time2str('%x', $$sdate);
-       "\n"
+                                       " to ". time2str('%x', $$sdate). "\n"
     if $DEBUG;
 
   my $prorate_ratio =   ( $$sdate                     - $last_bill )
-- 
cgit v1.2.1


From 73e382b838f031512684138fedb7d813684ddd28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 07:50:18 +0000
Subject: tax exemption by tax name, RT#5127

---
 FS/FS.pm                     |   2 +
 FS/FS/Conf.pm                |   7 +++
 FS/FS/Schema.pm              |  12 ++++
 FS/FS/cust_main.pm           | 109 +++++++++++++++++++++++++++++++++++-
 FS/FS/cust_main_exemption.pm | 128 +++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                  |   2 +
 FS/t/cust_main_exemption.t   |   5 ++
 7 files changed, 262 insertions(+), 3 deletions(-)
 create mode 100644 FS/FS/cust_main_exemption.pm
 create mode 100644 FS/t/cust_main_exemption.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index c4be977f1..e34b45db6 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -228,6 +228,8 @@ L<FS::cust_main_Mixin> - Mixin class for records that contain fields from cust_m
 
 L<FS::cust_main_invoice> - Invoice destination class
 
+L<FS::cust_main_exemption> - Customer tax exemption class
+
 L<FS::cust_main_note> - Customer note class
 
 L<FS::banned_pay> - Banned payment information class
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8065f3b47..543c77027 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2827,6 +2827,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'tax-cust_exempt-groups',
+    'section'     => '',
+    'description' => 'List of grouping possibilities for tax names, for per-customer exemption purposes, one tax name prefix for line.  For example, "GST" would indicate the ability to exempt customers individually from taxes starting with "GST" (but not other taxes).',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'cust_main-default_view',
     'section'     => 'UI',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 69a96a99a..0ca15a64d 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -788,6 +788,18 @@ sub tables_hashref {
       'index' => [ [ 'custnum' ], [ '_date' ], ],
     },
 
+    'cust_main_exemption' => {
+      'columns' => [
+        'exemptionnum', 'serial', '',      '', '', '',
+        'custnum',         'int', '',      '', '', '', 
+        'taxname',     'varchar', '', $char_d, '', '',
+        #start/end dates?  for reporting?
+      ],
+      'primary_key' => 'exemptionnum',
+      'unique'      => [],
+      'index'       => [ [ 'custnum' ] ],
+    },
+
     'cust_main_county' => { #county+state+country are checked off the
                             #cust_main_county for validation and to provide
                             # a tax rate.
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9f9ae1869..51ba20920 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -40,6 +40,7 @@ use FS::cust_refund;
 use FS::part_referral;
 use FS::cust_main_county;
 use FS::cust_location;
+use FS::cust_main_exemption;
 use FS::tax_rate;
 use FS::tax_rate_location;
 use FS::cust_tax_location;
@@ -363,7 +364,7 @@ invoicing_list destination to the newly-created svc_acct.  Here's an example:
 
   $cust_main->insert( {}, [ $email, 'POST' ] );
 
-Currently available options are: I<depend_jobnum> and I<noexport>.
+Currently available options are: I<depend_jobnum>, I<noexport> and I<tax_exemption>.
 
 If I<depend_jobnum> is set, all provisioning jobs will have a dependancy
 on the supplied jobnum (they will not run until the specific job completes).
@@ -374,6 +375,9 @@ The I<noexport> option is deprecated.  If I<noexport> is set true, no
 provisioning jobs (exports) are scheduled.  (You can schedule them later with
 the B<reexport> method.)
 
+The I<tax_exemption> option can be set to an arrayref of tax names.
+FS::cust_main_exemption records will be created and inserted.
+
 =cut
 
 sub insert {
@@ -459,6 +463,24 @@ sub insert {
     $self->invoicing_list( $invoicing_list );
   }
 
+  warn "  setting cust_main_exemption\n"
+    if $DEBUG > 1;
+
+  my $tax_exemption = delete $options{'tax_exemption'};
+  if ( $tax_exemption ) {
+    foreach my $taxname ( @$tax_exemption ) {
+      my $cust_main_exemption = new FS::cust_main_exemption {
+        'custnum' => $self->custnum,
+        'taxname' => $taxname,
+      };
+      my $error = $cust_main_exemption->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "inserting cust_main_exemption (transaction rolled back): $error";
+      }
+    }
+  }
+
   if (    $conf->config('cust_main-skeleton_tables')
        && $conf->config('cust_main-skeleton_custnum') ) {
 
@@ -1295,6 +1317,16 @@ sub delete {
     }
   }
 
+  foreach my $cust_main_exemption (
+    qsearch( 'cust_main_exemption', { 'custnum' => $self->custnum } )
+  ) {
+    my $error = $cust_main_exemption->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   my $error = $self->SUPER::delete;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -1306,7 +1338,8 @@ sub delete {
 
 }
 
-=item replace [ OLD_RECORD ] [ INVOICING_LIST_ARYREF ]
+=item replace [ OLD_RECORD ] [ INVOICING_LIST_ARYREF ] [ , OPTION => VALUE ... ] ]
+
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
@@ -1318,6 +1351,11 @@ check_invoicing_list first.  Here's an example:
 
   $new_cust_main->replace( $old_cust_main, [ $email, 'POST' ] );
 
+Currently available options are: I<tax_exemption>.
+
+The I<tax_exemption> option can be set to an arrayref of tax names.
+FS::cust_main_exemption records will be deleted and inserted as appropriate.
+
 =cut
 
 sub replace {
@@ -1364,7 +1402,7 @@ sub replace {
     return $error;
   }
 
-  if ( @param ) { # INVOICING_LIST_ARYREF
+  if ( @param && ref($param[0]) eq 'ARRAY' ) { # INVOICING_LIST_ARYREF
     my $invoicing_list = shift @param;
     $error = $self->check_invoicing_list( $invoicing_list );
     if ( $error ) {
@@ -1374,6 +1412,40 @@ sub replace {
     $self->invoicing_list( $invoicing_list );
   }
 
+  my %options = @param;
+
+  my $tax_exemption = delete $options{'tax_exemption'};
+  if ( $tax_exemption ) {
+
+    my %cust_main_exemption =
+      map { $_->taxname => $_ }
+          qsearch('cust_main_exemption', { 'custnum' => $old->custnum } );
+
+    foreach my $taxname ( @$tax_exemption ) {
+
+      next if delete $cust_main_exemption{$taxname};
+
+      my $cust_main_exemption = new FS::cust_main_exemption {
+        'custnum' => $self->custnum,
+        'taxname' => $taxname,
+      };
+      my $error = $cust_main_exemption->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "inserting cust_main_exemption (transaction rolled back): $error";
+      }
+    }
+
+    foreach my $cust_main_exemption ( values %cust_main_exemption ) {
+      my $error = $cust_main_exemption->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "deleting cust_main_exemption (transaction rolled back): $error";
+      }
+    }
+
+  }
+
   if ( $self->payby =~ /^(CARD|CHEK|LECB)$/ &&
        grep { $self->get($_) ne $old->get($_) } qw(payinfo paydate payname) ) {
     # card/check/lec info has changed, want to retry realtime_ invoice events
@@ -6054,6 +6126,22 @@ see L<Time::Local> and L<Date::Parse> for conversion functions.
 sub total_owed_date {
   my $self = shift;
   my $time = shift;
+
+#  my $custnum = $self->custnum;
+#
+#  my $owed_sql = FS::cust_bill->owed_sql;
+#
+#  my $sql = "
+#    SELECT SUM($owed_sql) FROM cust_bill
+#      WHERE custnum = $custnum
+#        AND _date <= $time
+#  ";
+#
+#  my $sth = dbh->prepare($sql) or die dbh->errstr;
+#  $sth->execute() or die $sth->errstr;
+#
+#  return sprintf( '%.2f', $sth->fetchrow_arrayref->[0] );
+
   my $total_bill = 0;
   foreach my $cust_bill (
     grep { $_->_date <= $time }
@@ -6062,6 +6150,7 @@ sub total_owed_date {
     $total_bill += $cust_bill->owed;
   }
   sprintf( "%.2f", $total_bill );
+
 }
 
 =item total_paid
@@ -6287,6 +6376,20 @@ sub paydate_monthyear {
   }
 }
 
+=item tax_exemption TAXNAME
+
+=cut
+
+sub tax_exemption {
+  my( $self, $taxname ) = @_;
+
+  qsearchs( 'cust_main_exemption', { 'custnum' => $self->custnum,
+                                     'taxname' => { 'op'    => 'LIKE',
+                                                    'value' => $taxname.'%' },
+                                    },
+          );
+}
+
 =item invoicing_list [ ARRAYREF ]
 
 If an arguement is given, sets these email addresses as invoice recipients
diff --git a/FS/FS/cust_main_exemption.pm b/FS/FS/cust_main_exemption.pm
new file mode 100644
index 000000000..06d22b7e0
--- /dev/null
+++ b/FS/FS/cust_main_exemption.pm
@@ -0,0 +1,128 @@
+package FS::cust_main_exemption;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+
+=head1 NAME
+
+FS::cust_main_exemption - Object methods for cust_main_exemption records
+
+=head1 SYNOPSIS
+
+  use FS::cust_main_exemption;
+
+  $record = new FS::cust_main_exemption \%hash;
+  $record = new FS::cust_main_exemption { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_main_exemption object represents a customer tax exemption from a
+specific tax name (prefix).  FS::cust_main_exemption inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item exemptionnum
+
+Primary key
+
+=item custnum
+
+Customer (see L<FS::cust_main>)
+
+=item taxname
+
+taxname
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_main_exemption'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('exemptionnum')
+    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum')
+    || $self->ut_text('taxname')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_main>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b77d5d892..b52d7b318 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -440,3 +440,5 @@ FS/cust_bill_pkg_tax_rate_location.pm
 t/cust_bill_pkg_tax_rate_location.t
 FS/cust_recon.pm
 t/cust_recon.t
+FS/cust_main_exemption.pm
+t/cust_main_exemption.t
diff --git a/FS/t/cust_main_exemption.t b/FS/t/cust_main_exemption.t
new file mode 100644
index 000000000..fec6d197e
--- /dev/null
+++ b/FS/t/cust_main_exemption.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_main_exemption;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 74cb9e1c3974d8899bf9745564d0dfce5875454c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 10:06:11 +0000
Subject: finish basic implemention of tax exemption by tax name hack, RT#5127

---
 FS/FS/Conf.pm      |  2 +-
 FS/FS/cust_main.pm | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 543c77027..a9b891c8b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2830,7 +2830,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'tax-cust_exempt-groups',
     'section'     => '',
-    'description' => 'List of grouping possibilities for tax names, for per-customer exemption purposes, one tax name prefix for line.  For example, "GST" would indicate the ability to exempt customers individually from taxes starting with "GST" (but not other taxes).',
+    'description' => 'List of grouping possibilities for tax names, for per-customer exemption purposes, one tax name per line.  For example, "GST" would indicate the ability to exempt customers individually from taxes named "GST" (but not other taxes).',
     'type'        => 'textarea',
   },
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 51ba20920..ed16e1b9e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2972,6 +2972,10 @@ sub _handle_taxes {
         @taxes = qsearch( 'cust_main_county', \%taxhash_elim );
       }
 
+      @taxes = grep { ! $_->taxname or ! $self->tax_exemption($_->taxname) }
+                    @taxes
+        if $self->cust_main_exemption; #just to be safe
+
       if ( $conf->exists('tax-pkg_address') && $cust_pkg->locationnum ) {
         foreach (@taxes) {
           $_->set('pkgnum',      $cust_pkg->pkgnum );
@@ -2984,12 +2988,12 @@ sub _handle_taxes {
       $taxes{'recur'} = [ @taxes ];
       $taxes{$_} = [ @taxes ] foreach (@classes);
 
-      # maybe eliminate this entirely, along with all the 0% records
-      unless ( @taxes ) {
-        return
-          "fatal: can't find tax rate for state/county/country/taxclass ".
-          join('/', map $taxhash{$_}, qw(state county country taxclass) );
-      }
+      # # maybe eliminate this entirely, along with all the 0% records
+      # unless ( @taxes ) {
+      #   return
+      #     "fatal: can't find tax rate for state/county/country/taxclass ".
+      #     join('/', map $taxhash{$_}, qw(state county country taxclass) );
+      # }
 
     } #if $conf->exists('enable_taxproducts') ...
 
@@ -6384,12 +6388,20 @@ sub tax_exemption {
   my( $self, $taxname ) = @_;
 
   qsearchs( 'cust_main_exemption', { 'custnum' => $self->custnum,
-                                     'taxname' => { 'op'    => 'LIKE',
-                                                    'value' => $taxname.'%' },
-                                    },
+                                     'taxname' => $taxname,
+                                   },
           );
 }
 
+=item cust_main_exemption
+
+=cut
+
+sub cust_main_exemption {
+  my $self = shift;
+  qsearch( 'cust_main_exemption', { 'custnum' => $self->custnum } );
+}
+
 =item invoicing_list [ ARRAYREF ]
 
 If an arguement is given, sets these email addresses as invoice recipients
-- 
cgit v1.2.1


From e29b0941ad478b02834085de669dd2cd0b3e56fa Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 10:28:41 +0000
Subject: fix setup/recur -> setup_fee/recur_fee upgrade

---
 FS/FS/part_pkg.pm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 0562a6d44..efaa4ef83 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1225,27 +1225,29 @@ sub _upgrade_data { # class method
   foreach my $part_pkg (@part_pkg) {
 
     unless ( $part_pkg->plan ) {
-
       $part_pkg->plan('flat');
+    }
 
-      if ( $part_pkg->setup =~ /^\s*([\d\.]+)\s*$/ ) {
+    if ( length($part_pkg->option('setup_fee')) == 0 
+         && $part_pkg->setup =~ /^\s*([\d\.]+)\s*$/ ) {
 
-        my $opt = new FS::part_pkg_option {
-          'pkgpart'     => $part_pkg->pkgpart,
-          'optionname'  => 'setup_fee',
-          'optionvalue' => $1,
-        };
-        my $error = $opt->insert;
-        die $error if $error;
+      my $opt = new FS::part_pkg_option {
+        'pkgpart'     => $part_pkg->pkgpart,
+        'optionname'  => 'setup_fee',
+        'optionvalue' => $1,
+      };
+      my $error = $opt->insert;
+      die $error if $error;
 
-        $part_pkg->setup('');
 
-      } else {
-        die "Can't parse part_pkg.setup for fee; convert pkgnum ".
-            $part_pkg->pkgnum. " manually: ". $part_pkg->setup. "\n";
-      }
+      #} else {
+      #  die "Can't parse part_pkg.setup for fee; convert pkgnum ".
+      #      $part_pkg->pkgnum. " manually: ". $part_pkg->setup. "\n";
+    }
+    $part_pkg->setup('');
 
-      if ( $part_pkg->recur =~ /^\s*([\d\.]+)\s*$/ ) {
+    if ( length($part_pkg->option('recur_fee')) == 0
+         && $part_pkg->recur =~ /^\s*([\d\.]+)\s*$/ ) {
 
         my $opt = new FS::part_pkg_option {
           'pkgpart'     => $part_pkg->pkgpart,
@@ -1255,14 +1257,12 @@ sub _upgrade_data { # class method
         my $error = $opt->insert;
         die $error if $error;
 
-        $part_pkg->recur('');
-
-      } else {
-        die "Can't parse part_pkg.setup for fee; convert pkgnum ".
-            $part_pkg->pkgnum. " manually: ". $part_pkg->setup. "\n";
-      }
 
+      #} else {
+      #  die "Can't parse part_pkg.setup for fee; convert pkgnum ".
+      #      $part_pkg->pkgnum. " manually: ". $part_pkg->setup. "\n";
     }
+    $part_pkg->recur('');
 
     $part_pkg->replace; #this should take care of plandata, right?
 
-- 
cgit v1.2.1


From cd48e8003490f6ac502ca1465a7d3c4ae2577444 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 10:39:48 +0000
Subject: fix pod

---
 FS/FS/access_user.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm
index e605c9035..8cc8b64fc 100644
--- a/FS/FS/access_user.pm
+++ b/FS/FS/access_user.pm
@@ -275,7 +275,7 @@ sub name {
 =item access_usergroup
 
 Returns links to the the groups this user is a part of, as FS::access_usergroup
-objects (see L<FS::access_usergroup).
+objects (see L<FS::access_usergroup>).
 
 =cut
 
-- 
cgit v1.2.1


From 93e8083843fb810d74962fa1b0c5ce677f2ad8b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 10:45:26 +0000
Subject: eliminate harmless upgrade error: Argument "" isn't numeric in
 numeric eq (==) at /usr/local/share/perl/5.8.8/FS/part_pkg.pm line 371.

---
 FS/FS/part_pkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index efaa4ef83..1ea941fd6 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -369,7 +369,7 @@ sub replace {
   foreach my $part_svc ( qsearch('part_svc', {} ) ) {
     my $quantity = $pkg_svc->{$part_svc->svcpart} || 0;
     my $primary_svc =
-      ( defined($options->{'primary_svc'})
+      ( defined($options->{'primary_svc'}) && $options->{'primary_svc'}
         && $options->{'primary_svc'} == $part_svc->svcpart
       )
         ? 'Y'
-- 
cgit v1.2.1


From 73e346e819dc56fb4447f9eb1624a49df1f58ab7 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 22 Jun 2009 17:00:57 +0000
Subject: wtf?  the tax applies but it doesn't? RT#5574

---
 FS/FS/cust_main.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ed16e1b9e..e7cdd21d4 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3085,6 +3085,7 @@ sub _gather_taxes {
 
   unless (@taxclassnums) {
     @taxclassnums = map { $_->taxclassnum }
+                    grep { $_->taxable eq 'Y' }
                     $part_pkg->part_pkg_taxrate('cch', $geocode, $class);
   }
   warn "Found taxclassnum values of ". join(',', @taxclassnums)
-- 
cgit v1.2.1


From 5479fdb0844b77cbc313a1ab4135d769b034d981 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 22:55:05 +0000
Subject: fix advanced customer report failure, RT#5515

---
 FS/FS/Mason.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 90c865775..2a22bfdc5 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -57,7 +57,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use DateTime::Format::Strptime;
   use Lingua::EN::Inflect qw(PL);
   use Tie::IxHash;
-  use URI::URL;
+  use URI;
   use URI::Escape;
   use HTML::Entities;
   use HTML::TreeBuilder;
-- 
cgit v1.2.1


From 961ed0b05abcd9c9180d4c91ef4dd75cca4e3eb2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 22 Jun 2009 23:42:19 +0000
Subject: fix using encryption produces non-decrypted data in payment receipts,
 RT#5536

---
 FS/FS/cust_pay.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 0caba7574..201b427aa 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -216,11 +216,15 @@ sub insert {
       my $payby = $self->payby;
       my $payinfo = $self->payinfo;
       $payby =~ s/^BILL$/Check/ if $payinfo;
-      $payinfo = $self->paymask if $payby eq 'CARD' || $payby eq 'CHEK';
+      if ( $payby eq 'CARD' || $payby eq 'CHEK' ) {
+        $payinfo = $self->paymask
+      } else {
+        $payinfo = $self->decrypt($payinfo);
+      }
       $payby =~ s/^CHEK$/Electronic check/;
 
       $error = send_email(
-        'from'    => $conf->config('invoice_from', $self->cust_main->agentnum),
+        'from'    => $conf->config('invoice_from', $cust_main->agentnum),
                                    #invoice_from??? well as good as any
         'to'      => \@invoicing_list,
         'subject' => 'Payment receipt',
-- 
cgit v1.2.1


From 0ab909de22a43fc86e581e50d60f786ce2d5f8d6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Jun 2009 04:42:14 +0000
Subject: fix upgrade issue w/ black part_pkg.comment, RT#3988

---
 FS/FS/part_pkg.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 1ea941fd6..ba80475eb 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1281,6 +1281,7 @@ sub _upgrade_data { # class method
     $new->custom('Y');
     my $comment = $part_pkg->comment;
     $comment =~ s/^\(CUSTOM\) //;
+    $comment = '(none)' unless $comment =~ /\S/;
     $new->comment($comment);
 
     my $pkg_svc = { map { $_->svcpart => $_->quantity } $part_pkg->pkg_svc };
-- 
cgit v1.2.1


From d8e19d73efa750780648146fd45fe701c70c3465 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 24 Jun 2009 09:07:21 +0000
Subject: Move expiration alerts into FS::Cron::alert_expiration

---
 FS/FS/Cron/alert_expiration.pm | 177 +++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-daily          |   4 +
 2 files changed, 181 insertions(+)
 create mode 100644 FS/FS/Cron/alert_expiration.pm

(limited to 'FS')

diff --git a/FS/FS/Cron/alert_expiration.pm b/FS/FS/Cron/alert_expiration.pm
new file mode 100644
index 000000000..a9b9da9e9
--- /dev/null
+++ b/FS/FS/Cron/alert_expiration.pm
@@ -0,0 +1,177 @@
+package FS::Cron::alert_expiration;
+
+use vars qw( @ISA @EXPORT_OK);
+use Exporter;
+use FS::Record qw(qsearch);
+use FS::Conf;
+use FS::cust_main;
+use FS::Misc;
+use Time::Local;
+use Date::Parse qw(str2time);
+
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw( alert_expiration );
+
+my $warning_time = 30 * 24 * 60 * 60;
+my $urgent_time = 15 * 24 * 60 * 60;
+my $panic_time = 5 * 24 * 60 * 60;
+my $window_time = 24 * 60 * 60;
+
+sub alert_expiration {
+  my $conf = new FS::Conf;
+  my $smtpmachine = $conf->config('smtpmachine');
+  
+  my %opt = @_;
+  my ($_date) = $opt{'d'} ? str2time($opt{'d'}) : $^T;
+  $_date += $opt{'y'} * 86400 if $opt{'y'};
+  my ($sec, $min, $hour, $mday, $mon, $year) = (localtime($_date)) [0..5];
+  $mon++;
+
+  my $debug = 0;
+  $debug = 1 if $opt{'v'};
+  $debug = $opt{'l'} if $opt{'l'};
+
+  $FS::cust_main::DEBUG = $debug;
+
+  # Get a list of customers.
+ 
+  my %limit;
+  $limit{'agentnum'} = $opt{'a'} if $opt{'a'};
+  $limit{'payby'}    = $opt{'p'} if $opt{'p'};
+
+  my @customers;
+
+  if(my @custnums = @ARGV) {
+    # We're given an explicit list of custnums, so select those.  Then check against 
+    # -a and -p to avoid doing anything unexpected.
+    foreach (@custnums) {
+      my $customer = FS::cust_main->by_key($_);
+      if($customer and (!$opt{'a'} or $customer->agentnum == $opt{'a'})
+                   and (!$opt{'p'} or $customer->payby eq $opt{'p'}) ) {
+        push @customers, $customer;
+      }
+    }
+  }
+  else { # no @ARGV
+    @customers = qsearch('cust_main', \%limit);
+  }
+  return if(!@customers);
+  foreach my $customer (@customers) {
+    my $paydate = $customer->paydate;
+    next if $paydate =~ /^\s*$/; # skip empty expiration dates
+    
+    my $custnum = $customer->custnum;
+    my $first   = $customer->first;
+    my $last    = $customer->last;
+    my $company = $customer->company;
+    my $payby   = $customer->payby;
+    my $payinfo = $customer->payinfo;
+    my $daytime = $customer->daytime;
+    my $night   = $customer->night;
+
+    my ($paymonth, $payyear) = $customer->paydate_monthyear;
+    $paymonth--; # localtime() convention
+    $payday = 1; # This is enforced by FS::cust_main::check.
+    my $expire_time;
+    if($payby eq 'CARD' || $payby eq 'DCRD') {
+      # Credit cards expire at the end of the month/year.
+      if($paymonth == 11) {
+        $payyear++;
+        $paymonth = 0;
+      } else {
+        $paymonth++;
+      }
+      $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear) - 1;
+    }
+    else {
+      $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear);
+    }
+    
+    if (grep { $expire_time < $_date + $_ &&
+               $expire_time > $_date + $_ - $window_time } 
+               ($warning_time, $urgent_time, $panic_time) ) {
+      my $agentnum = $customer->agentnum;
+      $mail_sender = $conf->config('invoice_from', $agentnum);
+      $failure_recipient = $conf->config('invoice_from', $agentnum) 
+        || 'postmaster';
+      
+      my @alerter_template = $conf->config('alerter_template', $agentnum)
+        or die 'cannot load config file alerter_template';
+
+      my $alerter = new Text::Template(TYPE   => 'ARRAY',
+                                       SOURCE => [ 
+                                         map "$_\n", @alerter_template
+                                         ])
+        or die "can't create Text::Template object: $Text::Template::ERROR";
+
+      $alerter->compile()
+        or die "can't compile template: $Text::Template::ERROR";
+      
+      my @packages = $customer->ncancelled_pkgs;
+      if(@packages) {
+        my @invoicing_list = $customer->invoicing_list;
+        my @to_addrs = grep { $_ ne 'POST' } @invoicing_list;
+        if(@to_addrs) {
+          # Set up template fields.
+          my %fill_in;
+          $fill_in{$_} = $customer->getfield($_) 
+            foreach(qw(first last company));
+          $fill_in{'expdate'} = $expire_time;
+          $fill_in{'company_name'} = $conf->config('company_name', $agentnum);
+          $fill_in{'company_address'} =
+            join("\n",$conf->config('company_address',$agentnum))."\n";
+          if($payby eq 'CARD' || $payby eq 'DCRD') {
+            $fill_in{'payby'} = "credit card (".
+              substr($customer->payinfo, 0, 2) . "xxxxxxxxxx" .
+              substr($payinfo, -4) . ")";
+          }
+          elsif($payby eq 'COMP') {
+            $fill_in{'payby'} = 'complimentary account';
+          }
+          else {
+            $fill_in{'payby'} = 'current method';
+          }
+          # Send it already!
+          my $error = FS::Misc::send_email ( 
+            from    =>  $mail_sender,
+            to      =>  [ @to_addrs ],
+            subject =>  'Billing Arrangement Expiration',
+            body    =>  [ $alerter->fill_in( HASH => \%fill_in ) ],
+          );
+          die "can't send expiration alert: $error"
+            if $error;
+        } 
+        else { # if(@to_addrs)
+          push @{$agent_failure_body{$customer->agentnum}},
+            sprintf(qq{%5d %-32.32s %4s %10s %12s %12s},
+              $custnum,
+              $first . " " . $last . "   " . $company,
+              $payby,
+              $paydate,
+              $daytime,
+              $night );
+        }
+      } # if(@packages)
+    } # if(expired)
+  } # foreach(@customers)
+
+  # Failure notification
+  foreach my $agentnum (keys %agent_failure_body) {
+    $mail_sender = $conf->config('invoice_from', $agentnum)
+      if($conf->exists('invoice_from', $agentnum));
+    $failure_recipient = $conf->config('invoice_from', $agentnum)
+      if($conf->exists('invoice_from', $agentnum));
+    my $error = FS::Misc::send_email (
+      from    =>  $mail_sender,
+      to      =>  $failure_recipient,
+      subject =>  'Unnotified Billing Arrangement Expirations',
+      body    =>  [ @{$agent_failure_body{$agentnum}} ],
+      );
+    die "can't send alerter failure email to $failure_recipient: $error"
+      if $error;
+  }
+
+}
+
+1;
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index bda42f025..acf795087 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -14,6 +14,10 @@ adminsuidsetup $user;
 use FS::Cron::bill qw(bill);
 bill(%opt);
 
+# Send alerts about upcoming credit card expiration.
+use FS::Cron::alert_expiration qw(alert_expiration);
+alert_expiration(%opt);
+
 #what to do about the below when using -m?  that is the question.
 
 #you don't want to skip this, besides, it should be cheap
-- 
cgit v1.2.1


From 70d0d44dff39cb9235cbbec1918c4ea95f0dc4c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Jun 2009 18:36:32 +0000
Subject: add support for db profiling, RT#5662

---
 FS/bin/freeside-queued | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'FS')

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 2188dd404..22fd7bb5e 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -157,6 +157,8 @@ while (1) {
 
       forksuidsetup($user);
 
+      dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
+
       #auto-use classes...
       if (    $ljob->job =~ /(FS::(part_export|cust_main)::\w+)::/
            || $ljob->job =~ /(FS::\w+)::/
@@ -191,6 +193,13 @@ while (1) {
         $ljob->delete;
       }
 
+      if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
+        open(PROFILE,">%%%FREESIDE_LOG%%%/queueprofile.$$.".time)
+          or die "can't open profile file: $!";
+        print PROFILE dbh->sprintProfile();
+        close PROFILE or die "can't close profile file: $!";
+      }
+
       exit;
       #end-of-kid
     }
-- 
cgit v1.2.1


From fa19c2c557f7abd72f94357373290b99dd3297bf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Jun 2009 01:28:53 +0000
Subject: tax adjustments, RT#5595

---
 FS/FS.pm                     |   2 +
 FS/FS/AccessRight.pm         |   1 +
 FS/FS/Conf.pm                |   7 ++
 FS/FS/Schema.pm              |  18 +++++-
 FS/FS/cust_bill.pm           |   8 +--
 FS/FS/cust_bill_pkg.pm       |  16 ++++-
 FS/FS/cust_main.pm           |  30 +++++++++
 FS/FS/cust_tax_adjustment.pm | 149 +++++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                  |   2 +
 FS/t/cust_tax_adjustment.t   |   5 ++
 10 files changed, 231 insertions(+), 7 deletions(-)
 create mode 100644 FS/FS/cust_tax_adjustment.pm
 create mode 100644 FS/t/cust_tax_adjustment.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index e34b45db6..1477e985f 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -102,6 +102,8 @@ L<FS::cust_main_county> - Locale (tax rate) class
 
 L<FS::cust_tax_exempt> - Tax exemption record class
 
+L<FS::cust_tax_adjustment> - Tax adjustment record class
+
 L<FS::cust_tax_exempt_pkg> - Line-item specific tax exemption record class
 
 L<FS::svc_Common> - Service base class
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 146b9fa4e..3157d5ff0 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -152,6 +152,7 @@ tie my %rights, 'Tie::IxHash',
     'View invoices',
     'Resend invoices', #NEWNEW
     'View customer tax exemptions', #yow
+    'Add customer tax adjustment', #new, but no need to phase in
     'View customer batched payments', #NEW
     'View customer pending payments', #NEW
     'Edit customer pending payments', #NEW
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a9b891c8b..ac479da1e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2851,6 +2851,13 @@ worry that config_items is freeside-specific and icky.
     ],
   },
 
+  {
+    'key'         => 'enable_tax_adjustments',
+    'section'     => 'billing',
+    'description' => 'Enable the ability to add manual tax adjustments.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 0ca15a64d..aed8d6079 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -513,6 +513,7 @@ sub tables_hashref {
         'sdate',               @date_type,              '', '', 
         'edate',               @date_type,              '', '', 
         'itemdesc',         'varchar', 'NULL', $char_d, '', '', 
+        'itemcomment',      'varchar', 'NULL', $char_d, '', '', 
         'section',          'varchar', 'NULL', $char_d, '', '', 
         'quantity',             'int', 'NULL',      '', '', '',
         'unitsetup',           @money_typen,            '', '', 
@@ -520,7 +521,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'billpkgnum',
       'unique' => [],
-      'index' => [ ['invnum'], [ 'pkgnum' ] ],
+      'index' => [ ['invnum'], [ 'pkgnum' ], [ 'itemdesc' ], ],
     },
 
     'cust_bill_pkg_detail' => {
@@ -800,6 +801,21 @@ sub tables_hashref {
       'index'       => [ [ 'custnum' ] ],
     },
 
+    'cust_tax_adjustment' => {
+      'columns' => [
+        'adjustmentnum', 'serial',     '',      '', '', '',
+        'custnum',          'int',     '',      '', '', '',
+        'taxname',      'varchar',     '', $char_d, '', '',
+        'amount',    @money_type,                   '', '', 
+        'comment',     'varchar',  'NULL', $char_d, '', '', 
+        'billpkgnum',       'int', 'NULL',      '', '', '',
+        #more?  no cust_bill_pkg_tax_location?
+      ],
+      'primary_key' => 'adjustmentnum',
+      'unique'      => [],
+      'index'       => [ [ 'custnum' ], [ 'billpkgnum' ] ],
+    },
+
     'cust_main_county' => { #county+state+country are checked off the
                             #cust_main_county for validation and to provide
                             # a tax rate.
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 737f68cc1..17b88c540 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1457,11 +1457,9 @@ sub print_csv {
   
       } else { #pkgnum tax
         next unless $cust_bill_pkg->setup != 0;
-        my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
-                         ? ( $cust_bill_pkg->itemdesc || 'Tax' )
-                         : 'Tax';
-        ($pkg, $setup, $recur, $sdate, $edate) =
-          ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+        $pkg = $cust_bill_pkg->desc;
+        $setup = sprintf('%10.2f', $cust_bill_pkg->setup );
+        ( $sdate, $edate ) = ( '', '' );
       }
   
       $csv->combine(
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index bb071739e..fbc67c542 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -175,6 +175,17 @@ sub insert {
     }
   }
 
+  my $cust_tax_adjustment = $self->get('cust_tax_adjustment');
+  if ( $cust_tax_adjustment ) {
+    $cust_tax_adjustment->billpkgnum($self->billpkgnum);
+    $error = $cust_tax_adjustment->replace;
+    warn $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
@@ -224,6 +235,7 @@ sub check {
       || $self->ut_numbern('sdate')
       || $self->ut_numbern('edate')
       || $self->ut_textn('itemdesc')
+      || $self->ut_textn('itemcomment')
   ;
   return $error if $error;
 
@@ -381,7 +393,9 @@ sub desc {
   if ( $self->pkgnum > 0 ) {
     $self->itemdesc || $self->part_pkg->pkg;
   } else {
-    $self->itemdesc || 'Tax';
+    my $desc = $self->itemdesc || 'Tax';
+    $desc .= ' '. $self->itemcomment if $self->itemcomment =~ /\S/;
+    $desc;
   }
 }
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e7cdd21d4..dd99edab3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -41,6 +41,7 @@ use FS::part_referral;
 use FS::cust_main_county;
 use FS::cust_location;
 use FS::cust_main_exemption;
+use FS::cust_tax_adjustment;
 use FS::tax_rate;
 use FS::tax_rate_location;
 use FS::cust_tax_location;
@@ -2661,6 +2662,35 @@ sub bill {
 
   }
 
+  #add tax adjustments
+  warn "adding tax adjustments...\n" if $DEBUG > 2;
+  foreach my $cust_tax_adjustment (
+    qsearch('cust_tax_adjustment', { 'custnum'    => $self->custnum,
+                                     'billpkgnum' => '',
+                                   }
+           )
+  ) {
+
+    my $tax = sprintf('%.2f', $cust_tax_adjustment->amount );
+    $total_setup = sprintf('%.2f', $total_setup+$tax );
+
+    my $itemdesc = $cust_tax_adjustment->taxname;
+    $itemdesc = '' if $itemdesc eq 'Tax';
+
+    push @cust_bill_pkg, new FS::cust_bill_pkg {
+      'pkgnum'      => 0,
+      'setup'       => $tax,
+      'recur'       => 0,
+      'sdate'       => '',
+      'edate'       => '',
+      'itemdesc'    => $itemdesc,
+      'itemcomment' => $cust_tax_adjustment->comment,
+      'cust_tax_adjustment' => $cust_tax_adjustment,
+      #'cust_bill_pkg_tax_location' => \@cust_bill_pkg_tax_location,
+    };
+
+  }
+
   my $charged = sprintf('%.2f', $total_setup + $total_recur );
 
   #create the new invoice
diff --git a/FS/FS/cust_tax_adjustment.pm b/FS/FS/cust_tax_adjustment.pm
new file mode 100644
index 000000000..5891368c5
--- /dev/null
+++ b/FS/FS/cust_tax_adjustment.pm
@@ -0,0 +1,149 @@
+package FS::cust_tax_adjustment;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+use FS::cust_main;
+use FS::cust_bill_pkg;
+
+=head1 NAME
+
+FS::cust_tax_adjustment - Object methods for cust_tax_adjustment records
+
+=head1 SYNOPSIS
+
+  use FS::cust_tax_adjustment;
+
+  $record = new FS::cust_tax_adjustment \%hash;
+  $record = new FS::cust_tax_adjustment { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_tax_adjustment object represents an taxation adjustment.
+FS::cust_tax_adjustment inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item adjustmentnum
+
+primary key
+
+=item custnum
+
+custnum
+
+=item taxname
+
+taxname
+
+=item amount
+
+amount
+
+=item comment
+
+comment
+
+=item billpkgnum
+
+billpkgnum
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_tax_adjustment'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('adjustmentnum')
+    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum' )
+    || $self->ut_text('taxname')
+    || $self->ut_money('amount')
+    || $self->ut_textn('comment')
+    || $self->ut_foreign_keyn('billpkgnum', 'cust_bill_pkg', 'billpkgnum' )
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+sub cust_bill_pkg {
+  my $self = shift;
+  qsearchs('cust_bill_pkg', { 'billpkgnum' => $self->billpkgnum } );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index b52d7b318..cc4f98e3e 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -442,3 +442,5 @@ FS/cust_recon.pm
 t/cust_recon.t
 FS/cust_main_exemption.pm
 t/cust_main_exemption.t
+FS/cust_tax_adjustment.pm
+t/cust_tax_adjustment.t
diff --git a/FS/t/cust_tax_adjustment.t b/FS/t/cust_tax_adjustment.t
new file mode 100644
index 000000000..cc5719a8c
--- /dev/null
+++ b/FS/t/cust_tax_adjustment.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_tax_adjustment;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From e4a707839edd433eac3f766c6106e06842d7428e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Jun 2009 19:47:48 +0000
Subject: fix signups for the no-gateway-at-all case, RT#5673

---
 FS/FS/ClientAPI/Signup.pm |  7 ++++---
 FS/FS/agent.pm            | 14 +++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 02aa5800b..d0ac419ec 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -286,11 +286,12 @@ sub signup_info {
       foreach my $payby (@{$signup_info->{payby}}) {
         warn "$me checking $payby payment fields\n" if $DEBUG > 1;
         my $hide = 0;
-        if (FS::payby->realtime($payby)) {
+        if ( FS::payby->realtime($payby) ) {
           my $payment_gateway =
             $agent->payment_gateway( 'method' => FS::payby->payby2bop($payby) );
-          if ($payment_gateway->gateway_namespace eq
-              'Business::OnlineThirdPartyPayment'
+          if ( $payment_gateway
+                 && $payment_gateway->gateway_namespace
+                      eq 'Business::OnlineThirdPartyPayment'
              ) {
             warn "$me hiding $payby payment fields\n" if $DEBUG > 1;
             $hide = 1;
diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 5fbe2c46d..28d191a15 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -206,7 +206,10 @@ sub ticketing_queue {
 
 Returns a payment gateway object (see L<FS::payment_gateway>) for this agent.
 
-Currently available options are I<invnum>, I<method>, and I<payinfo>.
+Currently available options are I<nofatal>, I<invnum>, I<method>, and I<payinfo>.
+
+If I<nofatal> is set, and no gateway is available, then the empty string
+will be returned instead of throwing a fatal exception.
 
 If I<invnum> is set to the number of an invoice (see L<FS::cust_bill>) then
 an attempt will be made to select a gateway suited for the taxes paid on 
@@ -276,8 +279,13 @@ sub payment_gateway {
     # agent_payment_gateway referenced payment_gateway
 
     my $conf = new FS::Conf;
-    die "Real-time processing not enabled\n"
-      unless $conf->exists('business-onlinepayment');
+    unless ( $conf->exists('business-onlinepayment') ) {
+      if ( $options{'nofatal'} ) {
+        return '';
+      } else {
+        die "Real-time processing not enabled\n";
+      }
+    }
 
     #load up config
     my $bop_config = 'business-onlinepayment';
-- 
cgit v1.2.1


From 0a4c53ac3a8feae51578012e55a6db5ad0d56ba7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Jun 2009 19:55:35 +0000
Subject: eliminate harmless warning log spam:  Argument "" isn't numeric in
 numeric eq (==) at /usr/local/share/perl/5.8.8/FS/ClientAPI/Signup.pm line 57

---
 FS/FS/ClientAPI/Signup.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index d0ac419ec..32cdd9f0a 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -61,7 +61,9 @@ sub signup_info {
                   } }
                 grep { $_->svcpart($svc_x)
                        && ( $href->{ $_->pkgpart }
-                            || $_->agentnum == $agent->agentnum
+                            || ( $_->agentnum
+                                 && $_->agentnum == $agent->agentnum
+                               )
                           )
                      }
                   qsearch( 'part_pkg', { 'disabled' => '' } )
-- 
cgit v1.2.1


From 2958ef6290556aa0528d4301725f90b57f49dc19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 25 Jun 2009 20:23:22 +0000
Subject: finish fixing "Real time processing not enabled!" error when using
 signup without any real-time processor

---
 FS/FS/ClientAPI/Signup.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 32cdd9f0a..1f007981e 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -290,7 +290,9 @@ sub signup_info {
         my $hide = 0;
         if ( FS::payby->realtime($payby) ) {
           my $payment_gateway =
-            $agent->payment_gateway( 'method' => FS::payby->payby2bop($payby) );
+            $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
+                                     'nofatal' => 1,
+                                   );
           if ( $payment_gateway
                  && $payment_gateway->gateway_namespace
                       eq 'Business::OnlineThirdPartyPayment'
-- 
cgit v1.2.1


From 45a4c5ad153a132ab392d71ca7cffbd08ff3c9c2 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 26 Jun 2009 06:55:07 +0000
Subject: Add expiration alerts to freeside-daily routine

---
 FS/FS/Conf.pm         | 10 +++++++++-
 FS/bin/freeside-daily |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ac479da1e..b45cdd797 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -565,12 +565,20 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'alert_expiration',
+    'section'     => 'billing',
+    'description' => 'Enable alerts about billing method expiration.',
+    'type'        => 'checkbox',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'alerter_template',
     'section'     => 'billing',
     'description' => 'Template file for billing method expiration alerts.  See the <a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Credit_cards_and_Electronic_checks">billing documentation</a> for details.',
     'type'        => 'textarea',
-    'per-agent'   => 1,
+    'per_agent'   => 1,
   },
 
   {
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index acf795087..271c436c6 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -3,6 +3,7 @@
 use strict;
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup);
+use FS::Conf;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
@@ -16,7 +17,8 @@ bill(%opt);
 
 # Send alerts about upcoming credit card expiration.
 use FS::Cron::alert_expiration qw(alert_expiration);
-alert_expiration(%opt);
+my $conf = new FS::Conf;
+alert_expiration(%opt) if($conf->exists('alert_expiration'));
 
 #what to do about the below when using -m?  that is the question.
 
-- 
cgit v1.2.1


From 2594c62a8915496a5dde2db46f2f3bcba3f86a43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jun 2009 18:53:46 +0000
Subject: in smart_search, move duplicate elimination bits so that they're used
 even when doing an exact search on a browser-remembered result

---
 FS/FS/cust_main.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index dd99edab3..3f23346db 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -8110,12 +8110,12 @@ sub smart_search {
 
     }
 
-    #eliminate duplicates
-    my %saw = ();
-    @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
-
   }
 
+  #eliminate duplicates
+  my %saw = ();
+  @cust_main = grep { !$saw{$_->custnum}++ } @cust_main;
+
   @cust_main;
 
 }
-- 
cgit v1.2.1


From 60c6c6b6f471606908a0f862cef8eab15d42972b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jun 2009 23:12:45 +0000
Subject: add -s and -n flags to freeside-daily to specify the kinds of jobs to
 be run, RT#5572

---
 FS/bin/freeside-queued | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 22fd7bb5e..008616fb0 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -4,6 +4,7 @@ use strict;
 use vars qw( $DEBUG $kids $max_kids %kids );
 use POSIX qw(:sys_wait_h);
 use IO::File;
+use Getopt::Std;
 use FS::UID qw(adminsuidsetup forksuidsetup driver_name dbh myconnect);
 use FS::Daemon qw(daemonize1 drop_root logfile daemonize2 sigint sigterm);
 use FS::Conf;
@@ -18,6 +19,10 @@ $DEBUG = 0;
 
 $kids = 0;
 
+&untaint_argv;  #what it sounds like  (eww)
+use vars qw(%opt);
+getopts('sn', \%opt );
+
 my $user = shift or die &usage;
 
 warn "starting daemonization (forking)\n" if $DEBUG;
@@ -95,9 +100,16 @@ while (1) {
                    ? " LIMIT $limit FOR UPDATE "
                    : " FOR UPDATE LIMIT $limit " );
 
+  my $hashref = { 'status' => 'new' };
+  if ( $opt{'s'} ) {
+    $hashref->{'status'} = 'Y';
+  } elsif ( $opt{'n'} ) {
+    $hashref->{'status'} = '';
+  }
+
   my @jobs = qsearch({
     'table'     => 'queue',
-    'hashref'   => { 'status' => 'new' },
+    'hashref'   => $hashref,
     'extra_sql' => $nodepend,
     'order_by'  => $order_by,
   });
@@ -217,6 +229,15 @@ while (1) {
   }
 }
 
+sub untaint_argv {
+  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
+    #$ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    # Date::Parse
+    $ARGV[$_] =~ /^(.*)$/ || die "Illegal arguement \"$ARGV[$_]\"";
+    $ARGV[$_]=$1;
+  }
+}
+
 sub usage {
   die "Usage:\n\n  freeside-queued user\n";
 }
@@ -237,12 +258,16 @@ freeside-queued - Job queue daemon
 
 =head1 SYNOPSIS
 
-  freeside-queued user
+  freeside-queued [ -s | -n ] user
 
 =head1 DESCRIPTION
 
 Job queue daemon.  Should be running at all times.
 
+-s: "secure" jobs only (queued billing jobs)
+
+-n: non-"secure" jobs only (other jobs)
+
 user: from the mapsecrets file - see config.html from the base documentation
 
 =head1 VERSION
-- 
cgit v1.2.1


From 3cd902f4cad7410785e4640fce5d1fc45fb10c5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Jun 2009 23:21:45 +0000
Subject: doh, brainfart, RT#5572

---
 FS/bin/freeside-queued | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 008616fb0..e97a52cab 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -102,9 +102,9 @@ while (1) {
 
   my $hashref = { 'status' => 'new' };
   if ( $opt{'s'} ) {
-    $hashref->{'status'} = 'Y';
+    $hashref->{'secure'} = 'Y';
   } elsif ( $opt{'n'} ) {
-    $hashref->{'status'} = '';
+    $hashref->{'secure'} = '';
   }
 
   my @jobs = qsearch({
-- 
cgit v1.2.1


From 2a548cd8918d6c5978cc161a8808e9c8934535b8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 27 Jun 2009 00:55:33 +0000
Subject: replaced by FS::Cron::alert_expiration

---
 FS/bin/freeside-expiration-alerter | 241 -------------------------------------
 1 file changed, 241 deletions(-)
 delete mode 100755 FS/bin/freeside-expiration-alerter

(limited to 'FS')

diff --git a/FS/bin/freeside-expiration-alerter b/FS/bin/freeside-expiration-alerter
deleted file mode 100755
index 0bb61db4a..000000000
--- a/FS/bin/freeside-expiration-alerter
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use Date::Format;
-use Time::Local;
-use Text::Template;
-use Getopt::Std;
-use Net::SMTP;
-use Mail::Header;
-use Mail::Internet;
-use FS::Conf;
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::cust_main;
-
-use vars qw($smtpmachine %agent_failure_body);
-
-#hush, perl!
-$FS::alerter::_template::first = "";
-$FS::alerter::_template::last = "";
-$FS::alerter::_template::company = "";
-$FS::alerter::_template::payby = "";
-$FS::alerter::_template::expdate = "";
-
-# Set the mail program  and other variables
-my $mail_sender = "billing\@mydomain.tld";  # or invoice_from if available
-my $failure_recipient = "postmaster";       # or invoice_from if available
-my $warning_time = 30 * 24 * 60 * 60;
-my $urgent_time = 15 * 24 * 60 * 60;
-my $panic_time = 5 * 24 * 60 * 60;
-my $window_time = 24 * 60 * 60;
-
-&untaint_argv;	#what it sounds like  (eww)
-
-#we're at now now (and later).
-my($_date)= $^T;
-
-# Get the current month
-my ($sec,$min,$hour,$mday,$mon,$year) =
-	(localtime($_date) )[0,1,2,3,4,5]; 
-$mon++;
-
-# Login to the database
-my $user = shift or die &usage;
-adminsuidsetup $user;
-
-# Get the needed configuration files
-my $conf = new FS::Conf;
-$smtpmachine = $conf->config('smtpmachine');
-
-my(@customers)=qsearch('cust_main',{});
-if (scalar(@customers) == 0)
-{
-  exit 1;
-}
-
-# Now I can start looping
-foreach my $customer (@customers)
-{
-  my $paydate = $customer->getfield('paydate');
-  next if $paydate =~ /^\s*$/; #skip empty expiration dates
-
-  my $custnum = $customer->getfield('custnum');
-  my $first = $customer->getfield('first');
-  my $last = $customer->getfield('last');
-  my $company = $customer->getfield('company');
-  my $payby = $customer->getfield('payby');
-  my $payinfo = $customer->getfield('payinfo');
-  my $daytime = $customer->getfield('daytime');
-  my $night = $customer->getfield('night');
-
-  my ($payyear,$paymonth,$payday) = split (/-/,$paydate);
-
-  my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear);
-
-  #credit cards expire at the end of the month/year of their exp date
-  if ($payby eq 'CARD' || $payby eq 'DCRD') {
-    ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++);
-    $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear);
-    $expire_time--;
-  }
-
-  if (($expire_time < $_date + $warning_time &&
-    $expire_time > $_date + $warning_time - $window_time) ||
-      ($expire_time < $_date + $urgent_time &&
-       $expire_time > $_date + $urgent_time - $window_time) ||
-      ($expire_time < $_date + $panic_time &&
-       $expire_time > $_date + $panic_time - $window_time)) {
-
-    # Prepare for sending email, now inside the customer loop so i can be agent
-    # virtualized
-
-    my $agentnum = $customer->agentnum;
-
-    $mail_sender = $conf->config('invoice_from', $agentnum )
-      if $conf->exists('invoice_from', $agentnum);
-    $failure_recipient = $conf->config('invoice_from', $agentnum)
-      if $conf->exists('invoice_from', $agentnum);
-
-    $ENV{MAILADDRESS} = $mail_sender;
-
-    my @alerter_template = $conf->config('alerter_template', $agentnum)
-      or die "cannot load config file alerter_template";
-
-    my $alerter = new Text::Template TYPE   => 'ARRAY',
-                                     SOURCE => [ map "$_\n", @alerter_template ]
-      or die "can't create new Text::Template object: $Text::Template::ERROR";
-
-    $alerter->compile() or die "can't compile template: $Text::Template::ERROR";
-
-    my @packages = $customer->ncancelled_pkgs;
-    if (scalar(@packages) != 0) {
-      my @invoicing_list = $customer->invoicing_list;
-      if ( grep { $_ ne 'POST' } @invoicing_list ) { 
-        my $header = new Mail::Header ( [
-          "From: $mail_sender",
-          "To: ". join(', ', grep { $_ ne 'POST' } @invoicing_list ),
-          "Sender: $mail_sender",
-          "Reply-To: $mail_sender",
-          "Date: ". time2str("%a, %d %b %Y %X %z", time),
-          "Subject: Billing Arrangement Expiration",
-        ] );
-        $FS::alerter::_template::first = $first;
-        $FS::alerter::_template::last = $last;
-        $FS::alerter::_template::company = $company;
-        if ($payby eq 'CARD' || $payby eq 'DCRD') {
-          $FS::alerter::_template::payby = "credit card (" .
-            substr($payinfo, 0, 2) . "xxxxxxxxxx" .
-            substr($payinfo, -4) . ")";
-        }elsif ($payby eq 'COMP') {
-          $FS::alerter::_template::payby = "complimentary account";
-        }else{
-          $FS::alerter::_template::payby = "current method";
-        }
-        $FS::alerter::_template::expdate = $expire_time;
-
-        $FS::alerter::_template::company_name =
-          $conf->config('company_name', $agentnum);
-        $FS::alerter::_template::company_address =
-          join("\n", $conf->config('company_address', $agentnum) ). "\n";
-
-        my $message = new Mail::Internet (
-          'Header' => $header,
-          'Body' => [ $alerter->fill_in( PACKAGE => 'FS::alerter::_template' ) ],
-        );
-        $!=0;
-        $message->smtpsend( Host => $smtpmachine )
-          or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-            or die "Can't send expiration email: $!";
-
-      } elsif ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { 
-        push @{$agent_failure_body{$customer->agentnum}},
-          sprintf(qq{%5d %-32.32s %4s %10s %12s %12s},
-            $custnum,
-            $first . " " . $last . "   " . $company,
-            $payby,
-            $paydate,
-            $daytime,
-            $night
-          );
-      }
-    }
-  }
-}
-
-# Now I need to send failure EMAIL
-
-foreach my $agentnum ( keys %agent_failure_body ) {
-
-  $mail_sender = $conf->config('invoice_from', $agentnum )
-    if $conf->exists('invoice_from', $agentnum);
-  $failure_recipient = $conf->config('invoice_from', $agentnum)
-    if $conf->exists('invoice_from', $agentnum);
-
-  $ENV{MAILADDRESS} = $mail_sender;
-  my $header = new Mail::Header ( [
-    "From: Account Processor",
-    "To: $failure_recipient",
-    "Sender: $mail_sender",
-    "Reply-To: $mail_sender",
-    "Subject: Unnotified Billing Arrangement Expirations",
-  ] );
-
-  my $message = new Mail::Internet (
-    'Header' => $header,
-    'Body' => [ @{$agent_failure_body{$agentnum}} ],
-  );
-  $!=0;
-  $message->smtpsend( Host => $smtpmachine )
-    or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-      or die "can't send alerter failure email to $failure_recipient".
-             " via server $smtpmachine with SMTP: $!";
-}
-
-# subroutines
-sub untaint_argv {
-  foreach $_ ( $[ .. $#ARGV ) { #untaint @ARGV
-    $ARGV[$_] =~ /^([\w\-\/]*)$/ || die "Illegal argument \"$ARGV[$_]\"";
-    $ARGV[$_]=$1;
-  }
-}
-
-sub usage {
-  die "Usage:\n\n  freeside-expiration-alerter user\n";
-}
-
-=head1 NAME
-
-freeside-expiration-alerter - Emails notifications of credit card expirations.
-
-=head1 SYNOPSIS
-
-  freeside-expiration-alerter user
-
-=head1 DESCRIPTION
-
-Emails customers notice that their credit card or other billing arrangement
-is about to expire.  Usually run as a cron job.
-
-user: From the mapsecrets file - see config.html from the base documentation
-
-=head1 BUGS
-
-Yes..... Use at your own risk. No guarantees or warrantees of any
-kind apply to this program. Parts of this program are hacked from
-other GNU licensed software created mainly by Ivan Kohler.
-
-This is released under the GNU Public License. See www.gnu.org
-for more information regarding this license.
-
-=head1 SEE ALSO
-
-L<FS::cust_main>, config.html from the base documentation
-
-=head1 AUTHOR
-
-Jeff Finucane <jeff@cmh.net>
-
-=cut
-
-
-- 
cgit v1.2.1


From 7784bb1c43ea3031b2ca3bedf4b1a39aeb4ffe17 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 29 Jun 2009 06:21:51 +0000
Subject: remove freeside-expiration-alerter

---
 FS/MANIFEST | 1 -
 1 file changed, 1 deletion(-)

(limited to 'FS')

diff --git a/FS/MANIFEST b/FS/MANIFEST
index cc4f98e3e..70287a3d9 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -13,7 +13,6 @@ bin/freeside-deloutsource
 bin/freeside-deloutsourceuser
 bin/freeside-deluser
 bin/freeside-email
-bin/freeside-expiration-alerter
 bin/freeside-queued
 bin/freeside-radgroup
 bin/freeside-reexport
-- 
cgit v1.2.1


From 55f003404af6a2416571138356d11c5ad3755e58 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 29 Jun 2009 13:53:25 +0000
Subject: FCC form 477 reporting #4912

---
 FS/FS.pm                        |   6 +-
 FS/FS/Conf.pm                   |   7 +++
 FS/FS/Schema.pm                 |  12 ++++
 FS/FS/cust_main.pm              |   7 +++
 FS/FS/cust_pkg.pm               |  32 ++++++++++
 FS/FS/part_pkg_report_option.pm | 125 ++++++++++++++++++++++++++++++++++++++++
 FS/MANIFEST                     |   2 +
 FS/t/part_pkg_report_option.t   |   5 ++
 8 files changed, 194 insertions(+), 2 deletions(-)
 create mode 100644 FS/FS/part_pkg_report_option.pm
 create mode 100644 FS/t/part_pkg_report_option.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index 1477e985f..c3148735b 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -167,9 +167,9 @@ L<FS::part_export> - External provisioning export class
 
 L<FS::part_export_option> - Export option class
 
-L<FS::pkg_category> - Package category class
+L<FS::pkg_category> - Package category class (invoice oriented)
 
-L<FS::pkg_class> - Package class class
+L<FS::pkg_class> - Package class class (tax oriented)
 
 L<FS::part_pkg> - Package definition class
 
@@ -179,6 +179,8 @@ L<FS::part_pkg_taxclass> - Tax class class
 
 L<FS::part_pkg_option> - Package definition option class
 
+L<FS::part_pkg_report_option> - Package reporting classification class
+
 L<FS::pkg_svc> - Class linking package definitions (see L<FS::part_pkg>) with
 service definitions (see L<FS::part_svc>)
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b45cdd797..12d6075b8 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2575,6 +2575,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cust_main-require_censustract',
+    'section'     => 'UI',
+    'description' => 'Customer is required to have a census tract.  Useful for FCC form 477 reports. See also: cust_main-auto_standardize_address',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'disable_acl_changes',
     'section'     => '',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index aed8d6079..61cd17e06 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -686,6 +686,7 @@ sub tables_hashref {
         'paytype',  'varchar', 'NULL', $char_d, '', '', 
         'payip',    'varchar', 'NULL', 15, '', '', 
         'geocode',  'varchar', 'NULL', 20,  '', '',
+        'censustract', 'varchar', 'NULL', 20,  '', '', # 7 to save space?
         'tax',      'char', 'NULL', 1, '', '', 
         'otaker',   'varchar', '',    32, '', '', 
         'refnum',   'int',  '',     '', '', '', 
@@ -1850,6 +1851,17 @@ sub tables_hashref {
       'index'       => [ [ 'pkgpart' ], [ 'optionname' ] ],
     },
 
+    'part_pkg_report_option' => {
+      'columns' => [
+        'num',      'serial',   '',      '', '', '', 
+        'name',     'varchar',  '', $char_d, '', '', 
+        'disabled', 'char', 'NULL',       1, '', '', 
+      ],
+      'primary_key' => 'num',
+      'unique' => [ [ 'name' ] ],
+      'index' => [ [ 'disabled' ] ],
+    },
+
     'rate' => {
       'columns' => [
         'ratenum',  'serial', '', '', '', '', 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3f23346db..e5f289ca3 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7572,6 +7572,13 @@ sub search_sql {
   $pkgwhere .= "AND (cancel = 0 or cancel is null)"
     unless $params->{'cancelled_pkgs'};
 
+  ##
+  # parse without census tract checkbox
+  ##
+
+  push @where, "(censustract = '' or censustract is null)"
+    if $params->{'no_censustract'};
+
   ##
   # dates
   ##
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index a510c5245..881e005de 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2324,12 +2324,44 @@ sub search_sql {
   }
   #eslaf
 
+  ###
+  # parse package report options
+  ###
+
+  my @report_option = ();
+  if ( exists($params->{'report_option'})
+       && $params->{'report_option'} =~ /^([,\d]*)$/
+     )
+  {
+    @report_option = split(',', $1);
+  }
+
+  if (@report_option) {
+    # this will result in the empty set for the dangling comma case as it should
+    push @where, 
+      map{ "0 < ( SELECT count(*) FROM part_pkg_option
+                    WHERE part_pkg_option.pkgpart = part_pkg.pkgpart
+                    AND optionname = 'report_option_$_'
+                    AND optionvalue = '1' )"
+         } @report_option;
+  }
+
+  #eslaf
+
   ###
   # parse custom
   ###
 
   push @where,  "part_pkg.custom = 'Y'" if $params->{custom};
 
+  ###
+  # parse censustract
+  ###
+
+  if ( $params->{'censustract'} =~ /^([.\d]+)$/ and $1 ) {
+    push @where,  "cust_main.censustract = '". $params->{censustract}. "'";
+  }
+
   ###
   # parse part_pkg
   ###
diff --git a/FS/FS/part_pkg_report_option.pm b/FS/FS/part_pkg_report_option.pm
new file mode 100644
index 000000000..16a4c9864
--- /dev/null
+++ b/FS/FS/part_pkg_report_option.pm
@@ -0,0 +1,125 @@
+package FS::part_pkg_report_option;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+
+=head1 NAME
+
+FS::part_pkg_report_option - Object methods for part_pkg_report_option records
+
+=head1 SYNOPSIS
+
+  use FS::part_pkg_report_option;
+
+  $record = new FS::part_pkg_report_option \%hash;
+  $record = new FS::part_pkg_report_option { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_pkg_report_option object represents a package definition optional
+reporting classification.  FS::part_pkg_report_option inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item num
+
+primary key
+
+=item name
+
+name - The name associated with the reporting option
+
+=item disabled
+
+disabled - set to 'Y' to prevent addition to new packages
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new report option.  To add the option to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'part_pkg_report_option'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete {
+  return "Can't delete part_pkg_report_option records!";
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('num')
+    || $self->ut_text('name')
+    || $self->ut_enum('disabled', [ '', 'Y' ])
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=back
+
+=head1 BUGS
+
+Overlaps somewhat with pkg_class and pkg_category
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 70287a3d9..7def8dffd 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -439,6 +439,8 @@ FS/cust_bill_pkg_tax_rate_location.pm
 t/cust_bill_pkg_tax_rate_location.t
 FS/cust_recon.pm
 t/cust_recon.t
+FS/part_pkg_report_option.pm
+t/part_pkg_report_option.t
 FS/cust_main_exemption.pm
 t/cust_main_exemption.t
 FS/cust_tax_adjustment.pm
diff --git a/FS/t/part_pkg_report_option.t b/FS/t/part_pkg_report_option.t
new file mode 100644
index 000000000..622bb3872
--- /dev/null
+++ b/FS/t/part_pkg_report_option.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_pkg_report_option;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 665067cef48a5516e0bfb2dd79d99b8495e25ee5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 01:42:56 +0000
Subject: phone devices (for netsapiens integration), RT#5226

---
 FS/FS.pm              |   4 ++
 FS/FS/Mason.pm        |   2 +
 FS/FS/Schema.pm       |  23 ++++++++
 FS/FS/part_device.pm  | 134 ++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/phone_device.pm | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
 FS/FS/svc_phone.pm    |  12 ++++
 FS/MANIFEST           |   4 ++
 FS/t/part_device.t    |   5 ++
 FS/t/phone_device.t   |   5 ++
 9 files changed, 340 insertions(+)
 create mode 100644 FS/FS/part_device.pm
 create mode 100644 FS/FS/phone_device.pm
 create mode 100644 FS/t/part_device.t
 create mode 100644 FS/t/phone_device.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index c3148735b..e9efcc1cf 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -138,6 +138,10 @@ L<FS::part_virtual_field> - Broadband virtual field class
 
 L<FS::svc_phone> - Phone service class
 
+L<FS::phone_device> - Phone device class
+
+L<FS::part_device> - Device definition class
+
 L<FS::phone_avail> - Phone number availability cache
 
 L<FS::cdr> - Call Detail Record class
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 2a22bfdc5..cce2dbf21 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -174,6 +174,8 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::access_right;
   use FS::AccessRight;
   use FS::svc_phone;
+  use FS::phone_device;
+  use FS::part_device;
   use FS::reason_type;
   use FS::reason;
   use FS::cust_main_note;
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 61cd17e06..4351f2876 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2306,6 +2306,29 @@ sub tables_hashref {
       'index'  => [ [ 'countrycode', 'phonenum' ] ],
     },
 
+    'phone_device' => {
+      'columns' => [
+        'devicenum', 'serial',     '', '', '', '',
+        'devicepart',   'int',     '', '', '', '',
+        'svcnum',       'int',     '', '', '', '', 
+        'mac_addr', 'varchar', 'NULL', 12, '', '', 
+      ],
+      'primary_key' => 'devicenum',
+      'unique' => [ [ 'mac_addr' ], ],
+      'index'  => [ [ 'devicepart' ], [ 'svcnum' ], ],
+    },
+
+    'part_device' => {
+      'columns' => [
+        'devicepart', 'serial',  '',      '', '', '',
+        'devicename', 'varchar', '', $char_d, '', '',
+        #'classnum', #tie to an inventory class?
+      ],
+      'primary_key' => 'devicepart',
+      'unique' => [ [ 'devicename' ] ], #?
+      'index'  => [],
+    },
+
     'phone_avail' => {
       'columns' => [
         'availnum',    'serial',      '',      '', '', '', 
diff --git a/FS/FS/part_device.pm b/FS/FS/part_device.pm
new file mode 100644
index 000000000..79a534ae7
--- /dev/null
+++ b/FS/FS/part_device.pm
@@ -0,0 +1,134 @@
+package FS::part_device;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record; # qw( qsearch qsearchs );
+
+=head1 NAME
+
+FS::part_device - Object methods for part_device records
+
+=head1 SYNOPSIS
+
+  use FS::part_device;
+
+  $record = new FS::part_device \%hash;
+  $record = new FS::part_device { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::part_device object represents a phone device definition. FS::part_device
+inherits from FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item devicepart
+
+primary key
+
+=item devicename
+
+devicename
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'part_device'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('devicepart')
+    || $self->ut_text('devicename')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+sub process_batch_import {
+  my $job = shift;
+
+  my $opt = { 'table'   => 'part_device',
+              'params'  => [],
+              'formats' => { 'default' => [ 'devicename' ] },
+              'default_csv' => 1,
+            };
+
+  FS::Record::process_batch_import( $job, $opt, @_ );
+
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/phone_device.pm b/FS/FS/phone_device.pm
new file mode 100644
index 000000000..a7097a113
--- /dev/null
+++ b/FS/FS/phone_device.pm
@@ -0,0 +1,151 @@
+package FS::phone_device;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearchs ); # qsearch );
+use FS::part_device;
+use FS::svc_phone;
+
+=head1 NAME
+
+FS::phone_device - Object methods for phone_device records
+
+=head1 SYNOPSIS
+
+  use FS::phone_device;
+
+  $record = new FS::phone_device \%hash;
+  $record = new FS::phone_device { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::phone_device object represents a specific customer phone device, such as
+a SIP phone or ATA.  FS::phone_device inherits from FS::Record.  The following
+fields are currently supported:
+
+=over 4
+
+=item devicenum
+
+primary key
+
+=item devicepart
+
+devicepart
+
+=item svcnum
+
+svcnum
+
+=item mac_addr
+
+mac_addr
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'phone_device'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $mac = $self->mac_addr;
+  $mac =~ s/\s+//g;
+  $mac =~ s/://g;
+  $self->mac_addr($mac);
+
+  my $error = 
+    $self->ut_numbern('devicenum')
+    || $self->ut_foreign_key('devicepart', 'part_device', 'devicepart')
+    || $self->ut_foreign_key('svcnum', 'svc_phone', 'svcnum' ) #cust_svc?
+    || $self->ut_hexn('mac_addr')
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item part_device
+
+Returns the device type record (see L<FS::part_device>) associated with this
+customer device.
+
+=cut
+
+sub part_device {
+  my $self = shift;
+  qsearchs( 'part_device', { 'devicepart' => $self->devicepart } );
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index 73ea8e731..badbb4eb4 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -7,6 +7,7 @@ use FS::Record qw( qsearch qsearchs );
 use FS::Msgcat qw(gettext);
 use FS::svc_Common;
 use FS::part_svc;
+use FS::phone_device;
 
 @ISA = qw( FS::svc_Common );
 
@@ -326,6 +327,17 @@ sub radius_groups {
   ();
 }
 
+=item phone_device
+
+Returns any FS::phone_device records associated with this service.
+
+=cut
+
+sub phone_device {
+  my $self = shift;
+  qsearch('phone_device', { 'svcnum' => $self->svcnum } );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 7def8dffd..732e3de53 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -445,3 +445,7 @@ FS/cust_main_exemption.pm
 t/cust_main_exemption.t
 FS/cust_tax_adjustment.pm
 t/cust_tax_adjustment.t
+FS/phone_device.pm
+t/phone_device.t
+FS/part_device.pm
+t/part_device.t
diff --git a/FS/t/part_device.t b/FS/t/part_device.t
new file mode 100644
index 000000000..569686829
--- /dev/null
+++ b/FS/t/part_device.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::part_device;
+$loaded=1;
+print "ok 1\n";
diff --git a/FS/t/phone_device.t b/FS/t/phone_device.t
new file mode 100644
index 000000000..307031400
--- /dev/null
+++ b/FS/t/phone_device.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::phone_device;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 55c933db01346b350ad08c03246ca0db0473c056 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 02:54:54 +0000
Subject: add DID association w/user?  docs from netsapiens rough... RT#5226

---
 FS/FS/part_export/netsapiens.pm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 172f7b053..22124e951 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -63,6 +63,15 @@ sub ns_subscriber {
   "/domains_config/$domain/subscriber_config/$phonenum";
 }
 
+sub ns_dialplan {
+  my($self, $svc_phone) = (shift, shift);
+
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
+
+  "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*"
+}
+
 sub ns_create_or_update {
   my($self, $svc_phone, $dial_policy) = (shift, shift, shift);
 
@@ -80,6 +89,8 @@ sub ns_create_or_update {
     $lastname  = $cust_main->get('last');
   }
 
+  #create user
+
   my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 
                                 'subscriber_login' => $phonenum.'@'.$domain,
                                 'firstname'        => $firstname,
@@ -94,6 +105,17 @@ sub ns_create_or_update {
             join(', ', $self->ns_parse_response( $ns->responseContent ) );
   }
 
+  #map DID to user
+  my $ns2 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone),
+                                 'to_user' => $phonenum.'@'.$domain,
+                                 'to_host' => $domain,
+                             );
+
+  if ( $ns2->responseCode !~ /^2/ ) {
+     return $ns2->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns2->responseContent ) );
+  }
+
   '';
 }
 
-- 
cgit v1.2.1


From ef49390629d8bd97cc4f607b559c9552aa86b482 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 09:38:41 +0000
Subject: more steps to netsapiens export, RT#5226

---
 FS/FS/part_export/netsapiens.pm | 166 ++++++++++++++++++++++++++++++++++------
 FS/FS/phone_device.pm           |  97 ++++++++++++++++++++++-
 2 files changed, 236 insertions(+), 27 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 22124e951..a1957d46d 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -9,10 +9,13 @@ use FS::part_export;
 @ISA = qw(FS::part_export);
 
 tie my %options, 'Tie::IxHash',
-  'login'         => { label=>'NetSapiens tac2 API username' },
-  'password'      => { label=>'NetSapiens tac2 API password' },
-  'url'           => { label=>'NetSapiens tac2 URL' },
-  'domain'        => { label=>'NetSapiens Domain' },
+  'login'           => { label=>'NetSapiens tac2 User API username' },
+  'password'        => { label=>'NetSapiens tac2 User API password' },
+  'url'             => { label=>'NetSapiens tac2 User URL' },
+  'device_login'    => { label=>'NetSapiens tac2 Device API username' },
+  'device_password' => { label=>'NetSapiens tac2 Device API password' },
+  'device_url'      => { label=>'NetSapiens tac2 Device URL' },
+  'domain'          => { label=>'NetSapiens Domain' },
 ;
 
 %info = (
@@ -29,12 +32,22 @@ END
 sub rebless { shift; }
 
 sub ns_command {
-  my( $self, $method, $command ) = splice(@_,0,3);
+  my $self = shift;
+  $self->_ns_command('', @_);
+}
+
+sub ns_device_command { 
+  my $self = shift;
+  $self->_ns_command('device', @_);
+}
+
+sub ns_command {
+  my( $self, $prefix, $method, $command ) = splice(@_,0,4);
 
   eval 'use REST::Client';
   die $@ if $@;
 
-  my $ns = new REST::Client 'host'=>$self->option('url');
+  my $ns = new REST::Client 'host'=>$self->option($prefix.'url');
 
   my @args = ( $command );
 
@@ -46,8 +59,8 @@ sub ns_command {
     $args[0] .= $ns->buildQuery( { @_ } );
   }
 
-  my $auth =
-    encode_base64( $self->option('login'). ':'. $self->option('password') );
+  my $auth = encode_base64( $self->option($prefix.'login'). ':'.
+                            $self->option($prefix.'password')    );
   push @args, { 'Authorization' => "Basic $auth" };
 
   $ns->$method( @args );
@@ -63,6 +76,27 @@ sub ns_subscriber {
   "/domains_config/$domain/subscriber_config/$phonenum";
 }
 
+sub ns_registrar {
+  my($self, $svc_phone) = (shift, shift);
+
+  my $domain = $self->option('domain');
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
+
+  $self->ns_subscriber($svc_phone).
+    '/registrar_config/'. $self->ns_devicename($svc_phone);
+}
+
+sub ns_devicename {
+  my( $self, $svc_phone ) = (shift, shift);
+
+  my $domain = $self->option('domain');
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
+
+  "sip:$countrycode$phonenum@$domain";
+}
+
 sub ns_dialplan {
   my($self, $svc_phone) = (shift, shift);
 
@@ -72,11 +106,21 @@ sub ns_dialplan {
   "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*"
 }
 
+sub ns_device {
+  my($self, $svc_phone, $phone_device ) = (shift, shift, shift);
+
+  #my $countrycode = $svc_phone->countrycode;
+  #my $phonenum    = $svc_phone->phonenum;
+
+  "/phones_config/". $phone_device->mac_addr;
+}
+
 sub ns_create_or_update {
   my($self, $svc_phone, $dial_policy) = (shift, shift, shift);
 
   my $domain = $self->option('domain');
-  my $phonenum = $svc_phone->phonenum;
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
 
   my( $firstname, $lastname );
   if ( $svc_phone->phone_name =~ /^\s*(\S+)\s+(\S.*\S)\s*$/ ) {
@@ -89,33 +133,44 @@ sub ns_create_or_update {
     $lastname  = $cust_main->get('last');
   }
 
-  #create user
+  # Piece 1 (already done) - User creation
 
   my $ns = $self->ns_command( 'PUT', $self->ns_subscriber($svc_phone), 
-                                'subscriber_login' => $phonenum.'@'.$domain,
-                                'firstname'        => $firstname,
-                                'lastname'         => $lastname,
-                                'subscriber_pin'   => $svc_phone->pin,
-                                'dial_plan'        => 'Default', #config?
-                                'dial_policy'      => $dial_policy,
-                            );
+    'subscriber_login' => $phonenum.'@'.$domain,
+    'firstname'        => $firstname,
+    'lastname'         => $lastname,
+    'subscriber_pin'   => $svc_phone->pin,
+    'dial_plan'        => 'Default', #config?
+    'dial_policy'      => $dial_policy,
+  );
 
   if ( $ns->responseCode !~ /^2/ ) {
      return $ns->responseCode. ' '.
             join(', ', $self->ns_parse_response( $ns->responseContent ) );
   }
 
-  #map DID to user
-  my $ns2 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone),
-                                 'to_user' => $phonenum.'@'.$domain,
-                                 'to_host' => $domain,
-                             );
+  #Piece 2 - sip device creation 
+
+  my $ns2 = $self->ns_command( 'PUT', $self->ns_registrar($svc_phone),
+  );
 
   if ( $ns2->responseCode !~ /^2/ ) {
      return $ns2->responseCode. ' '.
             join(', ', $self->ns_parse_response( $ns2->responseContent ) );
   }
 
+  #Piece 3 - DID mapping to user
+
+  my $ns3 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone),
+    'to_user' => $countrycode.$phonenum,
+    'to_host' => $domain,
+  );
+
+  if ( $ns3->responseCode !~ /^2/ ) {
+     return $ns3->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns3->responseContent ) );
+  }
+
   '';
 }
 
@@ -124,6 +179,8 @@ sub ns_delete {
 
   my $ns = $self->ns_command( 'DELETE', $self->ns_subscriber($svc_phone) );
 
+  #delete other things?
+
   if ( $ns->responseCode !~ /^2/ ) {
      return $ns->responseCode. ' '.
             join(', ', $self->ns_parse_response( $ns->responseContent ) );
@@ -165,7 +222,7 @@ sub _export_delete {
 
 sub _export_suspend {
   my( $self, $svc_phone ) = (shift, shift);
-  $self->ns_create_or_udpate($svc_phone, 'Deny');
+  $self->ns_create_or_update($svc_phone, 'Deny');
 }
 
 sub _export_unsuspend {
@@ -174,6 +231,69 @@ sub _export_unsuspend {
   $self->_export_insert($svc_phone);
 }
 
+sub export_device_insert {
+  my( $self, $svc_phone, $phone_device ) = (shift, shift, shift);
+
+  #my $domain = $self->option('domain');
+  my $countrycode = $svc_phone->countrycode;
+  my $phonenum    = $svc_phone->phonenum;
+
+  my $device = $self->ns_devicename($svc_phone);
+
+  my $ns = $self->ns_device_command(
+    'PUT', $self->ns_device($svc_phone, $phone_device),
+      'line1_enable' => 'yes',
+      'device1'      => $self->ns_devicename($svc_phone),
+      'line1_ext'    => $countrycode.$phonenum,
+,
+      #'line2_enable' => 'yes',
+      #'device2'      =>
+      #'line2_ext'    =>
+
+      #'notes' => 
+      'server'       => 'SiPbx',
+      'domain'       => $self->option('domain'),
+
+      'brand'        => $phone_device->part_device->devicename,
+      
+  );
+
+  if ( $ns->responseCode !~ /^2/ ) {
+     return $ns->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns->responseContent ) );
+  }
+
+  '';
+
+}
+
+sub export_device_delete {
+  my( $self, $svc_phone, $phone_device ) = (shift, shift, shift);
+
+  my $ns = $self->ns_device_command(
+    'DELETE', $self->ns_device($svc_phone, $phone_device),
+  );
+
+  if ( $ns->responseCode !~ /^2/ ) {
+     return $ns->responseCode. ' '.
+            join(', ', $self->ns_parse_response( $ns->responseContent ) );
+  }
+
+  '';
+
+
+}
+
+
+sub export_device_replace {
+  my( $self, $svc_phone, $new_phone_device, $old_phone_device ) =
+    (shift, shift, shift, shift);
+
+  #?
+  $self->export_device_insert( $svc_phone, $new_phone_device );
+
+}
+
 sub export_links {
   my($self, $svc_phone, $arrayref) = (shift, shift, shift);
   #push @$arrayref, qq!<A HREF="http://example.com/~!. $svc_phone->username.
diff --git a/FS/FS/phone_device.pm b/FS/FS/phone_device.pm
index a7097a113..1bdbc3428 100644
--- a/FS/FS/phone_device.pm
+++ b/FS/FS/phone_device.pm
@@ -2,7 +2,7 @@ package FS::phone_device;
 
 use strict;
 use base qw( FS::Record );
-use FS::Record qw( qsearchs ); # qsearch );
+use FS::Record qw( dbh qsearchs ); # qsearch );
 use FS::part_device;
 use FS::svc_phone;
 
@@ -76,7 +76,32 @@ otherwise returns false.
 
 =cut
 
-# the insert method can be inherited from FS::Record
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $self->svc_phone->export('device_insert', $self); #call device export
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
+
 
 =item delete
 
@@ -84,7 +109,31 @@ Delete this record from the database.
 
 =cut
 
-# the delete method can be inherited from FS::Record
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  $self->svc_phone->export('device_delete', $self); #call device export
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
 
 =item replace OLD_RECORD
 
@@ -93,7 +142,35 @@ returns the error, otherwise returns false.
 
 =cut
 
-# the replace method can be inherited from FS::Record
+sub replace {
+  my $new = shift;
+
+  my $old = ( blessed($_[0]) && $_[0]->isa('FS::Record') )
+              ? shift
+              : $new->replace_old;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $new->SUPER::replace($old);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $new->svc_phone->export('device_replace', $new, $old); #call device export
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
 
 =item check
 
@@ -137,6 +214,18 @@ sub part_device {
   qsearchs( 'part_device', { 'devicepart' => $self->devicepart } );
 }
 
+=item svc_phone
+
+Returns the phone number (see L<FS::svc_phone>) associated with this customer
+device.
+
+=cut
+
+sub svc_phone {
+  my $self = shift;
+  qsearchs( 'svc_phone', { 'svcnum' => $self->svcnum } );
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From b769174d6b1f1a7372298e05165ca6c21e3a0620 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 11:09:23 +0000
Subject: this will help

---
 FS/FS/part_export/netsapiens.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index a1957d46d..eea2509cc 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -41,7 +41,7 @@ sub ns_device_command {
   $self->_ns_command('device', @_);
 }
 
-sub ns_command {
+sub _ns_command {
   my( $self, $prefix, $method, $command ) = splice(@_,0,4);
 
   eval 'use REST::Client';
@@ -281,7 +281,6 @@ sub export_device_delete {
 
   '';
 
-
 }
 
 
-- 
cgit v1.2.1


From 0376f47e1ec2ec9b8702a0e6c5146af9c66beb5e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 12:28:38 +0000
Subject: one-time charge "hold for later" / any package future start date,
 RT#5347

---
 FS/FS/Cron/bill.pm | 193 ++++++++++++++++++++++++++++++++---------------------
 FS/FS/Schema.pm    |   5 +-
 FS/FS/cust_main.pm |  51 ++++++++++----
 FS/FS/cust_pkg.pm  |   5 ++
 4 files changed, 164 insertions(+), 90 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 29f5f36c9..61b47355a 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -13,10 +13,16 @@ use FS::part_event;
 use FS::part_event_condition;
 
 @ISA = qw( Exporter );
-@EXPORT_OK = qw ( bill );
+@EXPORT_OK = qw ( bill bill_where );
 
-sub bill {
+#freeside-daily %opt:
+#  -s: re-charge setup fees
+#  -v: enable debugging
+#  -l: debugging level
+#  -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+#  -r: Multi-process mode dry run option
 
+sub bill {
   my %opt = @_;
 
   my $check_freq = $opt{'check_freq'} || '1d';
@@ -24,91 +30,24 @@ sub bill {
   my $debug = 0;
   $debug = 1 if $opt{'v'};
   $debug = $opt{'l'} if $opt{'l'};
- 
   $FS::cust_main::DEBUG = $debug;
   #$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
 
-  my @search = ();
-
-  push @search, "( cust_main.archived != 'Y' OR archived IS NULL )"; #disable?
-
-  push @search, "cust_main.payby    = '". $opt{'p'}. "'"
-    if $opt{'p'};
-  push @search, "cust_main.agentnum =  ". $opt{'a'}
-    if $opt{'a'};
-
-  if ( @ARGV ) {
-    push @search, "( ".
-      join(' OR ', map "cust_main.custnum = $_", @ARGV ).
-    " )";
-  }
-
-  ###
-  # generate where_pkg/where_event search clause
-  ###
-
   #we're at now now (and later).
-  my($time)= $opt{'d'} ? str2time($opt{'d'}) : $^T;
-  $time += $opt{'y'} * 86400 if $opt{'y'};
-
-  my $invoice_time = $opt{'n'} ? $^T : $time;
+  $opt{'time'} = $opt{'d'} ? str2time($opt{'d'}) : $^T;
+  $opt{'time'} += $opt{'y'} * 86400 if $opt{'y'};
 
-  # select * from cust_main where
-  my $where_pkg = <<"END";
-    0 < ( select count(*) from cust_pkg
-            where cust_main.custnum = cust_pkg.custnum
-              and ( cancel is null or cancel = 0 )
-              and (    setup is null or setup =  0
-                    or bill  is null or bill  <= $time 
-                    or ( expire is not null and expire <= $^T )
-                    or ( adjourn is not null and adjourn <= $^T )
-                  )
-        )
-END
-
-  my $where_event = join(' OR ', map {
-    my $eventtable = $_;
-
-    my $join  = FS::part_event_condition->join_conditions_sql(  $eventtable );
-    my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
-                                                                'time'=>$time,
-                                                              );
-
-    my $are_part_event = 
-      "0 < ( SELECT COUNT(*) FROM part_event $join
-               WHERE check_freq = '$check_freq'
-                 AND eventtable = '$eventtable'
-                 AND ( disabled = '' OR disabled IS NULL )
-                 AND $where
-           )
-      ";
-
-    if ( $eventtable eq 'cust_main' ) { 
-      $are_part_event;
-    } else {
-      "0 < ( SELECT COUNT(*) FROM $eventtable
-               WHERE cust_main.custnum = $eventtable.custnum
-                 AND $are_part_event
-           )
-      ";
-    }
-
-  } FS::part_event->eventtables);
-
-  push @search, "( $where_pkg OR $where_event )";
+  $opt{'invoice_time'} = $opt{'n'} ? $^T : $opt{'time'};
 
   ###
   # get a list of custnums
   ###
 
-  warn "searching for customers:\n". join("\n", @search). "\n"
-    if $opt{'v'} || $opt{'l'};
-
   my $cursor_dbh = dbh->clone;
 
   $cursor_dbh->do(
     "DECLARE cron_bill_cursor CURSOR FOR ".
-    "  SELECT custnum FROM cust_main WHERE ". join(' AND ', @search)
+    "  SELECT custnum FROM cust_main WHERE ". bill_where( %opt )
   ) or die $cursor_dbh->errstr;
 
   while ( 1 ) {
@@ -129,8 +68,8 @@ END
     foreach my $custnum ( @custnums ) {
     
       my %args = (
-          'time'         => $time,
-          'invoice_time' => $invoice_time,
+          'time'         => $opt{'time'},
+          'invoice_time' => $opt{'invoice_time'},
           'actual_time'  => $^T, #when freeside-bill was started
                                  #(not, when using -m, freeside-queued)
           'check_freq'   => $check_freq,
@@ -175,4 +114,108 @@ END
 
 }
 
+# freeside-daily %opt:
+#  -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
+#      but be careful.
+#
+#  -y: In addition to -d, which specifies an absolute date, the -y switch
+#      specifies an offset, in days.  For example, "-y 15" would increment the
+#      "pretend date" 15 days from whatever was specified by the -d switch
+#      (or now, if no -d switch was given).
+#
+#  -n: When used with "-d" and/or "-y", specifies that invoices should be dated
+#      with today's date, irregardless of the pretend date used to pre-generate
+#      the invoices.
+#
+#  -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
+#
+#  -a: Only process customers with the specified agentnum
+#
+#  -v: enable debugging
+#
+#  -l: debugging level
+
+sub bill_where {
+  my( %opt ) = @_;
+
+  my $time = $opt{'time'};
+  my $invoice_time = $opt{'invoice_time'};
+
+  my $check_freq = $opt{'check_freq'} || '1d';
+
+  my @search = ();
+
+  push @search, "( cust_main.archived != 'Y' OR archived IS NULL )"; #disable?
+
+  push @search, "cust_main.payby    = '". $opt{'p'}. "'"
+    if $opt{'p'};
+  push @search, "cust_main.agentnum =  ". $opt{'a'}
+    if $opt{'a'};
+
+  if ( @ARGV ) {
+    push @search, "( ".
+      join(' OR ', map "cust_main.custnum = $_", @ARGV ).
+    " )";
+  }
+
+  ###
+  # generate where_pkg/where_event search clause
+  ###
+
+  # select * from cust_main where
+  my $where_pkg = <<"END";
+    EXISTS(
+      SELECT 1 FROM cust_pkg
+        WHERE cust_main.custnum = cust_pkg.custnum
+          AND ( cancel IS NULL OR cancel = 0 )
+          AND (    ( ( setup IS NULL OR setup =  0 )
+                     AND ( start_date IS NULL OR start_date = 0
+                           OR ( start_date IS NOT NULL AND start_date <= $^T )
+                         )
+                   )
+                OR bill  IS NULL OR bill  <= $time 
+                OR ( expire  IS NOT NULL AND expire  <= $^T )
+                OR ( adjourn IS NOT NULL AND adjourn <= $^T )
+              )
+    )
+END
+
+  my $where_event = join(' OR ', map {
+    my $eventtable = $_;
+
+    my $join  = FS::part_event_condition->join_conditions_sql(  $eventtable );
+    my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
+                                                                'time'=>$time,
+                                                              );
+
+    my $are_part_event = 
+      "EXISTS ( SELECT 1 FROM part_event $join
+                  WHERE check_freq = '$check_freq'
+                    AND eventtable = '$eventtable'
+                    AND ( disabled = '' OR disabled IS NULL )
+                    AND $where
+              )
+      ";
+
+    if ( $eventtable eq 'cust_main' ) { 
+      $are_part_event;
+    } else {
+      "EXISTS ( SELECT 1 FROM $eventtable
+                  WHERE cust_main.custnum = $eventtable.custnum
+                    AND $are_part_event
+              )
+      ";
+    }
+
+  } FS::part_event->eventtables);
+
+  push @search, "( $where_pkg OR $where_event )";
+
+  warn "searching for customers:\n". join("\n", @search). "\n"
+    if $opt{'v'} || $opt{'l'};
+
+  join(' AND ', @search);
+
+}
+
 1;
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 4351f2876..3c203b9d1 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1085,6 +1085,7 @@ sub tables_hashref {
         'pkgpart',             'int',     '', '', '', '', 
         'locationnum',         'int', 'NULL', '', '', '',
         'otaker',          'varchar',     '', 32, '', '', 
+        'start_date',     @date_type,             '', '', 
         'setup',          @date_type,             '', '', 
         'bill',           @date_type,             '', '', 
         'last_bill',      @date_type,             '', '', 
@@ -1102,8 +1103,8 @@ sub tables_hashref {
       'primary_key' => 'pkgnum',
       'unique' => [],
       'index' => [ ['custnum'], ['pkgpart'], [ 'locationnum' ],
-                   ['setup'], ['last_bill'], ['bill'], ['susp'], ['adjourn'],
-                   ['expire'], ['cancel'],
+                   [ 'start_date' ], ['setup'], ['last_bill'], ['bill'],
+                   ['susp'], ['adjourn'], ['expire'], ['cancel'],
                    ['change_date'],
                  ],
     },
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index e5f289ca3..5768bebf9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -9,6 +9,7 @@ use Safe;
 use Carp;
 use Exporter;
 use Scalar::Util qw( blessed );
+use List::Util qw( min );
 use Time::Local qw(timelocal);
 use Data::Dumper;
 use Tie::IxHash;
@@ -2056,6 +2057,18 @@ sub unsuspended_pkgs {
   grep { ! $_->susp } $self->ncancelled_pkgs;
 }
 
+=item next_bill_date
+
+Returns the next date this customer will be billed, as a UNIX timestamp, or
+undef if no active package has a next bill date.
+
+=cut
+
+sub next_bill_date {
+  my $self = shift;
+  min( map $_->get('bill'), grep $_->get('bill'), $self->unsuspended_pkgs );
+}
+
 =item num_cancelled_pkgs
 
 Returns the number of cancelled packages (see L<FS::cust_pkg>) for this
@@ -2760,14 +2773,19 @@ sub _make_lines {
 
   my $setup = 0;
   my $unitsetup = 0;
-  if ( ! $cust_pkg->setup &&
-       (
-         ( $conf->exists('disable_setup_suspended_pkgs') &&
-          ! $cust_pkg->getfield('susp')
-        ) || ! $conf->exists('disable_setup_suspended_pkgs')
-       )
-    || $options{'resetup'}
-  ) {
+  if ( $options{'resetup'}
+       || ( ! $cust_pkg->setup
+            && ( ! $cust_pkg->start_date
+                 || $cust_pkg->start_date <= $time
+               )
+            && ( ! $conf->exists('disable_setup_suspended_pkgs')
+                 || ( $conf->exists('disable_setup_suspended_pkgs') &&
+                      ! $cust_pkg->getfield('susp')
+                    )
+               )
+          )
+    )
+  {
     
     warn "    bill setup\n" if $DEBUG > 1;
     $lineitems++;
@@ -2783,6 +2801,9 @@ sub _make_lines {
           #do need it, but it won't get written to the db
           #|| $cust_pkg->pkgpart != $real_pkgpart;
 
+    $cust_pkg->setfield('start_date', '')
+      if $cust_pkg->start_date;
+
   }
 
   ###
@@ -6727,12 +6748,14 @@ the error, otherwise returns false.
 
 sub charge {
   my $self = shift;
-  my ( $amount, $quantity, $pkg, $comment, $classnum, $additional );
+  my ( $amount, $quantity, $start_date, $classnum );
+  my ( $pkg, $comment, $additional );
   my ( $setuptax, $taxclass );   #internal taxes
   my ( $taxproduct, $override ); #vendor (CCH) taxes
   if ( ref( $_[0] ) ) {
     $amount     = $_[0]->{amount};
     $quantity   = exists($_[0]->{quantity}) ? $_[0]->{quantity} : 1;
+    $start_date = exists($_[0]->{start_date}) ? $_[0]->{start_date} : '';
     $pkg        = exists($_[0]->{pkg}) ? $_[0]->{pkg} : 'One-time charge';
     $comment    = exists($_[0]->{comment}) ? $_[0]->{comment}
                                            : '$'. sprintf("%.2f",$amount);
@@ -6742,9 +6765,10 @@ sub charge {
     $additional = $_[0]->{additional};
     $taxproduct = $_[0]->{taxproductnum};
     $override   = { '' => $_[0]->{tax_override} };
-  }else{
+  } else {
     $amount     = shift;
     $quantity   = 1;
+    $start_date = '';
     $pkg        = @_ ? shift : 'One-time charge';
     $comment    = @_ ? shift : '$'. sprintf("%.2f",$amount);
     $setuptax   = '';
@@ -6802,9 +6826,10 @@ sub charge {
   }
 
   my $cust_pkg = new FS::cust_pkg ( {
-    'custnum'  => $self->custnum,
-    'pkgpart'  => $pkgpart,
-    'quantity' => $quantity,
+    'custnum'    => $self->custnum,
+    'pkgpart'    => $pkgpart,
+    'quantity'   => $quantity,
+    'start_date' => $start_date,
   } );
 
   $error = $cust_pkg->insert;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 881e005de..d2f0690eb 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -122,6 +122,10 @@ Billing item definition (see L<FS::part_pkg>)
 
 Optional link to package location (see L<FS::location>)
 
+=item start_date
+
+date
+
 =item setup
 
 date
@@ -479,6 +483,7 @@ sub check {
     || $self->ut_foreign_key('custnum', 'cust_main', 'custnum')
     || $self->ut_numbern('pkgpart')
     || $self->ut_foreign_keyn('locationnum', 'cust_location', 'locationnum')
+    || $self->ut_numbern('start_date')
     || $self->ut_numbern('setup')
     || $self->ut_numbern('bill')
     || $self->ut_numbern('susp')
-- 
cgit v1.2.1


From 443150b6184876c967adffa199c20f53d5b76075 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Jun 2009 19:38:57 +0000
Subject: disabling a taxclass, RT#5472

---
 FS/FS/Schema.pm            |  3 +-
 FS/FS/part_pkg_taxclass.pm | 75 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 3c203b9d1..048fa0a4e 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1253,10 +1253,11 @@ sub tables_hashref {
       'columns' => [
         'taxclassnum',  'serial', '',       '', '', '',
         'taxclass',     'varchar', '', $char_d, '', '', 
+        'disabled', 'char',   'NULL',         1, '', '', 
       ],
       'primary_key' => 'taxclassnum',
       'unique'      => [ [ 'taxclass' ] ],
-      'index'       => [],
+      'index'       => [ [ 'disabled' ] ],
     },
 
     'part_pkg_taxproduct' => {
diff --git a/FS/FS/part_pkg_taxclass.pm b/FS/FS/part_pkg_taxclass.pm
index fda200ee9..6e3acf286 100644
--- a/FS/FS/part_pkg_taxclass.pm
+++ b/FS/FS/part_pkg_taxclass.pm
@@ -2,8 +2,9 @@ package FS::part_pkg_taxclass;
 
 use strict;
 use vars qw( @ISA );
-use FS::UID qw(dbh);
-use FS::Record qw( qsearch qsearchs );
+use FS::UID qw( dbh );
+use FS::Record; # qw( qsearch qsearchs );
+use FS::cust_main_county;
 
 @ISA = qw(FS::Record);
 
@@ -41,6 +42,10 @@ Primary key
 
 Tax class
 
+=item disabled
+
+Disabled flag, empty or 'Y'
+
 =back
 
 =head1 METHODS
@@ -67,7 +72,57 @@ otherwise returns false.
 
 =cut
 
-# the insert method can be inherited from FS::Record
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $sth = dbh->prepare("
+    SELECT country, state, county FROM cust_main_county
+      WHERE taxclass IS NOT NULL AND taxclass != ''
+      GROUP BY country, state, county
+  ") or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+
+  while ( my $row = $sth->fetchrow_hashref ) {
+    #warn "inserting for $row";
+    my $cust_main_county = new FS::cust_main_county {
+      'country'  => $row->{country},
+      'state'    => $row->{state},
+      'county'   => $row->{county},
+      'tax'      => 0,
+      'taxclass' => $self->taxclass,
+      #exempt_amount
+      #taxname
+      #setuptax
+      #recurtax
+    };
+    $error = $cust_main_county->insert;
+    #last if $error;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+}
 
 =item delete
 
@@ -84,7 +139,18 @@ returns the error, otherwise returns false.
 
 =cut
 
-# the replace method can be inherited from FS::Record
+sub replace {
+  my $new = shift;
+
+  my $old = ( blessed($_[0]) && $_[0]->isa('FS::Record') )
+              ? shift
+              : $new->replace_old;
+
+  return "Can't change tax class name (disable and create anew)"
+    if $old->taxclass ne $new->taxclass;
+
+  $new->SUPER::replace(@_);
+}
 
 =item check
 
@@ -103,6 +169,7 @@ sub check {
   my $error = 
     $self->ut_numbern('taxclassnum')
     || $self->ut_text('taxclass')
+    || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
   return $error if $error;
 
-- 
cgit v1.2.1


From 891171bfdf53febbfd295e3264521c587f4ba406 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 30 Jun 2009 20:18:39 +0000
Subject: documentation corrections

---
 FS/FS.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index e9efcc1cf..00286d477 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -173,7 +173,7 @@ L<FS::part_export_option> - Export option class
 
 L<FS::pkg_category> - Package category class (invoice oriented)
 
-L<FS::pkg_class> - Package class class (tax oriented)
+L<FS::pkg_class> - Package class class
 
 L<FS::part_pkg> - Package definition class
 
-- 
cgit v1.2.1


From cb57a42a578be11b85959c295828c995ad97f143 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Jul 2009 05:34:43 +0000
Subject: add tax class selection back for late charges w/1.9 events, RT#5665

---
 FS/FS/part_event/Action/cust_bill_fee_percent.pm | 19 +++++++++++++------
 FS/FS/part_event/Action/fee.pm                   | 12 +++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index 570fd6316..c6f37265a 100644
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -11,8 +11,9 @@ sub eventtable_hashref {
 
 sub option_fields {
   ( 
-    'percent' => { label=>'Percent', size=>2, },
-    'reason'  => 'Reason',
+    'percent'  => { label=>'Percent', size=>2, },
+    'reason'   => 'Reason',
+    'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
   );
 }
 
@@ -24,10 +25,16 @@ sub do_action {
   #my $cust_main = $self->cust_main($cust_bill);
   my $cust_main = $cust_bill->cust_main;
 
-  my $error = $cust_main->charge(
-    sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 ),
-    $self->option('reason')
-  );
+  my $amount =
+    sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 );
+
+  my $error = $cust_main->charge( {
+    'amount'     => $amount,
+    'pkg'        => $self->option('reason'),
+    'taxclass'   => $self->option('taxclass'),
+    #'start_date' => $cust_main->next_bill_date, #unless its more than N months away?
+  } );
+
   die $error if $error;
 
   '';
diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index 3cf50fbca..7d07df5c7 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -7,8 +7,9 @@ sub description { 'Late fee (flat)'; }
 
 sub option_fields {
   ( 
-    'charge' => { label=>'Amount', type=>'money', }, # size=>7, },
-    'reason' => 'Reason',
+    'charge'   => { label=>'Amount', type=>'money', }, # size=>7, },
+    'reason'   => 'Reason',
+    'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
   );
 }
 
@@ -19,7 +20,12 @@ sub do_action {
 
   my $cust_main = $self->cust_main($cust_object);
 
-  my $error = $cust_main->charge( $self->option('charge'), $self->option('reason') );
+  my $error = $cust_main->charge( {
+    'amount'   => $self->option('charge'),
+    'pkg'      => $self->option('reason'),
+    'taxclass' => $self->option('taxclass')
+    #'start_date' => $cust_main->next_bill_date, #unless its more than N months away?
+  } );
 
   die $error if $error;
 
-- 
cgit v1.2.1


From a67fd3bbfeec137ebf494e36eaa920145b8509a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 1 Jul 2009 10:28:49 +0000
Subject: start of settlement CDR processing, RT#5495

---
 FS/FS/Schema.pm                   |  27 +++++++
 FS/FS/cdr_termination.pm          | 152 ++++++++++++++++++++++++++++++++++++++
 FS/FS/cust_main.pm                |  30 +++++++-
 FS/FS/part_pkg/cdr_termination.pm |  96 ++++++++++++++++++++++++
 FS/FS/part_pkg/recur_Common.pm    |  57 ++++++++++++++
 FS/MANIFEST                       |   2 +
 FS/t/cdr_termination.t            |   5 ++
 7 files changed, 368 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/cdr_termination.pm
 create mode 100644 FS/FS/part_pkg/cdr_termination.pm
 create mode 100644 FS/FS/part_pkg/recur_Common.pm
 create mode 100644 FS/t/cdr_termination.t

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 048fa0a4e..1ae37197f 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -694,6 +694,7 @@ sub tables_hashref {
         'comments', 'text', 'NULL', '', '', '', 
         'spool_cdr','char', 'NULL', 1, '', '', 
         'squelch_cdr','char', 'NULL', 1, '', '', 
+        'cdr_termination_percentage', 'decimal', 'NULL', '', '', '',
         'invoice_terms', 'varchar', 'NULL', $char_d, '', '',
         'archived', 'char', 'NULL', 1, '', '',
       ],
@@ -2144,6 +2145,32 @@ sub tables_hashref {
       'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
     },
 
+    'cdr_termination' => {
+      'columns' => [
+        'cdrtermnum', 'bigserial', '',   '', '', '',
+        'acctid',        'bigint', '',   '', '', '', 
+        'termpart',         'int', '',   '', '', '',#future expansion, see below
+        'rated_price',  @money_typen,        '', '',
+        'status',     'varchar', 'NULL', 32, '', '',
+      ],
+      'primary_key' => 'cdrtermnum',
+      'unique'      => [ [ 'acctid', 'termpart' ] ],
+      'index'       => [ [ 'acctid' ], [ 'status' ], ],
+    },
+
+    #to handle multiple termination/settlement passes...
+   # 'part_termination' => {
+   #   'columns' => [
+   #     'termpart',       'int', '',      '', '', '',
+   #     'termname',   'varchar', '', $char_d, '', '',
+   #     'cdr_column', 'varchar', '', $char_d, '', '', #maybe set it here instead of in the price plan?
+   #   ],
+   #   'primary_key' => 'termpart',
+   #   'unique' => [],
+   #   'index'  => [],
+   # },
+
+    #the remaining cdr_ tables are not really used
     'cdr_calltype' => {
       'columns' => [
         'calltypenum',   'serial',  '', '', '', '', 
diff --git a/FS/FS/cdr_termination.pm b/FS/FS/cdr_termination.pm
new file mode 100644
index 000000000..5fe8db6bf
--- /dev/null
+++ b/FS/FS/cdr_termination.pm
@@ -0,0 +1,152 @@
+package FS::cdr_termination;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+
+=head1 NAME
+
+FS::cdr_termination - Object methods for cdr_termination records
+
+=head1 SYNOPSIS
+
+  use FS::cdr_termination;
+
+  $record = new FS::cdr_termination \%hash;
+  $record = new FS::cdr_termination { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cdr_termination object represents an CDR termination status.
+FS::cdr_termination inherits from FS::Record.  The following fields are
+currently supported:
+
+=over 4
+
+=item cdrtermnum
+
+primary key
+
+=item acctid
+
+acctid
+
+=item termpart
+
+termpart
+
+=item rated_price
+
+rated_price
+
+=item status
+
+status
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cdr_termination'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+# the insert method can be inherited from FS::Record
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+# the delete method can be inherited from FS::Record
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('cdrtermnum')
+    || $self->ut_foreign_key('acctid', 'cdr', 'acctid')
+    #|| $self->ut_foreign_key('termpart', 'part_termination', 'termpart')
+    || $self->ut_number('termpart')
+    || $self->ut_float('rated_price')
+    || $self->ut_enum('status', '', 'done' ) # , 'skipped' )
+  ;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item set_status_and_rated_price STATUS [ RATED_PRICE ]
+
+Sets the status to the provided string.  If there is an error, returns the
+error, otherwise returns false.
+
+=cut
+
+sub set_status_and_rated_price {
+  my($self, $status, $rated_price) = @_;
+  $self->status($status);
+  $self->rated_price($rated_price);
+  $self->replace();
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cdr>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 5768bebf9..1e4351931 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1553,6 +1553,7 @@ sub check {
     || $self->ut_textn('stateid_state')
     || $self->ut_textn('invoice_terms')
     || $self->ut_alphan('geocode')
+    || $self->ut_floatn('cdr_termination_percentage')
   ;
 
   #barf.  need message catalogs.  i18n.  etc.
@@ -6739,11 +6740,38 @@ sub credit {
 
 }
 
-=item charge AMOUNT [ PKG [ COMMENT [ TAXCLASS ] ] ]
+=item charge HASHREF || AMOUNT [ PKG [ COMMENT [ TAXCLASS ] ] ]
 
 Creates a one-time charge for this customer.  If there is an error, returns
 the error, otherwise returns false.
 
+New-style, with a hashref of options:
+
+  my $error = $cust_main->charge(
+                                  {
+                                    'amount'     => 54.32,
+                                    'quantity'   => 1,
+                                    'start_date' => str2time('7/4/2009'),
+                                    'pkg'        => 'Description',
+                                    'comment'    => 'Comment',
+                                    'additional' => [], #extra invoice detail
+                                    'classnum'   => 1,  #pkg_class
+
+                                    'setuptax'   => '', # or 'Y' for tax exempt
+
+                                    #internal taxation
+                                    'taxclass'   => 'Tax class',
+
+                                    #vendor taxation
+                                    'taxproduct' => 2,  #part_pkg_taxproduct
+                                    'override'   => {}, #XXX describe
+                                  }
+                                );
+
+Old-style:
+
+  my $error = $cust_main->charge( 54.32, 'Description', 'Comment', 'Tax class' );
+
 =cut
 
 sub charge {
diff --git a/FS/FS/part_pkg/cdr_termination.pm b/FS/FS/part_pkg/cdr_termination.pm
new file mode 100644
index 000000000..c0d99b72a
--- /dev/null
+++ b/FS/FS/part_pkg/cdr_termination.pm
@@ -0,0 +1,96 @@
+package FS::part_pkg::cdr_termination;
+
+use strict;
+use base qw( FS::part_pkg::recur_Common );
+use vars qw( $DEBUG %info );
+use Tie::IxHash;
+
+tie my %temporalities, 'Tie::IxHash',
+  'upcoming'  => "Upcoming (future)",
+  'preceding' => "Preceding (past)",
+;
+
+%info = (
+  'name' => 'VoIP rating of CDR records for termination partners.',
+  'shortname' => 'VoIP/telco CDR termination',
+  'fields' => {
+
+    'setup_fee'     => { 'name' => 'Setup fee for this package',
+                         'default' => 0,
+                       },
+    'recur_fee'     => { 'name' => 'Base recurring fee for this package',
+                         'default' => 0,
+                       },
+
+    #false laziness w/flat.pm
+    'recur_temporality' => { 'name' => 'Charge recurring fee for period',
+                             'type' => 'select',
+                             'select_options' => \%temporalities,
+                           },
+
+    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
+                                   ' of service at cancellation',
+                         'type' => 'checkbox',
+                       },
+
+    'cutoff_day'    => { 'name' => 'Billing Day (1 - 28) for prorating or '.
+                                   'subscription',
+                         'default' => '1',
+                       },
+
+    'recur_method'  => { 'name' => 'Recurring fee method',
+                         #'type' => 'radio',
+                         #'options' => \%recur_method,
+                         'type' => 'select',
+                         'select_options' => \%FS::part_pkg::recur_Common::recur_method,
+                       },
+  },
+
+  'fieldorder' => [qw(
+                       setup_fee recur_fee recur_temporality unused_credit
+                       recur_method cutoff_day
+                     )
+                  ],
+
+  'weight' => 48,
+
+);
+
+sub calc_setup {
+  my($self, $cust_pkg ) = @_;
+  $self->option('setup_fee');
+}
+
+sub calc_recur {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
+  #my $last_bill = $cust_pkg->last_bill;
+  my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
+
+  return 0
+    if $self->option('recur_temporality', 1) eq 'preceding'
+    && ( $last_bill eq '' || $last_bill == 0 );
+
+  my $charges = 0;
+
+  # termination calculations
+
+  # find CDRs with cdr_termination.status NULL
+  #  and matching our customer via svc_external.id/title?  (and via what field?)
+
+  #for each cdr, set status and rated price and add the charges, and add a line
+  #to the invoice
+
+  # eotermiation calculation
+
+  $charges += $self->calc_recur_Common(@_);
+
+  $charges;
+}
+
+sub is_free {
+  0;
+}
+
+1;
diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
new file mode 100644
index 000000000..71f3af718
--- /dev/null
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -0,0 +1,57 @@
+package FS::part_pkg::recur_Common;
+
+use strict;
+use vars qw( @ISA %recur_method );
+use Tie::IxHash;
+use Time::Local;
+use FS::part_pkg::prorate;
+
+@ISA = qw(FS::part_pkg::prorate);
+
+tie %recur_method, 'Tie::IxHash',
+  'anniversary'  => 'Charge the recurring fee at the frequency specified above',
+  'prorate'      => 'Charge a prorated fee the first time (selectable billing date)',
+  'subscription' => 'Charge the full fee for the first partial period (selectable billing date)',
+;
+
+sub calc_recur_Common {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_; #only need $sdate & $param
+
+  my $charges = 0;
+
+  if ( $param->{'increment_next_bill'} ) {
+
+    my $recur_method = $self->option('recur_method', 1) || 'anniversary';
+                  
+    if ( $recur_method eq 'prorate' ) {
+
+      $charges = $self->SUPER::calc_recur(@_);
+
+    } else {
+
+      $charges = $self->option('recur_fee');
+
+      if ( $recur_method eq 'subscription' ) {
+
+        my $cutoff_day = $self->option('cutoff_day', 1) || 1;
+        my ($day, $mon, $year) = ( localtime($$sdate) )[ 3..5 ];
+
+        if ( $day < $cutoff_day ) {
+          if ( $mon == 0 ) { $mon=11; $year--; }
+          else { $mon--; }
+        }
+
+        $$sdate = timelocal(0, 0, 0, $cutoff_day, $mon, $year);
+
+      }#$recur_method eq 'subscription'
+
+    }#$recur_method eq 'prorate'
+
+  }#increment_next_bill
+
+  $charges;
+
+}
+
+1;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 732e3de53..57cbc492c 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -449,3 +449,5 @@ FS/phone_device.pm
 t/phone_device.t
 FS/part_device.pm
 t/part_device.t
+FS/cdr_termination.pm
+t/cdr_termination.t
diff --git a/FS/t/cdr_termination.t b/FS/t/cdr_termination.t
new file mode 100644
index 000000000..7167bf288
--- /dev/null
+++ b/FS/t/cdr_termination.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cdr_termination;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 883f6c25e41831d9183e9500accb89f4cb23ae73 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 2 Jul 2009 01:26:46 +0000
Subject: update flat_introrate plan to better fit current codebase RT#4912

---
 FS/FS/ClientAPI/MyAccount.pm     |  3 ++-
 FS/FS/part_pkg/flat.pm           |  5 ++--
 FS/FS/part_pkg/flat_introrate.pm | 58 +++++++++++++++++-----------------------
 3 files changed, 30 insertions(+), 36 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 48a6ba940..298fe1796 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1209,7 +1209,8 @@ sub renew_info {
   my $total = $cust_main->balance;
 
   my @array = map {
-                    $total += $_->part_pkg->base_recur;
+                    my $bill = $_->bill;
+                    $total += $_->part_pkg->base_recur($_, \$bill);
                     my $renew_date = $_->part_pkg->add_freq($_->bill);
                     {
                       'pkgnum'             => $_->pkgnum,
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 171885770..d1863f432 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -144,7 +144,8 @@ sub unit_setup {
 }
 
 sub calc_recur {
-  my($self, $cust_pkg) = @_;
+  my $self = shift;
+  my($cust_pkg) = @_;
 
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
@@ -152,7 +153,7 @@ sub calc_recur {
   return 0
     if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
 
-  $self->base_recur($cust_pkg);
+  $self->base_recur(@_);
 }
 
 sub base_recur {
diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index 2568afa11..2d551f10f 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -1,46 +1,38 @@
 package FS::part_pkg::flat_introrate;
 
 use strict;
-use vars qw(@ISA %info $DEBUG $DEBUG_PRE);
+use vars qw(@ISA %info $DEBUG $me);
 #use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg::flat;
 
 use Date::Manip qw(DateCalc UnixDate ParseDate);
 
 @ISA = qw(FS::part_pkg::flat);
+$me = '[' . __PACKAGE__ . ']';
 $DEBUG = 0;
-$DEBUG_PRE = '[' . __PACKAGE__ . ']: ';
 
-%info = (
-  'name' => 'Introductory price for X months, then flat rate,'.
-            'relative to setup date (anniversary billing)',
-  'shortname' => 'Anniversary, with intro price',
-  'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
+(%info) = (%FS::part_pkg::flat::info);
+$info{name} = 'Introductory price for X months, then flat rate,'.
+              'relative to setup date (anniversary billing)';
+$info{shortname} = 'Anniversary, with intro price';
+$info{fields} = { %{$info{fields}} };
+$info{fields}{intro_fee} =
+         { 'name' => 'Introductory recurring fee for this package',
                      'default' => 0,
-                   },
-    'intro_fee' => { 'name' => 'Introductory recurring free for this package',
-                     'default' => 0,
-                   },
-    'intro_duration' => { 'name' => 'Duration of the introductory period, ' .
-                                    'in number of months',
-                          'default' => 0,
-			},
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-  },
-  'fieldorder' => [ 'setup_fee', 'intro_duration', 'intro_fee', 'recur_fee', 'unused_credit' ],
-  'weight' => 14,
-);
-
-sub calc_recur {
+         };
+$info{fields}{intro_duration} =
+         { 'name' => 'Duration of the introductory period, in number of months',
+           'default' => 0,
+         };
+$info{fieldorder} = [ @{ $info{fieldorder} } ];
+splice @{$info{fieldorder}}, 1, 0, qw( intro_duration intro_fee );
+$info{weight} = 14;
+
+sub base_recur {
   my($self, $cust_pkg, $time ) = @_;
 
+  my $now = $time ? $$time : time;
+
   my ($duration) = ($self->option('intro_duration') =~ /^(\d+)$/);
   unless ($duration) {
     die "Invalid intro_duration: " . $self->option('intro_duration');
@@ -50,11 +42,11 @@ sub calc_recur {
   my $intro_end = &DateCalc($setup, "+${duration} month");
   my $recur;
 
-  warn $DEBUG_PRE . "\$duration = ${duration}" if $DEBUG;
-  warn $DEBUG_PRE . "\$intro_end = ${intro_end}" if $DEBUG;
-  warn $DEBUG_PRE . "$$time < " . &UnixDate($intro_end, '%s') if $DEBUG;
+  warn "$me: \$duration = ${duration}" if $DEBUG;
+  warn "$me: \$intro_end = ${intro_end}" if $DEBUG;
+  warn "$me: $now < " . &UnixDate($intro_end, '%s') if $DEBUG;
 
-  if ($$time < &UnixDate($intro_end, '%s')) {
+  if ($now < &UnixDate($intro_end, '%s')) {
     $recur = $self->option('intro_fee');
   } else {
     $recur = $self->option('recur_fee');
-- 
cgit v1.2.1


From 8db53bcb53bbb32855c38f62afa4d1b39777cb7d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Jul 2009 02:02:46 +0000
Subject: fix late fees, RT#5665

---
 FS/FS/cust_main.pm                               |  2 +-
 FS/FS/part_event/Action/cust_bill_fee_percent.pm | 11 ++++++++---
 FS/FS/part_event/Action/fee.pm                   | 11 ++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1e4351931..a1b891226 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6790,7 +6790,7 @@ sub charge {
     $setuptax   = exists($_[0]->{setuptax}) ? $_[0]->{setuptax} : '';
     $taxclass   = exists($_[0]->{taxclass}) ? $_[0]->{taxclass} : '';
     $classnum   = exists($_[0]->{classnum}) ? $_[0]->{classnum} : '';
-    $additional = $_[0]->{additional};
+    $additional = $_[0]->{additional} || [];
     $taxproduct = $_[0]->{taxproductnum};
     $override   = { '' => $_[0]->{tax_override} };
   } else {
diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index c6f37265a..354778f7d 100644
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -14,6 +14,7 @@ sub option_fields {
     'percent'  => { label=>'Percent', size=>2, },
     'reason'   => 'Reason',
     'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
+    'nextbill' => { label=>'Hold late fee until next invoice', type=>'checkbox', value=>'Y' },
   );
 }
 
@@ -28,12 +29,16 @@ sub do_action {
   my $amount =
     sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 );
 
-  my $error = $cust_main->charge( {
+  my %charge = (
     'amount'     => $amount,
     'pkg'        => $self->option('reason'),
     'taxclass'   => $self->option('taxclass'),
-    #'start_date' => $cust_main->next_bill_date, #unless its more than N months away?
-  } );
+  );
+
+  $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
+    if $self->option('nextbill');
+
+  my $error = $cust_main->charge( \%charge );
 
   die $error if $error;
 
diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index 7d07df5c7..6ea7103ab 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -10,6 +10,7 @@ sub option_fields {
     'charge'   => { label=>'Amount', type=>'money', }, # size=>7, },
     'reason'   => 'Reason',
     'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
+    'nextbill' => { label=>'Hold late fee until next invoice', type=>'checkbox', value=>'Y' },
   );
 }
 
@@ -20,12 +21,16 @@ sub do_action {
 
   my $cust_main = $self->cust_main($cust_object);
 
-  my $error = $cust_main->charge( {
+  my %charge = (
     'amount'   => $self->option('charge'),
     'pkg'      => $self->option('reason'),
     'taxclass' => $self->option('taxclass')
-    #'start_date' => $cust_main->next_bill_date, #unless its more than N months away?
-  } );
+  );
+
+  $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
+    if $self->option('nextbill');
+
+  my $error = $cust_main->charge( \%charge );
 
   die $error if $error;
 
-- 
cgit v1.2.1


From 69678d308805f5ca4b171ea0c5ac1da957811aa0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 2 Jul 2009 11:22:48 +0000
Subject: settlement cdr processing, RT#5495

---
 FS/FS/Schema.pm                   |   2 +-
 FS/FS/cdr.pm                      |   2 +-
 FS/FS/cdr_termination.pm          |  28 ++++-----
 FS/FS/part_pkg/cdr_termination.pm | 124 +++++++++++++++++++++++++++++++++++---
 4 files changed, 133 insertions(+), 23 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 1ae37197f..52e119083 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2142,7 +2142,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'acctid',
       'unique' => [],
-      'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
+      'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'carrierid' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
     },
 
     'cdr_termination' => {
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index ab87a6893..7b1ee7a7e 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -527,8 +527,8 @@ my %export_formats = (
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
     sub { time2str('%r', shift->calldate_unix ) },   #TIME
     #'userfield',                                     #USER
-    'dst',                                           #NUMBER_DIALED
     'src',                                           #called from
+    'dst',                                           #NUMBER_DIALED
     $duration_sub,                                   #DURATION
     #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
     sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE
diff --git a/FS/FS/cdr_termination.pm b/FS/FS/cdr_termination.pm
index 5fe8db6bf..e0cde6e97 100644
--- a/FS/FS/cdr_termination.pm
+++ b/FS/FS/cdr_termination.pm
@@ -117,26 +117,26 @@ sub check {
     #|| $self->ut_foreign_key('termpart', 'part_termination', 'termpart')
     || $self->ut_number('termpart')
     || $self->ut_float('rated_price')
-    || $self->ut_enum('status', '', 'done' ) # , 'skipped' )
+    || $self->ut_enum('status', [ '', 'done' ] ) # , 'skipped' ] )
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
-=item set_status_and_rated_price STATUS [ RATED_PRICE ]
-
-Sets the status to the provided string.  If there is an error, returns the
-error, otherwise returns false.
-
-=cut
-
-sub set_status_and_rated_price {
-  my($self, $status, $rated_price) = @_;
-  $self->status($status);
-  $self->rated_price($rated_price);
-  $self->replace();
-}
+#=item set_status_and_rated_price STATUS [ RATED_PRICE ]
+#
+#Sets the status to the provided string.  If there is an error, returns the
+#error, otherwise returns false.
+#
+#=cut
+#
+#sub set_status_and_rated_price {
+#  my($self, $status, $rated_price) = @_;
+#  $self->status($status);
+#  $self->rated_price($rated_price);
+#  $self->replace();
+#}
 
 =back
 
diff --git a/FS/FS/part_pkg/cdr_termination.pm b/FS/FS/part_pkg/cdr_termination.pm
index c0d99b72a..15103378e 100644
--- a/FS/FS/part_pkg/cdr_termination.pm
+++ b/FS/FS/part_pkg/cdr_termination.pm
@@ -4,6 +4,9 @@ use strict;
 use base qw( FS::part_pkg::recur_Common );
 use vars qw( $DEBUG %info );
 use Tie::IxHash;
+use FS::Record qw( qsearch ); #qsearchs );
+use FS::cdr;
+use FS::cdr_termination;
 
 tie my %temporalities, 'Tie::IxHash',
   'upcoming'  => "Upcoming (future)",
@@ -22,6 +25,24 @@ tie my %temporalities, 'Tie::IxHash',
                          'default' => 0,
                        },
 
+    #'cdr_column'    => { 'name' => 'Column from CDR records',
+    #                     'type' => 'select',
+    #                     'select_enum' => [qw(
+    #                       dcontext
+    #                       channel
+    #                       dstchannel
+    #                       lastapp
+    #                       lastdata
+    #                       accountcode
+    #                       userfield
+    #                       cdrtypenum
+    #                       calltypenum
+    #                       description
+    #                       carrierid
+    #                       upstream_rateid
+    #                     )],
+    #                   },
+
     #false laziness w/flat.pm
     'recur_temporality' => { 'name' => 'Charge recurring fee for period',
                              'type' => 'select',
@@ -44,11 +65,28 @@ tie my %temporalities, 'Tie::IxHash',
                          'type' => 'select',
                          'select_options' => \%FS::part_pkg::recur_Common::recur_method,
                        },
+
+    #false laziness w/cdr_termination.pm
+    'output_format' => { 'name' => 'CDR invoice display format',
+                         'type' => 'select',
+                         'select_options' => { FS::cdr::invoice_formats() },
+                         'default'        => 'simple2', #XXX test
+                       },
+
+    'usage_section' => { 'name' => 'Section in which to place separate usage charges',
+                       },
+
+    'summarize_usage' => { 'name' => 'Include usage summary with recurring charges when usage is in separate section',
+                          'type' => 'checkbox',
+                        },
+
   },
 
   'fieldorder' => [qw(
-                       setup_fee recur_fee recur_temporality unused_credit
-                       recur_method cutoff_day
+                       setup_fee recur_fee
+                       cdr_column
+                       recur_temporality unused_credit recur_method cutoff_day
+                       output_format usage_section summarize_usage
                      )
                   ],
 
@@ -72,16 +110,88 @@ sub calc_recur {
     if $self->option('recur_temporality', 1) eq 'preceding'
     && ( $last_bill eq '' || $last_bill == 0 );
 
+  # termination calculations
+
+  my $term_percent = $cust_pkg->cust_main->cdr_termination_percentage;
+  die "no customer termination percentage" unless $term_percent;
+
+  my $output_format = $self->option('output_format', 'Hush!') || 'simple2';
+
   my $charges = 0;
 
-  # termination calculations
+  #find an svc_external record
+  my @svc_external = map  { $_->svc_x }
+                     grep { $_->part_svc->svcdb eq 'svc_external' }
+                     $cust_pkg->cust_svc;
+
+  die "cdr_termination package has no svc_external service"
+    unless @svc_external;
+  die "cdr_termination package has multiple svc_external services"
+    if scalar(@svc_external) > 1;
+
+  my $svc_external = $svc_external[0];
+
+  # find CDRs:
+  # - matching our customer via svc_external.id/title?  (and via what field?)
+
+  #let's try carrierid for now, can always make it configurable or rewrite
+  my $cdr_column = 'carrierid';
+
+  my %hashref = ( 'freesidestatus' => 'done' );
+
+  # try matching on svc_external.id for now... (or title?  if ints don't cut it)
+  $hashref{$cdr_column} = $svc_external[0]->id; 
+
+  # - with no cdr_termination.status
+
+  my $termpart = 1; #or from an option
+
+  #false lazienss w/search/cdr.html (i should be a part_termination method)
+  my $where_term =
+    "( cdr.acctid = cdr_termination.acctid AND termpart = $termpart ) ";
+  #my $join_term = "LEFT JOIN cdr_termination ON ( $where_term )";
+  my $extra_sql =
+    "AND NOT EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )";
+
+  #may need to process in batches if there's waaay too many
+  my @cdrs = qsearch({
+    'table'     => 'cdr',
+    #'addl_from' => $join_term,
+    'hashref'   => \%hashref,
+    'extra_sql' => "$extra_sql FOR UPDATE",
+  });
+
+  foreach my $cdr (@cdrs) {
+
+    #add a cdr_termination record and the charges
+
+    my $term_price = sprintf('%.2f', $cdr->rated_price * $term_percent / 100 );
+
+    my $cdr_termination = new FS::cdr_termination {
+      'acctid'      => $cdr->acctid,
+      'termpart'    => $termpart,
+      'rated_price' => $term_price,
+      'status'      => 'done',
+    };
+
+    my $error = $cdr_termination->insert;
+    die $error if $error; #next if $error; #or just skip this one???  why?
+
+    $charges += $term_price;
+
+    # and add a line to the invoice
+
+    my $call_details = $cdr->downstream_csv( 'format' => $output_format,
+                                             'charge' => $term_price,
+                                           );
 
-  # find CDRs with cdr_termination.status NULL
-  #  and matching our customer via svc_external.id/title?  (and via what field?)
+    my $classnum = ''; #usage class?
 
-  #for each cdr, set status and rated price and add the charges, and add a line
-  #to the invoice
+    #option to turn off?  or just use squelch_cdr for the customer probably
+    push @$details, [ 'C', $call_details, $term_price, $classnum ];
 
+  }
+    
   # eotermiation calculation
 
   $charges += $self->calc_recur_Common(@_);
-- 
cgit v1.2.1


From 34d3dd40a67b3e052fd033dd59bed4baa79083e3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 Jul 2009 00:08:12 +0000
Subject: spealing

---
 FS/FS/part_event/Condition/once.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Condition/once.pm b/FS/FS/part_event/Condition/once.pm
index 5a9161f06..d004814ff 100644
--- a/FS/FS/part_event/Condition/once.pm
+++ b/FS/FS/part_event/Condition/once.pm
@@ -7,7 +7,7 @@ use FS::cust_event;
 
 use base qw( FS::part_event::Condition );
 
-sub description { "Don't run this event again after it has completed sucessfully"; }
+sub description { "Don't run this event again after it has completed successfully"; }
 
 sub implicit_flag { 10; }
 
-- 
cgit v1.2.1


From 15c8b0fd8580afcd9c10d5816cbae43996c02ec0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 4 Jul 2009 00:47:53 +0000
Subject: add condition based on total customer payments as a multiplier of a
 specific package, RT#3983

---
 FS/FS/part_event/Condition/cust_payments.pm     |  2 +-
 FS/FS/part_event/Condition/cust_payments_pkg.pm | 68 +++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/part_event/Condition/cust_payments_pkg.pm

(limited to 'FS')

diff --git a/FS/FS/part_event/Condition/cust_payments.pm b/FS/FS/part_event/Condition/cust_payments.pm
index 41ef6c74a..477ecdbb0 100644
--- a/FS/FS/part_event/Condition/cust_payments.pm
+++ b/FS/FS/part_event/Condition/cust_payments.pm
@@ -3,7 +3,7 @@ package FS::part_event::Condition::cust_payments;
 use strict;
 use base qw( FS::part_event::Condition );
 
-sub description { 'Customer total payments'; }
+sub description { 'Customer total payments (amount)'; }
 
 sub option_fields {
   (
diff --git a/FS/FS/part_event/Condition/cust_payments_pkg.pm b/FS/FS/part_event/Condition/cust_payments_pkg.pm
new file mode 100644
index 000000000..d6c493bd0
--- /dev/null
+++ b/FS/FS/part_event/Condition/cust_payments_pkg.pm
@@ -0,0 +1,68 @@
+package FS::part_event::Condition::cust_payments_pkg;
+
+use strict;
+use base qw( FS::part_event::Condition );
+
+sub description { 'Customer total payments (multiplier of package)'; }
+
+sub eventtable_hashref {
+  { 'cust_pkg' => 1 };
+}
+
+sub option_fields {
+  (
+    'over_times' => { 'label'      => 'Customer total payments as least',
+                      'type'       => 'text',
+                      'value'      => '1', #default
+                    },
+    'what' => { 'label'   => 'Times',
+                'type'    => 'select',
+                #also add some way to specify in the package def, no?
+                'options' => [ qw( base_recur_permonth ) ],
+                'labels'  => { 'base_recur_permonth' => 'Base monthly fee', },
+              },
+  );
+}
+
+sub condition {
+  my($self, $cust_pkg) = @_;
+
+  my $cust_main = $self->cust_main($cust_pkg);
+
+  my $part_pkg = $cust_pkg->part_pkg;
+
+  my $over_times = $self->option('over_times');
+  $over_times = 0 unless length($over_times);
+
+  my $what = $self->option('what');
+
+  #false laziness w/Condition/cust_payments_pkg.pm
+  if ( $what eq 'base_recur_permonth' ) { #huh.  yuck.
+    if ( $part_pkg->freq !~ /^\d+$/ ) {
+      die 'WARNING: Not crediting customer '. $cust_main->referral_custnum.
+          ' for package '. $cust_pkg->pkgnum.
+          ' ( customer '. $cust_pkg->custnum. ')'.
+          ' - Referral credits not (yet) available for '.
+          ' packages with '. $part_pkg->freq_pretty. ' frequency';
+    }
+  }
+
+  $cust_main->total_paid >= $over_times * $part_pkg->$what($cust_pkg);
+
+}
+
+#XXX add for efficiency.  could use cust_main::total_paid_sql
+#use FS::cust_main;
+#sub condition_sql {
+#  my( $class, $table ) = @_;
+#
+#  my $over = $class->condition_sql_option('balance');
+#
+#  my $balance_sql = FS::cust_main->balance_sql;
+#
+#  "$balance_sql > $over";
+#
+#}
+
+1;
+
-- 
cgit v1.2.1


From 0ce1ba66efbd074aca5182bb3e42bd99ff55472a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 5 Jul 2009 21:35:52 +0000
Subject: CDR search by dcontext, charged_party, toggle of display fields,
 RT#4081

---
 FS/FS/Schema.pm |  7 ++++++-
 FS/FS/cdr.pm    | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 52e119083..67ef612f3 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2142,7 +2142,12 @@ sub tables_hashref {
       ],
       'primary_key' => 'acctid',
       'unique' => [],
-      'index' => [ [ 'calldate' ], [ 'src' ], [ 'dst' ], [ 'charged_party' ], [ 'accountcode' ], [ 'carrierid' ], [ 'freesidestatus' ], [ 'freesiderewritestatus' ], [ 'cdrbatch' ], ],
+      'index' => [ [ 'calldate' ],
+                   [ 'src' ], [ 'dst' ], [ 'dcontext' ], [ 'charged_party' ],
+                   [ 'accountcode' ], [ 'carrierid' ],
+                   [ 'freesidestatus' ], [ 'freesiderewritestatus' ],
+                   [ 'cdrbatch' ],
+                 ],
     },
 
     'cdr_termination' => {
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 7b1ee7a7e..96132ec90 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -153,6 +153,54 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'cdr'; }
 
+sub table_info {
+  {
+    'fields' => {
+#XXX fill in some (more) nice names
+        #'acctid'                => '',
+        'calldate'              => 'Call date',
+        'clid'                  => 'Caller ID',
+        'src'                   => 'Source',
+        'dst'                   => 'Destination',
+        'dcontext'              => 'Dest. context',
+        'channel'               => 'Channel',
+        'dstchannel'            => 'Destination channel',
+        #'lastapp'               => '',
+        #'lastdata'              => '',
+        'startdate'             => 'Start date',
+        'answerdate'            => 'Answer date',
+        'enddate'               => 'End date',
+        'duration'              => 'Duration',
+        'billsec'               => 'Billable seconds',
+        'disposition'           => 'Disposition',
+        'amaflags'              => 'AMA flags',
+        'accountcode'           => 'Account code',
+        #'uniqueid'              => '',
+        'userfield'             => 'User field',
+        #'cdrtypenum'            => '',
+        'charged_party'         => 'Charged party',
+        #'upstream_currency'     => '',
+        'upstream_price'        => 'Upstream price',
+        #'upstream_rateplanid'   => '',
+        #'ratedetailnum'         => '',
+        'rated_price'           => 'Rated price',
+        #'distance'              => '',
+        #'islocal'               => '',
+        #'calltypenum'           => '',
+        #'description'           => '',
+        #'quantity'              => '',
+        'carrierid'             => 'Carrier ID',
+        #'upstream_rateid'       => '',
+        'svcnum'                => 'Freeside service',
+        'freesidestatus'        => 'Freeside status',
+        'freesiderewritestatus' => 'Freeside rewrite status',
+        'cdrbatch'              => 'Batch',
+    },
+
+  };
+
+}
+
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
-- 
cgit v1.2.1


From 5849811bcc0f85c9c92d89f3948c5779dd67998d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Jul 2009 00:47:58 +0000
Subject: on CDR date parse, consider 1970-01-01 NULL like 1900-01-01, RT#4081

---
 FS/FS/cdr.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 96132ec90..418519eb2 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -766,8 +766,8 @@ sub _cdr_date_parse {
      die "unparsable date: $date"; #maybe we shouldn't die...
   }
 
-  return '' if $year == 1900 && $mon == 1 && $day == 1
-            && $hour == 0    && $min == 0 && $sec == 0;
+  return '' if ( $year == 1900 || $year == 1970 ) && $mon == 1 && $day == 1
+            && $hour == 0 && $min == 0 && $sec == 0;
 
   if ($options{gmt}) {
     timegm($sec, $min, $hour, $day, $mon-1, $year);
-- 
cgit v1.2.1


From 395432a840d5dd564e4b94fb9215a89bec1542ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Jul 2009 00:53:12 +0000
Subject: for netcentrex CDRs, import duration to duration field (previously
 only billsec)

---
 FS/FS/cdr/netcentrex.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr/netcentrex.pm b/FS/FS/cdr/netcentrex.pm
index 0cd5c7b34..a434d5d5f 100644
--- a/FS/FS/cdr/netcentrex.pm
+++ b/FS/FS/cdr/netcentrex.pm
@@ -28,7 +28,10 @@ use FS::cdr qw(_cdr_date_parser_maker);
     '', #04 Leg number (all 0)
     _cdr_date_parser_maker('startdate'),  #05 Authorize timestamp
     _cdr_date_parser_maker('answerdate'), #06 Start timestamp
-    'billsec', #'duration', #07 Duration
+    sub { my( $cdr, $duration ) = @_; #07 Duration
+          $cdr->duration($duration);
+          $cdr->billsec( $duration);
+        },
     _e164_parser_maker('src',      'charged_party'),                 #08 Caller
     _e164_parser_maker('dcontext', 'dst', 'norewrite_pivotonly'=>1) ,#09 Callee
     'channel', #10 Source IP
-- 
cgit v1.2.1


From 63a8b9603b4d270a32f61d4e4dd4efc7df470991 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 7 Jul 2009 07:32:07 +0000
Subject: Add freeside-void-payments script for returned check processing

---
 FS/bin/freeside-void-payments | 177 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100755 FS/bin/freeside-void-payments

(limited to 'FS')

diff --git a/FS/bin/freeside-void-payments b/FS/bin/freeside-void-payments
new file mode 100755
index 000000000..18fed05a7
--- /dev/null
+++ b/FS/bin/freeside-void-payments
@@ -0,0 +1,177 @@
+#!/usr/bin/perl -w
+
+use strict;
+use vars qw( $user $cust_main @customers );
+use Getopt::Std;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs);
+use FS::Conf;
+use FS::cust_main;
+use FS::cust_pay;
+use Business::OnlinePayment; # For retrieving the void list only.
+use Time::Local;
+use Date::Parse 'str2time';
+use Date::Format 'time2str';
+
+my %opt;
+getopts("f:ca:g:s:e:", \%opt);
+
+$user = shift or die &usage;
+&adminsuidsetup( $user );
+
+# The -g and -a options need to override this.
+my $method = $opt{'c'} ? 'ECHECK' : 'CARD';
+my $gateway;
+if($opt{'g'}) {
+  $gateway = FS::payment_gateway->by_key($opt{'g'})
+    or die "Payment gateway not found: '".$opt{'g'}."'.";
+}
+elsif($opt{'a'}) {
+  my $agent = FS::agent->by_key($opt{'a'})
+    or die "Agent not found: '".$opt{'a'}."'.";
+  $gateway = $agent->payment_gateway(method => $method)
+    or die "Agent has no payment gateway for method '$method'.";
+}
+
+my ($processor, $login, $password, $action, @bop_options) =
+  FS::cust_main->default_payment_gateway($method);
+my $gatewaynum = '';
+
+if($gateway) {
+# override the default gateway
+  $gatewaynum = $gateway->gatewaynum . '-' if $gateway->gatewaynum;
+  $processor = $gateway->gateway_module;
+  $login     = $gateway->gateway_username;
+  $password  = $gateway->gateway_password;
+  $action    = $gateway->gateway_action;
+  @bop_options = $gateway->options;
+}
+
+my @auths;
+if($opt{'f'}) {
+# Read the list of authorization numbers from a file.
+  my $in;
+  open($in, '< '. $opt{'f'}) or die "Unable to open file: '".$opt{'f'}."'.";
+  @auths = grep /^\d+$/, <$in>;
+  chomp @auths;
+}
+else {
+# Get the list from the processor.  This requires the processor module to 
+# support get_returns.
+  my $transaction = new Business::OnlinePayment ( $processor, @bop_options );
+  if(! $transaction->can('get_returns')) {
+    die "'$processor' does not provide an automated void list.";
+  }
+  my @local = localtime;
+# Start and end dates for this can be set via -s and -e.  If they're not,
+# end defaults to midnight today and start defaults to one day before end.
+  my $end = defined($opt{'e'}) ? 
+      str2time($opt{'e'}) : timelocal(0, 0, 0, @local[3,4,5]);
+  my $start = defined($opt{'s'}) ?
+      str2time($opt{'s'}) : $end - 86400;
+  die "Invalid date range: '$start'-'$end'" if not ($start and $end);
+  $transaction->content (
+    login     => $login,
+    password  => $password,
+    start     => time2str("%Y-%m-%d",$start),
+    end       => time2str("%Y-%m-%d",$end),
+    );
+  @auths = $transaction->get_returns;
+}
+
+$opt{'r'} ||= 'freeside-void-payments';
+
+foreach my $authnum (@auths) {
+  my $paybatch = $gatewaynum . $processor . ':' . $authnum;
+  my $cust_pay = qsearchs('cust_pay', { paybatch => $paybatch } );
+  if($cust_pay) {
+    $cust_pay->void($opt{'r'});
+  }
+  else {
+    warn "cust_pay record not found: '$paybatch'";
+  }
+}
+
+sub usage {
+    die "Usage:\n\n  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] user\n";
+}
+
+__END__
+
+# Documentation
+
+=head1 NAME
+
+freeside-void-payments - Automatically void a list of returned payments.
+
+=head1 SYNOPSIS
+
+  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] user
+
+=head1 DESCRIPTION
+
+Voids payments that were returned by the payment processor.  Can be 
+run periodically from crontab or manually after receiving a list of 
+returned payments.  Normally this is a meaningful operation only for 
+electronic checks.
+
+This script voids payments based on the combination of gateway (see 
+L<FS::payment_gateway>) and authorization number, since this is 
+generally how the processor will identify them later.
+
+  -f: Read the list of authorization numbers from the specified file.  
+      If they are not from the default payment gateway, -g or -a 
+      must be given to identify the gateway.
+      
+  If -f is not given, the script will attempt to contact the gateway 
+  and download a list of returned transactions.  To support this, 
+  the Business::OnlinePayment module for the processor must implement 
+  the I<get_returns()> method.  For an example, see 
+  L<Business::OnlinePayment::WesternACH>.
+
+  -s, -e: Specify the starting and ending dates for the void list.  
+      This has no effect if -f is given.  The end date defaults to 
+      today, and the start date defaults to one day before the end date.
+
+  -r: The reason for voiding the payments, to be stored in the database.
+
+  -g: The L<FS::payment_gateway> number for the gateway that handled 
+      these payments.  If -f is not given, this determines which 
+      gateway will be contacted.  This overrides -a.
+
+  -a: The agentnum whose default gateway will be used.  If neither -a 
+      nor -g is given, the system default gateway will be used.
+
+  -c: Use the default gateway for check transactions rather than 
+      credit cards.
+
+A warning will be emitted for each transaction that can't be found.  
+This may happen if it's already been voided, or if the gateway 
+doesn't match.
+
+=head1 EXAMPLE
+
+Given 'returns.txt', which contains one authorization number on each 
+line, provided by your default e-check processor:
+
+  freeside-void-payments -f returns.txt -c -r 'Returned check'
+
+If your default processor is Western ACH, which supports automated 
+returns processing, this voids all returned payments since 2009-06-01:
+
+  freeside-void-payments -r 'Returned check' -s 2009-06-01
+
+This, in your crontab, will void returned payments for the last 
+day at 8:30 every morning:
+
+  30 8 * * * /usr/local/bin/freeside-void-payments -r 'Returned check'
+
+=head1 BUGS
+
+Most payment gateways don't support it, making the script largely useless.
+
+=head1 SEE ALSO
+
+L<Business::OnlinePayment>, L<FS::cust_pay>
+
+=cut
-- 
cgit v1.2.1


From 75c3b711d30e566d4ec8dd8d8ed90926b22d4b15 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Jul 2009 09:23:20 +0000
Subject: allow null svc_broadband.ip_addr

---
 FS/FS/Conf.pm          |  8 ++++++++
 FS/FS/Schema.pm        |  2 +-
 FS/FS/svc_broadband.pm | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 12d6075b8..10f5d0449 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2835,6 +2835,14 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  #more fine-grained, service def-level control could be useful eventually?
+  {
+    'key'         => 'svc_broadband-allow_null_ip_addr',
+    'section'     => '',
+    'description' => '',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'tax-report_groups',
     'section'     => '',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 67ef612f3..19e1c66bc 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1763,7 +1763,7 @@ sub tables_hashref {
         'blocknum', 'int', '', '', '', '', 
         'speed_up', 'int', '', '', '', '', 
         'speed_down', 'int', '', '', '', '', 
-        'ip_addr', 'varchar', '', 15, '', '', 
+        'ip_addr', 'varchar', 'NULL', 15, '', '', 
         'mac_addr', 'varchar', 'NULL', 12, '', '', 
         'authkey',  'varchar', 'NULL', 32, '', '', 
         'latitude', 'decimal', 'NULL', '', '', '', 
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 6007c7083..74cedfc77 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -246,7 +246,19 @@ sub check {
     }
   }
 
+  $error = $self->_check_ip_addr;
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+sub _check_ip_addr {
+  my $self = shift;
+
   if (not($self->ip_addr) or $self->ip_addr eq '0.0.0.0') {
+
+    return '' if $conf->exists('svc_broadband-allow_null_ip_addr'); #&& !$self->blocknum
+
     return "Must supply either address or block"
       unless $self->blocknum;
     my $next_addr = $self->addr_block->next_free_addr;
@@ -255,6 +267,7 @@ sub check {
     } else {
       return "No free addresses in addr_block (blocknum: ".$self->blocknum.")";
     }
+
   }
 
   if (not($self->blocknum)) {
@@ -288,7 +301,7 @@ sub check {
     return 'Router '.$router->routernum.' cannot provide svcpart '.$self->svcpart;
   }
 
-  $self->SUPER::check;
+  '';
 }
 
 sub _check_duplicate {
-- 
cgit v1.2.1


From 7e4c4494f0ca232a482fe94f78083fc250e2bd4b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 7 Jul 2009 09:53:15 +0000
Subject: allow null svc_broadband.ip_addr

---
 FS/FS/Schema.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 19e1c66bc..475cec833 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1760,7 +1760,7 @@ sub tables_hashref {
       'columns' => [
         'svcnum', 'int', '', '', '', '', 
         'description', 'varchar', 'NULL', $char_d, '', '', 
-        'blocknum', 'int', '', '', '', '', 
+        'blocknum', 'int', 'NULL', '', '', '', 
         'speed_up', 'int', '', '', '', '', 
         'speed_down', 'int', '', '', '', '', 
         'ip_addr', 'varchar', 'NULL', 15, '', '', 
-- 
cgit v1.2.1


From 70569273833d91085c6c562865a78a08ddde49a1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 8 Jul 2009 11:12:46 +0000
Subject: borg RT menus, RT#1169

---
 FS/FS/Conf.pm                     |   7 +++
 FS/FS/Mason.pm                    |   3 ++
 FS/FS/TicketSystem/RT_External.pm |   5 ++
 FS/FS/TicketSystem/RT_Internal.pm | 111 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 125 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 10f5d0449..70dfa6851 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2881,6 +2881,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'rt-crontool',
+    'section'     => '',
+    'description' => 'Enable the RT CronTool extension.',
+    'type'        => 'checkbox',
+  },
+
 );
 
 1;
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index cce2dbf21..5e77b9893 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -384,6 +384,9 @@ sub mason_interps {
                         ${$_[0]} = "'". ${$_[0]}. "'";
                       }
                     },
+    compiler     => HTML::Mason::Compiler::ToObject->new(
+                      allow_globals        => [qw(%session)],
+                    ),
   );
 
   my $rt_interp = new HTML::Mason::Interp (
diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index 3a9c7e82d..c788c03a1 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -349,5 +349,10 @@ sub transaction_status {
   $self->_retrieve_single_value($sql);
 }
 
+sub access_right {
+  warn "WARNING: no access rights available w/ external RT";
+  0;
+}
+
 1;
 
diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index d24a96c04..6ac3fc61f 100644
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -1,13 +1,16 @@
 package FS::TicketSystem::RT_Internal;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $DEBUG );
 use FS::UID qw(dbh);
 use FS::CGI qw(popurl);
 use FS::TicketSystem::RT_Libs;
+use RT::CurrentUser;
 
 @ISA = qw( FS::TicketSystem::RT_Libs );
 
+$DEBUG = 1;
+
 sub sql_num_customer_tickets {
   "( select count(*) from tickets
                      join links on ( tickets.id = links.localbase )
@@ -25,5 +28,111 @@ sub baseurl {
   }
 }
 
+#mapping/genericize??
+#ShowConfigTab ModifySelf
+sub access_right {
+  my( $self, $session, $right ) = @_;
+
+  #return '' unless $conf->config('ticket_system');
+  return '' unless FS::Conf->new->config('ticket_system');
+
+  $self->_web_external_auth($session)
+    unless $session
+    && $session->{'CurrentUser'};
+
+  $session->{'CurrentUser'}->HasRight( Right  => $right,
+                                       Object => $RT::System );
+}
+
+#shameless false laziness w/rt/html/autohandler to get logged into RT from afar
+sub _web_external_auth {
+  my( $self, $session ) = @_;
+
+  my $user = $FS::CurrentUser::CurrentUser->username;
+
+  $session->{'CurrentUser'} = RT::CurrentUser->new();
+
+  warn "loading RT user for $user\n"
+    if $DEBUG;
+
+  $session->{'CurrentUser'}->Load($user);
+
+  if ( ! $session->{'CurrentUser'}->Id() ) {
+
+      # Create users on-the-fly
+
+      warn "can't load RT user for $user; auto-creating\n"
+        if $DEBUG;
+
+      my $UserObj = RT::User->new( RT::CurrentUser->new('RT_System') );
+
+      my ( $val, $msg ) = $UserObj->Create(
+          %{ ref($RT::AutoCreate) ? $RT::AutoCreate : {} },
+          Name  => $user,
+          Gecos => $user,
+      );
+
+      if ($val) {
+
+          # now get user specific information, to better create our user.
+          my $new_user_info
+              = RT::Interface::Web::WebExternalAutoInfo($user);
+
+          # set the attributes that have been defined.
+          # FIXME: this is a horrible kludge. I'm sure there's something cleaner
+          foreach my $attribute (
+              'Name',                  'Comments',
+              'Signature',             'EmailAddress',
+              'PagerEmailAddress',     'FreeformContactInfo',
+              'Organization',          'Disabled',
+              'Privileged',            'RealName',
+              'NickName',              'Lang',
+              'EmailEncoding',         'WebEncoding',
+              'ExternalContactInfoId', 'ContactInfoSystem',
+              'ExternalAuthId',        'Gecos',
+              'HomePhone',             'WorkPhone',
+              'MobilePhone',           'PagerPhone',
+              'Address1',              'Address2',
+              'City',                  'State',
+              'Zip',                   'Country'
+              )
+          {
+              #uhh, wrong root
+              #$m->comp( '/Elements/Callback', %ARGS,
+              #    _CallbackName => 'NewUser' );
+
+              my $method = "Set$attribute";
+              $UserObj->$method( $new_user_info->{$attribute} )
+                  if ( defined $new_user_info->{$attribute} );
+          }
+          $session->{'CurrentUser'}->Load($user);
+      }
+      else {
+
+         # we failed to successfully create the user. abort abort abort.
+          delete $session->{'CurrentUser'};
+
+          die "can't auto-create RT user"; #an error message would be nice :/
+          #$m->abort() unless $RT::WebFallbackToInternalAuth;
+          #$m->comp( '/Elements/Login', %ARGS,
+          #    Error => loc( 'Cannot create user: [_1]', $msg ) );
+      }
+  }
+
+  unless ( $session->{'CurrentUser'}->Id() ) {
+      delete $session->{'CurrentUser'};
+
+      die "can't auto-create RT user";
+      #$user = $orig_user;
+      # 
+      #if ($RT::WebExternalOnly) {
+      #    $m->comp( '/Elements/Login', %ARGS,
+      #        Error => loc('You are not an authorized user') );
+      #    $m->abort();
+      #}
+  }
+
+}
+
 1;
 
-- 
cgit v1.2.1


From 2ab9eb8640221cb01b06a818651cb5797431a146 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Jul 2009 21:05:54 +0000
Subject: unapplied payments report, RT#4861

---
 FS/FS/cust_main.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index a1b891226..286d3332a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7519,6 +7519,32 @@ sub balance_date_sql {
 
 }
 
+=item unapplied_payments_date_sql START_TIME [ END_TIME ]
+
+Returns an SQL fragment to retreive the total unapplied payments for this
+customer, only considering invoices with date earlier than START_TIME, and
+optionally not later than END_TIME.
+
+Times are specified as SQL fragments or numeric
+UNIX timestamps; see L<perlfunc/"time">).  Also see L<Time::Local> and
+L<Date::Parse> for conversion functions.  The empty string can be passed
+to disable that time constraint completely.
+
+Available options are:
+
+=cut
+
+sub unapplied_payments_date_sql {
+  my( $class, $start, $end, ) = @_;
+
+  my $unapp_pay    = FS::cust_pay->unapplied_sql;
+
+  my $pay_where = $class->_money_table_where( 'cust_pay', $start, $end,
+                                                          'unapplied_date'=>1 );
+
+  " ( SELECT COALESCE(SUM($unapp_pay), 0) FROM cust_pay $pay_where ) ";
+}
+
 =item _money_table_where TABLE START_TIME [ END_TIME [ OPTION => VALUE ... ] ]
 
 Helper method for balance_date_sql; name (and usage) subject to change
-- 
cgit v1.2.1


From 1cf09d80c37393560d1fd831ec1aa04354e09d6a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Jul 2009 23:58:43 +0000
Subject: add -r option

---
 FS/bin/freeside-cdr-sftp_and_import | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index c4484f1d4..18de94ddf 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -10,8 +10,8 @@ use FS::cdr;
 # parse command line
 ###
 
-use vars qw( $opt_p $opt_e $opt_d $opt_v );
-getopts('p:e:d:v');
+use vars qw( $opt_p $opt_r $opt_e $opt_d $opt_v );
+getopts('p:r:e:d:v');
 
 $opt_e ||= 'csv';
 #$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
@@ -39,6 +39,9 @@ warn "Retreiving directory listing\n" if $opt_v;
 
 my $ls_sftp = sftp();
 
+$ls_sftp->setcwd($opt_r) or die "can't chdir to $opt_r\n"
+  if $opt_r;
+
 my $ls = $ls_sftp->ls('.', wanted => qr/^$opt_p.*\.$opt_e$/i );
 
 ###
@@ -104,7 +107,7 @@ cdr.sftp_and_import - Download CDR files from a remote server via SFTP
 
 =head1 SYNOPSIS
 
-  cdr.sftp_and_import [ -p prefix ] [ -e extension ] [ -d donefolder ] [ -v ] user format [sftpuser@]servername
+  cdr.sftp_and_import [ -p prefix ] [ -e extension ] [ -r remotefolder ] [ -d donefolder ] [ -v ] user format [sftpuser@]servername
 
 =head1 DESCRIPTION
 
@@ -115,6 +118,8 @@ import them into the database.
 
 -e: file extension, defaults to .csv
 
+-r: if specified, changes into this remote folder before starting
+
 -d: if specified, moves files to the specified folder when done
 
 -v: verbose
-- 
cgit v1.2.1


From 96c2153a00ebf556d94feaf033ce337c13dd0cc6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 9 Jul 2009 23:59:34 +0000
Subject: sansay CDRs, RT#5495

---
 FS/FS/cdr.pm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 418519eb2..8ade4ea41 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -753,6 +753,11 @@ sub _cdr_date_parse {
 
   return '' unless length($date); #that's okay, it becomes NULL
 
+  if ( $date =~ /^([a-z]{3})\s+([a-z]{3})\s+(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2}\s+(\d{4})$/i && $7 > 1970 ) {
+    my $time = str2time($date);
+    return $time if $time > 100000; #just in case
+  }
+
   my($year, $mon, $day, $hour, $min, $sec);
 
   #$date =~ /^\s*(\d{4})[\-\/]\(\d{1,2})[\-\/](\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s*$/
-- 
cgit v1.2.1


From f1f09d882038f5b9950598be62d94fc1486596d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Jul 2009 00:00:37 +0000
Subject: sansay CDRs, RT#5495

---
 FS/FS/cdr.pm        |   2 +-
 FS/FS/cdr/sansay.pm | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/cdr/sansay.pm

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 8ade4ea41..77f3ec6dc 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -753,7 +753,7 @@ sub _cdr_date_parse {
 
   return '' unless length($date); #that's okay, it becomes NULL
 
-  if ( $date =~ /^([a-z]{3})\s+([a-z]{3})\s+(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2}\s+(\d{4})$/i && $7 > 1970 ) {
+  if ( $date =~ /^([a-z]{3})\s+([a-z]{3})\s+(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s+(\d{4})$/i && $7 > 1970 ) {
     my $time = str2time($date);
     return $time if $time > 100000; #just in case
   }
diff --git a/FS/FS/cdr/sansay.pm b/FS/FS/cdr/sansay.pm
new file mode 100644
index 000000000..44accdce5
--- /dev/null
+++ b/FS/FS/cdr/sansay.pm
@@ -0,0 +1,408 @@
+package FS::cdr::sansay;
+
+use strict;
+use base qw( FS::cdr );
+use vars qw( %info );
+use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+
+%info = (
+  'name'          => 'Sansay VSX',
+  'weight'        => 135,
+  'header'        => 1,     #0 default, set to 1 to ignore the first line, or
+                            # to higher numbers to ignore that number of lines
+  'type'          => 'csv', #csv (default), fixedlength or xls
+  'sep_char'      => ';',   #for csv, defaults to ,
+  'disabled'      => 0,     #0 default, set to 1 to disable
+
+
+  #listref of what to do with each field from the CDR, in order
+  'import_fields' => [
+
+    # "Header" (I do not think this means what you think it means)
+    #002452502;V1.10;R;
+
+    # Record Sequence Number 9 Unique identification of this record
+    'uniqueid',
+
+    '', #Version Number         5 Format version number of records to follow
+        #                         "V1.10"
+    '', #Record Type            1 Type of CDR being generated
+        #                         R ­ Normal CDR record, A - Audit
+
+    # "Body"
+    #WithMedia;181-1071459514@192.188.0.28;0001;Mon Dec 15 11:38:34 2003;Mon Dec 15 11:38:41 2003;Mon Dec 15 11:38:48 2003;480;EndedByRemoteUser;3;T;000200;H323;;192.188.0.38;9001;192.188.0.28;f0faff54-2e6c-11d8-8c4b-bd4d562c2265;192.188.0.38;18044;192.188.0.28;10756;G.729b;240;460;6066;14060;0;0;0;000200;H323;;192.188.0.28;8811;192.188.0.38;e83af3d3-1d2d-d811-9f98-003048424934;192.188.0.38;19236;192.188.0.28;10758;G.729b;460;240;14060;6066;0;0;0;F;9001;305;2;15;305000;00000011 44934567 45231267 2300BCC0;8587542200;
+
+    '',         #ConnectionType      16 Type of connection : Media or No Media
+    '',         #SessionID           32 Unique ID assigned to the call by
+                #                       SSM subsystem
+    '', #XXX    #Release Cause       4  2.4 Internal process Release Cause
+
+                    #Cause Code Descriptions
+                    #01         Normal answered call
+                    #02         No Answer, tear down by originator
+                    #03         No answer, tear down by the termination
+                    #04         NORMAL_NO_ANSWER, tear down by
+                    #           system
+                    #402        Service Not Available
+                    #403        Termination capability un-compatible
+                    #404        Outbound digit translation failed
+                    #405        Termination reject for some other reasons
+                    #406        Termination Route is blocked
+                    #500        Originator is not in the Authorized list
+                    #           (source verification failed)
+                    #501        Origination digit translation failed
+                    #502        Origination direction is not bi-directional or
+                    #           inbound
+                    #503        Origination is not in service state
+                    #600        Max system call handling reached
+                    #601        System reject call
+                    #602        System outbound digit translation error
+                    #           (maybe invalid configuration)
+                    #603        System inbound digit translation error
+                    #           (Maybe invalid configuration)
+
+
+    #Start Time of Date  32 Indicates Time of Date when the call
+    #                       entered the system
+    _cdr_date_parser_maker('startddate'), 
+
+    #Answer Time of Date 32 Indicates TOD when the call was
+    #                       answered
+    _cdr_date_parser_maker('answerdate'), 
+
+    #Release TOD             32  Indicates the TOD when the call was
+    #                            disconnected
+    _cdr_date_parser_maker('enddate'), 
+
+    #Minutes West of         32  Minutes West of Greenwich Mean
+    #Greenwich Mean Time         Time. Used to calculate the time
+    #                            zone.
+    '', #XXX use this
+
+    #Release Cause from      32  Release cause string from either H323
+    #Protocol Stack              or SIP protocol stack
+    #4. Release Cause String (Field #8 in CDR)
+    #- a string of text further identifying the teardown circumstance from terminating protocol message.
+    '',
+
+    #Binary Value of Release 4   Binary value of the protocol release
+    #Cause from Protocol         cause
+    #stack
+    #
+    #3. Release Cause from Stack ( Field # 9 in CDR)
+    #- an integer value based on the releasing dialogues protocol.
+    #   a.   For a H.323 call leg originated release it will be the real Q.931 value received from the far
+    #                side.
+    #Some of the Q.931 release causes;
+    #3: No route to destination
+    #16; Normal Clearing
+    #17: User Busy
+    #19: NO Answer from User
+    #21; Call Rejected
+    #28: Address Incomplete
+    #34: No Circuit Channel Available
+    #....
+    #   b.   For a SIP call leg originated release, it's a RFC 3261 release cause value received from the
+    #                far side.
+    #The following is the list that VSX generated if certain event happen:
+    #"400 Parse Failed"                     -      Malformed Message
+    #"405 Method Not Allowed"               -      Unsupported Method
+    #"480 Temporarily Unavailable"                 -       Overload Throttle Rejection, Max Sessions
+    #Exceeded, Demo License Expired, Capacity Exceeded on Route, Radius Server Timeout
+    #"415 No valid codec"                   -      No valid codec could be supported between origination and
+    #term call legs.
+    #"481   Transaction Does Not Exist"     -       Unknown Transaction or Dialog
+    #"487   Transaction Terminated"                 -      Origination Cancel
+    #"488   ReInvite Rejected"              -       Relay of ReInvite was Rejected
+    #"504   Server Time-out"                        -      Internal VSX Failure
+    #"500   Sequence Out of Order"                  -      CSeq counter violation
+    #  c.    For a VSX system originated release, it an internal release cause for teardown.
+    #If the VSX initiates a call teardown, the following cause values and strings are written into the CDR:
+    #999,    "Demo Licence Expired!"
+    #999,    "VSX Capacity Exceeded"
+    #999,    "VSX Operator Reset"
+    #999,    "Route Rejected"
+    #999,    "Radius Rejected"
+    #999,    "Radius Access Timeout"
+    #999,    "Gatekeeper Reject"
+    #999,    "Enum Server Reject"
+    #999,    "Enum Server Timeout"
+    #999,    "DNS Server Reject"
+    #999,    "DNS/GK Timeout"
+    #999,    "Could not allocate media"
+    #999,    "No Response to INVITE"
+    #999,    "Ring No Answer Timeout"
+    #999,    "200 OK Timeout"
+    #999,    "Maximum Duration Exceeded"
+    #987,    "Termination Capacity Exceeded"
+    #987,    "Origination Capacity Exceeded"
+    #987,    "Term CPS Capacity Exceeded"
+    #987,    "Orig CPS Capacity Exceeded"
+    #987,    "Max H323 Legs Exceeded"
+    '',
+
+    #1st release dialogue    1   O: origination, T: termination
+    #2. 1st Release Dialogue ( Field #10 in CDR)
+    #- one character value identifying the side of the call that i
+    #        ,,O ­ origination initiated the teardown.
+    #        ,,T ­ termination initiated the teardown.
+    #        ,,N ­ the VSX internally initiated the teardown.
+    '',
+
+    #Trunk ID -- Origination 6   TrunkID for origination GW(resources)
+    'accountcode', # right? # use cdr-charged_party-accountcode
+
+    #VoIP Protocol - Origination    6   VoIP protocol for origination dialogue
+    '',
+
+    #Origination Source Number     128 Source Number in Origination Dialogue
+    'src',
+
+    #Origination Source Host Name 128 FQDN or IP address for Source GW in Origination Dialogue
+    'channel',
+
+    #Origination Destination Number 128 Destination Number in Origination
+    #Dialogue
+    'dst',
+
+    #Origination Destination Host Name 128 FQDN or IP address for Destination
+    #GW in Origination Dialogue
+    'dstchannel',
+
+    #Origination Call ID     128 Unique ID for the origination dialogue(leg)
+    '', #'clid', #? that's not really the same call ID
+
+    #Origination Remote      16  Remote Payload IP address for
+    #         Payload IP         origination dialogue
+    #         Address
+    '',
+
+    #Origination Remote      6   Remote Payload UDP address for
+    #         Payload UDP        origination dialogue
+    #         Address
+    '',
+
+    #Origination Local       16  Local(SG) Payload IP address for
+    #         Payload IP         origination dialogue
+    #         Address
+    '',
+
+    #Origination Local       6   Local(SG) Payload UDP address for
+    #         Payload UDP        origination dialogue
+    #         Address
+    '',
+
+    #Origination Codec List  128 Supported Codec list( separated by
+    #                            comma) for origination dialogue
+    '',
+
+    #Origination Ingress     10  Number of Ingress( into Sansay
+    #         Packets            system) payload packets in
+    #                            origination dialogue
+    '',
+
+    #Origination Egress      10  Number of Egress( out from Sansay
+    #         Packets            system) payload packets in
+    #                            origination dialogue
+    '',
+
+    #Origination Ingress     10  Number of Ingress( into Sansay
+    #         Octets             system) payload octets in origination
+    #                            dialogue
+    '',
+
+    #Origination Egress      10  Number of Egress( out from Sansay
+    #        Octets              system) payload octets in origination
+    #                            dialogue
+    '',
+
+    #Origination Ingress     10  Number of Ingress( into Sansay
+    #        Packet Loss         system) payload packet loss in
+    #                            origination dialogue
+    '',
+
+    #Origination Ingress     10  Average Ingress( into Sansay system)
+    #        Delay               payload packets delay ( in ms) in
+    #                            origination dialogue
+    '',
+
+    #Origination Ingress     10  Average of Ingress( into Sansay
+    #        Packet Jitter       system) payload packet Jitter ( in ms)
+    #                            in origination dialogue
+    '',
+
+    #Trunk ID -- Termination 6   Trunk ID for termination GW(resources)
+    'carrierid',
+
+    #VoIP Protocol -         6   VoIP protocol from termination GW
+    #        Termination
+    '',
+
+    #Termination Source      128 Source Number in Termination
+    #        Number              Dialogue
+    '',
+
+    #Termination Source Host 128 FQDN or IP address for Source GW
+    #        Name                in Termination Dialogue
+    '',
+
+    #Termination Destination 128 Destination Number in Termination
+    #        Number              Dialogue
+    '',
+
+    #Termination Destination 128 FQDN or IP address for Destination
+    #        Host Name           GW in Termination Dialogue
+    '',
+
+    #Termination Call ID     128 Unique ID for the termination
+    #                            dialogue(leg)
+    '',
+
+    #Termination Remote      16  Remote Payload IP address for
+    #        Payload IP          termination dialogue
+    #        Address
+    '',
+
+    #Termination Remote      6   Remote Payload UDP address for
+    #        Payload UDP         termination dialogue
+    #        Address
+    '',
+
+    #Termination Local       16  Local(SG) Payload IP address for
+    #        Payload IP          termination dialogue
+    #        Address
+    '',
+
+    #Termination Local       6   Local(SG) Payload UDP address for
+    #        Payload UDP         termination dialogue
+    #        Address
+    '',
+
+    #Termination Codec List  128 Supported Codec list( separated by
+    #                            comma) for termination dialogue
+    '',
+
+    #Termination Ingress     10  Number of Ingress( into Sansay
+    #        Packets             system) payload packets in
+    #                            termination dialogue
+    '',
+
+    #Termination Egress      10  Number of Egress( out from Sansay
+    #        Packets             system) payload packets in
+    #                            termination dialogue
+    '',
+
+    #Termination Ingress     10  Number of Ingress( into Sansay
+    #        Octets              system) payload octets in
+    #                           termination dialogue
+    '',
+
+    #Termination Egress      10 Number of Egress( out from Sansay
+    #        Octets             system) payload octets in
+    #                           termination dialogue
+    '',
+
+    #Termination Ingress     10 Number of Ingress( into Sansay
+    #        Packet Loss        system) payload packet loss in
+    #                           termination dialogue
+    '',
+
+    #Termination Ingress     10 Average Ingress( into Sansay system)
+    #        Delay              payload packets delay ( in ms) in
+    #                           termination dialogue
+    '',
+
+    #Termination Ingress     10 Average of Ingress( into Sansay
+    #        Packet Jitter      system) payload packet Jitter ( in ms)
+    #                           in termination dialogue
+    '',
+
+    #Final Route Indication  1  F: Final Route Selection,
+    #                           I: Intermediate Route Attempts
+    '',
+
+    #Routing Digits          64 Routing Digit (Digit after Inbound
+    #                           translation, before Outbound
+    #                           Translation). This may also be the
+    #                           LRN if LNP feature is enabled
+    '',
+
+    #Call Duration in Second 6  Call Duration in Seconds. 0 if this is
+    #                           failed call
+    'billsec',
+
+    #Post Dial Delay in      6  Post dial delay (from call attempt to
+    #        Seconds            ring). 0 if this is failed call
+    '',
+
+    #Ring Time in Second     6  Ring Time in Seconds. 0 if this is
+    #                           failed call
+    '',
+
+    #Duration in milliseconds      10 Call duration in milliseconds.
+    '',
+
+    #Conf ID                 36 Unique Conference ID for this call in
+    #                           Cisco format
+    '',
+
+    #RPID/ANI                32 Inbound Remote Party ID line or
+    #                           Proxy Asserted Identity if provided
+    'clid', #?
+
+  ],
+
+);
+
+1;
+
+__END__
+
+list of freeside CDR fields, useful ones marked with *
+
+N/A       acctid - primary key
+FILLED_IN *[1]   calldate - Call timestamp (SQL timestamp)
+DONE       clid - Caller*ID with text
+DONE *      src - Caller*ID number / Source number
+DONE *      dst - Destination extension
+       dcontext - Destination context
+DONE       channel - Channel used
+DONE       dstchannel - Destination channel if appropriate
+       lastapp - Last application if appropriate
+       lastdata - Last application data
+DONE *      startdate - Start of call (UNIX-style integer timestamp)
+DONE        answerdate - Answer time of call (UNIX-style integer timestamp)
+DONE *      enddate - End time of call (UNIX-style integer timestamp)
+*      duration - Total time in system, in seconds
+DONE *      billsec - Total time call is up, in seconds
+*[2]   disposition - What happened to the call: ANSWERED, NO ANSWER, BUSY
+       amaflags - What flags to use: BILL, IGNORE etc, specified on a per
+       channel basis like accountcode.
+DONE *[3]   accountcode - CDR account number to use: account
+       uniqueid - Unique channel identifier
+       userfield - CDR user-defined field
+       cdr_type - CDR type - see FS::cdr_type (Usage = 1, S&E = 7, OC&C = 8)
+FILLED_IN *[4]   charged_party - Service number to be billed
+       upstream_currency - Wholesale currency from upstream
+*[5]   upstream_price - Wholesale price from upstream
+       upstream_rateplanid - Upstream rate plan ID
+       rated_price - Rated (or re-rated) price
+       distance - km (need units field?)
+       islocal - Local - 1, Non Local = 0
+*[6]   calltypenum - Type of call - see FS::cdr_calltype
+       description - Description (cdr_type 7&8 only) (used for
+       cust_bill_pkg.itemdesc)
+       quantity - Number of items (cdr_type 7&8 only)
+DONE       carrierid - Upstream Carrier ID (see FS::cdr_carrier)
+       upstream_rateid - Upstream Rate ID
+       svcnum - Link to customer service (see FS::cust_svc)
+       freesidestatus - NULL, done (or something)
+
+[1] Auto-populated from startdate if not present
+[2] Package options available to ignore calls without a specific disposition
+[3] When using 'cdr-charged_party-accountcode' config
+[4] Auto-populated from src (normal calls) or dst (toll free calls) if not present
+[5] When using 'upstream_simple' rating method.
+[6] Set to usage class classnum when using pre-rated CDRs and usage class-based
+    taxation (local/intrastate/interstate/international)
+
-- 
cgit v1.2.1


From be5a76006fb0d317c667c0432737284146b2ae45 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Jul 2009 00:36:02 +0000
Subject: fix sansay CDR import to ignore "NA" in dates, RT#5495

---
 FS/FS/cdr.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 77f3ec6dc..723123a76 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -752,6 +752,7 @@ sub _cdr_date_parse {
   my %options = @_;
 
   return '' unless length($date); #that's okay, it becomes NULL
+  return '' if $date eq 'NA'; #sansay
 
   if ( $date =~ /^([a-z]{3})\s+([a-z]{3})\s+(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})\s+(\d{4})$/i && $7 > 1970 ) {
     my $time = str2time($date);
-- 
cgit v1.2.1


From 27af526f59996d1f1cb8f4181d4e320020c98062 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 12 Jul 2009 13:27:07 +0000
Subject: stop gratuitous hash manipulatoin during enum untaint

---
 FS/FS/Record.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 3e3af524c..be29b5c8a 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2342,7 +2342,7 @@ sub ut_enum {
   my( $self, $field, $choices ) = @_;
   foreach my $choice ( @$choices ) {
     if ( $self->getfield($field) eq $choice ) {
-      $self->setfield($choice);
+      $self->setfield($field, $choice);
       return '';
     }
   }
-- 
cgit v1.2.1


From 242bd784a47ba7b36d806d7be9383ff6377c3f15 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 12 Jul 2009 23:38:12 +0000
Subject: this should fix $fsurl under the unified RT?  sure hope so

---
 FS/FS/CGI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 7ad1dc28f..f33a718fa 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -241,7 +241,7 @@ sub rooturl {
        (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
        /
        (process/)?
-       ([\w\-\.\/]+)
+       ([\w\-\.\/]*)
        $
      }
      {}x;
-- 
cgit v1.2.1


From ff27089dd05a3d9ff0b0b9898d7104d18c0174ac Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jul 2009 09:19:02 +0000
Subject: fix self-service agent-specific logos

---
 FS/FS/ClientAPI/MyAccount.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 298fe1796..02b54ffc9 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -654,7 +654,14 @@ sub invoice_logo {
   #sessioning for this?  how do we get the session id to the backend invoice
   # template so it can add it to the link, blah
 
-  my $templatename = $p->{'templatename'};
+  my $agentnum = '';
+  if ( $p->{'invnum'} ) {
+    my $cust_bill = qsearchs('cust_bill', { 'invnum' => $p->{'invnum'} } )
+      or return { 'error' => 'unknown invnum' };
+    $agentnum = $cust_bill->cust_main->agentnum;
+  }
+
+  my $templatename = $p->{'template'} || $p->{'templatename'};
 
   #false laziness-ish w/view/cust_bill-logo.cgi
 
@@ -668,7 +675,7 @@ sub invoice_logo {
   my $filename = "logo$templatename.png";
 
   return { 'error'        => '',
-           'logo'         => $conf->config_binary($filename),
+           'logo'         => $conf->config_binary($filename, $agentnum),
            'content_type' => 'image/png', #should allow gif, jpg too
          };
 }
-- 
cgit v1.2.1


From 3cb93a3aa0af9f004b7ee122bdf5c1daf5f1289c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 13 Jul 2009 10:12:22 +0000
Subject: eliminate harmless "no %info hash found in
 FS::part_pkg::recur_Common, skipping" warning

---
 FS/FS/part_pkg/recur_Common.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 71f3af718..2739cbc8f 100644
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -1,13 +1,15 @@
 package FS::part_pkg::recur_Common;
 
 use strict;
-use vars qw( @ISA %recur_method );
+use vars qw( @ISA %info %recur_method );
 use Tie::IxHash;
 use Time::Local;
 use FS::part_pkg::prorate;
 
 @ISA = qw(FS::part_pkg::prorate);
 
+%info = ( 'disabled' => 1 ); #recur_Common not a usable price plan directly
+
 tie %recur_method, 'Tie::IxHash',
   'anniversary'  => 'Charge the recurring fee at the frequency specified above',
   'prorate'      => 'Charge a prorated fee the first time (selectable billing date)',
-- 
cgit v1.2.1


From b6a644c59f47d0a890c2f3122d362a72958fbc58 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 13 Jul 2009 16:02:32 +0000
Subject: correct ordering and other bugs in tax updates

---
 FS/FS/tax_rate.pm          | 45 +++++++++++++++++++++++++++++++++++++++++----
 FS/FS/tax_rate_location.pm | 21 ++++++++++++++-------
 2 files changed, 55 insertions(+), 11 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 9a25f947b..d55b09b22 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -917,6 +917,7 @@ sub process_batch_import {
     my $error = '';
     my @insert_list = ();
     my @delete_list = ();
+    my @predelete_list = ();
 
     my @list = ( 'GEOCODE',  'geofile',   \&FS::tax_rate_location::batch_import,
                  'CODE',     'codefile',  \&FS::tax_class::batch_import,
@@ -972,9 +973,26 @@ sub process_batch_import {
       close $dfh;
 
       push @insert_list, $name, $ifh->filename, $import_sub;
-      unshift @delete_list, $name, $dfh->filename, $import_sub;
+      if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better
+        unshift @predelete_list, $name, $dfh->filename, $import_sub;
+      } else {
+        unshift @delete_list, $name, $dfh->filename, $import_sub;
+      }
 
     }
+
+    while( scalar(@predelete_list) ) {
+      my ($name, $file, $import_sub) =
+        (shift @predelete_list, shift @predelete_list, shift @predelete_list);
+
+      my $fmt = $format. ( $name eq 'ZIP' ? '-zip' : '' );
+      open my $fh, "< $file" or $error ||= "Can't open $name file $file: $!";
+      $error ||=
+        &{$import_sub}({ 'filehandle' => $fh, 'format' => $fmt }, $job);
+      close $fh;
+      unlink $file or warn "Can't delete $file: $!";
+    }
+    
     while( scalar(@insert_list) ) {
       my ($name, $file, $import_sub) =
         (shift @insert_list, shift @insert_list, shift @insert_list);
@@ -1316,7 +1334,7 @@ sub process_download_and_update {
     if (-d $dir) {
 
       if (-d "$dir.4") {
-        opendir(my $dirh, $dir) or die "failed to open $dir.4: $!\n";
+        opendir(my $dirh, "$dir.4") or die "failed to open $dir.4: $!\n";
         foreach my $file (readdir($dirh)) {
           unlink "$dir.4/$file" if (-f "$dir.4/$file");
         }
@@ -1426,6 +1444,7 @@ sub process_download_and_update {
 
     my @insert_list = ();
     my @delete_list = ();
+    my @predelete_list = ();
 
     my @list = (
                  'geocode',  \&FS::tax_rate_location::batch_import, 
@@ -1491,13 +1510,31 @@ sub process_download_and_update {
       %oldlines = ();
 
       push @insert_list, $name, $ifh->filename, $method;
-      unshift @delete_list, $name, $dfh->filename, $method
-        unless $name eq 'detail';
+      if ( $name eq 'geocode' ) {
+        unshift @predelete_list, $name, $dfh->filename, $method
+          unless $name eq 'detail';
+      } else {
+        unshift @delete_list, $name, $dfh->filename, $method
+          unless $name eq 'detail';
+      }
 
       close $dfh;
       close $ifh;
     }
 
+    while( scalar(@predelete_list) ) {
+      my ($name, $file, $method) =
+        (shift @predelete_list, shift @predelete_list, shift @predelete_list);
+
+      my $fmt = "$format-update";
+      $fmt = $fmt. ( $name eq 'zip' ? '-zip' : '' );
+      open my $fh, "< $file" or $error ||= "Can't open $name file $file: $!";
+      $error ||=
+        &{$method}({ 'filehandle' => $fh, 'format' => $fmt }, $job);
+      close $fh;
+      #unlink $file or warn "Can't delete $file: $!";
+    }
+
     while( scalar(@insert_list) ) {
       my ($name, $file, $method) =
         (shift @insert_list, shift @insert_list, shift @insert_list);
diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index 0e0dafebb..218ed977b 100644
--- a/FS/FS/tax_rate_location.pm
+++ b/FS/FS/tax_rate_location.pm
@@ -125,11 +125,18 @@ sub check {
   ;
   return $error if $error;
 
-  my $t = qsearchs( 'tax_rate_location',
-                    { map { $_ => $self->$_ } qw( data_vendor geocode ) },
-                  );
-
-  return "geocode already in use for this vendor"
+  my $t;
+  $t = qsearchs( 'tax_rate_location',
+                 { disabled => '',
+                   ( map { $_ => $self->$_ } qw( data_vendor geocode ) ),
+                 },
+               )
+    unless $self->disabled;
+
+  $t = $self->by_key( $self->taxratelocationnum )
+    if ( !$t && $self->taxratelocationnum );
+
+  return "geocode ". $self->geocode. " already in use for this vendor"
     if ( $t && $t->taxratelocationnum != $self->taxratelocationnum );
 
   return "may only be disabled"
@@ -194,7 +201,7 @@ sub batch_import {
       if (exists($hash->{'actionflag'}) && $hash->{'actionflag'} eq 'D') {
         delete($hash->{actionflag});
 
-        $hash->{deleted} = '';
+        $hash->{disabled} = '';
         my $tax_rate_location = qsearchs('tax_rate_location', $hash);
         return "Can't find tax_rate_location to delete: ".
                join(" ", map { "$_ => ". $hash->{$_} } @fields)
@@ -279,7 +286,7 @@ sub batch_import {
 
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return "can't insert tax_rate for $line: $error";
+        return "can't insert tax_rate_location for $line: $error";
       }
 
     }
-- 
cgit v1.2.1


From 1d3af1f921c52bc1cd1dde7a73b9a22f097bf606 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Tue, 14 Jul 2009 00:28:05 +0000
Subject: New export to register/transfer/renew/revoke domains using Net::DRI.
 Currently optimized for OpenSRS.  Should become more generalized in later
 releases.  Modified Makefile to insert the Freeside log folder into the new
 export.  Modified svc_domain.pm to prevent generation of transfer requests
 when a domain is moved to a different package with a domain registration
 attached to one of the included services.  Modified domreg.cgi to display
 errors on a separate page.

---
 FS/FS/part_export/domreg_net_dri.pm | 614 ++++++++++++++++++++++++++++++++++++
 FS/FS/svc_domain.pm                 |   2 +-
 2 files changed, 615 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/part_export/domreg_net_dri.pm

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_net_dri.pm b/FS/FS/part_export/domreg_net_dri.pm
new file mode 100644
index 000000000..885d6b6b0
--- /dev/null
+++ b/FS/FS/part_export/domreg_net_dri.pm
@@ -0,0 +1,614 @@
+package FS::part_export::domreg_net_dri;
+
+use vars qw(@ISA %info %options $conf);
+use Tie::IxHash;
+use FS::part_export::null;
+
+=head1 NAME
+
+FS::part_export::domreg_net_dri - Register or transfer domains with Net::DRI
+
+=head1 DESCRIPTION
+
+This module handles registering and transferring domains with select registrars or registries supported
+by L<Net::DRI>.
+
+As a part_export, this module can be designated for use with svc_domain services.  When the svc_domain object
+is inserted into the Freeside database, registration or transferring of the domain may be initiated, depending
+on the setting of the svc_domain's action field.  Further operations can be performed from the View Domain screen.
+
+Logging information is written to the Freeside log folder.
+
+For correct operation you must add name/value pairs to the protcol and transport options fields.  The setttings
+depend on the domain registry driver (DRD) selected.
+
+=over 4
+
+=item N - Register the domain
+
+=item M - Transfer the domain
+
+=item I - Ignore the domain for registration purposes
+
+=back
+
+=cut
+
+@ISA = qw(FS::part_export::null);
+
+my @tldlist = qw/com net org biz info name mobi at be ca cc ch cn de dk es eu fr it mx nl tv uk us/;
+
+my $opensrs_protocol_opts=<<'END';
+username=
+password=
+auto_renew=0
+affiliate_id=
+reseller_id=
+END
+
+my $opensrs_transport_opts=<<'END';
+client_login=
+client_password=
+END
+
+tie %options, 'Tie::IxHash',
+  'drd'            => { label  => 'Domain Registry Driver (DRD)',
+                      type => 'select',
+                      options => [ qw/BookMyName CentralNic Gandi OpenSRS OVH VNDS/ ],
+                      default => 'OpenSRS' },
+  'log_level'  => { label  => 'Logging',
+                      type => 'select',
+		      options => [ qw/debug info notice warning error critical alert emergency/ ],
+                      default => 'warning' },
+  'protocol_opts'  => {
+                      label   => 'Protocol Options',
+                      type    => 'textarea',
+                      default => $opensrs_protocol_opts,
+                      },
+  'transport_opts' => {
+                      label   => 'Transport Options',
+                      type    => 'textarea',
+                      default => $opensrs_transport_opts,
+                      },
+#  'register'       => { label => 'Use for registration',
+#                      type => 'checkbox',
+#                      default => '1' },
+#  'transfer'       => { label => 'Use for transfer',
+#                      type => 'checkbox',
+#                      default => '1' },
+#  'delete'         => { label => 'Use for deletion',
+#                      type => 'checkbox',
+#                      default => '1' },
+#  'renew'          => { label => 'Use for renewals',
+#                      type => 'checkbox',
+#                      default => '1' },
+  'tlds'           => { label => 'Use this export for these top-level domains (TLDs)',
+                      type => 'select',
+                      multi => 1,
+                      size => scalar(@tldlist),
+                      options => [ @tldlist ],
+                      default => 'com net org' },
+;
+
+my $opensrs_protocol_defaults = $opensrs_protocol_opts;
+$opensrs_protocol_defaults =~ s|\n|\\n|g;
+
+my $opensrs_transport_defaults = $opensrs_transport_opts;
+$opensrs_transport_defaults =~ s|\n|\\n|g;
+
+%info = (
+  'svc'     => 'svc_domain',
+  'desc'    => 'Domain registration via Net::DRI',
+  'options' => \%options,
+  'notes'   => <<"END"
+Registers and transfers domains via a Net::DRI registrar or registry.
+<a href="http://search.cpan.org/search?dist=Net-DRI">Net::DRI</a>
+must be installed.  You must have an account at the selected registrar/registry.
+<BR />
+Some top-level domains have additional business rules not supported by this export. These TLDs cannot be registered or transfered with this export.
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="OpenSRS Live System (rr-n1-tor.opensrs.net)" onClick='
+      document.dummy.machine.value = "rr-n1-tor.opensrs.net";
+      this.form.machine.value = "rr-n1-tor.opensrs.net";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="OpenSRS Test System (horizon.opensrs.net)" onClick='
+      document.dummy.machine.value = "horizon.opensrs.net";
+      this.form.machine.value = "horizon.opensrs.net";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="OpenSRS protocol/transport options" onClick='
+      this.form.protocol_opts.value = "$opensrs_protocol_defaults";
+      this.form.transport_opts.value = "$opensrs_transport_defaults";
+    '>
+</UL>
+END
+);
+
+install_callback FS::UID sub {
+  $conf = new FS::Conf;
+};
+
+#sub rebless { shift; }
+
+# experiment: want the status of these right away, so no queueing
+
+sub _export_insert {
+  my( $self, $svc_domain ) = ( shift, shift );
+
+  return if $svc_domain->action eq 'I';  # Ignoring registration, just doing DNS
+
+  if ($svc_domain->action eq 'N') {
+    return $self->register( $svc_domain );
+  } elsif ($svc_domain->action eq 'M') {
+    return $self->transfer( $svc_domain );
+  }
+  return "Unknown domain action " . $svc_domain->action;
+}
+
+=item get_portfolio_credentials
+
+Returns, in list context, the user name and password for the domain portfolio.
+
+This is currently specified via the username and password keys in the protocol options.
+
+=cut
+
+sub get_portfolio_credentials {
+  my $self = shift;
+
+  my %opts = $self->get_protocol_options();
+  return ($opts{username}, $opts{password});
+}
+
+=item format_tel
+
+Reformats a phone number according to registry rules.  Currently Freeside stores phone numbers
+in NANPA format and most registries prefer "+CCC.NPANPXNNNN"
+
+=cut
+
+sub format_tel {
+  my $tel = shift;
+
+  #if ($tel =~ /^(\d{3})-(\d{3})-(\d{4})\s*(x\s*(\d+))?$/) {
+  if ($tel =~ /^(\d{3})-(\d{3})-(\d{4})$/) {
+    $tel = "+1.$1$2$3"; # TBD: other country codes
+#    if $tel .= "$4" if $4;
+  }
+  return $tel;
+}
+
+sub gen_contact_set {
+  my ($self, $dri, $cust_main) = @_;
+
+  my @invoicing_list = $cust_main->invoicing_list_emailonly;
+  if ( $conf->exists('emailinvoiceautoalways')
+       || $conf->exists('emailinvoiceauto') && ! @invoicing_list
+       || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
+    push @invoicing_list, $cust_main->all_emails;
+  }
+
+  my $email = ($conf->exists('business-onlinepayment-email-override'))
+              ? $conf->config('business-onlinepayment-email-override')
+              : $invoicing_list[0];
+
+  my $cs=$dri->local_object('contactset');
+  my $co=$dri->local_object('contact');
+
+  my ($user, $pass) = $self->get_portfolio_credentials();
+
+  $co->srid($user);	# Portfolio user name for OpenSRS?
+  $co->auth($pass);	# Portfolio password for OpenSRS?
+
+  $co->firstname($cust_main->first);
+  $co->name($cust_main->last);
+  $co->org($cust_main->company || '-');
+  $co->street([$cust_main->address1, $cust_main->address2]);
+  $co->city($cust_main->city);
+  $co->sp($cust_main->state);
+  $co->pc($cust_main->zip);
+  $co->cc($cust_main->country);
+  $co->voice(format_tel($cust_main->daytime()));
+  $co->email($email);
+
+  $cs->set($co, 'registrant');
+  $cs->set($co, 'admin');
+  $cs->set($co, 'billing');
+
+  return $cs;
+}
+
+=item validate_contact_set
+
+Attempts to validate contact data for the domain based on OpenSRS rules.
+
+Returns undef if the contact data is acceptable, an error message if the contact
+data lacks one or more required fields.
+
+=cut
+
+sub validate_contact_set {
+  my $c = shift;
+
+  my %fields = (
+    firstname => "first name",
+    name => "last name",
+    street => "street address",
+    city => "city",
+    sp => "state",
+    pc => "ZIP/postal code",
+    cc => "country",
+    email => "email address",
+    voice => "phone number",
+  );
+  my @err = ();
+  foreach my $which (qw/registrant admin billing/) {
+    my $co = $c->get($which);
+    foreach (keys %fields) {
+      if (!$co->$_()) {
+        push @err, $fields{$_};
+      }
+    }
+  }
+  if (scalar(@err) > 0) {
+    return "Contact information needs: " . join(', ', @err);
+  }
+  undef;
+}
+
+#sub _export_replace {
+#  my( $self, $new, $old ) = (shift, shift, shift);
+#
+#  return '';
+#
+#}
+
+## Domain registration exports do nothing on delete.  You're just removing the domain from Freeside, not the registry
+#sub _export_delete {
+#  my( $self, $www ) = ( shift, shift );
+#
+#  return '';
+#}
+
+=item split_textarea_options
+
+Split textarea contents into lines, split lines on =, and then trim the results;
+
+=cut
+
+sub split_textarea_options {
+  my ($self, $optname) = @_;
+  my %opts =  map {
+    my ($key, $value) = split /=/, $_;
+    $key =~ s/^\s*//;
+    $key =~ s/\s*$//;
+    $value =~ s/^\s*//;
+    $value =~ s/\s*$//;
+    $key => $value } split /\n/, $self->option($optname);
+  %opts;
+}
+
+=item get_protocol_options
+
+Return a hash of protocol options
+
+=cut
+
+sub get_protocol_options {
+  my $self = shift;
+  my %opts = $self->split_textarea_options('protocol_opts');
+  if ($self->machine =~ /opensrs\.net/) {
+   my %topts = $self->get_transport_options;
+   $opts{reseller_id} = $topts{client_login};
+  }
+  %opts;
+}
+
+=item get_transport_options
+
+Return a hash of transport options
+
+=cut
+
+sub get_transport_options {
+  my $self = shift;
+  my %opts = $self->split_textarea_options('transport_opts');
+  $opts{remote_url} = "https://" . $self->machine . ":55443/resellers" if $self->machine =~ /opensrs\.net/;
+  %opts;
+}
+
+=item is_supported_domain
+
+Return undef if the domain name uses a TLD or SLD that is supported by this registrar.
+Otherwise return an error message explaining what's wrong.
+
+=cut
+
+sub is_supported_domain {
+  my $self = shift;
+  my $svc_domain = shift;
+
+  # Get the TLD of the new domain
+  my @bits = split /\./, $svc_domain->domain;
+
+  return "Can't register subdomains: " . $svc_domain->domain if scalar(@bits) != 2;
+
+  my $tld = pop @bits;
+
+  # See if it's one this export supports
+  my @tlds = split /\s+/, $self->option('tlds');
+  @tlds =  map { s/\.//; $_ } @tlds;
+  return "Can't register top-level domain $tld, restricted to: " . $self->option('tlds') if ! grep { $_ eq $tld } @tlds;
+  return undef;
+}
+
+=item get_dri
+
+=cut
+
+sub get_dri {
+  my $self = shift;
+  my $dri;
+
+#  return $self->{dri} if $self->{dri}; #!!!TBD!!! connection caching.
+
+  eval "use Net::DRI;";
+  return $@ if $@;
+
+# $dri=Net::DRI->new(...) to create the global object. Save the result,
+
+  eval {
+    #$dri = Net::DRI::TrapExceptions->new(10);
+    $dri = Net::DRI->new({logging => [ 'files', { output_directory => '%%%FREESIDE_LOG%%%' } ]}); #!!!TBD!!!
+    $dri->logging->level( $self->option('log_level') );
+    $dri->add_registry( $self->option('drd') );
+    my $protocol;
+    $protocol = 'xcp' if $self->option('drd') eq 'OpenSRS';
+
+    $dri->target( $self->option('drd') )->add_current_profile($self->option('drd') . '1',
+#      'Net::DRI::Protocol::' . $self->option('protocol_type'),
+#      $self->option('protocol_type'),
+#	'xcp', #TBD!!!!
+	$protocol, # Implies transport
+#      'Net::DRI::Transport::' . $self->option('transport_type'),
+      { $self->get_transport_options() },
+#      [ $self->get_protocol_options() ]
+      );
+  };
+  return $@ if $@;
+
+  $self->{dri} = $dri;
+  return $dri;
+}
+
+=item get_status
+
+Returns a reference to a hashref containing information on the domain's status.  The keys
+defined depend on the status.
+
+'unregistered' means the domain is not registered.
+
+Otherwise, if the domain is in an asynchronous operation such as a transfer, returns the state
+of that operation.
+
+Otherwise returns a value indicating if the domain can be managed through our reseller account.
+
+=cut
+
+sub get_status {
+  my ( $self, $svc_domain ) = @_;
+  my $rc;
+  my $rslt = {};
+
+  my $dri = $self->get_dri;
+
+    if (UNIVERSAL::isa($dri, 'Net::DRI::Exception')) {
+      $rslt->{'message'} = $dri->as_string;
+      return $rslt;
+    }
+  eval {
+    $rc = $dri->domain_check( $svc_domain->domain );
+    if (!$rc->is_success()) {
+      # Problem accessing the registry/registrar
+      $rslt->{'message'} = $rc->message;
+    } elsif (!$dri->get_info('exist')) {
+      # Domain is not registered
+      $rslt->{'unregistered'} = 1;
+    } else {
+      $rc = $dri->domain_transfer_query( $svc_domain->domain );
+      if ($rc->is_success() && $dri->get_info('status')) {
+        # Transfer in progress
+      	$rslt->{status} = $dri->get_info('status');
+	$rslt->{contact_email} = $dri->get_info('request_address');
+	$rslt->{last_update_time} = $dri->get_info('unixtime');
+      } elsif ($dri->get_info('reason')) {
+	$rslt->{'reason'} = $dri->get_info('reason');
+        # Domain is not being transferred...
+        $rc = $dri->domain_info( $svc_domain->domain, { $self->get_protocol_options() } );
+        if ($rc->is_success() && $dri->get_info('exDate')) {
+            $rslt->{'expdate'} = $dri->get_info('exDate');
+	}
+      } else {
+        $rslt->{status} = 'Unknown';
+      }
+    }
+  };
+#  rslt->{'message'} = $@->as_string if $@;
+  if ($@) {
+    rslt->{'message'} = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->as_string : $@->message;
+  }
+
+  return $rslt; # Success
+}
+
+=item register
+
+Attempts to register the domain through the reseller account associated with this export.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub register {
+  my ( $self, $svc_domain, $years ) = @_;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $dri = $self->get_dri;
+  return $dri->as_string if (UNIVERSAL::isa($dri, 'Net::DRI::Exception'));
+
+  eval { # All $dri methods can throw an exception.
+
+# Call methods
+    my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+
+    my $cs = $self->gen_contact_set($dri, $cust_main);
+
+    $err = validate_contact_set($cs);
+    return $err if $err;
+
+# !!!TBD!!! add custom name servers when supported; add ns => $ns to hash passed to domain_create
+
+    $res = $dri->domain_create($svc_domain->domain, { $self->get_protocol_options(), pure_create => 1, contact => $cs, duration => DateTime::Duration->new(years => $years) });
+    $err = $res->is_success ? '' : $res->message;
+  };
+  if ($@) {
+    $err = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->msg : $@->message;
+  }
+
+  return $err;
+}
+
+=item transfer
+
+Attempts to transfer the domain into the reseller account associated with this export.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub transfer {
+  my ( $self, $svc_domain ) = @_;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+# $dri=Net::DRI->new(...) to create the global object. Save the result,
+  my $dri = $self->get_dri;
+  return $dri->as_string if (UNIVERSAL::isa($dri, 'Net::DRI::Exception'));
+
+  eval { # All $dri methods can throw an exception
+
+# Call methods
+    my $cust_main = $svc_domain->cust_svc->cust_pkg->cust_main;
+
+    my $cs = $self->gen_contact_set($dri, $cust_main);
+
+    $err = validate_contact_set($cs);
+    return $err if $err;
+
+# !!!TBD!!! add custom name servers when supported; add ns => $ns to hash passed to domain_transfer_start
+
+    $res = $dri->domain_transfer_start($svc_domain->domain, { $self->get_protocol_options(), contact => $cs });
+    $err = $res->is_success ? '' : $res->message;
+  };
+  if ($@) {
+    $err = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->msg : $@->message;
+  }
+
+  return $err;
+}
+
+=item renew
+
+Attempts to renew the domain for the specified number of years.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub renew {
+  my ( $self, $svc_domain, $years ) = @_;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $dri = $self->get_dri;
+  return $dri->as_string if (UNIVERSAL::isa($dri, 'Net::DRI::Exception'));
+
+  eval { # All $dri methods can throw an exception
+    my $expdate;
+    my $res = $dri->domain_info( $svc_domain->domain, { $self->get_protocol_options() } );
+    if ($res->is_success() && $dri->get_info('exDate')) {
+      $expdate = $dri->get_info('exDate');
+
+#    return "Domain renewal not enabled" if !$self->option('renew');
+      $res = $dri->domain_renew( $svc_domain->domain, { $self->get_protocol_options(), duration => DateTime::Duration->new(years => $years), current_expiration => $expdate });
+    }
+    $err = $res->is_success ? '' : $res->message;
+  };
+  if ($@) {
+    $err = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->msg : $@->message;
+  }
+
+  return $err;
+}
+
+=item revoke
+
+Attempts to revoke the domain registration.  Only succeeds if invoked during the DRI
+grace period immediately after registration.
+
+Like most export functions, returns an error message on failure or undef on success.
+
+=cut
+
+sub revoke {
+  my ( $self, $svc_domain ) = @_;
+
+  my $err = $self->is_supported_domain( $svc_domain );
+  return $err if $err;
+
+  my $dri = $self->get_dri;
+  return $dri->as_string if (UNIVERSAL::isa($dri, 'Net::DRI::Exception'));
+
+  eval { # All $dri methods can throw an exception
+
+#    return "Domain registration revocation not enabled" if !$self->option('revoke');
+    my $res = $dri->domain_delete( $svc_domain->domain, { $self->get_protocol_options(), domain => $svc_domain->domain, pure_delete => 1 });
+    $err = $res->is_success ? '' : $res->message;
+  };
+  if ($@) {
+    $err = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->msg : $@->message;
+  }
+
+  return $err;
+}
+
+=item registrar
+
+Should return a full-blown object representing the Net::DRI DRD, but current just returns a hashref
+containing the registrar name.
+
+=cut
+
+sub registrar {
+  my $self = shift;
+  return {
+  	name => $self->option('drd'),
+  };
+}
+
+=head1 SEE ALSO
+
+L<FS::part_export_option>, L<FS::export_svc>, L<FS::svc_domain>,
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index dd4f2c52f..07fe7ce51 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -300,7 +300,7 @@ sub replace {
     if $old->getfield('domain') ne $new->getfield('domain'); 
 
   # Better to do it here than to force the caller to remember that svc_domain is weird.
-  $new->setfield(action => 'M');
+  $new->setfield(action => 'I');
   my $error = $new->SUPER::replace($old, @_);
   return $error if $error;
 }
-- 
cgit v1.2.1


From b898dc674b2d5158a2ecccd3424ad2ea7dc264e0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Jul 2009 02:53:57 +0000
Subject: fix netsapiens device provisioning?  or at least better debugging,
 RT#5226

---
 FS/FS/part_export/netsapiens.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index eea2509cc..9181344fb 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -1,12 +1,13 @@
 package FS::part_export::netsapiens;
 
-use vars qw(@ISA %info);
+use vars qw(@ISA $me %info);
 use URI;
 use MIME::Base64;
 use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
+$me = '[FS::part_export::netsapiens]';
 
 tie my %options, 'Tie::IxHash',
   'login'           => { label=>'NetSapiens tac2 User API username' },
@@ -16,6 +17,7 @@ tie my %options, 'Tie::IxHash',
   'device_password' => { label=>'NetSapiens tac2 Device API password' },
   'device_url'      => { label=>'NetSapiens tac2 Device URL' },
   'domain'          => { label=>'NetSapiens Domain' },
+  'debug'           => { label=>'Enable debugging', type=>'checkbox' },
 ;
 
 %info = (
@@ -38,7 +40,7 @@ sub ns_command {
 
 sub ns_device_command { 
   my $self = shift;
-  $self->_ns_command('device', @_);
+  $self->_ns_command('device_', @_);
 }
 
 sub _ns_command {
@@ -59,6 +61,10 @@ sub _ns_command {
     $args[0] .= $ns->buildQuery( { @_ } );
   }
 
+  warn "$me $method ". $self->option($prefix.'url').
+       " $command ". join(', ', @_). "\n"
+    if $self->option('debug');
+
   my $auth = encode_base64( $self->option($prefix.'login'). ':'.
                             $self->option($prefix.'password')    );
   push @args, { 'Authorization' => "Basic $auth" };
-- 
cgit v1.2.1


From 396a55184bad97c610fcda4d7bba05c1ee01c956 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Tue, 14 Jul 2009 19:05:05 +0000
Subject: Changed description of "action" field to match domain registration
 exports.

---
 FS/FS/svc_domain.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 07fe7ce51..3311ac566 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -140,8 +140,8 @@ otherwise returns false.
 The additional fields I<pkgnum> and I<svcpart> (see L<FS::cust_svc>) should be 
 defined.  An FS::cust_svc record will be created and inserted.
 
-The additional field I<action> should be set to I<N> for new domains or I<M>
-for transfers.
+The additional field I<action> should be set to I<N> for new domains, I<M>
+for transfers, or I<I> for no action (registered elsewhere).
 
 A registration or transfer email will be submitted unless
 $FS::svc_domain::whois_hack is true.
-- 
cgit v1.2.1


From 103b35181e4d7bbf4c66fedc0550c9ad40564704 Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Tue, 14 Jul 2009 19:06:05 +0000
Subject: Minor bug fix, spotted by Jeff.

---
 FS/FS/part_export/domreg_net_dri.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_net_dri.pm b/FS/FS/part_export/domreg_net_dri.pm
index 885d6b6b0..d25945d60 100644
--- a/FS/FS/part_export/domreg_net_dri.pm
+++ b/FS/FS/part_export/domreg_net_dri.pm
@@ -438,7 +438,7 @@ sub get_status {
   };
 #  rslt->{'message'} = $@->as_string if $@;
   if ($@) {
-    rslt->{'message'} = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->as_string : $@->message;
+    $rslt->{'message'} = (UNIVERSAL::isa($@, 'Net::DRI::Exception')) ? $@->as_string : $@->message;
   }
 
   return $rslt; # Success
-- 
cgit v1.2.1


From adb66f1922f56a50212d42af9c608b4ee3c7f0a0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jul 2009 22:49:33 +0000
Subject: add option to trim leading zeros when setting charged_party to
 accountcode, RT#5495

---
 FS/FS/Conf.pm | 7 +++++++
 FS/FS/cdr.pm  | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 70dfa6851..eb046ee42 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2751,6 +2751,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cdr-charged_party-accountcode-trim_leading_0s',
+    'section'     => '',
+    'description' => 'When setting the charged_party field of CDRs to the accountcode, trim any leading zeros.',
+    'type'        => 'checkbox',
+  },
+
 #  {
 #    'key'         => 'cdr-charged_party-truncate_prefix',
 #    'section'     => '',
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 723123a76..efccd4bae 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -349,7 +349,10 @@ sub set_charged_party {
 
     if ( $conf->exists('cdr-charged_party-accountcode') && $self->accountcode ){
 
-      $self->charged_party( $self->accountcode );
+      my $charged_party = $self->accountcode;
+      $charged_party =~ s/^0+//
+        if $conf->exists('cdr-charged_party-accountcode-trim_leading_0s');
+      $self->charged_party( $charged_party );
 
     } else {
 
-- 
cgit v1.2.1


From 7898f5301f0d6c08dcb12ab273696b4a90458cdd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jul 2009 23:06:03 +0000
Subject: unused for now

---
 FS/FS/part_pkg/cdr_termination.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/cdr_termination.pm b/FS/FS/part_pkg/cdr_termination.pm
index 15103378e..a07384655 100644
--- a/FS/FS/part_pkg/cdr_termination.pm
+++ b/FS/FS/part_pkg/cdr_termination.pm
@@ -81,10 +81,9 @@ tie my %temporalities, 'Tie::IxHash',
                         },
 
   },
-
+                       #cdr_column
   'fieldorder' => [qw(
                        setup_fee recur_fee
-                       cdr_column
                        recur_temporality unused_credit recur_method cutoff_day
                        output_format usage_section summarize_usage
                      )
-- 
cgit v1.2.1


From fab68494b3c142c97ccf11ab9c10757c988bd76d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 16 Jul 2009 22:16:16 +0000
Subject: dark magic coming soon

---
 FS/FS/Mason.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 5e77b9893..ac11026cf 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -185,6 +185,8 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::part_pkg_taxoverride;
   use FS::part_pkg_taxrate;
   use FS::tax_rate;
+  use FS::part_pkg_report_option;
+  # Sammath Naur
 
   if ( %%%RT_ENABLED%%% ) {
     eval '
-- 
cgit v1.2.1


From 2b7f02dec42a7b63cb66f6521eaddd2ea54f9b57 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 00:10:34 +0000
Subject: get rid of cdr_upstream_rate table and some other old convergent
 cruft

---
 FS/FS.pm                   |   2 -
 FS/FS/Schema.pm            |  12 ----
 FS/FS/cdr.pm               |  57 +------------------
 FS/FS/cdr_upstream_rate.pm | 138 ---------------------------------------------
 FS/FS/part_pkg/voip_cdr.pm | 121 +++++++++++++++++++--------------------
 FS/t/cdr_upstream_rate.t   |   5 --
 6 files changed, 62 insertions(+), 273 deletions(-)
 delete mode 100644 FS/FS/cdr_upstream_rate.pm
 delete mode 100644 FS/t/cdr_upstream_rate.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index 00286d477..09ef298e7 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -150,8 +150,6 @@ L<FS::cdr_calltype> - CDR calltype class
 
 L<FS::cdr_carrier> - CDR carrier class
 
-L<FS::cdr_upstream_rate> - CDR upstream rate class
-
 L<FS::cdr_type> - CDR type class
 
 L<FS::svc_external> - Externally tracked service class.
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 475cec833..8b5318421 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2206,18 +2206,6 @@ sub tables_hashref {
       'index'       => [],
     },
 
-    #map upstream rateid to ours...
-    'cdr_upstream_rate' => {
-      'columns' => [
-        'upstreamratenum', 'serial',  '', '', '', '',
-        'upstream_rateid', 'varchar', '', $char_d, '', '', 
-        'ratedetailnum',   'int', 'NULL', '', '', '',
-      ],
-      'primary_key' => 'upstreamratenum', #XXX need a primary key
-      'unique' => [ [ 'upstream_rateid' ] ], #unless we add another field, yeah
-      'index'  => [],
-    },
-
     #'cdr_file' => {
     #  'columns' => [
     #    'filenum',    'serial',     '', '', '', '',
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index efccd4bae..152f1d680 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -472,51 +472,11 @@ sub calltypename {
   $cdr_calltype ? $cdr_calltype->calltypename : '';
 }
 
-=item cdr_upstream_rate
-
-Returns the upstream rate mapping (see L<FS::cdr_upstream_rate>), or the empty
-string if no FS::cdr_upstream_rate object is associated with this CDR.
-
-=cut
-
-sub cdr_upstream_rate {
-  my $self = shift;
-  return '' unless $self->upstream_rateid;
-  qsearchs('cdr_upstream_rate', { 'upstream_rateid' => $self->upstream_rateid })
-    or '';
-}
-
-=item _convergent_format COLUMN [ COUNTRYCODE ]
-
-Returns the number in COLUMN formatted as follows:
-
-If the country code does not match COUNTRYCODE (default "61"), it is returned
-unchanged.
-
-If the country code does match COUNTRYCODE (default "61"), it is removed.  In
-addiiton, "0" is prepended unless the number starts with 13, 18 or 19. (???)
-
-=cut
-
-sub _convergent_format {
-  my( $self, $field ) = ( shift, shift );
-  my $countrycode = scalar(@_) ? shift : '61'; #+61 = australia
-  #my $number = $self->$field();
-  my $number = $self->get($field);
-  #if ( $number =~ s/^(\+|011)$countrycode// ) {
-  if ( $number =~ s/^\+$countrycode// ) {
-    $number = "0$number"
-      unless $number =~ /^1[389]/; #???
-  }
-  $number;
-}
-
 =item downstream_csv [ OPTION => VALUE, ... ]
 
 =cut
 
 my %export_names = (
-  'convergent'      => {},
   'simple'  => {
     'name'           => 'Simple',
     'invoice_header' => "Date,Time,Name,Destination,Duration,Price",
@@ -550,21 +510,6 @@ my $duration_sub = sub {
 };
 
 my %export_formats = (
-  'convergent' => [
-    'carriername', #CARRIER
-    sub { shift->_convergent_format('src') }, #SERVICE_NUMBER
-    sub { shift->_convergent_format('charged_party') }, #CHARGED_NUMBER
-    sub { time2str('%Y-%m-%d', shift->calldate_unix ) }, #DATE
-    sub { time2str('%T',       shift->calldate_unix ) }, #TIME
-    'billsec', #'duration', #DURATION
-    sub { shift->_convergent_format('dst') }, #NUMBER_DIALED
-    '', #XXX add (from prefixes in most recent email) #FROM_DESC
-    '', #XXX add (from prefixes in most recent email) #TO_DESC
-    'calltypename', #CLASS_CODE
-    'rated_price', #PRICE
-    sub { shift->rated_price ? 'Y' : 'N' }, #RATED
-    '', #OTHER_INFO
-  ],
   'simple' => [
     sub { time2str('%D', shift->calldate_unix ) },   #DATE
     sub { time2str('%r', shift->calldate_unix ) },   #TIME
@@ -618,7 +563,7 @@ $export_formats{'accountcode_default'} =
 sub downstream_csv {
   my( $self, %opt ) = @_;
 
-  my $format = $opt{'format'}; # 'convergent';
+  my $format = $opt{'format'};
   return "Unknown format $format" unless exists $export_formats{$format};
 
   #my $conf = new FS::Conf;
diff --git a/FS/FS/cdr_upstream_rate.pm b/FS/FS/cdr_upstream_rate.pm
deleted file mode 100644
index 2fd978203..000000000
--- a/FS/FS/cdr_upstream_rate.pm
+++ /dev/null
@@ -1,138 +0,0 @@
-package FS::cdr_upstream_rate;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs );
-use FS::rate_detail;
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::cdr_upstream_rate - Object methods for cdr_upstream_rate records
-
-=head1 SYNOPSIS
-
-  use FS::cdr_upstream_rate;
-
-  $record = new FS::cdr_upstream_rate \%hash;
-  $record = new FS::cdr_upstream_rate { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::cdr_upstream_rate object represents an upstream rate mapping to 
-internal rate detail (see L<FS::rate_detail>).  FS::cdr_upstream_rate inherits
-from FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item upstreamratenum - primary key
-
-=item upstream_rateid - CDR upstream Rate ID (cdr.upstream_rateid - see L<FS::cdr>)
-
-=item ratedetailnum - Rate detail - see L<FS::rate_detail>
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new upstream rate mapping.  To add the upstream rate to the database,
-see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-# the new method can be inherited from FS::Record, if a table method is defined
-
-sub table { 'cdr_upstream_rate'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-# the insert method can be inherited from FS::Record
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-# the delete method can be inherited from FS::Record
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-# the replace method can be inherited from FS::Record
-
-=item check
-
-Checks all fields to make sure this is a valid upstream rate.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
-sub check {
-  my $self = shift;
-
-  my $error = 
-    $self->ut_numbern('upstreamratenum')
-    #|| $self->ut_number('upstream_rateid')
-    || $self->ut_alpha('upstream_rateid')
-    #|| $self->ut_text('upstream_rateid')
-    || $self->ut_foreign_key('ratedetailnum', 'rate_detail', 'ratedetailnum' )
-  ;
-  return $error if $error;
-
-  $self->SUPER::check;
-}
-
-=item rate_detail
-
-Returns the internal rate detail object for this upstream rate (see
-L<FS::rate_detail>).
-
-=cut
-
-sub rate_detail {
-  my $self = shift;
-  qsearchs('rate_detail', { 'ratedetailnum' => $self->ratedetailnum } );
-}
-
-=back
-
-=head1 BUGS
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 1195b1694..929a2d725 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -19,8 +19,9 @@ $DEBUG = 0;
 
 tie my %rating_method, 'Tie::IxHash',
   'prefix' => 'Rate calls by using destination prefix to look up a region and rate according to the internal prefix and rate tables',
-  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
+#  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
   'upstream_simple' => 'Simply pass through and charge the "upstream_price" amount.',
+  'flat' => 'A single price per minute for all calls.',
 ;
 
 tie my %recur_method, 'Tie::IxHash',
@@ -243,7 +244,7 @@ sub calc_recur {
 
   my $charges = 0;
 
-  my $downstream_cdr = '';
+#  my $downstream_cdr = '';
 
   my $rating_method     = $self->option('rating_method') || 'prefix';
   my $intl              = $self->option('international_prefix') || '011';
@@ -396,36 +397,36 @@ sub calc_recur {
 
         }
 
-      } elsif ( $rating_method eq 'upstream' ) { #XXX this was convergent, not currently used.  very much becoming the odd one out. remove?
-
-        if ( $cdr->cdrtypenum == 1 ) { #rate based on upstream rateid
-
-          $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
-
-          $regionnum = $rate_detail->dest_regionnum;
-          $rate_region = $rate_detail->dest_region;
-
-          $pretty_destnum = $cdr->dst;
-
-          warn "  found rate for regionnum $regionnum and ".
-               "rate detail $rate_detail\n"
-            if $DEBUG;
-
-        } else { #pass upstream price through
-
-          $charge = sprintf('%.2f', $cdr->upstream_price);
-          $charges += $charge;
- 
-          @call_details = (
-            #time2str("%Y %b %d - %r", $cdr->calldate_unix ),
-            time2str("%c", $cdr->calldate_unix),  #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
-            'N/A', #minutes...
-            '$'.$charge,
-            #$pretty_destnum,
-            $cdr->description, #$rate_region->regionname,
-          );
-
-        }
+#      } elsif ( $rating_method eq 'upstream' ) { #XXX this was convergent, not currently used.  very much becoming the odd one out. remove?
+#
+#        if ( $cdr->cdrtypenum == 1 ) { #rate based on upstream rateid
+#
+#          $rate_detail = $cdr->cdr_upstream_rate->rate_detail;
+#
+#          $regionnum = $rate_detail->dest_regionnum;
+#          $rate_region = $rate_detail->dest_region;
+#
+#          $pretty_destnum = $cdr->dst;
+#
+#          warn "  found rate for regionnum $regionnum and ".
+#               "rate detail $rate_detail\n"
+#            if $DEBUG;
+#
+#        } else { #pass upstream price through
+#
+#          $charge = sprintf('%.2f', $cdr->upstream_price);
+#          $charges += $charge;
+# 
+#          @call_details = (
+#            #time2str("%Y %b %d - %r", $cdr->calldate_unix ),
+#            time2str("%c", $cdr->calldate_unix),  #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
+#            'N/A', #minutes...
+#            '$'.$charge,
+#            #$pretty_destnum,
+#            $cdr->description, #$rate_region->regionname,
+#          );
+#
+#        }
 
       } elsif ( $rating_method eq 'upstream_simple' ) {
 
@@ -526,8 +527,8 @@ sub calc_recur {
         # if the customer flag is on, call "downstream_csv" or something
         # like it to export the call downstream!
         # XXX price plan option to pick format, or something...
-        $downstream_cdr .= $cdr->downstream_csv( 'format' => 'convergent' )
-          if $spool_cdr;
+        #$downstream_cdr .= $cdr->downstream_csv( 'format' => 'XXX format' )
+        #  if $spool_cdr;
 
         my $error = $cdr->set_status_and_rated_price('done', $charge);
         die $error if $error;
@@ -541,32 +542,32 @@ sub calc_recur {
   unshift @$details, [ 'C', FS::cdr::invoice_header($output_format) ]
     if @$details && $rating_method ne 'upstream';
 
-  if ( $spool_cdr && length($downstream_cdr) ) {
-
-    use FS::UID qw(datasrc);
-    my $dir = '/usr/local/etc/freeside/export.'. datasrc. '/cdr';
-    mkdir $dir, 0700 unless -d $dir;
-    $dir .= '/'. $cust_pkg->custnum.
-    mkdir $dir, 0700 unless -d $dir;
-    my $filename = time2str("$dir/CDR%Y%m%d-spool.CSV", time); #XXX invoice date instead?  would require changing the order things are generated in cust_main::bill insert cust_bill first - with transactions it could be done though
-
-    push @{ $param->{'precommit_hooks'} },
-         sub {
-               #lock the downstream spool file and append the records 
-               use Fcntl qw(:flock);
-               use IO::File;
-               my $spool = new IO::File ">>$filename"
-                 or die "can't open $filename: $!\n";
-               flock( $spool, LOCK_EX)
-                 or die "can't lock $filename: $!\n";
-               seek($spool, 0, 2)
-                 or die "can't seek to end of $filename: $!\n";
-               print $spool $downstream_cdr;
-               flock( $spool, LOCK_UN );
-               close $spool;
-             };
-
-  } #if ( $spool_cdr && length($downstream_cdr) )
+#  if ( $spool_cdr && length($downstream_cdr) ) {
+#
+#    use FS::UID qw(datasrc);
+#    my $dir = '/usr/local/etc/freeside/export.'. datasrc. '/cdr';
+#    mkdir $dir, 0700 unless -d $dir;
+#    $dir .= '/'. $cust_pkg->custnum.
+#    mkdir $dir, 0700 unless -d $dir;
+#    my $filename = time2str("$dir/CDR%Y%m%d-spool.CSV", time); #XXX invoice date instead?  would require changing the order things are generated in cust_main::bill insert cust_bill first - with transactions it could be done though
+#
+#    push @{ $param->{'precommit_hooks'} },
+#         sub {
+#               #lock the downstream spool file and append the records 
+#               use Fcntl qw(:flock);
+#               use IO::File;
+#               my $spool = new IO::File ">>$filename"
+#                 or die "can't open $filename: $!\n";
+#               flock( $spool, LOCK_EX)
+#                 or die "can't lock $filename: $!\n";
+#               seek($spool, 0, 2)
+#                 or die "can't seek to end of $filename: $!\n";
+#               print $spool $downstream_cdr;
+#               flock( $spool, LOCK_UN );
+#               close $spool;
+#             };
+#
+#  } #if ( $spool_cdr && length($downstream_cdr) )
 
   if ($param->{'increment_next_bill'}) {
     my $recur_method = $self->option('recur_method', 1) || 'anniversary';
diff --git a/FS/t/cdr_upstream_rate.t b/FS/t/cdr_upstream_rate.t
deleted file mode 100644
index f9458c527..000000000
--- a/FS/t/cdr_upstream_rate.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::cdr_upstream_rate;
-$loaded=1;
-print "ok 1\n";
-- 
cgit v1.2.1


From 7b423c8c8d9bb0d2d9a7b472926958cf7d6ed5be Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 00:33:56 +0000
Subject: get rid of cdr_upstream_rate table and some other old convergent
 cruft

---
 FS/MANIFEST | 2 --
 1 file changed, 2 deletions(-)

(limited to 'FS')

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 57cbc492c..8082610d7 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -334,8 +334,6 @@ FS/inventory_class.pm
 t/inventory_class.t
 FS/inventory_item.pm
 t/inventory_item.t
-FS/cdr_upstream_rate.pm
-t/cdr_upstream_rate.t
 FS/access_user.pm
 t/access_user.t
 FS/access_user_pref.pm
-- 
cgit v1.2.1


From 020029a07fdc007573bc50f2573c08ffc1ed2748 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 00:35:53 +0000
Subject: add single_price option so you can do one per-minute price without
 rate tables, RT#5495

---
 FS/FS/part_pkg/voip_cdr.pm | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 929a2d725..744c45192 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -21,7 +21,7 @@ tie my %rating_method, 'Tie::IxHash',
   'prefix' => 'Rate calls by using destination prefix to look up a region and rate according to the internal prefix and rate tables',
 #  'upstream' => 'Rate calls based on upstream data: If the call type is "1", map the upstream rate ID directly to an internal rate (rate_detail), otherwise, pass the upstream price through directly.',
   'upstream_simple' => 'Simply pass through and charge the "upstream_price" amount.',
-  'flat' => 'A single price per minute for all calls.',
+  'single_price' => 'A single price per minute for all calls.',
 ;
 
 tie my %recur_method, 'Tie::IxHash',
@@ -75,7 +75,7 @@ tie my %temporalities, 'Tie::IxHash',
                          'select_options' => \%recur_method,
                        },
 
-    'rating_method' => { 'name' => 'Region rating method',
+    'rating_method' => { 'name' => 'Rating method',
                          'type' => 'radio',
                          'options' => \%rating_method,
                        },
@@ -87,6 +87,10 @@ tie my %temporalities, 'Tie::IxHash',
                      'select_label' => 'ratename',
                    },
 
+    'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
+                      'type' => 'money',
+                    },
+
     'ignore_unrateable' => { 'name' => 'Ignore calls without a rate in the rate tables.  By default, the system will throw a fatal error upon encountering unrateable calls.',
                              'type' => 'checkbox',
                            },
@@ -440,6 +444,32 @@ sub calc_recur {
                         );
         $classnum = $cdr->calltypenum;
 
+      } elsif ( $rating_method eq 'single_price' ) {
+
+        # a little false laziness w/below
+
+        my $granularity = 60;
+
+                    # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
+        my $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
+
+        $seconds += $granularity - ( $seconds % $granularity )
+          if $seconds      # don't granular-ize 0 billsec calls (bills them)
+          ;#&& $granularity; # 0 is per call
+        my $minutes = sprintf("%.1f", $seconds / 60);
+        $minutes =~ s/\.0$// ;# if $granularity == 60;
+
+        $charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
+                                  + 0.00000001 ); #so 1.005 rounds to 1.01
+
+        $charge =  
+        $charges += $charge;
+
+        @call_details = ($cdr->downstream_csv( 'format' => $output_format,
+                                               'charge' => $charge,
+                                             )
+                        );
+
       } else {
         die "don't know how to rate CDRs using method: $rating_method\n";
       }
-- 
cgit v1.2.1


From 7bcdea1c8e23921e054dca5371c7507364c2b3a8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 00:36:59 +0000
Subject: add single_price option so you can do one per-minute price without
 rate tables, RT#5495

---
 FS/FS/part_pkg/voip_cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 744c45192..e6044b174 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -204,7 +204,7 @@ tie my %temporalities, 'Tie::IxHash',
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
                        recur_method cutoff_day
-                       rating_method ratenum ignore_unrateable
+                       rating_method ratenum min_charge ignore_unrateable
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
-- 
cgit v1.2.1


From 725f4954f7d4efaf7cd3fd5e402a5dacd5d185b9 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 17 Jul 2009 01:44:24 +0000
Subject: bill usage when cancelling package

---
 FS/FS/Conf.pm              |  7 ++++++
 FS/FS/cust_main.pm         | 38 +++++++++++++++++++++++++----
 FS/FS/cust_pkg.pm          | 17 +++++++++++++
 FS/FS/part_pkg/voip_cdr.pm | 59 +++++++++++++++++++---------------------------
 4 files changed, 81 insertions(+), 40 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index eb046ee42..1d937b781 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1493,6 +1493,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'bill_usage_on_cancel',
+    'section'     => 'billing',
+    'description' => 'Enable automatic generation of an invoice for usage when a package is cancelled.  Not all packages can do this.  Usage data must already be available.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'require_cardname',
     'section'     => 'billing',
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 286d3332a..1f063d950 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2201,12 +2201,16 @@ Available options are:
 
 =item ban - can be set true to ban this customer's credit card or ACH information, if present.
 
+=item nobill - can be set true to skip billing if it might otherwise be done.
+
 =back
 
 Always returns a list: an empty list on success or a list of errors.
 
 =cut
 
+# nb that dates are not specified as valid options to this method
+
 sub cancel {
   my( $self, %opt ) = @_;
 
@@ -2232,6 +2236,13 @@ sub cancel {
 
   my @pkgs = $self->ncancelled_pkgs;
 
+  if ( !$opt{nobill} && $conf->exists('bill_usage_on_cancel') ) {
+    $opt{nobill} = 1;
+    my $error = $self->bill( pkg_list => [ @pkgs ], cancel => 1 );
+    warn "Error billing during cancel, custnum ". $self->custnum. ": $error"
+      if $error;
+  }
+
   warn "$me cancelling ". scalar($self->ncancelled_pkgs). "/".
        scalar(@pkgs). " packages for customer ". $self->custnum. "\n"
     if $DEBUG;
@@ -2441,6 +2452,13 @@ An array ref of specific packages (objects) to attempt billing, instead trying a
 
 Used in conjunction with the I<time> option, this option specifies the date of for the generated invoices.  Other calculations, such as whether or not to generate the invoice in the first place, are not affected.
 
+=item cancel
+
+This boolean value informs the us that the package is being cancelled.  This
+typically might mean not charging the normal recurring fee but only usage
+fees since the last billing. Setup charges may be charged.  Not all package
+plans support this feature (they tend to charge 0).
+
 =back
 
 =cut
@@ -2479,7 +2497,8 @@ sub bill {
   my %taxlisthash;
   my @precommit_hooks = ();
 
-  foreach my $cust_pkg ( $self->ncancelled_pkgs ) {
+  $options{ pkg_list } ||= [ $self->ncancelled_pkgs ];  #param checks?
+  foreach my $cust_pkg ( @{ $options{ pkg_list } } ) {
 
     warn "  bill package ". $cust_pkg->pkgnum. "\n" if $DEBUG > 1;
 
@@ -2537,6 +2556,8 @@ sub bill {
     } elsif ( $postal_pkg ) {
 
       foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
+        my %postal_options = %options;
+        delete $postal_options{cancel};
         my $error =
           $self->_make_lines( 'part_pkg'            => $part_pkg,
                               'cust_pkg'            => $postal_pkg,
@@ -2546,7 +2567,7 @@ sub bill {
                               'recur'               => \$total_recur,
                               'tax_matrix'          => \%taxlisthash,
                               'time'                => $time,
-                              'options'             => \%options,
+                              'options'             => \%postal_options,
                             );
         if ($error) {
           $dbh->rollback if $oldAutoCommit;
@@ -2822,6 +2843,7 @@ sub _make_lines {
         || ( $part_pkg->plan eq 'voip_cdr'
               && $part_pkg->option('bill_every_call')
            )
+        || ( $options{cancel} )
   ) {
 
     # XXX should this be a package event?  probably.  events are called
@@ -2835,18 +2857,22 @@ sub _make_lines {
     $lineitems++;
 
     # XXX shared with $recur_prog
-    $sdate = $cust_pkg->bill || $cust_pkg->setup || $time;
+    $sdate = ( $options{cancel} ? $cust_pkg->last_bill : $cust_pkg->bill )
+             || $cust_pkg->setup
+             || $time;
 
     #over two params!  lets at least switch to a hashref for the rest...
     my $increment_next_bill = ( $part_pkg->freq ne '0'
                                 && ( $cust_pkg->getfield('bill') || 0 ) <= $time
+                                && !$options{cancel}
                               );
     my %param = ( 'precommit_hooks'     => $precommit_hooks,
                   'increment_next_bill' => $increment_next_bill,
                 );
 
-    $recur = eval { $cust_pkg->calc_recur( \$sdate, \@details, \%param ) };
-    return "$@ running calc_recur for $cust_pkg\n"
+    my $method = $options{cancel} ? 'calc_cancel' : 'calc_recur';
+    $recur = eval { $cust_pkg->$method( \$sdate, \@details, \%param ) };
+    return "$@ running $method for $cust_pkg\n"
       if ( $@ );
 
     if ( $increment_next_bill ) {
@@ -2926,9 +2952,11 @@ sub _make_lines {
       if ( $part_pkg->option('recur_temporality', 1) eq 'preceding' ) {
         $cust_bill_pkg->sdate( $hash{last_bill} );
         $cust_bill_pkg->edate( $sdate - 86399   ); #60s*60m*24h-1
+        $cust_bill_pkg->edate( $time ) if $options{cancel};
       } else { #if ( $part_pkg->option('recur_temporality', 1) eq 'upcoming' ) {
         $cust_bill_pkg->sdate( $sdate );
         $cust_bill_pkg->edate( $cust_pkg->bill );
+        #$cust_bill_pkg->edate( $time ) if $options{cancel};
       }
 
       $cust_bill_pkg->pkgpart_override($part_pkg->pkgpart)
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index d2f0690eb..f56402377 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -560,6 +560,8 @@ Available options are:
 
 =item date - can be set to a unix style timestamp to specify when to cancel (expire)
 
+=item nobill - can be set true to skip billing if it might otherwise be done.
+
 =back
 
 If there is an error, returns the error, otherwise returns false.
@@ -570,6 +572,8 @@ sub cancel {
   my( $self, %options ) = @_;
   my $error;
 
+  my $conf = new FS::Conf;
+
   warn "cust_pkg::cancel called with options".
        join(', ', map { "$_: $options{$_}" } keys %options ). "\n"
     if $DEBUG;
@@ -595,6 +599,19 @@ sub cancel {
   my $date = $options{date} if $options{date}; # expire/cancel later
   $date = '' if ($date && $date <= time);      # complain instead?
 
+  #race condition: usage could be ongoing until unprovisioned
+  #resolved by performing a change package instead (which unprovisions) and
+  #later cancelling
+  if ( !$options{nobill} && !$date && $conf->exists('bill_usage_on_cancel') ) {
+      my $error =
+        $self->cust_main->bill( pkg_list => [ $self ], cancel => 1 );
+      warn "Error billing during cancel, custnum ".
+        #$self->cust_main->custnum. ": $error"
+        ": $error"
+        if $error;
+  }
+
+
   my $cancel_time = $options{'time'} || time;
 
   if ( $options{'reason'} ) {
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index e6044b174..5a43403f7 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -12,6 +12,7 @@ use FS::cdr;
 use FS::rate;
 use FS::rate_prefix;
 use FS::rate_detail;
+use FS::part_pkg::recur_Common;
 
 @ISA = qw(FS::part_pkg::prorate);
 
@@ -24,12 +25,6 @@ tie my %rating_method, 'Tie::IxHash',
   'single_price' => 'A single price per minute for all calls.',
 ;
 
-tie my %recur_method, 'Tie::IxHash',
-  'anniversary' => 'Charge the recurring fee at the frequency specified above',
-  'prorate' => 'Charge a prorated fee the first time (selectable billing date)',
-  'subscription' => 'Charge the full fee for the first partial period (selectable billing date)',
-;
-
 #tie my %cdr_location, 'Tie::IxHash',
 #  'internal' => 'Internal: CDR records imported into the internal CDR table',
 #  'external' => 'External: CDR records queried directly from an external '.
@@ -72,7 +67,7 @@ tie my %temporalities, 'Tie::IxHash',
                          #'type' => 'radio',
                          #'options' => \%recur_method,
                          'type' => 'select',
-                         'select_options' => \%recur_method,
+                         'select_options' => \%FS::part_pkg::recur_common::recur_method,
                        },
 
     'rating_method' => { 'name' => 'Rating method',
@@ -228,11 +223,32 @@ sub calc_setup {
   $self->option('setup_fee');
 }
 
-#false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
 sub calc_recur {
   my $self = shift;
   my($cust_pkg, $sdate, $details, $param ) = @_;
 
+  my $charges = 0;
+
+  $charges += $self->calc_usage(@_);
+  $charges += $self->calc_recur_Common(@_);
+
+  $charges;
+
+}
+
+sub calc_cancel {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
+  $self->calc_usage(@_);
+}
+
+#false laziness w/voip_sqlradacct calc_recur resolve it if that one ever gets used again
+
+sub calc_usage {
+  my $self = shift;
+  my($cust_pkg, $sdate, $details, $param ) = @_;
+
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
@@ -599,33 +615,6 @@ sub calc_recur {
 #
 #  } #if ( $spool_cdr && length($downstream_cdr) )
 
-  if ($param->{'increment_next_bill'}) {
-    my $recur_method = $self->option('recur_method', 1) || 'anniversary';
-                  
-    if ( $recur_method eq 'prorate' ) {
-
-      $charges += $self->SUPER::calc_recur(@_);
-
-    } else {
-
-      $charges += $self->option('recur_fee');
-
-      if ( $recur_method eq 'subscription' ) {
-
-        my $cutoff_day = $self->option('cutoff_day', 1) || 1;
-        my ($day, $mon, $year) = ( localtime($$sdate) )[ 3..5 ];
-
-        if ( $day < $cutoff_day ) {
-          if ( $mon == 0 ) { $mon=11; $year--; }
-          else { $mon--; }
-        }
-
-        $$sdate = timelocal(0, 0, 0, $cutoff_day, $mon, $year);
-
-      }#$recur_method eq 'subscription'
-    }#$recur_method eq 'prorate'
-  }#increment_next_bill
-
   $charges;
 }
 
-- 
cgit v1.2.1


From 1b8a2cc3b3697f3921e26a31691acfabacc1efd6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 22:26:38 +0000
Subject: commit pkgpart exclusion for billing run, RT#5495

---
 FS/FS/Cron/bill.pm    |  7 +++++++
 FS/FS/cust_main.pm    | 15 +++++++++++++--
 FS/bin/freeside-daily | 10 +++++++---
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 61b47355a..1feba7948 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -21,6 +21,7 @@ use FS::part_event_condition;
 #  -l: debugging level
 #  -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
 #  -r: Multi-process mode dry run option
+#  -g: Don't bill these pkgparts
 
 sub bill {
   my %opt = @_;
@@ -39,6 +40,9 @@ sub bill {
 
   $opt{'invoice_time'} = $opt{'n'} ? $^T : $opt{'time'};
 
+  my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
+                            : {};
+
   ###
   # get a list of custnums
   ###
@@ -74,6 +78,7 @@ sub bill {
                                  #(not, when using -m, freeside-queued)
           'check_freq'   => $check_freq,
           'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
+          'not_pkgpart'  => $not_pkgpart,
       );
 
       if ( $opt{'m'} ) {
@@ -152,6 +157,8 @@ sub bill_where {
   push @search, "cust_main.agentnum =  ". $opt{'a'}
     if $opt{'a'};
 
+  #it would be useful if i recognized $opt{g} / $not_pkgpart...
+
   if ( @ARGV ) {
     push @search, "( ".
       join(' OR ', map "cust_main.custnum = $_", @ARGV ).
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 1f063d950..2957579d7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2331,6 +2331,9 @@ Debugging level.  Default is 0 (no debugging), or can be set to 1 (passed-in opt
 
 =back
 
+Options are passed to the B<bill> and B<collect> methods verbatim, so all
+options of those methods are also available.
+
 =cut
 
 sub bill_and_collect {
@@ -2448,6 +2451,10 @@ An array ref of specific packages (objects) to attempt billing, instead trying a
 
  $cust_main->bill( pkg_list => [$pkg1, $pkg2] );
 
+=item not_pkgpart
+
+A hashref of pkgparts to exclude from this billing run.
+
 =item invoice_time
 
 Used in conjunction with the I<time> option, this option specifies the date of for the generated invoices.  Other calculations, such as whether or not to generate the invoice in the first place, are not affected.
@@ -2472,6 +2479,8 @@ sub bill {
   my $time = $options{'time'} || time;
   my $invoice_time = $options{'invoice_time'} || $time;
 
+  $options{'not_pkgpart'} ||= {};
+
   #put below somehow?
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -2497,8 +2506,10 @@ sub bill {
   my %taxlisthash;
   my @precommit_hooks = ();
 
-  $options{ pkg_list } ||= [ $self->ncancelled_pkgs ];  #param checks?
-  foreach my $cust_pkg ( @{ $options{ pkg_list } } ) {
+  $options{'pkg_list'} ||= [ $self->ncancelled_pkgs ];  #param checks?
+  foreach my $cust_pkg ( @{ $options{'pkg_list'} } ) {
+
+    next if $options{'not_pkgpart'}->{$cust_pkg->pkgpart};
 
     warn "  bill package ". $cust_pkg->pkgnum. "\n" if $DEBUG > 1;
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 271c436c6..119f93a59 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -7,7 +7,7 @@ use FS::Conf;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrk", \%opt);
+getopts("p:a:d:vl:sy:nmrkg:", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -31,8 +31,9 @@ unless ( $opt{k} ) {
   use FS::Cron::notify qw(notify_flat_delay);
   notify_flat_delay(%opt);
 
-  use FS::Cron::vacuum qw(vacuum);
-  vacuum();
+  #Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib
+  #use FS::Cron::vacuum qw(vacuum);
+  #vacuum();
 
 }
 
@@ -93,6 +94,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -a: Only process customers with the specified agentnum
 
+  -g: Don't process the provided pkgpart (or pkgparts, specified as a comma-
+      separated list).
+
   -s: re-charge setup fees
 
   -v: enable debugging
-- 
cgit v1.2.1


From d2a3168138e461ea99a72a062fedf380846eb0e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Jul 2009 23:33:50 +0000
Subject: remove unused cdr_upstream_rate

---
 FS/FS/cdr.pm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 152f1d680..373527498 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -13,7 +13,6 @@ use FS::Record qw( qsearch qsearchs );
 use FS::cdr_type;
 use FS::cdr_calltype;
 use FS::cdr_carrier;
-use FS::cdr_upstream_rate;
 
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker );
-- 
cgit v1.2.1


From 52d81f0b1f3bc092da71e7f5919d332c4fa012d5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 20 Jul 2009 04:51:34 +0000
Subject: one $conf is enough

---
 FS/FS/cust_pkg.pm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index f56402377..4d44692b3 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -647,7 +647,6 @@ sub cancel {
     # Add a credit for remaining service
     my $remaining_value = $self->calc_remain(time=>$cancel_time);
     if ( $remaining_value > 0 && !$options{'no_credit'} ) {
-      my $conf = new FS::Conf;
       my $error = $self->cust_main->credit(
         $remaining_value,
         'Credit for unused time on '. $self->part_pkg->pkg,
@@ -673,10 +672,8 @@ sub cancel {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   return '' if $date; #no errors
 
-  my $conf = new FS::Conf;
   my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ } $self->cust_main->invoicing_list;
   if ( !$options{'quiet'} && $conf->exists('emailcancel') && @invoicing_list ) {
-    my $conf = new FS::Conf;
     my $error = send_email(
       'from'    => $conf->config('invoice_from', $self->cust_main->agentnum),
       'to'      => \@invoicing_list,
-- 
cgit v1.2.1


From 87a986f35b347affed5f1e1ff5c5c7c59ccd4ad1 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 20 Jul 2009 14:26:12 +0000
Subject: bundle bill linked packages into top line total when desired #5724

---
 FS/FS/Schema.pm        | 14 +++++---
 FS/FS/cust_bill.pm     | 93 +++++++++++++++++++++++++++++++++++++++-----------
 FS/FS/cust_bill_pkg.pm |  3 ++
 FS/FS/cust_main.pm     | 34 ++++++++++++------
 FS/FS/part_pkg.pm      | 26 +++++++++-----
 FS/FS/part_pkg_link.pm |  8 ++++-
 6 files changed, 134 insertions(+), 44 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 8b5318421..419e9ac20 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -518,6 +518,7 @@ sub tables_hashref {
         'quantity',             'int', 'NULL',      '', '', '',
         'unitsetup',           @money_typen,            '', '', 
         'unitrecur',           @money_typen,            '', '', 
+        'hidden',              'char', 'NULL',       1, '', '',
       ],
       'primary_key' => 'billpkgnum',
       'unique' => [],
@@ -1240,15 +1241,18 @@ sub tables_hashref {
 
     'part_pkg_link' => {
       'columns' => [
-        'pkglinknum',  'serial',  '',      '', '', '',
-        'src_pkgpart', 'int',     '',      '', '', '',
-        'dst_pkgpart', 'int',     '',      '', '', '', 
-        'link_type',   'varchar', '', $char_d, '', '',
+        'pkglinknum',  'serial',   '',      '', '', '',
+        'src_pkgpart', 'int',      '',      '', '', '',
+        'dst_pkgpart', 'int',      '',      '', '', '', 
+        'link_type',   'varchar',  '', $char_d, '', '',
+        'hidden',      'char', 'NULL',       1, '', '',
       ],
       'primary_key' => 'pkglinknum',
-      'unique' => [ [ 'src_pkgpart', 'dst_pkgpart', 'link_type' ] ],
+      'unique' => [ [ 'src_pkgpart', 'dst_pkgpart', 'link_type', 'hidden' ] ],
       'index'  => [ [ 'src_pkgpart' ] ],
     },
+    # XXX somewhat borked unique: we don't really want a hidden and unhidden
+    # it turns out we'd prefer to use svc, bill, and invisibill (or something)
 
     'part_pkg_taxclass' => {
       'columns' => [
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 17b88c540..ac0280842 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2793,8 +2793,19 @@ sub _items_cust_bill_pkg {
   my $section = $opt{section}->{description} if $opt{section};
 
   my @b = ();
+  my ($s, $r, $u) = ( undef, undef, undef );
   foreach my $cust_bill_pkg ( @$cust_bill_pkg )
   {
+
+    foreach ( $s, $r, $u ) {
+      if ( $_ && !$cust_bill_pkg->hidden ) {
+        $_->{amount}      = sprintf( "%.2f", $_->{amount} ),
+        $_->{unit_amount} = sprintf( "%.2f", $_->{unit_amount} ),
+        push @b, { %$_ };
+        $_ = undef;
+      }
+    }
+
     foreach my $display ( grep { defined($section)
                                  ? $_->section eq $section
                                  : 1
@@ -2826,18 +2837,25 @@ sub _items_cust_bill_pkg {
           my @d = ();
           push @d, map &{$escape_function}($_),
                        $cust_pkg->h_labels_short($self->_date)
-            unless $cust_pkg->part_pkg->hide_svc_detail;
+            unless $cust_pkg->part_pkg->hide_svc_detail
+                || $cust_bill_pkg->hidden;
           push @d, $cust_bill_pkg->details(%details_opt)
             if $cust_bill_pkg->recur == 0;
 
-          push @b, {
-            description     => $description,
-            #pkgpart         => $part_pkg->pkgpart,
-            pkgnum          => $cust_bill_pkg->pkgnum,
-            amount          => sprintf("%.2f", $cust_bill_pkg->setup),
-            unit_amount     => sprintf("%.2f", $cust_bill_pkg->unitsetup),
-            quantity        => $cust_bill_pkg->quantity,
-            ext_description => \@d,
+          if ( $cust_bill_pkg->hidden ) {
+            $s->{amount}      += $cust_bill_pkg->setup;
+            $s->{unit_amount} += $cust_bill_pkg->unitsetup;
+            push @{ $s->{ext_description} }, @d;
+          } else {
+            $s = {
+              description     => $description,
+              #pkgpart         => $part_pkg->pkgpart,
+              pkgnum          => $cust_bill_pkg->pkgnum,
+              amount          => $cust_bill_pkg->setup,
+              unit_amount     => $cust_bill_pkg->unitsetup,
+              quantity        => $cust_bill_pkg->quantity,
+              ext_description => \@d,
+            };
           };
 
         }
@@ -2869,6 +2887,7 @@ sub _items_cust_bill_pkg {
                                                  #$cust_bill_pkg->sdate)
             unless $cust_pkg->part_pkg->hide_svc_detail
                 || $cust_bill_pkg->itemdesc
+                || $cust_bill_pkg->hidden
                 || $is_summary;
 
           push @d, $cust_bill_pkg->details(%details_opt)
@@ -2883,17 +2902,45 @@ sub _items_cust_bill_pkg {
             $amount = $cust_bill_pkg->usage;
           }
   
-          push @b, {
-            description     => $description,
-            #pkgpart         => $part_pkg->pkgpart,
-            pkgnum          => $cust_bill_pkg->pkgnum,
-            amount          => sprintf("%.2f", $amount),
-            unit_amount     => sprintf("%.2f", $cust_bill_pkg->unitrecur),
-            quantity        => $cust_bill_pkg->quantity,
-            ext_description => \@d,
-          } unless ( $type eq 'U' && ! $amount );
+          if ( !$type || $type eq 'R' ) {
+
+            if ( $cust_bill_pkg->hidden ) {
+              $r->{amount}      += $amount;
+              $r->{unit_amount} += $cust_bill_pkg->unitrecur;
+              push @{ $r->{ext_description} }, @d;
+            } else {
+              $r = {
+                description     => $description,
+                #pkgpart         => $part_pkg->pkgpart,
+                pkgnum          => $cust_bill_pkg->pkgnum,
+                amount          => $amount,
+                unit_amount     => $cust_bill_pkg->unitrecur,
+                quantity        => $cust_bill_pkg->quantity,
+                ext_description => \@d,
+              };
+            }
+
+          } elsif ( $amount ) {  # && $type eq 'U'
+
+            if ( $cust_bill_pkg->hidden ) {
+              $u->{amount}      += $amount;
+              $u->{unit_amount} += $cust_bill_pkg->unitrecur;
+              push @{ $u->{ext_description} }, @d;
+            } else {
+              $u = {
+                description     => $description,
+                #pkgpart         => $part_pkg->pkgpart,
+                pkgnum          => $cust_bill_pkg->pkgnum,
+                amount          => $amount,
+                unit_amount     => $cust_bill_pkg->unitrecur,
+                quantity        => $cust_bill_pkg->quantity,
+                ext_description => \@d,
+              };
+            }
 
-        }
+          }
+
+        } # recurring or usage with recurring charge
 
       } else { #pkgnum tax or one-shot line item (??)
 
@@ -2918,6 +2965,14 @@ sub _items_cust_bill_pkg {
 
   }
 
+  foreach ( $s, $r, $u ) {
+    if ( $_ ) {
+      $_->{amount}      = sprintf( "%.2f", $_->{amount} ),
+      $_->{unit_amount} = sprintf( "%.2f", $_->{unit_amount} ),
+      push @b, { %$_ };
+    }
+  }
+
   @b;
 
 }
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index fbc67c542..abf021845 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -63,6 +63,8 @@ supported:
 
 =item unitrecur - If not set, defaults to recur
 
+=item hidden - If set to Y, indicates data should not appear as separate line item on invoice
+
 =back
 
 sdate and edate are specified as UNIX timestamps; see L<perlfunc/"time">.  Also
@@ -236,6 +238,7 @@ sub check {
       || $self->ut_numbern('edate')
       || $self->ut_textn('itemdesc')
       || $self->ut_textn('itemcomment')
+      || $self->ut_enum('hidden', [ '', 'Y' ])
   ;
   return $error if $error;
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2957579d7..9d41c4bdf 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2535,6 +2535,7 @@ sub bill {
                             'recur'               => \$total_recur,
                             'tax_matrix'          => \%taxlisthash,
                             'time'                => $time,
+                            'real_pkgpart'        => $real_pkgpart,
                             'options'             => \%options,
                           );
       if ($error) {
@@ -2566,6 +2567,7 @@ sub bill {
 
     } elsif ( $postal_pkg ) {
 
+      my $real_pkgpart = $postal_pkg->pkgpart;
       foreach my $part_pkg ( $postal_pkg->part_pkg->self_and_bill_linked ) {
         my %postal_options = %options;
         delete $postal_options{cancel};
@@ -2578,6 +2580,7 @@ sub bill {
                               'recur'               => \$total_recur,
                               'tax_matrix'          => \%taxlisthash,
                               'time'                => $time,
+                              'real_pkgpart'        => $real_pkgpart,
                               'options'             => \%postal_options,
                             );
         if ($error) {
@@ -2790,7 +2793,7 @@ sub _make_lines {
   my (%options) = %{$params{options}};
 
   my $dbh = dbh;
-  my $real_pkgpart = $cust_pkg->pkgpart;
+  my $real_pkgpart = $params{real_pkgpart};
   my %hash = $cust_pkg->hash;
   my $old_cust_pkg = new FS::cust_pkg \%hash;
 
@@ -2958,6 +2961,7 @@ sub _make_lines {
         'unitrecur' => $unitrecur,
         'quantity'  => $cust_pkg->quantity,
         'details'   => \@details,
+        'hidden'    => $part_pkg->hidden,
       };
 
       if ( $part_pkg->option('recur_temporality', 1) eq 'preceding' ) {
@@ -2981,7 +2985,7 @@ sub _make_lines {
       ###
 
       my $error = 
-        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time});
+        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time}, $real_pkgpart);
       return $error if $error;
 
       push @$cust_bill_pkgs, $cust_bill_pkg;
@@ -3001,6 +3005,7 @@ sub _handle_taxes {
   my $cust_bill_pkg = shift;
   my $cust_pkg = shift;
   my $invoice_time = shift;
+  my $real_pkgpart = shift;
 
   my %cust_bill_pkg = ();
   my %taxes = ();
@@ -3091,20 +3096,29 @@ sub _handle_taxes {
   }
  
   my @display = ();
-  if ( $conf->exists('separate_usage') ) {
+  if ( $conf->exists('separate_usage') || $cust_bill_pkg->hidden ) {
+
+    my $temp_pkg = new FS::cust_pkg { pkgpart => $real_pkgpart };
+    my %hash = $cust_bill_pkg->hidden  # maybe for all bill linked?
+               ? (  'section' => $temp_pkg->part_pkg->categoryname )
+               : ();
+
     my $section = $cust_pkg->part_pkg->option('usage_section', 'Hush!');
     my $summary = $cust_pkg->part_pkg->option('summarize_usage', 'Hush!');
-    push @display, new FS::cust_bill_pkg_display { type    => 'S' };
-    push @display, new FS::cust_bill_pkg_display { type    => 'R' };
-    push @display, new FS::cust_bill_pkg_display { type    => 'U',
-                                                   section => $section
-                                                 };
+    push @display, new FS::cust_bill_pkg_display { type => 'S', %hash };
+    push @display, new FS::cust_bill_pkg_display { type => 'R', %hash };
+
     if ($section && $summary) {
-      $display[2]->post_total('Y');
       push @display, new FS::cust_bill_pkg_display { type    => 'U',
                                                      summary => 'Y',
-                                                   }
+                                                     %hash,
+                                                   };
+      $hash{post_total} = 'Y';
     }
+
+    $hash{section} = $section if $conf->exists('separate_usage');
+    push @display, new FS::cust_bill_pkg_display { type => 'U', %hash };
+
   }
   $cust_bill_pkg->set('display', \@display);
 
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index ba80475eb..3ee9e7f01 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -917,10 +917,12 @@ sub svc_part_pkg_link {
 
 sub _part_pkg_link {
   my( $self, $type ) = @_;
-  qsearch('part_pkg_link', { 'src_pkgpart' => $self->pkgpart,
-                             'link_type'   => $type,
-                           }
-         );
+  qsearch({ table    => 'part_pkg_link',
+            hashref  => { 'src_pkgpart' => $self->pkgpart,
+                          'link_type'   => $type,
+                        },
+            order_by => "ORDER BY hidden",
+         });
 }
 
 sub self_and_bill_linked {
@@ -928,12 +930,18 @@ sub self_and_bill_linked {
 }
 
 sub _self_and_linked {
-  my( $self, $type ) = @_;
+  my( $self, $type, $hidden ) = @_;
+  $hidden ||= '';
+
+  my @result = ();
+  foreach ( ( $self, map { $_->dst_pkg->_self_and_linked($type, $_->hidden) }
+                     $self->_part_pkg_link($type) ) )
+  {
+    $_->hidden($hidden) if $hidden;
+    push @result, $_;
+  }
 
-  ( $self,
-    map { $_->dst_pkg->_self_and_linked($type) }
-        $self->_part_pkg_link($type)
-  );
+  (@result);
 }
 
 =item part_pkg_taxoverride [ CLASS ]
diff --git a/FS/FS/part_pkg_link.pm b/FS/FS/part_pkg_link.pm
index f51736055..fb7a8d387 100644
--- a/FS/FS/part_pkg_link.pm
+++ b/FS/FS/part_pkg_link.pm
@@ -51,6 +51,11 @@ Destination package (see L<FS::part_pkg>)
 Link type - currently, "bill" (source package bills a line item from target
 package), or "svc" (source package includes services from target package).
 
+=item hidden
+
+Flag indicating that this subpackage should be felt, but not seen as an invoice
+line item when set to 'Y'
+
 =back
 
 =head1 METHODS
@@ -114,7 +119,8 @@ sub check {
     $self->ut_numbern('pkglinknum')
     || $self->ut_foreign_key('src_pkgpart', 'part_pkg', 'pkgpart')
     || $self->ut_foreign_key('dst_pkgpart', 'part_pkg', 'pkgpart')
-    || $self->ut_text('link_type', [ 'bill', 'svc' ] )
+    || $self->ut_enum('link_type', [ 'bill', 'svc' ] )
+    || $self->ut_enum('hidden', [ '', 'Y' ] )
   ;
   return $error if $error;
 
-- 
cgit v1.2.1


From 5bc86917c4ce4451c124680f125bea72799f35b8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 20 Jul 2009 23:01:12 +0000
Subject: config setting to have emailed invoices include call details #5275

---
 FS/FS/Conf.pm      |  7 +++++++
 FS/FS/cust_bill.pm | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1d937b781..8ae926e6b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2097,6 +2097,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'voip-cdr_email',
+    'section'     => '',
+    'description' => 'Include the call details on emailed invoices even if the customer is configured for not printing them on the invoices.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_forward-arbitrary_dst',
     'section'     => '',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index ac0280842..9937bc76d 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -605,6 +605,8 @@ sub generate_email {
     'subject'   => (($args{'subject'}) ? $args{'subject'} : 'Invoice'),
   );
 
+  my %cdrs = ( 'unsquelch_cdr' => $conf->exists('voip-cdr_email') );
+
   if (ref($args{'to'}) eq 'ARRAY') {
     $return{'to'} = $args{'to'};
   } else {
@@ -643,7 +645,7 @@ sub generate_email {
       if ( ref($args{'print_text'}) eq 'ARRAY' ) {
         $data = $args{'print_text'};
       } else {
-        $data = [ $self->print_text('', $args{'template'}) ];
+        $data = [ $self->print_text('', $args{'template'}, %cdrs) ];
       }
 
     }
@@ -690,7 +692,11 @@ sub generate_email {
                          '    </title>',
                          '  </head>',
                          '  <body bgcolor="#e8e8e8">',
-                         $self->print_html('', $args{'template'}, $content_id),
+                         $self->print_html({ time          => '',
+                                             template      => $args{'template'},
+                                             cid           => $content_id,
+                                             %cdrs,
+                                          }),
                          '  </body>',
                          '</html>',
                        ],
@@ -723,7 +729,7 @@ sub generate_email {
 
       $related->add_part($image);
 
-      my $pdf = build MIME::Entity $self->mimebuild_pdf('', $args{'template'});
+      my $pdf = build MIME::Entity $self->mimebuild_pdf('', $args{'template'}, %cdrs);
 
       $return{'mimeparts'} = [ $related, $pdf ];
 
@@ -751,7 +757,7 @@ sub generate_email {
 
       #mime parts arguments a la MIME::Entity->build().
       $return{'mimeparts'} = [
-        { $self->mimebuild_pdf('', $args{'template'}) }
+        { $self->mimebuild_pdf('', $args{'template'}, %cdrs) }
       ];
     }
   
@@ -771,7 +777,7 @@ sub generate_email {
       if ( ref($args{'print_text'}) eq 'ARRAY' ) {
         $return{'body'} = $args{'print_text'};
       } else {
-        $return{'body'} = [ $self->print_text('', $args{'template'}) ];
+        $return{'body'} = [ $self->print_text('', $args{'template'}, %cdrs) ];
       }
 
     }
@@ -1611,11 +1617,12 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 =cut
 
 sub print_text {
-  my( $self, $today, $template ) = @_;
+  my( $self, $today, $template, %opt ) = @_;
 
   my %params = ( 'format' => 'template' );
   $params{'time'} = $today if $today;
   $params{'template'} = $template if $template;
+  $params{'unsquelch_cdr'} = $opt{'unsquelch_cdr'} if $opt{'unsquelch_cdr'};
 
   $self->print_generic( %params );
 }
@@ -1636,11 +1643,12 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 =cut
 
 sub print_latex {
-  my( $self, $today, $template ) = @_;
+  my( $self, $today, $template, %opt ) = @_;
 
   my %params = ( 'format' => 'latex' );
   $params{'time'} = $today if $today;
   $params{'template'} = $template if $template;
+  $params{'unsquelch_cdr'} = $opt{'unsquelch_cdr'} if $opt{'unsquelch_cdr'};
 
   $template ||= $self->_agent_template;
 
-- 
cgit v1.2.1


From 458906d72c4c6360dd478fd1169db4dc41d1bfa3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Jul 2009 00:20:23 +0000
Subject: don't have a money type in package definitions at the moment

---
 FS/FS/part_pkg/voip_cdr.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 5a43403f7..4529a987e 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -83,7 +83,7 @@ tie my %temporalities, 'Tie::IxHash',
                    },
 
     'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
-                      'type' => 'money',
+                      'type' => 'text',
                     },
 
     'ignore_unrateable' => { 'name' => 'Ignore calls without a rate in the rate tables.  By default, the system will throw a fatal error upon encountering unrateable calls.',
-- 
cgit v1.2.1


From 35e0bcdf5d574b2b30796159617b845255d528ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Jul 2009 05:27:12 +0000
Subject: if we're going to do recur_Common, have to use and @ISA (and
 capitalize) it

---
 FS/FS/part_pkg/voip_cdr.pm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 4529a987e..3006eaa56 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -4,17 +4,16 @@ use strict;
 use vars qw(@ISA $DEBUG %info);
 use Date::Format;
 use Tie::IxHash;
-use Time::Local;
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
-use FS::part_pkg::flat;
+use FS::part_pkg::recur_Common;
 use FS::cdr;
 use FS::rate;
 use FS::rate_prefix;
 use FS::rate_detail;
 use FS::part_pkg::recur_Common;
 
-@ISA = qw(FS::part_pkg::prorate);
+@ISA = qw(FS::part_pkg::recur_Common);
 
 $DEBUG = 0;
 
@@ -67,7 +66,7 @@ tie my %temporalities, 'Tie::IxHash',
                          #'type' => 'radio',
                          #'options' => \%recur_method,
                          'type' => 'select',
-                         'select_options' => \%FS::part_pkg::recur_common::recur_method,
+                         'select_options' => \%FS::part_pkg::recur_Common::recur_method,
                        },
 
     'rating_method' => { 'name' => 'Rating method',
@@ -151,6 +150,7 @@ tie my %temporalities, 'Tie::IxHash',
     '411_rewrite' => { 'name' => 'Rewrite these (comma-separated) destination numbers to 411 for rating purposes (also ignore any carrierid check): ',
                       },
 
+    #false laziness w/cdr_termination.pm
     'output_format' => { 'name' => 'CDR invoice display format',
                          'type' => 'select',
                          'select_options' => { FS::cdr::invoice_formats() },
@@ -163,6 +163,7 @@ tie my %temporalities, 'Tie::IxHash',
     'summarize_usage' => { 'name' => 'Include usage summary with recurring charges when usage is in separate section',
                           'type' => 'checkbox',
                         },
+    #eofalse
 
     'bill_every_call' => { 'name' => 'Generate an invoice immediately for every call.  Useful for prepaid.',
                            'type' => 'checkbox',
@@ -683,11 +684,6 @@ sub is_free {
   0;
 }
 
-sub base_recur {
-  my($self, $cust_pkg) = @_;
-  $self->option('recur_fee');
-}
-
 #  This equates svc_phone records; perhaps svc_phone should have a field
 #  to indicate it represents a line
 sub calc_units {    
-- 
cgit v1.2.1


From 8de398042315381f8db2a62475e95d391ca0a24f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Jul 2009 05:29:41 +0000
Subject: and fix min_charge option, RT#5495

---
 FS/FS/part_pkg/voip_cdr.pm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 3006eaa56..11ff76be4 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -82,7 +82,6 @@ tie my %temporalities, 'Tie::IxHash',
                    },
 
     'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
-                      'type' => 'text',
                     },
 
     'ignore_unrateable' => { 'name' => 'Ignore calls without a rate in the rate tables.  By default, the system will throw a fatal error upon encountering unrateable calls.',
-- 
cgit v1.2.1


From 48214eb5dfdaf96e35a60959d9c227c699a2a3d3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Jul 2009 07:03:11 +0000
Subject: yow.  fix spurious charge errors w/single_price, round to four
 decimal places (wtf?) instead of 2, RT#5495

---
 FS/FS/part_pkg/voip_cdr.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 11ff76be4..4f05963ef 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -475,10 +475,12 @@ sub calc_usage {
         my $minutes = sprintf("%.1f", $seconds / 60);
         $minutes =~ s/\.0$// ;# if $granularity == 60;
 
-        $charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
-                                  + 0.00000001 ); #so 1.005 rounds to 1.01
+        # XXX config?
+        #$charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
+                                  #+ 0.00000001 ); #so 1.005 rounds to 1.01
+        $charge = sprintf('%.4f', ( $self->option('min_charge') * $minutes )
+                                  + 0.0000000001 ); #so 1.00005 rounds to 1.0001
 
-        $charge =  
         $charges += $charge;
 
         @call_details = ($cdr->downstream_csv( 'format' => $output_format,
-- 
cgit v1.2.1


From 6a7c4ac2fafc9d722c3ee4c5b75f1f8ca83b6c1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 21 Jul 2009 18:44:57 +0000
Subject: sub-penny termination pricing too, RT#5495

---
 FS/FS/Schema.pm                   | 12 ++++++------
 FS/FS/part_pkg/cdr_termination.pm |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 419e9ac20..b2f590aec 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2112,7 +2112,7 @@ sub tables_hashref {
 
         # how it was rated internally...
         'ratedetailnum',           'int', 'NULL',      '', '', '',
-        'rated_price',         'decimal', 'NULL',  '10,2', '', '',
+        'rated_price',         'decimal', 'NULL',  '10,4', '', '',
 
         'distance',            'decimal', 'NULL',      '', '', '',
         'islocal',                 'int', 'NULL',      '', '', '', # '',  '', 0, '' instead?
@@ -2156,11 +2156,11 @@ sub tables_hashref {
 
     'cdr_termination' => {
       'columns' => [
-        'cdrtermnum', 'bigserial', '',   '', '', '',
-        'acctid',        'bigint', '',   '', '', '', 
-        'termpart',         'int', '',   '', '', '',#future expansion, see below
-        'rated_price',  @money_typen,        '', '',
-        'status',     'varchar', 'NULL', 32, '', '',
+        'cdrtermnum', 'bigserial',     '',      '', '', '',
+        'acctid',        'bigint',     '',      '', '', '', 
+        'termpart',         'int',     '',      '', '', '',#future use see below
+        'rated_price',  'decimal', 'NULL',  '10,4', '', '',
+        'status',       'varchar', 'NULL',      32, '', '',
       ],
       'primary_key' => 'cdrtermnum',
       'unique'      => [ [ 'acctid', 'termpart' ] ],
diff --git a/FS/FS/part_pkg/cdr_termination.pm b/FS/FS/part_pkg/cdr_termination.pm
index a07384655..d99903d77 100644
--- a/FS/FS/part_pkg/cdr_termination.pm
+++ b/FS/FS/part_pkg/cdr_termination.pm
@@ -164,7 +164,9 @@ sub calc_recur {
 
     #add a cdr_termination record and the charges
 
-    my $term_price = sprintf('%.2f', $cdr->rated_price * $term_percent / 100 );
+    # XXX config?
+    #my $term_price = sprintf('%.2f', $cdr->rated_price * $term_percent / 100 );
+    my $term_price = sprintf('%.4f', $cdr->rated_price * $term_percent / 100 );
 
     my $cdr_termination = new FS::cdr_termination {
       'acctid'      => $cdr->acctid,
-- 
cgit v1.2.1


From cfaf9fea2cfb5cf14ad5f835e89fc2a34cc460de Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Jul 2009 06:58:08 +0000
Subject: need to see who is still on deb 4 & pg 7.4

---
 FS/FS/Tron.pm | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Tron.pm b/FS/FS/Tron.pm
index 26ab639ed..78af0fe33 100644
--- a/FS/FS/Tron.pm
+++ b/FS/FS/Tron.pm
@@ -9,34 +9,56 @@ use FS::Record qw( qsearchs );
 use FS::svc_external;
 use FS::cust_svc_option;
 
-our @EXPORT_OK = qw( tron_scan tron_lint);
+our @EXPORT_OK = qw( tron_ping tron_scan tron_lint);
 
 our %desired = (
-  #lenient for now, so we can fix up important stuff
+  #less lenient, we need to make sure we upgrade deb 4 & pg 7.4 
   'freeside_version' => qr/^1\.(7\.3|9\.0)/,
-  'debian_version'   => qr/^4/,
+  'debian_version'   => qr/^5/, #qr/^5.0.[2-9]$/ #qr/^4/,
   'apache_mpm'       => qw/^(Prefork|$)/,
+  'pg_version'       => qr/^8\.[1-9]/,
+  'apache_version'   => qr/^2/,
 
   #payment gateway survey
 #  'payment_gateway'  => qw/^authorizenet$/,
 
   #stuff to add/replace later
-  #'pg_version'       => qr/^8\.[1-9]/,
-  #'apache_version'   => qr/^2/,
   #'apache_mpm'       => qw/^Prefork/,
+  #'pg_version'       => qr/^8\.[3-9]/,
 );
 
-sub tron_scan {
-  my $cust_svc = shift;
+sub _cust_svc_external {
+  my $cust_svc_or_svcnum = shift;
 
-  my $svc_external;
-  if ( ref($cust_svc) ) {
+  my ( $cust_svc, $svc_external );
+  if ( ref($cust_svc_or_svcnum) ) {
+    $cust_svc = $cust_svc_or_svcnum;
     $svc_external = $cust_svc->svc_x;
   } else {
-    $svc_external = qsearchs('svc_external', { 'svcnum' => $cust_svc } );
+    $svc_external = qsearchs('svc_external', { svcnum=>$cust_svc_or_svcnum } );
     $cust_svc = $svc_external->cust_svc;
   }
 
+  ( $cust_svc, $svc_external );
+
+}
+
+sub tron_ping {
+  my( $cust_svc, $svc_external ) = _cust_svc_external(shift);
+
+  my %hash = ();
+  my $machine = $svc_external->title; # or better as a cust_svc_option??
+  sshopen2($machine, *READER, *WRITER, '/bin/echo pong');
+  my $pong = scalar(<READER>);
+  close READER;
+  close WRITER;
+  
+  $pong =~ /pong/;
+}
+
+sub tron_scan {
+  my( $cust_svc, $svc_external ) = _cust_svc_external(shift);
+
   #don't scan again if things are okay
   my $bad = 0;
   foreach my $option ( keys %desired ) {
@@ -48,7 +70,9 @@ sub tron_scan {
   #do the scan
   my %hash = ();
   my $machine = $svc_external->title; # or better as a cust_svc_option??
-  sshopen2($machine, *READER, *WRITER, '/usr/local/bin/freeside-yori all');
+  #sshopen2($machine, *READER, *WRITER, '/usr/local/bin/freeside-yori all');
+  #fix freeside users' patch if necessary, since packages put this in /usr/bin
+  sshopen2($machine, *READER, *WRITER, 'freeside-yori all');
   while (<READER>) {
     chomp;
     my($option, $value) = split(/: ?/);
-- 
cgit v1.2.1


From 6fcc07e1f7e5ef310413967b9eb32f57e30c60ae Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Jul 2009 19:40:28 +0000
Subject: fix -r option, RT#5675

---
 FS/bin/freeside-void-payments | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-void-payments b/FS/bin/freeside-void-payments
index 18fed05a7..b6869a342 100755
--- a/FS/bin/freeside-void-payments
+++ b/FS/bin/freeside-void-payments
@@ -14,7 +14,7 @@ use Date::Parse 'str2time';
 use Date::Format 'time2str';
 
 my %opt;
-getopts("f:ca:g:s:e:", \%opt);
+getopts("r:f:ca:g:s:e:", \%opt);
 
 $user = shift or die &usage;
 &adminsuidsetup( $user );
-- 
cgit v1.2.1


From 0580d615b6339dc2e3cba1700d689074aca7d78d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 23 Jul 2009 19:46:05 +0000
Subject: avoid harmless warning: Use of uninitialized value in string ne

---
 FS/FS/cust_pay.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 201b427aa..4ff291934 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -345,7 +345,8 @@ sub delete {
     return $error;
   }
 
-  if ( $conf->config('deletepayments') ne '' ) {
+  if (    $conf->exists('deletepayments')
+       && $conf->config('deletepayments') ne '' ) {
 
     my $cust_main = $self->cust_main;
 
-- 
cgit v1.2.1


From 68f56930178c09ee08d2ab4045298d0cb1757ce8 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 24 Jul 2009 05:51:19 +0000
Subject: Add -v switch (verbose) to freeside-void-payments

---
 FS/bin/freeside-void-payments | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-void-payments b/FS/bin/freeside-void-payments
index b6869a342..9aa04d671 100755
--- a/FS/bin/freeside-void-payments
+++ b/FS/bin/freeside-void-payments
@@ -8,13 +8,14 @@ use FS::Record qw(qsearchs);
 use FS::Conf;
 use FS::cust_main;
 use FS::cust_pay;
+use FS::cust_pay_void;
 use Business::OnlinePayment; # For retrieving the void list only.
 use Time::Local;
 use Date::Parse 'str2time';
 use Date::Format 'time2str';
 
 my %opt;
-getopts("r:f:ca:g:s:e:", \%opt);
+getopts("r:f:ca:g:s:e:vn", \%opt);
 
 $user = shift or die &usage;
 &adminsuidsetup( $user );
@@ -80,20 +81,41 @@ else {
 }
 
 $opt{'r'} ||= 'freeside-void-payments';
-
+my $success = 0;
+my $notfound = 0;
+print "Voiding ".scalar(@auths)." transactions:\n" if $opt{'v'};
 foreach my $authnum (@auths) {
   my $paybatch = $gatewaynum . $processor . ':' . $authnum;
   my $cust_pay = qsearchs('cust_pay', { paybatch => $paybatch } );
+  my $error;
   if($cust_pay) {
-    $cust_pay->void($opt{'r'});
+    $error = $cust_pay->void($opt{'r'});
+    $success++ if not $error;
   }
   else {
-    warn "cust_pay record not found: '$paybatch'";
+    my $cpv = qsearchs('cust_pay_void', { paybatch => $paybatch });
+    if($cpv) {
+      $error = 'already voided '.time2str('%Y-%m-%d', $cpv->void_date) . 
+        ' by ' . $cpv->otaker;
+    }
+    else {
+      $error = 'not found';
+      $notfound++;
+    }
+  }
+  if($opt{'v'}) {
+    print $authnum;
+    print "\t($error)" if $error; 
+    print "\n";
   }
 }
 
+if($opt{'v'}) {
+  print scalar(@auths)." transactions: $success voided, $notfound not found\n";
+}
+
 sub usage {
-    die "Usage:\n\n  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] user\n";
+    die "Usage:\n\n  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] [ -v ] [ -n ]user\n";
 }
 
 __END__
@@ -106,7 +128,7 @@ freeside-void-payments - Automatically void a list of returned payments.
 
 =head1 SYNOPSIS
 
-  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] user
+  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] [ -v ] [ -n ] user
 
 =head1 DESCRIPTION
 
@@ -145,6 +167,8 @@ generally how the processor will identify them later.
   -c: Use the default gateway for check transactions rather than 
       credit cards.
 
+  -v: Be verbose.
+
 A warning will be emitted for each transaction that can't be found.  
 This may happen if it's already been voided, or if the gateway 
 doesn't match.
-- 
cgit v1.2.1


From f0edb7c4423b58ad3659e0069f1f69b2e9b11021 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 24 Jul 2009 09:38:15 +0000
Subject: add handling of ChilliSpot (and CoovaChilli) Max attributes,
 specifically ChilliSpot-Max-{Input,Output,Total}-{Octets,Gigawords}, RT#5815

---
 FS/FS/Conf.pm     |  8 ++++++++
 FS/FS/svc_acct.pm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8ae926e6b..832322faf 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1664,6 +1664,14 @@ worry that config_items is freeside-specific and icky.
     'select_enum' => [ 'Framed-IP-Address', 'Framed-Address' ],
   },
 
+  #http://dev.coova.org/svn/coova-chilli/doc/dictionary.chillispot
+  {
+    'key'         => 'radius-chillispot-max',
+    'section'     => '',
+    'description' => 'Enable ChilliSpot (and CoovaChilli) Max attributes, specifically ChilliSpot-Max-{Input,Output,Total}-{Octets,Gigawords}.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_acct-alldomains',
     'section'     => '',
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 4669588d5..6f61eae0e 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -15,6 +15,7 @@ use vars qw( @ISA $DEBUG $me $conf $skip_fuzzyfiles
              $dirhash
              @saltset @pw_set );
 use Scalar::Util qw( blessed );
+use Math::BigInt;
 use Carp;
 use Fcntl qw(:flock);
 use Date::Format;
@@ -1440,6 +1441,28 @@ sub radius_reply {
     $reply{'Session-Timeout'} = $self->seconds;
   }
 
+  if ( $conf->exists('radius-chillispot-max') ) {
+    #http://dev.coova.org/svn/coova-chilli/doc/dictionary.chillispot
+
+    #hmm.  just because sqlradius.pm says so?
+    my %whatis = (
+      'input'  => 'up',
+      'output' => 'down',
+      'total'  => 'total',
+    );
+
+    foreach my $what (qw( input output total )) {
+      my $is = $whatis{$what}.'bytes';
+      if ( $self->$is() =~ /\d/ ) {
+        my $big = new Math::BigInt $self->$is();
+        my $att = "Chillispot-Max-\u$what";
+        $reply{"$att-Octets"}    = $big->copy->band(0xffffffff)->bstr;
+        $reply{"$att-Gigawords"} = $big->copy->brsft(32)->bstr;
+      }
+    }
+
+  }
+
   %reply;
 }
 
@@ -1772,6 +1795,16 @@ sub _op_usage {
   die "Can't update $column for svcnum". $self->svcnum
     if $rv == 0;
 
+  #$self->snapshot; #not necessary, we retain the old values
+  #create an object with the updated usage values
+  my $new = qsearchs('svc_acct', { 'svcnum' => $self->svcnum });
+  #call exports
+  my $error = $new->replace($self);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Error replacing: $error";
+  }
+
   #overlimit_action eq 'cancel' handling
   my $cust_pkg = $self->cust_svc->cust_pkg;
   if ( $cust_pkg
@@ -1925,6 +1958,16 @@ sub set_usage {
       if $rv == 0;
   }
 
+  #$self->snapshot; #not necessary, we retain the old values
+  #create an object with the updated usage values
+  my $new = qsearchs('svc_acct', { 'svcnum' => $self->svcnum });
+  #call exports
+  my $error = $new->replace($self);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Error replacing: $error";
+  }
+
   if ( $reset ) {
     my $error;
 
@@ -2706,6 +2749,8 @@ probably live somewhere else...
 insertion of RADIUS group stuff in insert could be done with child_objects now
 (would probably clean up export of them too)
 
+_op_usage and set_usage bypass the history... maybe they shouldn't
+
 =head1 SEE ALSO
 
 L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
-- 
cgit v1.2.1


From a1937e6377a16bd90f345b77a1cab3ebfbe1a2b1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Jul 2009 07:57:14 +0000
Subject: teach Record.pm about BYTEA handling in order to store files in the
 db, RT#4964

---
 FS/FS/Record.pm | 81 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 24 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index be29b5c8a..9e1c0e890 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -54,6 +54,12 @@ FS::UID->install_callback( sub {
   $conf = FS::Conf->new; 
   $conf_encryption = $conf->exists('encryption');
   $File::CounterFile::DEFAULT_DIR = $conf->base_dir . "/counters.". datasrc;
+  if ( driver_name eq 'Pg' ) {
+    eval "use DBD::Pg qw(:pg_types);";
+    die $@ if $@;
+  } else {
+    eval "sub PG_BYTEA { die 'guru meditation #9: calling PG_BYTEA when not running Pg?'; }";
+  }
 } );
 
 
@@ -252,8 +258,40 @@ fine in the common case where there are only two parameters:
 
 my %TYPE = (); #for debugging
 
+sub _bind_type {
+  my($type, $value) = @_;
+
+  my $bind_type = { TYPE => SQL_VARCHAR };
+
+  if ( $type =~ /(big)?(int|serial)/i && $value =~ /^\d+(\.\d+)?$/ ) {
+
+    $bind_type = { TYPE => SQL_INTEGER };
+
+  } elsif ( $type =~ /^bytea$/i || $type =~ /(blob|varbinary)/i ) {
+
+    if ( driver_name eq 'Pg' ) {
+      no strict 'subs';
+      $bind_type = { pg_type => PG_BYTEA };
+    #} else {
+    #  $bind_type = ? #SQL_VARCHAR could be fine?
+    }
+
+  #DBD::Pg 1.49: Cannot bind ... unknown sql_type 6 with SQL_FLOAT
+  #fixed by DBD::Pg 2.11.8
+  #can change back to SQL_FLOAT in early-mid 2010, once everyone's upgraded
+  #(make a Tron test first)
+  } elsif ( _is_fs_float( $type, $value ) ) {
+
+    $bind_type = { TYPE => SQL_DECIMAL };
+
+  }
+
+  $bind_type;
+
+}
+
 sub _is_fs_float {
-  my ($type, $value) = @_;
+  my($type, $value) = @_;
   if ( ( $type =~ /(numeric)/i && $value =~ /^[+-]?\d+(\.\d+)?$/ ) ||
        ( $type =~ /(real|float4)/i && $value =~ /[-+]?\d*\.?\d+([eE][-+]?\d+)?/)
      ) {
@@ -331,23 +369,14 @@ sub qsearch {
     $value = $value->{'value'} if ref($value);
     my $type = dbdef->table($table)->column($field)->type;
 
-    my $TYPE = SQL_VARCHAR;
-    if ( $type =~ /(big)?(int|serial)/i && $value =~ /^\d+(\.\d+)?$/ ) {
-      $TYPE = SQL_INTEGER;
-
-    #DBD::Pg 1.49: Cannot bind ... unknown sql_type 6 with SQL_FLOAT
-    #fixed by DBD::Pg 2.11.8
-    #can change back to SQL_FLOAT in early-mid 2010, once everyone's upgraded
-    } elsif ( _is_fs_float( $type, $value ) ) {
-      $TYPE = SQL_DECIMAL;
-    }
+    my $bind_type = _bind_type($type, $value);
 
-    if ( $DEBUG > 2 ) {
-      no strict 'refs';
-      %TYPE = map { &{"DBI::$_"}() => $_ } @{ $DBI::EXPORT_TAGS{sql_types} }
-        unless keys %TYPE;
-      warn "  bind_param $bind (for field $field), $value, TYPE $TYPE{$TYPE}\n";
-    }
+    #if ( $DEBUG > 2 ) {
+    #  no strict 'refs';
+    #  %TYPE = map { &{"DBI::$_"}() => $_ } @{ $DBI::EXPORT_TAGS{sql_types} }
+    #    unless keys %TYPE;
+    #  warn "  bind_param $bind (for field $field), $value, TYPE $TYPE{$TYPE}\n";
+    #}
 
     #if this needs to be re-enabled, it needs to use a custom op like
     #"APPROX=" or something (better name?, not '=', to avoid affecting other
@@ -357,22 +386,20 @@ sub qsearch {
     #  $sth->bind_param($bind++, $value*1.00001, { TYPE => $TYPE } );
     #  $sth->bind_param($bind++, $value*.99999, { TYPE => $TYPE } );
     #} else {
-      $sth->bind_param($bind++, $value, { TYPE => $TYPE } );
+      $sth->bind_param($bind++, $value, $bind_type );
     #}
 
   }
 
   foreach my $param ( @$extra_param ) {
-    my $TYPE = SQL_VARCHAR;
+    my $bind_type = { TYPE => SQL_VARCHAR };
     my $value = $param;
     if ( ref($param) ) {
       $value = $param->[0];
       my $type = $param->[1];
-      if ( $type =~ /(big)?(int|serial)/i && $value =~ /^\d+(\.\d+)?$/ ) {
-        $TYPE = SQL_INTEGER;
-      } # & DECIMAL?  well, who cares for now
+      $bind_type = _bind_type($type, $value);
     }
-    $sth->bind_param($bind++, $value, { TYPE => $TYPE } );
+    $sth->bind_param($bind++, $value, $bind_type );
   }
 
 #  $sth->execute( map $record->{$_},
@@ -2678,7 +2705,7 @@ sub _quote {
        ")\n" if $DEBUG > 2;
 
   if ( $value eq '' && $nullable ) {
-    'NULL'
+    'NULL';
   } elsif ( $value eq '' && $column_type =~ /^(int|numeric)/ ) {
     cluck "WARNING: Attempting to set non-null integer $table.$column null; ".
           "using 0 instead";
@@ -2686,6 +2713,12 @@ sub _quote {
   } elsif ( $value =~ /^\d+(\.\d+)?$/ && 
             ! $column_type =~ /(char|binary|text)$/i ) {
     $value;
+  } elsif (( $column_type =~ /^bytea$/i || $column_type =~ /(blob|varbinary)/i )
+           && driver_name eq 'Pg'
+          )
+  {
+    no strict 'subs';
+    dbh->quote($value, PG_BYTEA);
   } else {
     dbh->quote($value);
   }
-- 
cgit v1.2.1


From d57a1feb48c55fecb95502e894575eebb306a58a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 25 Jul 2009 21:33:09 +0000
Subject: this should fix the re-email/print links on event search pages
 sending too much, RT#5740, RT#5570

---
 FS/FS/cust_event.pm | 133 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 115 insertions(+), 18 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm
index 6df2faaa1..10fb0acf7 100644
--- a/FS/FS/cust_event.pm
+++ b/FS/FS/cust_event.pm
@@ -1,7 +1,7 @@
 package FS::cust_event;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use vars qw( @ISA $DEBUG $me );
 use Carp qw( croak confess );
 use FS::Record qw( qsearch qsearchs dbdef );
 use FS::cust_main_Mixin;
@@ -14,6 +14,7 @@ use FS::cust_bill;
 @ISA = qw(FS::cust_main_Mixin FS::Record);
 
 $DEBUG = 0;
+$me = '[FS::cust_event]';
 
 =head1 NAME
 
@@ -295,6 +296,100 @@ sub retriable {
   $self->replace($old);
 }
 
+=item join_cust_sql
+
+=cut
+
+sub join_sql {
+  #my $class = shift;
+
+  "
+       JOIN part_event USING ( eventpart )
+  LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = invnum  )
+  LEFT JOIN cust_pkg  ON ( eventtable = 'cust_pkg'  AND tablenum = pkgnum  )
+  LEFT JOIN cust_main ON (    ( eventtable = 'cust_main' AND tablenum = cust_main.custnum )
+                           OR ( eventtable = 'cust_bill' AND cust_bill.custnum = cust_main.custnum )
+                           OR ( eventtable = 'cust_pkg'  AND cust_pkg.custnum  = cust_main.custnum )
+                         )
+  ";
+
+}
+
+=item search_sql HASHREF
+
+Class method which returns an SQL WHERE fragment to search for parameters
+specified in HASHREF.  Valid parameters are
+
+=over 4
+
+=item
+
+=item
+
+=back
+
+=cut
+
+#Note: validates all passed-in data; i.e. safe to use with unchecked CGI params.
+#sub 
+
+sub search_sql {
+  my($class, $param) = @_;
+  if ( $DEBUG ) {
+    warn "$me search_sql called with params: \n".
+         join("\n", map { "  $_: ". $param->{$_} } keys %$param ). "\n";
+  }
+
+  my @search = ();
+
+  if ( $param->{'agentnum'} && $param->{'agentnum'} =~ /^(\d+)$/ ) {
+    push @search, "cust_main.agentnum = $1";
+    #my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+    #die "unknown agentnum $1" unless $agent;
+  }
+
+  if ( $param->{'beginning'} =~ /^(\d+)$/ ) {
+    push @search, "cust_event._date >= $1";
+  }
+  if ( $param->{'ending'} =~ /^(\d+)$/ ) {
+    push @search, "cust_event._date <= $1";
+  }
+
+  if ( $param->{'failed'} ) {
+    push @search, "statustext != ''",
+                  "statustext IS NOT NULL",
+                  "statustext != 'N/A'";
+  }
+
+  #if ( $param->{'part_event.payby'} =~ /^(\w+)$/ ) {
+  #  push @search, "part_event.payby = '$1'";
+  #}
+
+  if ( $param->{'custnum'} =~ /^(\d+)$/ ) {
+    push @search, "cust_main.custnum = '$1'";
+  }
+
+  if ( $param->{'invnum'} =~ /^(\d+)$/ ) {
+    push @search, "part_event.eventtable = 'cust_bill'",
+                  "tablenum = '$1'";
+  }
+
+  if ( $param->{'pkgnum'} =~ /^(\d+)$/ ) {
+    push @search, "part_event.eventtable = 'cust_pkg'",
+                  "tablenum = '$1'";
+  }
+
+  #here is the agent virtualization
+  push @search,
+    $FS::CurrentUser::CurrentUser->agentnums_sql( 'table' => 'cust_main' );
+
+  my $where = 'WHERE '. join(' AND ', @search );
+
+
+  join(' AND ', @search );
+
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -336,41 +431,43 @@ sub process_re_X {
 
   re_X(
     $method,
-    $param->{'beginning'},
-    $param->{'ending'},
-    $param->{'failed'},
+    $param,
     $job,
   );
 
 }
 
-#this needs some updating based on the 1.7 cust_bill_event.pm still, i think
 sub re_X {
-  my($method, $beginning, $ending, $failed, $job) = @_;
+  my($method, $param, $job) = @_;
+
+  my $search_sql = FS::cust_event->search_sql($param);
 
-  my $from = 'LEFT JOIN part_event USING ( eventpart )';
+  #maybe not...?  we do want the "re-" action to match the search more closely
+  #            # yuck!  hardcoded *AND* sequential scans!
+  #my $where = " WHERE action LIKE 'cust_bill_send%' ".
+  #           ( $search_sql ? " AND $search_sql" : "" );
 
-              # yuck!  hardcoded *AND* sequential scans!
-  my $where = " WHERE action LIKE 'cust_bill_send%'".
-              "   AND cust_event._date >= $beginning".
-              "   AND cust_event._date <= $ending";
-  $where .= " AND statustext != '' AND statustext IS NOT NULL"
-    if $failed;
+  my $where = ( $search_sql ? " WHERE $search_sql" : "" );
 
   my @cust_event = qsearch({
     'table'     => 'cust_event',
-    'addl_from' => $from,
+    'addl_from' => FS::cust_event->join_sql(),
     'hashref'   => {},
     'extra_sql' => $where,
   });
 
+  warn "$me re_X found ". scalar(@cust_event). " events\n"
+    if $DEBUG;
+
   my( $num, $last, $min_sec ) = (0, time, 5); #progresbar foo
   foreach my $cust_event ( @cust_event ) {
 
-    $cust_event->cust_X->$method(
-      $cust_event->part_event->templatename
-      || $cust_event->cust_X->agent_template
-    );
+    my $cust_X = $cust_event->cust_X; # cust_bill
+    next unless $cust_X->can($method);
+
+    $cust_X->$method( $cust_event->part_event->templatename
+                      || $cust_X->agent_template
+                    );
 
     if ( $job ) { #progressbar foo
       $num++;
-- 
cgit v1.2.1


From 13a13b2e4bd74bb27b77d9492f5cd6487bfe3a21 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 26 Jul 2009 06:40:01 +0000
Subject: command line tool to apply payments and credits

---
 FS/bin/freeside-apply_payments_and_credits | 79 ++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100755 FS/bin/freeside-apply_payments_and_credits

(limited to 'FS')

diff --git a/FS/bin/freeside-apply_payments_and_credits b/FS/bin/freeside-apply_payments_and_credits
new file mode 100755
index 000000000..d789c6c2e
--- /dev/null
+++ b/FS/bin/freeside-apply_payments_and_credits
@@ -0,0 +1,79 @@
+#!/usr/bin/perl -w
+
+use strict;
+use vars qw( $DEBUG );
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearch qsearchs);
+use FS::cust_main;
+use DBI;
+
+$DEBUG = 1;
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup $user;
+
+my $unapplied_payments_sql = <<EOF;
+SELECT custnum FROM cust_pay WHERE paid >
+  ( ( SELECT coalesce(sum(amount),0) FROM cust_bill_pay
+        WHERE cust_pay.paynum = cust_bill_pay.paynum )
+  + ( SELECT coalesce(sum(amount),0) FROM cust_pay_refund
+        WHERE cust_pay.paynum = cust_pay_refund.paynum)
+  ) 
+EOF
+
+my $unapplied_credits_sql = <<EOF;
+SELECT custnum FROM cust_credit WHERE cust_credit.amount >
+  ( ( SELECT coalesce(sum(cust_credit_bill.amount),0) FROM cust_credit_bill
+        WHERE cust_credit.crednum = cust_credit_bill.crednum )
+  + ( SELECT coalesce(sum(cust_Credit_refund.amount),0) FROM cust_credit_refund
+        WHERE cust_credit.crednum = cust_credit_refund.crednum)
+  )
+EOF
+
+my %custnum = ();
+
+my $sth = $dbh->prepare($unapplied_payments_sql) or die $dbh->errstr;
+$sth->execute or die "unapplied payment search failed: ". $sth->errstr;
+
+map { $custnum{$_->[0]} = 1 } @{ $sth->fetchall_arrayref };
+
+$sth = $dbh->prepare($unapplied_credits_sql) or die $dbh->errstr;
+$sth->execute or die "unapplied credit search failed: ". $sth->errstr;
+
+map { $custnum{$_->[0]} = 1 } @{ $sth->fetchall_arrayref };
+
+foreach my $custnum ( keys %custnum ) {
+
+  warn "processing customer $custnum\n" if $DEBUG;
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or die "customer $custnum no longer exists!\n";
+
+  my $error = $cust_main->apply_payments_and_credits;
+  die $error if $error;
+
+}
+
+sub usage {
+  die "Usage:\n\n  freeside-apply_payments_and_credits user\n";
+}
+
+=head1 NAME
+
+freeside-apply_payments_and_credits - Command line interface to apply payments and credits to invoice
+
+=head1 SYNOPSIS
+
+  freeside-apply_payments_and_credits username
+
+=head1 DESCRIPTION
+
+Finds unapplied payment and credit amounts and applies them to any outstanding
+uncovered invoice amounts.
+
+B<username> is a username added by freeside-adduser.
+
+=cut
+
+
+
-- 
cgit v1.2.1


From b717c77e7af226f0f525df39fac49f11b3facd4c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 26 Jul 2009 18:40:11 +0000
Subject: bring up-to-date wrt 1.7 Conf.pm 1.180.2.49 (2009-7-26), RT#2873

---
 FS/FS/Conf_compat17.pm | 154 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 122 insertions(+), 32 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf_compat17.pm b/FS/FS/Conf_compat17.pm
index 0f2e19369..56bc956be 100644
--- a/FS/FS/Conf_compat17.pm
+++ b/FS/FS/Conf_compat17.pm
@@ -443,10 +443,10 @@ httemplate/docs/config.html
   },
 
   {
-   'key'         => 'business-onlinepayment-email_customer',
-   'section'     => 'billing',
-   'description' => 'Controls the "email_customer" flag used by some Business::OnlinePayment processors to enable customer receipts.',
-   'type'        => 'checkbox',
+    'key'         => 'business-onlinepayment-email_customer',
+    'section'     => 'billing',
+    'description' => 'Controls the "email_customer" flag used by some Business::OnlinePayment processors to enable customer receipts.',
+    'type'        => 'checkbox',
   },
 
   {
@@ -642,6 +642,13 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'invoice_subject',
+    'section'     => 'billing',
+    'description' => 'Subject: header on email invoices.  Defaults to "Invoice".  The following substitutions are available: $name, $name_short, $invoice_number, and $invoice_date.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'invoice_template',
     'section'     => 'required',
@@ -1185,6 +1192,13 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  { 
+    'key'         => 'username-colon',
+    'section'     => 'username',
+    'description' => 'Allow the colon character (:) in usernames.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'safe-part_bill_event',
     'section'     => 'UI',
@@ -1558,8 +1572,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'paymentforcedtobatch',
-    'section'     => 'UI',
-    'description' => 'Causes per customer payment entry to be forced to a batch processor rather than performed realtime.',
+    'section'     => 'deprecated',
+    'description' => 'See batch-enable_payby and realtime-disable_payby.  Used to (for CHEK): Cause per customer payment entry to be forced to a batch processor rather than performed realtime.',
     'type'        => 'checkbox',
   },
 
@@ -1586,6 +1600,14 @@ httemplate/docs/config.html
     'select_enum' => [ 'Framed-IP-Address', 'Framed-Address' ],
   },
 
+  #http://dev.coova.org/svn/coova-chilli/doc/dictionary.chillispot
+  {
+    'key'         => 'radius-chillispot-max',
+    'section'     => '',
+    'description' => 'Enable ChilliSpot (and CoovaChilli) Max attributes, specifically ChilliSpot-Max-{Input,Output,Total}-{Octets,Gigawords}.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_acct-alldomains',
     'section'     => '',
@@ -1614,6 +1636,24 @@ httemplate/docs/config.html
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'credit_card-recurring_billing_flag',
+    'section'     => 'billing',
+    'description' => 'This controls when the system passes the "recurring_billing" flag on credit card transactions.  If supported by your processor (and the Business::OnlinePayment processor module), passing the flag indicates this is a recurring transaction and may turn off the CVV requirement. ',
+    'type'        => 'select',
+    'select_hash' => [
+                       'actual_oncard' => 'Default/classic behavior: set the flag if a customer has actual previous charges on the card.',
+                       'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
+                     ],
+  },
+
+  {
+    'key'         => 'credit_card-recurring_billing_acct_code',
+    'section'     => 'billing',
+    'description' => 'When the "recurring billing" flag is set, also set the "acct_code" to "rebill".  Useful for reporting purposes with supported gateways (PlugNPay, others?)',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'cvv-save',
     'section'     => 'billing',
@@ -1818,13 +1858,13 @@ httemplate/docs/config.html
     'key'         => 'address2-search',
     'section'     => 'UI',
     'description' => 'Enable a "Unit" search box which searches the second address field',
-   'type'        => 'checkbox',
+    'type'        => 'checkbox',
   },
 
   {
-   'key'         => 'cust_main-require_address2',
-   'section'     => 'UI',
-   'description' => 'Second address field is required (on service address only, if billing and service addresses differ).  Also enables "Unit" labeling of address2 on customer view and edit pages.  Useful for multi-tenant applications.  See also: address2-search',
+    'key'         => 'cust_main-require_address2',
+    'section'     => 'UI',
+    'description' => 'Second address field is required (on service address only, if billing and service addresses differ).  Also enables "Unit" labeling of address2 on customer view and edit pages.  Useful for multi-tenant applications.  See also: address2-search',
     'type'        => 'checkbox',
   },
 
@@ -2025,21 +2065,29 @@ httemplate/docs/config.html
     'type'        => 'select-sub',
     'options_sub' => sub { require FS::Record;
                            require FS::part_pkg;
-                          map { $_->pkgpart => $_->pkg }
+                           map { $_->pkgpart => $_->pkg }
                                FS::Record::qsearch('part_pkg', { disabled=>'' } );
-                        },
+                         },
     'option_sub'  => sub { require FS::Record;
                            require FS::part_pkg;
-                          my $part_pkg = FS::Record::qsearchs(
-                            'part_pkg', { 'pkgpart'=>shift }
-                          );
+                           my $part_pkg = FS::Record::qsearchs(
+                             'part_pkg', { 'pkgpart'=>shift }
+                           );
                            $part_pkg ? $part_pkg->pkg : '';
-                        },
+                         },
   },
 
   {
-    'key'         => 'batch-enable',
+    'key'         => 'postal_invoice-recurring_only',
     'section'     => 'billing',
+    'description' => 'The postal invoice fee is omitted on invoices without recurring charges when this is set',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'batch-enable',
+    'section'     => 'deprecated', #make sure batch-enable_payby is set for
+                                   #everyone before removing
     'description' => 'Enable credit card and/or ACH batching - leave disabled for real-time installations.',
     'type'        => 'checkbox',
   },
@@ -2227,20 +2275,6 @@ httemplate/docs/config.html
     'type'       => 'checkbox',
   },
 
-  {
-    'key'         => 'cust_main-require_phone',
-    'section'     => '',
-    'description' => 'Require daytime or night for all customer records.',
-    'type'        => 'checkbox',
-  },
-
-  {
-    'key'         => 'cust_main-require_invoicing_list_email',
-    'section'     => '',
-    'description' => 'Email address field is required: require at least one invoicing email address for all customer records.',
-    'type'        => 'checkbox',
-  },
-
   {
     'key' => 'password-generated-allcaps',
     'section' => 'password',
@@ -2276,6 +2310,20 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cust_main-require_phone',
+    'section'     => '',
+    'description' => 'Require daytime or night for all customer records.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'cust_main-require_invoicing_list_email',
+    'section'     => '',
+    'description' => 'Email address field is required: require at least one invoicing email address for all customer records.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'cancel_credit_type',
     'section'     => 'billing',
@@ -2388,7 +2436,7 @@ httemplate/docs/config.html
     'description' => 'Default area code for customers.',
     'type'        => 'text',
   },
- 
+
   {
     'key'         => 'cust_bill-max_same_services',
     'section'     => 'billing',
@@ -2396,6 +2444,48 @@ httemplate/docs/config.html
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'suspend_email_admin',
+    'section'     => '',
+    'description' => 'Destination admin email address to enable suspension notices',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'email_report-subject',
+    'section'     => '',
+    'description' => 'Subject for reports emailed by freeside-fetch.  Defaults to "Freeside report".',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'sg-multicustomer_hack',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'queued-max_kids',
+    'section'     => '',
+    'description' => 'Maximum number of queued processes.  Defaults to 10.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'cancelled_cust-noevents',
+    'section'     => 'billing',
+    'description' => "Don't run events for cancelled customers",
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'svc_broadband-manage_link',
+    'section'     => 'UI',
+    'description' => 'URL for svc_broadband "Manage Device" link.  The following substitutions are available: $ip_addr.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
-- 
cgit v1.2.1


From f3717767d19f9da888e190f87a04dfa245d658b4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 27 Jul 2009 03:26:47 +0000
Subject: FCC from 477 improvements #4912

---
 FS/FS/Conf.pm      | 22 ++++++++++++++++++++++
 FS/FS/cust_main.pm | 20 ++++++++++++++++++++
 FS/FS/cust_pkg.pm  |  7 +++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 832322faf..37f55306a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2604,6 +2604,28 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'census_year',
+    'section'     => 'UI',
+    'description' => 'The year to use in census tract lookups',
+    'type'        => 'select',
+    'select_enum' => [ qw( 2008 2007 2006 ) ],
+  },
+
+  {
+    'key'         => 'company_latitude',
+    'section'     => 'UI',
+    'description' => 'Your company latitude (-90 through 90)',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'company_longitude',
+    'section'     => 'UI',
+    'description' => 'Your company longitude (-180 thru 180)',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'disable_acl_changes',
     'section'     => '',
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9d41c4bdf..518ab4d98 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1571,6 +1571,13 @@ sub check {
     unless ! $self->referral_custnum 
            || qsearchs( 'cust_main', { 'custnum' => $self->referral_custnum } );
 
+  if ( $self->censustract ne '' ) {
+    $self->censustract =~ /^\s*(\d{9})\.?(\d{2})\s*$/
+      or return "Illegal census tract: ". $self->censustract;
+    
+    $self->censustract("$1.$2");
+  }
+
   if ( $self->ss eq '' ) {
     $self->ss('');
   } else {
@@ -7371,6 +7378,19 @@ sub support_services {
 
 }
 
+# Return a list of latitude/longitude for one of the services (if any)
+sub service_coordinates {
+  my $self = shift;
+
+  my @svc_X = 
+    grep { $_->latitude && $_->longitude }
+    map { $_->svc_x }
+    map { $_->cust_svc }
+    $self->ncancelled_pkgs;
+
+  scalar(@svc_X) ? ( $svc_X[0]->latitude, $svc_X[0]->longitude ) : ()
+}
+
 =back
 
 =head1 CLASS METHODS
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4d44692b3..00a030117 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2377,8 +2377,11 @@ sub search_sql {
   # parse censustract
   ###
 
-  if ( $params->{'censustract'} =~ /^([.\d]+)$/ and $1 ) {
-    push @where,  "cust_main.censustract = '". $params->{censustract}. "'";
+  if ( exists($params->{'censustract'}) ) {
+    $params->{'censustract'} =~ /^([.\d]*)$/;
+    my $censustract = "cust_main.censustract = '$1'";
+    $censustract .= ' OR cust_main.censustract is NULL' unless $1;
+    push @where,  "( $censustract )";
   }
 
   ###
-- 
cgit v1.2.1


From 44a63e5978af2b5b4e00cabbc4b3541df4144305 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 27 Jul 2009 06:17:20 +0000
Subject: add deprecated config options back to Conf.pm to fix
 "unapplypayments" fails existential comparison errors, RT#2927

---
 FS/FS/Conf.pm | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 37f55306a..0fe3ca977 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -714,6 +714,20 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'unapplypayments',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable "unapplication" of unclosed payments.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'unapplycredits',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to nable "unapplication" of unclosed credits.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'dirhash',
     'section'     => 'shell',
@@ -935,6 +949,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'invoice_send_receipts',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, this used to send an invoice copy on payments and credits.  See the payment_receipt_email and XXXX instead.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'payment_receipt_email',
     'section'     => 'billing',
@@ -1023,6 +1044,13 @@ worry that config_items is freeside-specific and icky.
 #    'description' => 'Directory which contains domain registry information.  Each registry is a directory.',
 #  },
 
+  {
+    'key'         => 'report_template',
+    'section'     => 'deprecated',
+    'description' => 'Deprecated template file for reports.',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'maxsearchrecordsperpage',
     'section'     => 'UI',
@@ -1693,6 +1721,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'users-allow_comp',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, enable the <i>Complimentary customer</i> access right instead.  Was: Usernames (Freeside users, created with <a href="../docs/man/bin/freeside-adduser.html">freeside-adduser</a>) which can create complimentary customers, one per line.  If no usernames are entered, all users can create complimentary accounts.',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'credit_card-recurring_billing_flag',
     'section'     => 'billing',
@@ -1928,6 +1963,27 @@ worry that config_items is freeside-specific and icky.
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'echeck-void',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'cc-void',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'unvoid',
+    'section'     => 'deprecated',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable unvoiding of voided payments',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'address2-search',
     'section'     => 'UI',
@@ -2939,6 +2995,48 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "bindprimary", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "bindsecondaries", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "bsdshellmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "cyrus", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "cp_app", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "erpcdmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "icradiusmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "icradius_mysqldest", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "icradius_mysqlsource", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "icradius_secrets", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "maildisablecatchall", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "mxmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "nsmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "arecords", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "cnamerecords", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "nismachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "qmailmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "radiusmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "sendmailconfigpath", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "sendmailmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "sendmailrestart", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "shellmachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "shellmachine-useradd", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "shellmachine-userdel", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "shellmachine-usermod", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "shellmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "radiusprepend", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "textradiusprepend", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "username_policy", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "vpopmailmachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "vpopmailrestart", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "safe-part_pkg", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "selfservice_server-quiet", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "signup_server-quiet", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "signup_server-email", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "vonage-username", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "vonage-password", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+  { key => "vonage-fromnumber", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
+
 );
 
 1;
-- 
cgit v1.2.1


From cd2241d7ea1ce53a626adfd58a908cfd822c618c Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Tue, 28 Jul 2009 02:12:50 +0000
Subject: Add no_queue option to shellcommands exports

---
 FS/FS/part_export/shellcommands.pm            | 24 +++++++++++++++++++-----
 FS/FS/part_export/shellcommands_withdomain.pm |  3 +++
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index c55fa367e..e375302a4 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -65,6 +65,9 @@ tie my %options, 'Tie::IxHash',
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
+  'no_queue' => { label => 'Run command immediately',
+                   type  => 'checkbox',
+                },
 ;
 
 %info = (
@@ -367,12 +370,23 @@ sub _export_replace {
 
   my $command_string = eval(qq("$command"));
 
-  $self->shellcommands_queue( $new->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => $command_string,
-    stdin_string => $stdin_string,
+  my @ssh_cmd_args = (
+    user          => $self->option('user') || 'root',
+    host          => $self->machine,
+    command       => $command_string,
+    stdin_string  => $stdin_string,
   );
+
+  if($self->options('no_queue')) {
+    # discard return value just like freeside-queued.
+    eval { ssh_cmd(@ssh_cmd_args) };
+    $error = $@;
+    return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+      if $error;
+  }
+  else {
+    $self->shellcommands_queue( $new->svcnum, @ssh_cmd_args );
+  }
 }
 
 #a good idea to queue anything that could fail or take any time
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 7c5d9045f..e1f47e410 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -51,6 +51,9 @@ tie my %options, 'Tie::IxHash',
                type=>'select', options=>[qw(crypt md5)],
                default => 'crypt',
              },
+  'no_queue' => { label => 'Run command immediately',
+                 type  => 'checkbox',
+           },
 ;
 
 %info = (
-- 
cgit v1.2.1


From e1b1693a656964c6db0b8a3fb85494014434dcb1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 28 Jul 2009 21:17:45 +0000
Subject: adding a basic change history using history tables, RT#1005, RT#4357

---
 FS/FS/AccessRight.pm  |  1 +
 FS/FS/Conf.pm         |  9 ++++++++-
 FS/FS/Mason.pm        | 12 +++++++++++-
 FS/FS/svc_external.pm |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 3157d5ff0..29cecd5f2 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -94,6 +94,7 @@ tie my %rights, 'Tie::IxHash',
     'View customer',
     #'View Customer | View tickets',
     'Edit customer',
+    'View customer history',
     'Cancel customer',
     'Complimentary customer', #aka users-allow_comp 
     { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0fe3ca977..20abd4546 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2318,6 +2318,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'change_history-years',
+    'section'     => 'UI',
+    'description' => 'Number of years of change history to show by default.  Currently defaults to 0.5.',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'cust_main-packages-years',
     'section'     => 'UI',
@@ -2976,7 +2983,7 @@ worry that config_items is freeside-specific and icky.
       'tickets'         => 'Tickets',
       'packages'        => 'Packages',
       'payment_history' => 'Payment History',
-      #''                => 'Change History',
+      'change_history'  => 'Change History',
       'jumbo'           => 'Jumbo',
     ],
   },
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index ac11026cf..ed99bf694 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -186,6 +186,16 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::part_pkg_taxrate;
   use FS::tax_rate;
   use FS::part_pkg_report_option;
+  use FS::h_cust_pkg;
+  use FS::h_svc_acct;
+  use FS::h_svc_broadband;
+  use FS::h_svc_domain;
+  #use FS::h_domain_record;
+  use FS::h_svc_external;
+  use FS::h_svc_forward;
+  use FS::h_svc_phone;
+  #use FS::h_phone_device;
+  use FS::h_svc_www;
   # Sammath Naur
 
   if ( %%%RT_ENABLED%%% ) {
@@ -223,7 +233,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
 
       #slow, unreliable, segfaults and is optional
       #see rt/html/Ticket/Elements/ShowTransactionAttachments
-      #use Text::Quoted;
+      use Text::Quoted;
 
       #?#use File::Path qw( rmtree );
       #?#use File::Glob qw( bsd_glob );
diff --git a/FS/FS/svc_external.pm b/FS/FS/svc_external.pm
index 0fb391fef..aca7c1bcc 100644
--- a/FS/FS/svc_external.pm
+++ b/FS/FS/svc_external.pm
@@ -95,6 +95,7 @@ sub label {
       substr('0000000000'.uc($self->title), -10);
   } else {
     #$self->SUPER::label;
+    return $self->id unless $self->title =~ /\S/;
     $self->id. ' - '. $self->title;
   }
 }
-- 
cgit v1.2.1


From 50f5d60aef5ee82be33c978db6424372bfd7995b Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 28 Jul 2009 22:21:40 +0000
Subject: feature to email CSV of CDRs with invoices #5727

---
 FS/FS/Conf.pm      |  7 +++++++
 FS/FS/Schema.pm    |  1 +
 FS/FS/cust_bill.pm | 32 ++++++++++++++++++++++++++++++--
 FS/FS/cust_main.pm |  2 +-
 4 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 20abd4546..40fbaf6c5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2168,6 +2168,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'voip-cust_email_csv_cdr',
+    'section'     => '',
+    'description' => 'Enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'svc_forward-arbitrary_dst',
     'section'     => '',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index b2f590aec..649e0aa49 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -698,6 +698,7 @@ sub tables_hashref {
         'cdr_termination_percentage', 'decimal', 'NULL', '', '', '',
         'invoice_terms', 'varchar', 'NULL', $char_d, '', '',
         'archived', 'char', 'NULL', 1, '', '',
+        'email_csv_cdr', 'char', 'NULL', 1, '', '',
       ],
       'primary_key' => 'custnum',
       'unique' => [ [ 'agentnum', 'agent_custid' ] ],
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 9937bc76d..4e28af39c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -704,6 +704,18 @@ sub generate_email {
       #'Filename'    => 'invoice.pdf',
     );
 
+    my @otherparts = ();
+    if ( $self->cust_main->email_csv_cdr ) {
+
+      push @otherparts, build MIME::Entity
+        'Type'        => 'text/csv',
+        'Encoding'    => '7bit',
+        'Data'        => [ map { "$_\n" } $self->call_details ],
+        'Disposition' => 'attachment',
+      ;
+
+    }
+
     if ( $conf->exists('invoice_email_pdf') ) {
 
       #attaching pdf too:
@@ -731,7 +743,7 @@ sub generate_email {
 
       my $pdf = build MIME::Entity $self->mimebuild_pdf('', $args{'template'}, %cdrs);
 
-      $return{'mimeparts'} = [ $related, $pdf ];
+      $return{'mimeparts'} = [ $related, $pdf, @otherparts ];
 
     } else {
 
@@ -743,7 +755,7 @@ sub generate_email {
       #   image/png
 
       $return{'content-type'} = 'multipart/related';
-      $return{'mimeparts'} = [ $alternative, $image ];
+      $return{'mimeparts'} = [ $alternative, $image, @otherparts ];
       $return{'type'} = 'multipart/alternative'; #Content-Type of first part...
       #$return{'disposition'} = 'inline';
 
@@ -3033,6 +3045,22 @@ sub _items_payments {
 
 }
 
+=item call_details
+
+Returns an array of CSV strings representing the call details for this invoice
+
+=cut
+
+sub call_details {
+  my $self = shift;
+  map { $_->details( 'format_function' => sub{ shift },
+                     'escape_function' => sub{ return() },
+                   )
+      }
+    grep { $_->pkgnum }
+    $self->cust_bill_pkg;
+}
+
 
 =back
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 518ab4d98..f6ac186f9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1869,7 +1869,7 @@ sub check {
     $self->payname($1);
   }
 
-  foreach my $flag (qw( tax spool_cdr squelch_cdr archived )) {
+  foreach my $flag (qw( tax spool_cdr squelch_cdr archived email_csv_cdr )) {
     $self->$flag() =~ /^(Y?)$/ or return "Illegal $flag: ". $self->$flag();
     $self->$flag($1);
   }
-- 
cgit v1.2.1


From 4396080ed2829ae0595f1fd777f39d090c9bcd7c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Jul 2009 06:42:33 +0000
Subject: experimental package balances, RT#4339

---
 FS/FS/Conf.pm                        |   7 ++
 FS/FS/Schema.pm                      |   6 ++
 FS/FS/cust_bill.pm                   | 104 ++++++++++++++++++--
 FS/FS/cust_bill_ApplicationCommon.pm |   4 +
 FS/FS/cust_bill_pay.pm               |   2 +
 FS/FS/cust_credit.pm                 |   6 ++
 FS/FS/cust_credit_bill.pm            |   2 +
 FS/FS/cust_main.pm                   | 179 ++++++++++++++++++++++++++++++++---
 FS/FS/cust_pay.pm                    |  50 +++++++---
 FS/FS/cust_pay_pending.pm            |   6 ++
 FS/FS/cust_pay_void.pm               |  38 ++++++--
 FS/FS/cust_pkg.pm                    |  57 +++++++++++
 12 files changed, 421 insertions(+), 40 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 40fbaf6c5..c335c0140 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3009,6 +3009,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'pkg-balances',
+    'section'     => 'billing',
+    'description' => 'Enable experimental package balances.  Not recommended for general use.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 649e0aa49..15adba3ed 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -598,6 +598,7 @@ sub tables_hashref {
         'reasonnum', 'int', 'NULL', '', '', '', 
         'addlinfo', 'text', 'NULL', '', '', '',
         'closed',    'char', 'NULL', 1, '', '', 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
       ],
       'primary_key' => 'crednum',
       'unique' => [],
@@ -611,6 +612,7 @@ sub tables_hashref {
         'invnum',  'int', '', '', '', '', 
         '_date',    @date_type, '', '', 
         'amount',   @money_type, '', '', 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
       ],
       'primary_key' => 'creditbillnum',
       'unique' => [],
@@ -941,6 +943,7 @@ sub tables_hashref {
         #'paybatch',     'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
         'payunique',    'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage
 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
         'status',       'varchar',     '', $char_d, '', '', 
         'session_id',   'varchar', 'NULL', $char_d, '', '', #only need 32
         'statustext',   'text',    'NULL',  '', '', '', 
@@ -970,6 +973,7 @@ sub tables_hashref {
         'paybatch', 'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
         'payunique', 'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage
         'closed',    'char', 'NULL', 1, '', '', 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
       ],
       'primary_key' => 'paynum',
       #i guess not now, with cust_pay_pending, if we actually make it here, we _do_ want to record it# 'unique' => [ [ 'payunique' ] ],
@@ -989,6 +993,7 @@ sub tables_hashref {
 	'paymask', 'varchar', 'NULL', $char_d, '', '', 
         'paybatch',  'varchar',   'NULL', $char_d, '', '', #for auditing purposes.
         'closed',    'char', 'NULL', 1, '', '', 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
         'void_date', @date_type, '', '', 
         'reason',    'varchar',   'NULL', $char_d, '', '', 
         'otaker',   'varchar', '', 32, '', '', 
@@ -1005,6 +1010,7 @@ sub tables_hashref {
         'paynum',  'int',     '',   '', '', '', 
         'amount',  @money_type, '', '', 
         '_date',   @date_type, '', '', 
+        'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
       ],
       'primary_key' => 'billpaynum',
       'unique' => [],
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4e28af39c..4acdd85a3 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -235,6 +235,25 @@ sub cust_bill_pkg {
   );
 }
 
+=item cust_bill_pkg_pkgnum PKGNUM
+
+Returns the line items (see L<FS::cust_bill_pkg>) for this invoice and
+specified pkgnum.
+
+=cut
+
+sub cust_bill_pkg_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  qsearch(
+    { 'table'    => 'cust_bill_pkg',
+      'hashref'  => { 'invnum' => $self->invnum,
+                      'pkgnum' => $pkgnum,
+                    },
+      'order_by' => 'ORDER BY billpkgnum',
+    }
+  );
+}
+
 =item cust_pkg
 
 Returns the packages (see L<FS::cust_pkg>) corresponding to the line items for
@@ -432,6 +451,38 @@ sub cust_credited {
   ;
 }
 
+=item cust_bill_pay_pkgnum
+
+Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice
+with matching pkgnum.
+
+=cut
+
+sub cust_bill_pay_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum,
+                                'pkgnum' => $pkgnum,
+                              }
+           );
+}
+
+=item cust_credited_pkgnum
+
+Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice
+with matching pkgnum.
+
+=cut
+
+sub cust_credited_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_credit_bill', { 'invnum' => $self->invnum,
+                                   'pkgnum' => $pkgnum,
+                                 }
+           );
+}
+
 =item tax
 
 Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
@@ -465,6 +516,21 @@ sub owed {
   $balance;
 }
 
+sub owed_pkgnum {
+  my( $self, $pkgnum ) = @_;
+
+  #my $balance = $self->charged;
+  my $balance = 0;
+  $balance += $_->setup + $_->recur for $self->cust_bill_pkg_pkgnum($pkgnum);
+
+  $balance -= $_->amount            for $self->cust_bill_pay_pkgnum($pkgnum);
+  $balance -= $_->amount            for $self->cust_credited_pkgnum($pkgnum);
+
+  $balance = sprintf( "%.2f", $balance);
+  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+  $balance;
+}
+
 =item apply_payments_and_credits
 
 =cut
@@ -488,6 +554,13 @@ sub apply_payments_and_credits {
   my @payments = grep { $_->unapplied > 0 } $self->cust_main->cust_pay;
   my @credits  = grep { $_->credited > 0 } $self->cust_main->cust_credit;
 
+  if ( $conf->exists('pkg-balances') ) {
+    # limit @payments & @credits to those w/ a pkgnum grepped from $self
+    my %pkgnums = map { $_ => 1 } map $_->pkgnum, $self->cust_bill_pkg;
+    @payments = grep { ! $_->pkgnum || $pkgnums{$_->pkgnum} } @payments;
+    @credits  = grep { ! $_->pkgnum || $pkgnums{$_->pkgnum} } @credits;
+  }
+
   while ( $self->owed > 0 and ( @payments || @credits ) ) {
 
     my $app = '';
@@ -525,28 +598,39 @@ sub apply_payments_and_credits {
       die "guru meditation #12 and 35";
     }
 
+    my $unapp_amount;
     if ( $app eq 'pay' ) {
 
       my $payment = shift @payments;
-
-      $app = new FS::cust_bill_pay {
-        'paynum'  => $payment->paynum,
-	'amount'  => sprintf('%.2f', min( $payment->unapplied, $self->owed ) ),
-      };
+      $unapp_amount = $payment->unapplied;
+      $app = new FS::cust_bill_pay { 'paynum'  => $payment->paynum };
+      $app->pkgnum( $payment->pkgnum )
+        if $conf->exists('pkg-balances') && $payment->pkgnum;
 
     } elsif ( $app eq 'credit' ) {
 
       my $credit = shift @credits;
-
-      $app = new FS::cust_credit_bill {
-        'crednum' => $credit->crednum,
-	'amount'  => sprintf('%.2f', min( $credit->credited, $self->owed ) ),
-      };
+      $unapp_amount = $credit->credited;
+      $app = new FS::cust_credit_bill { 'crednum' => $credit->crednum };
+      $app->pkgnum( $credit->pkgnum )
+        if $conf->exists('pkg-balances') && $credit->pkgnum;
 
     } else {
       die "guru meditation #12 and 35";
     }
 
+    my $owed;
+    if ( $conf->exists('pkg-balances') && $app->pkgnum ) {
+      warn "owed_pkgnum ". $app->pkgnum;
+      $owed = $self->owed_pkgnum($app->pkgnum);
+    } else {
+      $owed = $self->owed;
+    }
+    next unless $owed > 0;
+
+    warn "min ( $unapp_amount, $owed )\n";
+    $app->amount( sprintf('%.2f', min( $unapp_amount, $owed ) ) );
+
     $app->invnum( $self->invnum );
 
     my $error = $app->insert;
diff --git a/FS/FS/cust_bill_ApplicationCommon.pm b/FS/FS/cust_bill_ApplicationCommon.pm
index af7e0879e..ec694ca58 100644
--- a/FS/FS/cust_bill_ApplicationCommon.pm
+++ b/FS/FS/cust_bill_ApplicationCommon.pm
@@ -115,6 +115,8 @@ sub apply_to_lineitems {
 
   my @apply = ();
 
+  my $conf = new FS::Conf;
+
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -127,6 +129,8 @@ sub apply_to_lineitems {
   my $dbh = dbh;
 
   my @open = $self->cust_bill->open_cust_bill_pkg; #FOR UPDATE...?
+  @open = grep { $_->pkgnum == $self->pkgnum } @open
+    if $conf->exists('pkg-balances') && $self->pkgnum;
   warn "$me ". scalar(@open). " open line items for invoice ".
        $self->cust_bill->invnum. ": ". join(', ', @open). "\n"
     if $DEBUG;
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index b7ba2b711..e1b02aecb 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -7,6 +7,7 @@ use FS::cust_main_Mixin;
 use FS::cust_bill_ApplicationCommon;
 use FS::cust_bill;
 use FS::cust_pay;
+use FS::cust_pkg;
 
 @ISA = qw( FS::cust_main_Mixin FS::cust_bill_ApplicationCommon );
 
@@ -121,6 +122,7 @@ sub check {
     || $self->ut_foreign_key('invnum', 'cust_bill', 'invnum' )
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
   ;
   return $error if $error;
 
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 47a8119ee..6c3effa13 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -8,6 +8,7 @@ use FS::Misc qw(send_email);
 use FS::Record qw( qsearch qsearchs dbdef );
 use FS::cust_main_Mixin;
 use FS::cust_main;
+use FS::cust_pkg;
 use FS::cust_refund;
 use FS::cust_credit_bill;
 use FS::part_pkg;
@@ -95,6 +96,10 @@ Text
 
 Books closed flag, empty or `Y'
 
+=item pkgnum
+
+Desired pkgnum when using experimental package balances.
+
 =back
 
 =head1 METHODS
@@ -295,6 +300,7 @@ sub check {
     || $self->ut_foreign_key('reasonnum', 'reason', 'reasonnum')
     || $self->ut_textn('addlinfo')
     || $self->ut_enum('closed', [ '', 'Y' ])
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
   ;
   return $error if $error;
 
diff --git a/FS/FS/cust_credit_bill.pm b/FS/FS/cust_credit_bill.pm
index 375c885a0..900a5c0d5 100644
--- a/FS/FS/cust_credit_bill.pm
+++ b/FS/FS/cust_credit_bill.pm
@@ -8,6 +8,7 @@ use FS::cust_main_Mixin;
 use FS::cust_bill_ApplicationCommon;
 use FS::cust_bill;
 use FS::cust_credit;
+use FS::cust_pkg;
 
 @ISA = qw( FS::cust_main_Mixin FS::cust_bill_ApplicationCommon );
 
@@ -122,6 +123,7 @@ sub check {
     || $self->ut_foreign_key('invnum', 'cust_bill', 'invnum' )
     || $self->ut_numbern('_date')
     || $self->ut_money('amount')
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
   ;
   return $error if $error;
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index f6ac186f9..9c131744d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6110,32 +6110,52 @@ sub apply_credits {
   @invoices = sort { $b->_date <=> $a->_date } @invoices
     if defined($opt{'order'}) && $opt{'order'} eq 'newest';
 
+  if ( $conf->exists('pkg-balances') ) {
+    # limit @credits to those w/ a pkgnum grepped from $self
+    my %pkgnums = ();
+    foreach my $i (@invoices) {
+      foreach my $li ( $i->cust_bill_pkg ) {
+        $pkgnums{$li->pkgnum} = 1;
+      }
+    }
+    @credits = grep { ! $_->pkgnum || $pkgnums{$_->pkgnum} } @credits;
+  }
+
   my $credit;
+
   foreach my $cust_bill ( @invoices ) {
-    my $amount;
 
     if ( !defined($credit) || $credit->credited == 0) {
       $credit = pop @credits or last;
     }
 
-    if ($cust_bill->owed >= $credit->credited) {
-      $amount=$credit->credited;
-    }else{
-      $amount=$cust_bill->owed;
+    my $owed;
+    if ( $conf->exists('pkg-balances') && $credit->pkgnum ) {
+      $owed = $cust_bill->owed_pkgnum($credit->pkgnum);
+    } else {
+      $owed = $cust_bill->owed;
+    }
+    unless ( $owed > 0 ) {
+      push @credits, $credit;
+      next;
     }
+
+    my $amount = min( $credit->credited, $owed );
     
     my $cust_credit_bill = new FS::cust_credit_bill ( {
       'crednum' => $credit->crednum,
       'invnum'  => $cust_bill->invnum,
       'amount'  => $amount,
     } );
+    $cust_credit_bill->pkgnum( $credit->pkgnum )
+      if $conf->exists('pkg-balances') && $credit->pkgnum;
     my $error = $cust_credit_bill->insert;
     if ( $error ) {
       $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
       die $error;
     }
     
-    redo if ($cust_bill->owed > 0);
+    redo if ($cust_bill->owed > 0) && ! $conf->exists('pkg-balances');
 
   }
 
@@ -6183,33 +6203,52 @@ sub apply_payments {
                  grep { $_->owed > 0 }
                  $self->cust_bill;
 
+  if ( $conf->exists('pkg-balances') ) {
+    # limit @payments to those w/ a pkgnum grepped from $self
+    my %pkgnums = ();
+    foreach my $i (@invoices) {
+      foreach my $li ( $i->cust_bill_pkg ) {
+        $pkgnums{$li->pkgnum} = 1;
+      }
+    }
+    @payments = grep { ! $_->pkgnum || $pkgnums{$_->pkgnum} } @payments;
+  }
+
   my $payment;
 
   foreach my $cust_bill ( @invoices ) {
-    my $amount;
 
     if ( !defined($payment) || $payment->unapplied == 0 ) {
       $payment = pop @payments or last;
     }
 
-    if ( $cust_bill->owed >= $payment->unapplied ) {
-      $amount = $payment->unapplied;
+    my $owed;
+    if ( $conf->exists('pkg-balances') && $payment->pkgnum ) {
+      $owed = $cust_bill->owed_pkgnum($payment->pkgnum);
     } else {
-      $amount = $cust_bill->owed;
+      $owed = $cust_bill->owed;
     }
+    unless ( $owed > 0 ) {
+      push @payments, $payment;
+      next;
+    }
+
+    my $amount = min( $payment->unapplied, $owed );
 
     my $cust_bill_pay = new FS::cust_bill_pay ( {
       'paynum' => $payment->paynum,
       'invnum' => $cust_bill->invnum,
       'amount' => $amount,
     } );
+    $cust_bill_pay->pkgnum( $payment->pkgnum )
+      if $conf->exists('pkg-balances') && $payment->pkgnum;
     my $error = $cust_bill_pay->insert;
     if ( $error ) {
       $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
       die $error;
     }
 
-    redo if ( $cust_bill->owed > 0);
+    redo if ( $cust_bill->owed > 0) && ! $conf->exists('pkg-balances');
 
   }
 
@@ -6270,6 +6309,41 @@ sub total_owed_date {
 
 }
 
+=item total_owed_pkgnum PKGNUM
+
+Returns the total owed on all invoices for this customer's specific package
+when using experimental package balances (see L<FS::cust_bill/owed_pkgnum>).
+
+=cut
+
+sub total_owed_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  $self->total_owed_date_pkgnum(2145859200, $pkgnum); #12/31/2037
+}
+
+=item total_owed_date_pkgnum TIME PKGNUM
+
+Returns the total owed for this customer's specific package when using
+experimental package balances on all invoices with date earlier than
+TIME.  TIME is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also
+see L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=cut
+
+sub total_owed_date_pkgnum {
+  my( $self, $time, $pkgnum ) = @_;
+
+  my $total_bill = 0;
+  foreach my $cust_bill (
+    grep { $_->_date <= $time }
+      qsearch('cust_bill', { 'custnum' => $self->custnum, } )
+  ) {
+    $total_bill += $cust_bill->owed_pkgnum($pkgnum);
+  }
+  sprintf( "%.2f", $total_bill );
+
+}
+
 =item total_paid
 
 Returns the total amount of all payments.
@@ -6306,6 +6380,21 @@ sub total_unapplied_credits {
   sprintf( "%.2f", $total_credit );
 }
 
+=item total_unapplied_credits_pkgnum PKGNUM
+
+Returns the total outstanding credit (see L<FS::cust_credit>) for this
+customer.  See L<FS::cust_credit/credited>.
+
+=cut
+
+sub total_unapplied_credits_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  my $total_credit = 0;
+  $total_credit += $_->credited foreach $self->cust_credit_pkgnum($pkgnum);
+  sprintf( "%.2f", $total_credit );
+}
+
+
 =item total_unapplied_payments
 
 Returns the total unapplied payments (see L<FS::cust_pay>) for this customer.
@@ -6320,6 +6409,22 @@ sub total_unapplied_payments {
   sprintf( "%.2f", $total_unapplied );
 }
 
+=item total_unapplied_payments_pkgnum PKGNUM
+
+Returns the total unapplied payments (see L<FS::cust_pay>) for this customer's
+specific package when using experimental package balances.  See
+L<FS::cust_pay/unapplied>.
+
+=cut
+
+sub total_unapplied_payments_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  my $total_unapplied = 0;
+  $total_unapplied += $_->unapplied foreach $self->cust_pay_pkgnum($pkgnum);
+  sprintf( "%.2f", $total_unapplied );
+}
+
+
 =item total_unapplied_refunds
 
 Returns the total unrefunded refunds (see L<FS::cust_refund>) for this
@@ -6372,6 +6477,26 @@ sub balance_date {
   );
 }
 
+=item balance_pkgnum PKGNUM
+
+Returns the balance for this customer's specific package when using
+experimental package balances (total_owed plus total_unrefunded, minus
+total_unapplied_credits minus total_unapplied_payments)
+
+=cut
+
+sub balance_pkgnum {
+  my( $self, $pkgnum ) = @_;
+
+  sprintf( "%.2f",
+      $self->total_owed_pkgnum($pkgnum)
+# n/a - refunds aren't part of pkg-balances since they don't apply to invoices
+#    + $self->total_unapplied_refunds_pkgnum($pkgnum)
+    - $self->total_unapplied_credits_pkgnum($pkgnum)
+    - $self->total_unapplied_payments_pkgnum($pkgnum)
+  );
+}
+
 =item in_transit_payments
 
 Returns the total of requests for payments for this customer pending in 
@@ -7001,6 +7126,22 @@ sub cust_credit {
     qsearch( 'cust_credit', { 'custnum' => $self->custnum } )
 }
 
+=item cust_credit_pkgnum
+
+Returns all the credits (see L<FS::cust_credit>) for this customer's specific
+package when using experimental package balances.
+
+=cut
+
+sub cust_credit_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_credit', { 'custnum' => $self->custnum,
+                              'pkgnum'  => $pkgnum,
+                            }
+    );
+}
+
 =item cust_pay
 
 Returns all the payments (see L<FS::cust_pay>) for this customer.
@@ -7013,6 +7154,22 @@ sub cust_pay {
     qsearch( 'cust_pay', { 'custnum' => $self->custnum } )
 }
 
+=item cust_pay_pkgnum
+
+Returns all the payments (see L<FS::cust_pay>) for this customer's specific
+package when using experimental package balances.
+
+=cut
+
+sub cust_pay_pkgnum {
+  my( $self, $pkgnum ) = @_;
+  sort { $a->_date <=> $b->_date }
+    qsearch( 'cust_pay', { 'custnum' => $self->custnum,
+                           'pkgnum'  => $pkgnum,
+                         }
+    );
+}
+
 =item cust_pay_void
 
 Returns all voided payments (see L<FS::cust_pay_void>) for this customer.
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 4ff291934..e1e6df2a2 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -17,6 +17,7 @@ use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_pay_refund;
 use FS::cust_main;
+use FS::cust_pkg;
 use FS::cust_pay_void;
 
 @ISA = qw( FS::payinfo_transaction_Mixin FS::cust_main_Mixin FS::Record );
@@ -62,28 +63,54 @@ currently supported:
 
 =over 4
 
-=item paynum - primary key (assigned automatically for new payments)
+=item paynum
 
-=item custnum - customer (see L<FS::cust_main>)
+primary key (assigned automatically for new payments)
 
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+=item custnum
+
+customer (see L<FS::cust_main>)
+
+=item _date
+
+specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
-=item paid - Amount of this payment
+=item paid
+
+Amount of this payment
+
+=item otaker
+
+order taker (assigned automatically, see L<FS::UID>)
+
+=item payby
+
+Payment Type (See L<FS::payinfo_Mixin> for valid payby values)
+
+=item payinfo
+
+Payment Information (See L<FS::payinfo_Mixin> for data format)
+
+=item paymask
+
+Masked payinfo (See L<FS::payinfo_Mixin> for how this works)
+
+=item paybatch
 
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
+text field for tracking card processing or other batch grouping
 
-=item payby - Payment Type (See L<FS::payinfo_Mixin> for valid payby values)
+=item payunique
 
-=item payinfo - Payment Information (See L<FS::payinfo_Mixin> for data format)
+Optional unique identifer to prevent duplicate transactions.
 
-=item paymask - Masked payinfo (See L<FS::payinfo_Mixin> for how this works)
+=item closed
 
-=item paybatch - text field for tracking card processing or other batch grouping
+books closed flag, empty or `Y'
 
-=item payunique - Optional unique identifer to prevent duplicate transactions.
+=item pkgnum
 
-=item closed - books closed flag, empty or `Y'
+Desired pkgnum when using experimental package balances.
 
 =back
 
@@ -417,6 +444,7 @@ sub check {
     || $self->ut_textn('paybatch')
     || $self->ut_textn('payunique')
     || $self->ut_enum('closed', [ '', 'Y' ])
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
     || $self->payinfo_check()
   ;
   return $error if $error;
diff --git a/FS/FS/cust_pay_pending.pm b/FS/FS/cust_pay_pending.pm
index fba19ea19..f48e1a8c1 100644
--- a/FS/FS/cust_pay_pending.pm
+++ b/FS/FS/cust_pay_pending.pm
@@ -6,6 +6,7 @@ use FS::Record qw( qsearch qsearchs dbh ); #dbh for _upgrade_data
 use FS::payinfo_transaction_Mixin;
 use FS::cust_main_Mixin;
 use FS::cust_main;
+use FS::cust_pkg;
 use FS::cust_pay;
 
 @ISA = qw( FS::payinfo_transaction_Mixin FS::cust_main_Mixin FS::Record );
@@ -77,6 +78,10 @@ Expiration date
 
 Unique identifer to prevent duplicate transactions.
 
+=item pkgnum
+
+Desired pkgnum when using experimental package balances.
+
 =item status
 
 Pending transaction status, one of the following:
@@ -193,6 +198,7 @@ sub check {
     #|| $self->ut_money('cust_balance')
     || $self->ut_hexn('session_id')
     || $self->ut_foreign_keyn('paynum', 'cust_pay', 'paynum' )
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
     || $self->payinfo_check() #payby/payinfo/paymask/paydate
   ;
   return $error if $error;
diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index de05f710b..86fbbe5ab 100644
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -9,6 +9,7 @@ use FS::cust_pay;
 #use FS::cust_bill_pay;
 #use FS::cust_pay_refund;
 #use FS::cust_main;
+use FS::cust_pkg;
 
 @ISA = qw( FS::Record FS::payinfo_Mixin );
 
@@ -40,24 +41,44 @@ are currently supported:
 
 =over 4
 
-=item paynum - primary key (assigned automatically for new payments)
+=item paynum
 
-=item custnum - customer (see L<FS::cust_main>)
+primary key (assigned automatically for new payments)
 
-=item paid - Amount of this payment
+=item custnum
 
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
+customer (see L<FS::cust_main>)
+
+=item paid
+
+Amount of this payment
+
+=item _date
+
+specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
-=item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
+=item payby
+
+`CARD' (credit cards), `CHEK' (electronic check/ACH),
 `LECB' (phone bill billing), `BILL' (billing), `CASH' (cash),
 `WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free)
 
-=item payinfo - card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
+=item payinfo
+
+card number, check #, or comp issuer (4-8 lowercase alphanumerics; think username), respectively
+
+=item paybatch
+
+text field for tracking card processing
+
+=item closed
+
+books closed flag, empty or `Y'
 
-=item paybatch - text field for tracking card processing
+=item pkgnum
 
-=item closed - books closed flag, empty or `Y'
+Desired pkgnum when using experimental package balances.
 
 =item void_date
 
@@ -156,6 +177,7 @@ sub check {
     || $self->ut_number('_date')
     || $self->ut_textn('paybatch')
     || $self->ut_enum('closed', [ '', 'Y' ])
+    || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
     || $self->ut_numbern('void_date')
     || $self->ut_textn('reason')
   ;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 00a030117..4724514c0 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1750,6 +1750,63 @@ sub statuscolor {
   $statuscolor{$self->status};
 }
 
+=item pkg_label
+
+Returns a label for this package.  (Currently "pkgnum: pkg - comment" or
+"pkg-comment" depending on user preference).
+
+=cut
+
+sub pkg_label {
+  my $self = shift;
+  my $label = $self->part_pkg->pkg_comment( 'nopkgpart' => 1 );
+  $label = $self->pkgnum. ": $label"
+    if $FS::CurrentUser::CurrentUser->option('show_pkgnum');
+  $label;
+}
+
+=item pkg_label_long
+
+Returns a long label for this package, adding the primary service's label to
+pkg_label.
+
+=cut
+
+sub pkg_label_long {
+  my $self = shift;
+  my $label = $self->pkg_label;
+  my $cust_svc = $self->primary_cust_svc;
+  $label .= ' ('. ($cust_svc->label)[1]. ')' if $cust_svc;
+  $label;
+}
+
+=item primary_cust_svc
+
+Returns a primary service (as FS::cust_svc object) if one can be identified.
+
+=cut
+
+#for labeling purposes - might not 100% match up with part_pkg->svcpart's idea
+
+sub primary_cust_svc {
+  my $self = shift;
+
+  my @cust_svc = $self->cust_svc;
+
+  return '' unless @cust_svc; #no serivces - irrelevant then
+  
+  return $cust_svc[0] if scalar(@cust_svc) == 1; #always return a single service
+
+  # primary service as specified in the package definition
+  # or exactly one service definition with quantity one
+  my $svcpart = $self->part_pkg->svcpart;
+  @cust_svc = grep { $_->svcpart == $svcpart } @cust_svc;
+  return $cust_svc[0] if scalar(@cust_svc) == 1;
+
+  #couldn't identify one thing..
+  return '';
+}
+
 =item labels
 
 Returns a list of lists, calling the label method for all services
-- 
cgit v1.2.1


From 57c08db01160c72aaada973a62f7b3a2e3cbd544 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Thu, 30 Jul 2009 07:35:18 +0000
Subject: Make no_queue option work correctly

---
 FS/FS/part_export/shellcommands.pm | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index e375302a4..11e3b7d4b 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -301,13 +301,23 @@ sub _export_command {
   $ldap_password  = shell_quote $ldap_password;
 
   my $command_string = eval(qq("$command"));
-
-  $self->shellcommands_queue( $svc_acct->svcnum,
-    user         => $self->option('user')||'root',
-    host         => $self->machine,
-    command      => $command_string,
-    stdin_string => $stdin_string,
+  my @ssh_cmd_args = (
+    user          => $self->option('user') || 'root',
+    host          => $self->machine,
+    command       => $command_string,
+    stdin_string  => $stdin_string,
   );
+
+  if($self->options('no_queue')) {
+    # discard return value just like freeside-queued.
+    eval { ssh_cmd(@ssh_cmd_args) };
+    $error = $@;
+    return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+      if $error;
+  }
+  else {
+    $self->shellcommands_queue( $new->svcnum, @ssh_cmd_args );
+  }
 }
 
 sub _export_replace {
-- 
cgit v1.2.1


From c1dbb54da9699d6d347b6d8392e2108f80fb1dcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 30 Jul 2009 09:19:20 +0000
Subject: pass a pkgnum from self-service if applicable, RT#4339

---
 FS/FS/ClientAPI/MyAccount.pm | 11 ++++++++---
 FS/FS/cust_main.pm           |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 02b54ffc9..895b11d9d 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -128,6 +128,8 @@ sub login {
   if ( $cust_pkg ) {
     my $cust_main = $cust_pkg->cust_main;
     $session->{'custnum'} = $cust_main->custnum;
+    $session->{'pkgnum'} = $cust_pkg->pkgnum
+      if $conf->exists('pkg-balances');
   }
 
   my $session_id;
@@ -518,6 +520,7 @@ sub process_payment {
     'payname'  => $payname,
     'paybatch' => $paybatch, #this doesn't actually do anything
     'paycvv'   => $paycvv,
+    'pkgnum'   => $session->{'pkgnum'},
     map { $_ => $p->{$_} } @{ $payby2fields{$payby} }
   );
   return { 'error' => $error } if $error;
@@ -560,9 +563,11 @@ sub realtime_collect {
   my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
     or return { 'error' => "unknown custnum $custnum" };
 
-  my $error = $cust_main->realtime_collect( 'method'     => $p->{'method'},
-                                            'session_id' => $p->{'session_id'},
-                                          );
+  my $error = $cust_main->realtime_collect(
+    'method'     => $p->{'method'},
+    'pkgnum'     => $session->{'pkgnum'},
+    'session_id' => $p->{'session_id'},
+  );
   return { 'error' => $error } unless ref( $error );
 
   return { 'error' => '', amount => $cust_main->balance, %$error };
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9c131744d..becb9054b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3961,6 +3961,7 @@ sub realtime_bop {
     'payinfo'           => $payinfo,
     'paydate'           => $paydate,
     'recurring_billing' => $content{recurring_billing},
+    'pkgnum'            => $options{'pkgnum'},
     'status'            => 'new',
     'gatewaynum'        => ( $payment_gateway ? $payment_gateway->gatewaynum : '' ),
   };
@@ -4116,6 +4117,7 @@ sub realtime_bop {
        'payinfo'  => $payinfo,
        'paybatch' => $paybatch,
        'paydate'  => $paydate,
+       'pkgnum'   => $options{'pkgnum'},
     } );
     #doesn't hurt to know, even though the dup check is in cust_pay_pending now
     $cust_pay->payunique( $options{payunique} )
@@ -4629,7 +4631,7 @@ On failure returns an error message.
 
 Returns false or a hashref upon success.  The hashref contains keys popup_url reference, and collectitems.  The first is a URL to which a browser should be redirected for completion of collection.  The second is a reference id for the transaction suitable for the end user.  The collectitems is a reference to a list of name value pairs suitable for assigning to a html form and posted to popup_url.
 
-Available options are: I<method>, I<amount>, I<description>, I<invnum>, I<quiet>, I<paynum_ref>, I<payunique>, I<session_id>
+Available options are: I<method>, I<amount>, I<description>, I<invnum>, I<quiet>, I<paynum_ref>, I<payunique>, I<session_id>, I<pkgnum>
 
 I<method> is one of: I<CC>, I<ECHECK> and I<LEC>.  If none is specified
 then it is deduced from the customer record.
@@ -5002,6 +5004,7 @@ sub _new_realtime_bop {
     'payinfo'           => $options{payinfo},
     'paydate'           => $paydate,
     'recurring_billing' => $content{recurring_billing},
+    'pkgnum'            => $options{'pkgnum'},
     'status'            => 'new',
     'gatewaynum'        => $payment_gateway->gatewaynum || '',
     'session_id'        => $options{session_id} || '',
@@ -5248,6 +5251,7 @@ sub _realtime_bop_result {
        #'payinfo'  => $payinfo,
        'paybatch' => $paybatch,
        'paydate'  => $cust_pay_pending->paydate,
+       'pkgnum'   => $cust_pay_pending->pkgnum,
     } );
     #doesn't hurt to know, even though the dup check is in cust_pay_pending now
     $cust_pay->payunique( $options{payunique} )
-- 
cgit v1.2.1


From 7f43bf155bc79e3c9bd5d88e53117595963c301e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 31 Jul 2009 13:20:54 +0000
Subject: skin up self-service according to config passed from backend, RT#5530

---
 FS/FS/ClientAPI/MyAccount.pm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 895b11d9d..9d031be33 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -55,6 +55,25 @@ sub _cache {
              } );
 }
 
+sub skin_info {
+  #my $p = shift;
+
+  my $conf = new FS::Conf;
+
+  my %skin = (
+    'head'         => join("\n", $conf->config('selfservice-head') ),
+    'body_header'  => join("\n", $conf->config('selfservice-body_header') ),
+    'body_footer'  => join("\n", $conf->config('selfservice-body_footer') ),
+    'body_bgcolor' => scalar( $conf->config('selfservice-body_bgcolor') ),
+    'box_bgcolor'  => scalar( $conf->config('selfservice-box_bgcolor')  ),
+
+    'company_name'   => scalar($conf->config('company_name')),
+  );
+
+  \%skin;
+
+}
+
 sub login_info {
   my $p = shift;
 
-- 
cgit v1.2.1


From 9f64bfef652922b7b546a12290805710acbeed08 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sat, 1 Aug 2009 19:16:47 +0000
Subject: support broader array of queue args #5855, fallout from #5495

---
 FS/FS/Schema.pm    |  1 +
 FS/FS/queue.pm     | 17 +++++++++++------
 FS/FS/queue_arg.pm |  3 +++
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 15adba3ed..80aed8297 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1622,6 +1622,7 @@ sub tables_hashref {
       'columns' => [
         'argnum', 'serial', '', '', '', '', 
         'jobnum', 'int', '', '', '', '', 
+        'frozen', 'char', 'NULL',       1, '', '',
         'arg', 'text', 'NULL', '', '', '', 
       ],
       'primary_key' => 'argnum',
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 381e418c9..1f2abe3ae 100644
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -3,6 +3,8 @@ package FS::queue;
 use strict;
 use vars qw( @ISA @EXPORT_OK $DEBUG $conf $jobnums);
 use Exporter;
+use MIME::Base64;
+use Storable qw( nfreeze thaw );
 use FS::UID qw(myconnect);
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
@@ -142,9 +144,11 @@ sub insert {
   }
 
   foreach my $arg ( @args ) {
+    my $freeze = ref($arg) ? 'Y' : '';
     my $queue_arg = new FS::queue_arg ( {
       'jobnum' => $self->jobnum,
-      'arg'    => $arg,
+      'frozen' => $freeze,
+      'arg'    => $freeze ? encode_base64(nfreeze($arg)) : $arg,# always freeze?
     } );
     $error = $queue_arg->insert;
     if ( $error ) {
@@ -254,11 +258,12 @@ Returns a list of the arguments associated with this job.
 
 sub args {
   my $self = shift;
-  map $_->arg, qsearch( 'queue_arg',
-                        { 'jobnum' => $self->jobnum },
-                        '',
-                        'ORDER BY argnum'
-                      );
+  map { $_->frozen ? thaw(decode_base64($_->arg)) : $_->arg }
+    qsearch( 'queue_arg',
+             { 'jobnum' => $self->jobnum },
+             '',
+             'ORDER BY argnum'
+           );
 }
 
 =item cust_svc
diff --git a/FS/FS/queue_arg.pm b/FS/FS/queue_arg.pm
index c96ff1236..8e9a10d28 100644
--- a/FS/FS/queue_arg.pm
+++ b/FS/FS/queue_arg.pm
@@ -36,6 +36,8 @@ FS::Record.  The following fields are currently supported:
 
 =item jobnum - see L<FS::queue>
 
+=item frozen - argument is frozen with Storable
+
 =item arg - argument
 
 =back
@@ -96,6 +98,7 @@ sub check {
   my $error =
     $self->ut_numbern('argnum')
     || $self->ut_numbern('jobnum')
+    || $self->ut_enum('frozen', [ '', 'Y' ])
     || $self->ut_anything('arg')
   ;
   return $error if $error;
-- 
cgit v1.2.1


From 01b857aa5fb209905d569844bc44710999df84e6 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 3 Aug 2009 14:07:27 +0000
Subject: bad tyops

---
 FS/FS/part_export/shellcommands.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 11e3b7d4b..faf065593 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -308,7 +308,7 @@ sub _export_command {
     stdin_string  => $stdin_string,
   );
 
-  if($self->options('no_queue')) {
+  if($self->option('no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
@@ -387,7 +387,7 @@ sub _export_replace {
     stdin_string  => $stdin_string,
   );
 
-  if($self->options('no_queue')) {
+  if($self->option('no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
-- 
cgit v1.2.1


From 3ad071d4c8d05a8a0a1e5a975722600e183548b4 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 3 Aug 2009 14:17:15 +0000
Subject: new doesn't exist

---
 FS/FS/part_export/shellcommands.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index faf065593..ed51f5d72 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -316,7 +316,7 @@ sub _export_command {
       if $error;
   }
   else {
-    $self->shellcommands_queue( $new->svcnum, @ssh_cmd_args );
+    $self->shellcommands_queue( $svc_acct->svcnum, @ssh_cmd_args );
   }
 }
 
-- 
cgit v1.2.1


From 32c4b823d2561ec9ed14fa446c11f15a68404d37 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Aug 2009 00:19:23 +0000
Subject: don't reset usage on package change when usage_rollover is on, it
 adds twice...

---
 FS/FS/cust_pkg.pm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4724514c0..396ae07cc 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1188,13 +1188,14 @@ sub change {
   }
 
   #reset usage if changing pkgpart
+  # AND usage rollover is off (otherwise adds twice, now and at package bill)
   if ($self->pkgpart != $cust_pkg->pkgpart) {
     my $part_pkg = $cust_pkg->part_pkg;
     $error = $part_pkg->reset_usage($cust_pkg, $part_pkg->is_prepaid
                                                  ? ()
                                                  : ( 'null' => 1 )
                                    )
-      if $part_pkg->can('reset_usage');
+      if $part_pkg->can('reset_usage') && ! $part_pkg->option('usage_rollover');
 
     if ($error) {
       $dbh->rollback if $oldAutoCommit;
@@ -1835,6 +1836,19 @@ sub h_labels {
   map { [ $_->label(@_) ] } $self->h_cust_svc(@_);
 }
 
+=item labels_short
+
+Like labels, except returns a simple flat list, and shortens long
+(currently >5 or the cust_bill-max_same_services configuration value) lists of
+identical services to one line that lists the service label and the number of
+individual services rather than individual items.
+
+=cut
+
+sub labels_short {
+  shift->_labels_short( 'labels', @_ );
+}
+
 =item h_labels_short END_TIMESTAMP [ START_TIMESTAMP ]
 
 Like h_labels, except returns a simple flat list, and shortens long
@@ -1845,7 +1859,11 @@ individual services rather than individual items.
 =cut
 
 sub h_labels_short {
-  my $self = shift;
+  shift->_labels_short( 'h_labels', @_ );
+}
+
+sub _labels_short {
+  my( $self, $method ) = ( shift, shift );
 
   my $conf = new FS::Conf;
   my $max_same_services = $conf->config('cust_bill-max_same_services') || 5;
-- 
cgit v1.2.1


From de7dc370b95f4175dd3119acffe2af2c8f6d735f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Aug 2009 22:04:51 +0000
Subject: ignore problams calling ->overlimit during sqlradius-reset, wtf?! 
 RT#5868

---
 FS/FS/svc_Common.pm             | 21 ++++++++++++++++++---
 FS/bin/freeside-sqlradius-reset |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 869ab5831..8fd5d0df6 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -1,8 +1,9 @@
 package FS::svc_Common;
 
 use strict;
-use vars qw( @ISA $noexport_hack $DEBUG $me );
-use Carp qw( cluck carp croak ); #specify cluck have to specify them all..
+use vars qw( @ISA $noexport_hack $DEBUG $me
+             $overlimit_missing_cust_svc_nonfatal_kludge );
+use Carp qw( cluck carp croak confess ); #specify cluck have to specify them all
 use Scalar::Util qw( blessed );
 use FS::Record qw( qsearch qsearchs fields dbh );
 use FS::cust_main_Mixin;
@@ -18,6 +19,8 @@ use FS::inventory_class;
 $me = '[FS::svc_Common]';
 $DEBUG = 0;
 
+$overlimit_missing_cust_svc_nonfatal_kludge = 0;
+
 =head1 NAME
 
 FS::svc_Common - Object method for all svc_ records
@@ -798,7 +801,19 @@ Sets or retrieves overlimit date.
 
 sub overlimit {
   my $self = shift;
-  $self->cust_svc->overlimit(@_);
+  #$self->cust_svc->overlimit(@_);
+  my $cust_svc = $self->cust_svc;
+  unless ( $cust_svc ) { #wtf?
+    my $error = "$me overlimit: missing cust_svc record for svc_acct svcnum ".
+                $self->svcnum;
+    if ( $overlimit_missing_cust_svc_nonfatal_kludge ) {
+      cluck "$error; continuing anyway as requested";
+      return '';
+    } else {
+      confess $error;
+    }
+  }
+  $cust_svc->overlimit(@_);
 }
 
 =item cancel
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 7d1d34336..5c77747ac 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -42,6 +42,10 @@ unless ( $opt_n ) {
   }
 }
 
+use FS::svc_Common;
+$FS::svc_Common::overlimit_missing_cust_svc_nonfatal_kludge = 1;
+$FS::svc_Common::overlimit_missing_cust_svc_nonfatal_kludge = 1;
+
 foreach my $export ( @exports ) {
 
   #my @svcparts = map { $_->svcpart } $export->export_svc;
-- 
cgit v1.2.1


From 7bb7306b32e48ae29fc91eb969ba70a465d21c2d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 4 Aug 2009 23:43:48 +0000
Subject: hopefully ignore errors about deleted accounts and properly finish
 freeside-sqlradius-reset, RT#5868

---
 FS/FS/svc_acct.pm               | 14 +++++++++-----
 FS/bin/freeside-sqlradius-reset | 19 +++++++++++++++----
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 6f61eae0e..294e32794 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1496,11 +1496,15 @@ sub radius_check {
   $check{$pw_attrib} = $password;
 
   my $cust_svc = $self->cust_svc;
-  die "FATAL: no cust_svc record for svc_acct.svcnum ". $self->svcnum. "\n"
-    unless $cust_svc;
-  my $cust_pkg = $cust_svc->cust_pkg;
-  if ( $cust_pkg && $cust_pkg->part_pkg->is_prepaid && $cust_pkg->bill ) {
-    $check{'Expiration'} = time2str('%B %e %Y %T', $cust_pkg->bill ); #http://lists.cistron.nl/pipermail/freeradius-users/2005-January/040184.html
+  if ( $cust_svc ) {
+    my $cust_pkg = $cust_svc->cust_pkg;
+    if ( $cust_pkg && $cust_pkg->part_pkg->is_prepaid && $cust_pkg->bill ) {
+      $check{'Expiration'} = time2str('%B %e %Y %T', $cust_pkg->bill ); #http://lists.cistron.nl/pipermail/freeradius-users/2005-January/040184.html
+    }
+  } else {
+    warn "WARNING: no cust_svc record for svc_acct.svcnum ". $self->svcnum.
+         "; can't set Expiration\n"
+      unless $cust_svc;
   }
 
   %check;
diff --git a/FS/bin/freeside-sqlradius-reset b/FS/bin/freeside-sqlradius-reset
index 5c77747ac..a77bad64f 100755
--- a/FS/bin/freeside-sqlradius-reset
+++ b/FS/bin/freeside-sqlradius-reset
@@ -53,14 +53,25 @@ foreach my $export ( @exports ) {
 
   my @svc_x =
     map  { $_->svc_x }
-    map  { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
-    grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+    #map  { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+    #grep { qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) }
+    #     $export->export_svc;
+    map  { @{ $_->[1] } }
+    grep { scalar( @{ $_->[1] } ) }
+    map  { [ $_, [ qsearch('cust_svc', { 'svcpart' => $_->svcpart } ) ] ] }
          $export->export_svc;
 
+
   foreach my $svc_x ( @svc_x ) {
 
-    $svc_x->check; #set any fixed usergroup so it'll export even if all
-                   #svc_acct records don't have the group yet
+    #$svc_x->check; #set any fixed usergroup so it'll export even if all
+    #               #svc_acct records don't have the group yet
+    #more efficient?
+    my $x = $svc_x->setfixed( $svc_x->_fieldhandlers);
+    unless ( ref($x) ) {
+      warn "WARNING: can't set fixed usergroups for svcnum ". $svc_x->svcnum.
+           "\n";
+    } 
 
     if ($overlimit_groups && $svc_x->overlimit) {
       $svc_x->usergroup( &{ $svc_x->_fieldhandlers->{'usergroup'} }
-- 
cgit v1.2.1


From f062fac0e5f6c352c1622ed66531f0521980302c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Aug 2009 02:27:08 +0000
Subject: export negative byte values to chillispot attributes as 0, RT#5815

---
 FS/FS/svc_acct.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 294e32794..ac978640d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1455,6 +1455,7 @@ sub radius_reply {
       my $is = $whatis{$what}.'bytes';
       if ( $self->$is() =~ /\d/ ) {
         my $big = new Math::BigInt $self->$is();
+        $big = new Math::BigInto '0' if $big->is_neg();
         my $att = "Chillispot-Max-\u$what";
         $reply{"$att-Octets"}    = $big->copy->band(0xffffffff)->bstr;
         $reply{"$att-Gigawords"} = $big->copy->brsft(32)->bstr;
-- 
cgit v1.2.1


From d6107b6ae3fce55df974ac0a603443adb1d14ba7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Aug 2009 02:27:35 +0000
Subject: export negative byte values to chillispot attributes as 0, RT#5815

---
 FS/FS/svc_acct.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ac978640d..74bbd1ac4 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1455,7 +1455,7 @@ sub radius_reply {
       my $is = $whatis{$what}.'bytes';
       if ( $self->$is() =~ /\d/ ) {
         my $big = new Math::BigInt $self->$is();
-        $big = new Math::BigInto '0' if $big->is_neg();
+        $big = new Math::BigInt '0' if $big->is_neg();
         my $att = "Chillispot-Max-\u$what";
         $reply{"$att-Octets"}    = $big->copy->band(0xffffffff)->bstr;
         $reply{"$att-Gigawords"} = $big->copy->brsft(32)->bstr;
-- 
cgit v1.2.1


From 94a66b78bcda5605d7ee5eb7c3e692fb2fe5cf2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 5 Aug 2009 23:34:28 +0000
Subject: fix cancellation errors with updated flat_introrate, RT#5865

---
 FS/FS/part_pkg/agent.pm           |  2 +-
 FS/FS/part_pkg/base_rate.pm       |  4 ++--
 FS/FS/part_pkg/flat.pm            | 10 +++++-----
 FS/FS/part_pkg/flat_delayed.pm    |  2 +-
 FS/FS/part_pkg/prorate_delayed.pm |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/agent.pm b/FS/FS/part_pkg/agent.pm
index 2ebaf5807..d41978cf5 100644
--- a/FS/FS/part_pkg/agent.pm
+++ b/FS/FS/part_pkg/agent.pm
@@ -119,7 +119,7 @@ sub calc_recur {
         my $pkg_setup_fee  =
           $part_pkg->setup_cost || $part_pkg->option('setup_fee');
         my $pkg_base_recur =
-          $part_pkg->recur_cost || $part_pkg->base_recur_permonth;
+          $part_pkg->recur_cost || $part_pkg->base_recur_permonth($cust_pkg);
 
         my $pkg_start = $cust_pkg->get('setup');
         if ( $pkg_start < $last_bill ) {
diff --git a/FS/FS/part_pkg/base_rate.pm b/FS/FS/part_pkg/base_rate.pm
index 64636d9ae..440e98518 100644
--- a/FS/FS/part_pkg/base_rate.pm
+++ b/FS/FS/part_pkg/base_rate.pm
@@ -63,7 +63,7 @@ sub calc_remain {
   my $time = time;  #should be able to pass this in for credit calculation
   my $next_bill = $cust_pkg->getfield('bill') || 0;
   my $last_bill = $cust_pkg->last_bill || 0;
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill
@@ -81,7 +81,7 @@ sub calc_remain {
   my $freq_sec = $1 * $sec{$2||'m'};
   return 0 unless $freq_sec;
 
-  sprintf("%.2f", $self->base_recur * ( $next_bill - $time ) / $freq_sec );
+  sprintf("%.2f", $self->base_recur($cust_pkg) * ( $next_bill - $time ) / $freq_sec );
 
 }
 
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index d1863f432..02ac6aeed 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -162,11 +162,11 @@ sub base_recur {
 }
 
 sub base_recur_permonth {
-  my($self, $cust_pkg) = @_; #$cust_pkg?
+  my($self, $cust_pkg) = @_;
 
   return 0 unless $self->freq =~ /^\d+$/ && $self->freq > 0;
 
-  sprintf('%.2f', $self->base_recur / $self->freq );
+  sprintf('%.2f', $self->base_recur($cust_pkg) / $self->freq );
 }
 
 sub calc_remain {
@@ -184,7 +184,7 @@ sub calc_remain {
   #my $last_bill = $cust_pkg->last_bill || 0;
   my $last_bill = $cust_pkg->get('last_bill') || 0; #->last_bill falls back to setup
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill
@@ -202,7 +202,7 @@ sub calc_remain {
   my $freq_sec = $1 * $sec{$2||'m'};
   return 0 unless $freq_sec;
 
-  sprintf("%.2f", $self->base_recur * ( $next_bill - $time ) / $freq_sec );
+  sprintf("%.2f", $self->base_recur($cust_pkg) * ( $next_bill - $time ) / $freq_sec );
 
 }
 
@@ -216,7 +216,7 @@ sub is_prepaid {
 
 sub usage_valuehash {
   my $self = shift;
-  map { $_, $self->option($_) } 
+  map { $_, $self->option($_) }
     grep { $self->option($_, 'hush') } 
     qw(seconds upbytes downbytes totalbytes);
 }
diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
index 4a2f1baf1..33f9dd80e 100644
--- a/FS/FS/part_pkg/flat_delayed.pm
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -58,7 +58,7 @@ sub calc_remain {
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill;
diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm
index 1d227984c..0073493ed 100644
--- a/FS/FS/part_pkg/prorate_delayed.pm
+++ b/FS/FS/part_pkg/prorate_delayed.pm
@@ -56,7 +56,7 @@ sub calc_remain {
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill;
-- 
cgit v1.2.1


From 833feb1713594b0146c230f8957d91e14ba0e436 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Aug 2009 00:39:36 +0000
Subject: delete phone_device records when svc_phone is deleted, RT#5226

---
 FS/FS/svc_phone.pm | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index badbb4eb4..11a5a0ee0 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -3,7 +3,7 @@ package FS::svc_phone;
 use strict;
 use vars qw( @ISA @pw_set $conf );
 use FS::Conf;
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch qsearchs dbh );
 use FS::Msgcat qw(gettext);
 use FS::svc_Common;
 use FS::part_svc;
@@ -152,6 +152,39 @@ Delete this record from the database.
 
 =cut
 
+sub delete {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $phone_device ( $self->phone_device ) {
+    my $error = $phone_device->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 # the delete method can be inherited from FS::Record
 
 =item replace OLD_RECORD
-- 
cgit v1.2.1


From b3e081bbd2ba95554687a531bc134c00026a3669 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 6 Aug 2009 00:41:41 +0000
Subject: pass mac addresses as lower-case to netsapiens, RT#5226

---
 FS/FS/part_export/netsapiens.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 9181344fb..a24bc3727 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -118,7 +118,7 @@ sub ns_device {
   #my $countrycode = $svc_phone->countrycode;
   #my $phonenum    = $svc_phone->phonenum;
 
-  "/phones_config/". $phone_device->mac_addr;
+  "/phones_config/". lc($phone_device->mac_addr);
 }
 
 sub ns_create_or_update {
-- 
cgit v1.2.1


From 958afb8d05de67e12df258b57bedcf85028b6253 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Aug 2009 00:39:14 +0000
Subject: don't start recurring billing when a start date hasn't been reached
 yet either... and since that works, add the start date to new package order,
 RT#5347

---
 FS/FS/cust_main.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index becb9054b..8cd03ebc6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2857,9 +2857,10 @@ sub _make_lines {
   my $recur = 0;
   my $unitrecur = 0;
   my $sdate;
-  if ( ! $cust_pkg->getfield('susp') and
-           ( $part_pkg->getfield('freq') ne '0' &&
-             ( $cust_pkg->getfield('bill') || 0 ) <= $time
+  if (     ! $cust_pkg->get('susp')
+       and ! $cust_pkg->get('start_date')
+       and ( $part_pkg->getfield('freq') ne '0'
+             && ( $cust_pkg->getfield('bill') || 0 ) <= $time
            )
         || ( $part_pkg->plan eq 'voip_cdr'
               && $part_pkg->option('bill_every_call')
-- 
cgit v1.2.1


From c183de0b7e942672cafdc1c14a203e389ffd2c43 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 7 Aug 2009 23:08:03 +0000
Subject: add ability to edit signup dates (turn on cust_main-edit_signupdate
 config), RT#4644

---
 FS/FS/Conf.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c335c0140..66f74578d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3016,6 +3016,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'cust_main-edit_signupdate',
+    'section'     => 'UI',
+    'descritpion' => 'Enable manual editing of the signup date.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
-- 
cgit v1.2.1


From 283ea2b5137ae3ec36882b492e6de024b0ce6027 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sun, 9 Aug 2009 09:05:38 +0000
Subject: Add cust_attachment stuff

---
 FS/FS/AccessRight.pm     |   3 +
 FS/FS/Conf.pm            |  14 ++++
 FS/FS/Mason.pm           |   1 +
 FS/FS/Record.pm          |   8 ++-
 FS/FS/Schema.pm          |  16 +++++
 FS/FS/cust_attachment.pm | 170 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 FS/FS/cust_attachment.pm

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 29cecd5f2..d19212520 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -100,6 +100,9 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers
     'Add customer note', #NEW
     'Edit customer note', #NEW
+    'Download attachment', #NEW
+    'Add attachment', #NEW
+    'Edit attachment', #NEW
     'Bill customer now', #NEW
     'Bulk send customer notices', #NEW
   ],
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 66f74578d..1da55837c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -735,6 +735,20 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'disable_cust_attachment',
+    'section'     => '',
+    'description' => 'Disable customer file attachments',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'max_attachment_size',
+    'section'     => '',
+    'description' => 'Maximum size for customer file attachments (leave blank for unlimited)',
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'disable_customer_referrals',
     'section'     => 'UI',
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index ed99bf694..d73d3810a 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -186,6 +186,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::part_pkg_taxrate;
   use FS::tax_rate;
   use FS::part_pkg_report_option;
+  use FS::cust_attachment;
   use FS::h_cust_pkg;
   use FS::h_svc_acct;
   use FS::h_svc_broadband;
diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 9e1c0e890..11afd9ff6 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -55,14 +55,13 @@ FS::UID->install_callback( sub {
   $conf_encryption = $conf->exists('encryption');
   $File::CounterFile::DEFAULT_DIR = $conf->base_dir . "/counters.". datasrc;
   if ( driver_name eq 'Pg' ) {
-    eval "use DBD::Pg qw(:pg_types);";
+    eval "use DBD::Pg ':pg_types'";
     die $@ if $@;
   } else {
     eval "sub PG_BYTEA { die 'guru meditation #9: calling PG_BYTEA when not running Pg?'; }";
   }
 } );
 
-
 =head1 NAME
 
 FS::Record - Database record objects
@@ -2718,7 +2717,10 @@ sub _quote {
           )
   {
     no strict 'subs';
-    dbh->quote($value, PG_BYTEA);
+#    dbh->quote($value, { pg_type => PG_BYTEA() }); # doesn't work right
+    # Pg binary string quoting: convert each character to 3-digit octal prefixed with \\, 
+    # single-quote the whole mess, and put an "E" in front.
+    return ("E'" . join('', map { sprintf('\\\\%03o', ord($_)) } split(//, $value) ) . "'");
   } else {
     dbh->quote($value);
   }
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 80aed8297..0ede00031 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -372,6 +372,22 @@ sub tables_hashref {
       'index' => [ ['typenum'] ],
     },
 
+    'cust_attachment' => {
+      'columns' => [
+        'attachnum', 'serial', '', '', '', '',
+        'custnum',   'int', '', '', '', '',
+        '_date',     @date_type, '', '',
+        'otaker',    'varchar', '', 32, '', '',
+        'filename',  'varchar', '', 32, '', '',
+        'mime_type', 'varchar', '', 32, '', '',
+        'body',      'blob', 'NULL', '', '', '',
+        'disabled',  @date_type, '', '',
+      ],
+      'primary_key' => 'attachnum',
+      'unique'      => [],
+      'index'       => [ ['custnum'] ],
+    },
+
     'cust_bill' => {
       'columns' => [
         'invnum',    'serial',  '', '', '', '', 
diff --git a/FS/FS/cust_attachment.pm b/FS/FS/cust_attachment.pm
new file mode 100644
index 000000000..9527381f4
--- /dev/null
+++ b/FS/FS/cust_attachment.pm
@@ -0,0 +1,170 @@
+package FS::cust_attachment;
+
+use strict;
+use base qw( FS::Record );
+use FS::Record qw( qsearch qsearchs );
+use FS::Conf;
+
+=head1 NAME
+
+FS::cust_attachment - Object methods for cust_attachment records
+
+=head1 SYNOPSIS
+
+  use FS::cust_attachment;
+
+  $record = new FS::cust_attachment \%hash;
+  $record = new FS::cust_attachment { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_attachment object represents a file attached to a L<FS::cust_main>
+object.  FS::cust_attachment inherits from FS::Record.  The following fields 
+are currently supported:
+
+=over 4
+
+=item attachnum
+
+Primary key (assigned automatically).
+
+=item custnum
+
+Customer number (see L<FS::cust_main>).
+
+=item _date
+
+The date the record was last updated.
+
+=item otaker
+
+Order taker (assigned automatically; see L<FS::UID>).
+
+=item filename
+
+The file's name.
+
+=item mime_type
+
+The Content-Type of the file.
+
+=item body
+
+The contents of the file.
+
+=item disabled
+
+If the attachment was disabled, this contains the date it was disabled.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new attachment object.
+
+=cut
+
+# the new method can be inherited from FS::Record, if a table method is defined
+
+sub table { 'cust_attachment'; }
+
+sub nohistory_fields { 'body'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+# the replace method can be inherited from FS::Record
+
+=item check
+
+Checks all fields to make sure this is a valid example.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+# the check method should currently be supplied - FS::Record contains some
+# data checking routines
+
+sub check {
+  my $self = shift;
+
+  my $conf = new FS::Conf;
+  my $error;
+  if($conf->config('disable_cust_attachment') ) {
+    $error = 'Attachments disabled (see configuration)';
+  }
+
+  $error = 
+    $self->ut_numbern('attachnum')
+    || $self->ut_number('custnum')
+    || $self->ut_numbern('_date')
+    || $self->ut_text('otaker')
+    || $self->ut_text('filename')
+    || $self->ut_text('mime_type')
+    || $self->ut_numbern('disabled')
+    || $self->ut_anything('body')
+  ;
+  if($conf->config('max_attachment_size') 
+    and $self->size > $conf->config('max_attachment_size') ) {
+    $error = 'Attachment too large'
+  }
+  return $error if $error;
+
+  $self->SUPER::check;
+}
+
+=item size
+
+Returns the size of the attachment in bytes.
+
+=cut
+
+sub size {
+  my $self = shift;
+  return length($self->body);
+}
+
+=back
+
+=head1 BUGS
+
+Doesn't work on non-Postgres systems.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
-- 
cgit v1.2.1


From d4c01ecffef02ef160d8c367270324e3d6a1c75d Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 9 Aug 2009 22:47:57 +0000
Subject: don't bomb when the line item has no start date

---
 FS/FS/cust_bill_pkg.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index abf021845..bb30f03cd 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -299,6 +299,7 @@ Returns the previous cust_bill_pkg for this package, if any.
 
 sub previous_cust_bill_pkg {
   my $self = shift;
+  return unless $self->sdate;
   qsearchs({
     'table'    => 'cust_bill_pkg',
     'hashref'  => { 'pkgnum' => $self->pkgnum,
-- 
cgit v1.2.1


From 81b342e3f83b433979a25c75cf287ad394ad8513 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 9 Aug 2009 23:45:06 +0000
Subject: fix per agent spools

---
 FS/FS/part_event/Action/cust_bill_spool_csv.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_spool_csv.pm b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
index f20ee46c9..11bb7b1a8 100644
--- a/FS/FS/part_event/Action/cust_bill_spool_csv.pm
+++ b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
@@ -35,6 +35,7 @@ sub option_fields {
                            },
     'spoolagent_spools' => { label => 'Individual per-agent spools',
                              type  => 'checkbox',
+                             value => 'Y',
                            },
   );
 }
-- 
cgit v1.2.1


From 39000f1ad925a76a4a334271b8e9e5da6a5dcb89 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 9 Aug 2009 23:53:39 +0000
Subject: whoops: theory should match practice

---
 FS/FS/part_event/Action/cust_bill_spool_csv.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_spool_csv.pm b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
index 11bb7b1a8..43d230033 100644
--- a/FS/FS/part_event/Action/cust_bill_spool_csv.pm
+++ b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
@@ -35,7 +35,7 @@ sub option_fields {
                            },
     'spoolagent_spools' => { label => 'Individual per-agent spools',
                              type  => 'checkbox',
-                             value => 'Y',
+                             value => '1',
                            },
   );
 }
-- 
cgit v1.2.1


From 99100d7e0d0b22a1844dde88acd529e79d096463 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Aug 2009 11:50:04 +0000
Subject: when using pkg-balances, limit self-service access when a customer
 with multiple packages logs on, RT#4189

---
 FS/FS/ClientAPI/MyAccount.pm | 149 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 111 insertions(+), 38 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 9d031be33..b6934f8bd 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -60,17 +60,20 @@ sub skin_info {
 
   my $conf = new FS::Conf;
 
-  my %skin = (
-    'head'         => join("\n", $conf->config('selfservice-head') ),
-    'body_header'  => join("\n", $conf->config('selfservice-body_header') ),
-    'body_footer'  => join("\n", $conf->config('selfservice-body_footer') ),
-    'body_bgcolor' => scalar( $conf->config('selfservice-body_bgcolor') ),
-    'box_bgcolor'  => scalar( $conf->config('selfservice-box_bgcolor')  ),
+  use vars qw($skin_info); #cache for performance.
+  #agentnum eventually...?  but if they're not logged in yet.. ?
+
+  $skin_info ||= {
+    'head'           => join("\n", $conf->config('selfservice-head') ),
+    'body_header'    => join("\n", $conf->config('selfservice-body_header') ),
+    'body_footer'    => join("\n", $conf->config('selfservice-body_footer') ),
+    'body_bgcolor'   => scalar( $conf->config('selfservice-body_bgcolor') ),
+    'box_bgcolor'    => scalar( $conf->config('selfservice-box_bgcolor')  ),
 
     'company_name'   => scalar($conf->config('company_name')),
-  );
+  };
 
-  \%skin;
+  $skin_info;
 
 }
 
@@ -80,6 +83,7 @@ sub login_info {
   my $conf = new FS::Conf;
 
   my %info = (
+    %{ skin_info() },
     'phone_login'  => $conf->exists('selfservice_server-phone_login'),
     'single_domain'=> scalar($conf->config('selfservice_server-single_domain')),
   );
@@ -122,16 +126,6 @@ sub login {
                            );
     return { error => 'User not found.' } unless $svc_acct;
 
-    #my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
-    #return { error => 'Only primary user may log in.' } 
-    #  if $conf->exists('selfservice_server-primary_only')
-    #    && ( ! $pkg_svc || $pkg_svc->primary_svc ne 'Y' );
-    my $cust_svc = $svc_acct->cust_svc;
-    my $part_pkg = $cust_svc->cust_pkg->part_pkg;
-    return { error => 'Only primary user may log in.' } 
-      if $conf->exists('selfservice_server-primary_only')
-         && $cust_svc->svcpart != $part_pkg->svcpart('svc_acct');
-
     return { error => 'Incorrect password.' }
       unless $svc_acct->check_password($p->{'password'});
 
@@ -143,14 +137,28 @@ sub login {
     'svcnum' => $svc_x->svcnum,
   };
 
-  my $cust_pkg = $svc_x->cust_svc->cust_pkg;
+  my $cust_svc = $svc_x->cust_svc;
+  my $cust_pkg = $cust_svc->cust_pkg;
   if ( $cust_pkg ) {
     my $cust_main = $cust_pkg->cust_main;
     $session->{'custnum'} = $cust_main->custnum;
-    $session->{'pkgnum'} = $cust_pkg->pkgnum
-      if $conf->exists('pkg-balances');
+    if ( $conf->exists('pkg-balances') ) {
+      my @cust_pkg = grep { $_->part_pkg->freq !~ /^(0|$)/ }
+                          $cust_main->ncancelled_pkgs;
+      $session->{'pkgnum'} = $cust_pkg->pkgnum
+        if scalar(@cust_pkg) > 1;
+    }
   }
 
+  #my $pkg_svc = $svc_acct->cust_svc->pkg_svc;
+  #return { error => 'Only primary user may log in.' } 
+  #  if $conf->exists('selfservice_server-primary_only')
+  #    && ( ! $pkg_svc || $pkg_svc->primary_svc ne 'Y' );
+  my $part_pkg = $cust_pkg->part_pkg;
+  return { error => 'Only primary user may log in.' }
+    if $conf->exists('selfservice_server-primary_only')
+       && $cust_svc->svcpart != $part_pkg->svcpart([qw( svc_acct svc_phone )]);
+
   my $session_id;
   do {
     $session_id = md5_hex(md5_hex(time(). {}. rand(). $$))
@@ -168,12 +176,57 @@ sub logout {
   my $p = shift;
   if ( $p->{'session_id'} ) {
     _cache->remove($p->{'session_id'});
-    return { 'error' => '' };
+    return { %{ skin_info() }, 'error' => '' };
   } else {
-    return { 'error' => "Can't resume session" }; #better error message
+    return { %{ skin_info() }, 'error' => "Can't resume session" }; #better error message
   }
 }
 
+sub access_info {
+  my $p = shift;
+
+  my $conf = new FS::Conf;
+
+  my $info = skin_info($p);
+
+  use vars qw( $cust_paybys ); #cache for performance
+  unless ( $cust_paybys ) {
+
+    my %cust_paybys = map { $_ => 1 }
+                      map { FS::payby->payby2payment($_) }
+                          $conf->config('signup_server-payby');
+
+    $cust_paybys = [ keys %cust_paybys ];
+
+  }
+  $info->{'cust_paybys'} = $cust_paybys;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or return { 'error' => "unknown custnum $custnum" };
+
+  $info->{hide_payment_fields} =
+  [
+    map { FS::payby->realtime($_) &&
+          $cust_main
+            ->agent
+            ->payment_gateway( 'method' => FS::payby->payby2bop($_) )
+            ->gateway_namespace
+            eq 'Business::OnlineThirdPartyPayment'
+        }
+    @{ $info->{cust_paybys} }
+  ];
+
+  return { %$info,
+           'custnum'    => $custnum,
+           'pkgnum'     => $session->{'pkgnum'},
+           'svcnum'     => $session->{'svcnum'},
+           'nonprimary' => $session->{'nonprimary'},
+         };
+}
+
 sub customer_info {
   my $p = shift;
 
@@ -196,21 +249,32 @@ sub customer_info {
     my $cust_main = qsearchs('cust_main', $search )
       or return { 'error' => "unknown custnum $custnum" };
 
-    $return{balance} = $cust_main->balance;
+    if ( $session->{'pkgnum'} ) { 
+      $return{balance} = $cust_main->balance_pkgnum( $session->{'pkgnum'} );
+    } else {
+      $return{balance} = $cust_main->balance;
+    }
 
     $return{tickets} = [ ($cust_main->tickets) ];
 
-    my @open = map {
-                     {
-                       invnum => $_->invnum,
-                       date   => time2str("%b %o, %Y", $_->_date),
-                       owed   => $_->owed,
-                     };
-                   } $cust_main->open_cust_bill;
-    $return{open_invoices} = \@open;
+    unless ( $session->{'pkgnum'} ) {
+      my @open = map {
+                       {
+                         invnum => $_->invnum,
+                         date   => time2str("%b %o, %Y", $_->_date),
+                         owed   => $_->owed,
+                       };
+                     } $cust_main->open_cust_bill;
+      $return{open_invoices} = \@open;
+    }
 
     $return{small_custview} =
-      small_custview( $cust_main, $conf->config('countrydefault') );
+      small_custview( $cust_main,
+                      scalar($conf->config('countrydefault')),
+                      ( $session->{'pkgnum'} ? 1 : 0 ), #nobalance
+                    );
+
+    warn $return{small_custview};
 
     $return{name} = $cust_main->first. ' '. $cust_main->get('last');
 
@@ -359,6 +423,12 @@ sub payment_info {
                      'country' => $conf->config('countrydefault') || 'US'
                    } );
 
+    my %cust_paybys = map { $_ => 1 }
+                      map { FS::payby->payby2payment($_) }
+                          $conf->config('signup_server-payby');
+
+    my @cust_paybys = keys %cust_paybys;
+
     $payment_info = {
 
       #list all counties/states/countries
@@ -374,9 +444,7 @@ sub payment_info {
       'paytypes' => [ @FS::cust_main::paytypes ],
 
       'paybys' => [ $conf->config('signup_server-payby') ],
-      'cust_paybys' => [ map { FS::payby->payby2payment($_) }
-                                 $conf->config('signup_server-payby')
-                       ],
+      'cust_paybys' => \@cust_paybys,
 
       'stateid_label' => FS::Msgcat::_gettext('stateid'),
       'stateid_state_label' => FS::Msgcat::_gettext('stateid_state'),
@@ -411,7 +479,7 @@ sub payment_info {
     @{ $return{cust_paybys} }
   ];
 
-  $return{balance} = $cust_main->balance;
+  $return{balance} = $cust_main->balance; #XXX pkg-balances?
 
   $return{payname} = $cust_main->payname
                      || ( $cust_main->first. ' '. $cust_main->get('last') );
@@ -589,7 +657,11 @@ sub realtime_collect {
   );
   return { 'error' => $error } unless ref( $error );
 
-  return { 'error' => '', amount => $cust_main->balance, %$error };
+  my $amount = $session->{'pkgnum'}
+                 ? $cust_main->balance_pkgnum( $session->{'pkgnum'} )
+                 : $cust_main->balance;
+
+  return { 'error' => '', amount => $amount, %$error };
 }
 
 sub process_payment_order_pkg {
@@ -802,6 +874,7 @@ sub list_svcs {
   foreach my $cust_pkg ( $p->{'ncancelled'} 
                          ? $cust_main->ncancelled_pkgs
                          : $cust_main->unsuspended_pkgs ) {
+    next if $session->{'pkgnum'} && $cust_pkg->pkgnum != $session->{'pkgnum'};
     push @cust_svc, @{[ $cust_pkg->cust_svc ]}; #@{[ ]} to force array context
   }
   if ( $p->{'svcdb'} ) {
-- 
cgit v1.2.1


From 7aed8d03d957ee46c71a679ab6fe906d27b33550 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Mon, 10 Aug 2009 18:05:50 +0000
Subject: Add preset for magicmail

---
 FS/FS/part_export/shellcommands_withdomain.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index e1f47e410..448f0b77b 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -87,6 +87,17 @@ the same username with different domains.  You will need to
     this.form.usermod_stdin.value = "";
     this.form.usermod_pwonly.checked = true;
   '>
+  <LI><INPUT TYPE="button" VALUE="MagicMail" onClick='
+    this.form.useradd.value = "/usr/bin/mm_create_email_service -e $svcnum -d $domain -u $username -p $quoted_password -f $first -l $last -m $svcnum -g EMAIL";
+    this.form.useradd_stdin.value = "";
+    this.form.userdel.value = "/usr/bin/mm_delete_user -e ${username}\\\@${domain}";
+    this.form.userdel_stdin.value = "";
+    this.form.suspend.value = "/usr/bin/mm_suspend_user -e ${username}\\\@${domain}";
+    this.form.suspend_stdin.value = "";
+    this.form.unsuspend.value = "/usr/bin/mm_activate_user -e ${username}\\\@${domain}";
+    this.form.unsuspend_stdin.value = "";
+    this.form.no_queue.checked = 1;
+  '>
 </UL>
 
 The following variables are available for interpolation (prefixed with
-- 
cgit v1.2.1


From 165423e6ce43f8f87f329330bf92f422e718a768 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 10 Aug 2009 21:44:08 +0000
Subject: last nits on netsapiens export, RT#5226

---
 FS/FS/part_export/netsapiens.pm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index a24bc3727..cf4b5e35c 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -85,10 +85,6 @@ sub ns_subscriber {
 sub ns_registrar {
   my($self, $svc_phone) = (shift, shift);
 
-  my $domain = $self->option('domain');
-  my $countrycode = $svc_phone->countrycode;
-  my $phonenum    = $svc_phone->phonenum;
-
   $self->ns_subscriber($svc_phone).
     '/registrar_config/'. $self->ns_devicename($svc_phone);
 }
@@ -97,19 +93,21 @@ sub ns_devicename {
   my( $self, $svc_phone ) = (shift, shift);
 
   my $domain = $self->option('domain');
-  my $countrycode = $svc_phone->countrycode;
+  #my $countrycode = $svc_phone->countrycode;
   my $phonenum    = $svc_phone->phonenum;
 
-  "sip:$countrycode$phonenum@$domain";
+  #"sip:$countrycode$phonenum\@$domain";
+  "sip:$phonenum\@$domain";
 }
 
 sub ns_dialplan {
   my($self, $svc_phone) = (shift, shift);
 
-  my $countrycode = $svc_phone->countrycode;
+  #my $countrycode = $svc_phone->countrycode;
   my $phonenum    = $svc_phone->phonenum;
 
-  "/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum@*"
+  #"/dialplans/DID+Table/dialplan_config/sip:$countrycode$phonenum\@*"
+  "/dialplans/DID+Table/dialplan_config/sip:$phonenum\@*"
 }
 
 sub ns_device {
@@ -125,7 +123,7 @@ sub ns_create_or_update {
   my($self, $svc_phone, $dial_policy) = (shift, shift, shift);
 
   my $domain = $self->option('domain');
-  my $countrycode = $svc_phone->countrycode;
+  #my $countrycode = $svc_phone->countrycode;
   my $phonenum    = $svc_phone->phonenum;
 
   my( $firstname, $lastname );
@@ -158,6 +156,7 @@ sub ns_create_or_update {
   #Piece 2 - sip device creation 
 
   my $ns2 = $self->ns_command( 'PUT', $self->ns_registrar($svc_phone),
+    'termination_match' => $self->ns_devicename($svc_phone)
   );
 
   if ( $ns2->responseCode !~ /^2/ ) {
@@ -168,7 +167,7 @@ sub ns_create_or_update {
   #Piece 3 - DID mapping to user
 
   my $ns3 = $self->ns_command( 'PUT', $self->ns_dialplan($svc_phone),
-    'to_user' => $countrycode.$phonenum,
+    'to_user' => $phonenum,
     'to_host' => $domain,
   );
 
@@ -250,7 +249,7 @@ sub export_device_insert {
     'PUT', $self->ns_device($svc_phone, $phone_device),
       'line1_enable' => 'yes',
       'device1'      => $self->ns_devicename($svc_phone),
-      'line1_ext'    => $countrycode.$phonenum,
+      'line1_ext'    => $phonenum,
 ,
       #'line2_enable' => 'yes',
       #'device2'      =>
-- 
cgit v1.2.1


From ae898cc8e6de40fbecb30c973f91cd955434b159 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Mon, 10 Aug 2009 23:04:57 +0000
Subject: Improve handling of deleted attachments

---
 FS/FS/AccessRight.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index d19212520..17d2d76fd 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -103,6 +103,10 @@ tie my %rights, 'Tie::IxHash',
     'Download attachment', #NEW
     'Add attachment', #NEW
     'Edit attachment', #NEW
+    'Delete attachment', #NEW
+    'View deleted attachments', #NEW
+    'Undelete attachment', #NEW
+    'Purge attachment', #NEW
     'Bill customer now', #NEW
     'Bulk send customer notices', #NEW
   ],
-- 
cgit v1.2.1


From 54538d4a7445f5315e27cb8ff44b5ddc4160ee88 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Aug 2009 02:34:57 +0000
Subject: add $company_name and $company_address to decline template, RT#5869

---
 FS/FS/cust_main.pm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8cd03ebc6..b8657895b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4221,7 +4221,13 @@ sub realtime_bop {
       $template->compile()
         or return "($perror) can't compile template: $Text::Template::ERROR";
 
-      my $templ_hash = { error => $transaction->error_message };
+      my $templ_hash = {
+        'company_name'    =>
+          scalar( $conf->config('company_name', $self->agentnum ) ),
+        'company_address' =>
+          join("\n", $conf->config('company_address', $self->agentnum ) ),
+        'error'           => $transaction->error_message,
+      };
 
       my $error = send_email(
         'from'    => $conf->config('invoice_from', $self->agentnum ),
@@ -5401,7 +5407,13 @@ sub _realtime_bop_result {
       $template->compile()
         or return "($perror) can't compile template: $Text::Template::ERROR";
 
-      my $templ_hash = { error => $transaction->error_message };
+      my $templ_hash = {
+        'company_name'    =>
+          scalar( $conf->config('company_name', $self->agentnum ) ),
+        'company_address' =>
+          join("\n", $conf->config('company_address', $self->agentnum ) ),
+        'error'           => $transaction->error_message,
+      };
 
       my $error = send_email(
         'from'    => $conf->config('invoice_from', $self->agentnum ),
-- 
cgit v1.2.1


From 66f90856e0b21117a4e62f2bebec0908feda8fda Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Aug 2009 02:45:21 +0000
Subject: fix bad debt writeoff action, RT#5798

---
 FS/FS/part_event/Action/writeoff.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/writeoff.pm b/FS/FS/part_event/Action/writeoff.pm
index fdea897fa..8529d29f1 100644
--- a/FS/FS/part_event/Action/writeoff.pm
+++ b/FS/FS/part_event/Action/writeoff.pm
@@ -22,9 +22,9 @@ sub do_action {
 
   my $cust_main = $self->cust_main($cust_object);
 
-  my $error = $cust_main->credit( $cust_main->balance,
-                                  $self->option('reasonnum'),
-                                );
+  my $reasonnum = $self->option('reasonnum');
+
+  my $error = $cust_main->credit( $cust_main->balance, \$reasonnum );
   die $error if $error;
 
   '';
-- 
cgit v1.2.1


From d1014a727cefa5d9813153594541f62ec15fc8b9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Aug 2009 02:36:25 +0000
Subject: fix multiple pkgpart search, RT#5924

---
 FS/FS/cust_pkg.pm | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 396ae07cc..4e57fbf2d 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2295,7 +2295,7 @@ active, inactive, suspended, one-time charge, inactive, cancel (or cancelled)
 
 =item pkgpart
 
-list specified how?
+pkgpart or arrayref or hashref of pkgparts
 
 =item setup
 
@@ -2463,9 +2463,24 @@ sub search_sql {
   # parse part_pkg
   ###
 
-  my $pkgpart = join (' OR pkgpart=',
-                      grep {$_} map { /^(\d+)$/; } ($params->{'pkgpart'}));
-  push @where,  '(pkgpart=' . $pkgpart . ')' if $pkgpart;
+  if ( ref($params->{'pkgpart'}) ) {
+
+    my @pkgpart = ();
+    if ( ref($params->{'pkgpart'}) eq 'HASH' ) {
+      @pkgpart = grep $params->{'pkgpart'}{$_}, keys %{ $params->{'pkgpart'} };
+    } elsif ( ref($params->{'pkgpart'}) eq 'ARRAY' ) {
+      @pkgpart = @{ $params->{'pkgpart'} };
+    } else {
+      die 'unhandled pkgpart ref '. $params->{'pkgpart'};
+    }
+
+    @pkgpart = grep /^(\d+)$/, @pkgpart;
+
+    push @where, 'pkgpart IN ('. join(',', @pkgpart). ')';
+
+  } elsif ( $params->{'pkgpart'} =~ /^(\d+)$/ ) {
+    push @where, "pkgpart = $1";
+  } 
 
   ###
   # parse dates
-- 
cgit v1.2.1


From 7aad2eb29c444625fd1130f4ed37d89a7da2c027 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 12 Aug 2009 05:22:08 +0000
Subject: add pre-bill event stage for late fees, RT#5589

---
 FS/FS/cust_main.pm                               | 152 ++++++++++++++++++++---
 FS/FS/part_event/Action.pm                       |  13 ++
 FS/FS/part_event/Action/cust_bill_fee_percent.pm |   2 +
 FS/FS/part_event/Action/fee.pm                   |   2 +
 4 files changed, 153 insertions(+), 16 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b8657895b..b278e9b14 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2488,7 +2488,6 @@ sub bill {
 
   $options{'not_pkgpart'} ||= {};
 
-  #put below somehow?
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -2502,6 +2501,17 @@ sub bill {
 
   $self->select_for_update; #mutex
 
+  my $error = $self->do_cust_event(
+    'debug'      => ( $options{'debug'} || 0 ),
+    'time'       => $invoice_time,
+    'check_freq' => $options{'check_freq'},
+    'stage'      => 'pre-bill',
+  );
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   my @cust_bill_pkg = ();
 
   ###
@@ -2755,7 +2765,7 @@ sub bill {
     '_date'   => ( $invoice_time ),
     'charged' => $charged,
   } );
-  my $error = $cust_bill->insert;
+  $error = $cust_bill->insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "can't create invoice for customer #". $self->custnum. ": $error";
@@ -3222,7 +3232,7 @@ sub _gather_taxes {
 
 }
 
-=item collect OPTIONS
+=item collect [ HASHREF | OPTION => VALUE ... ]
 
 (Attempt to) collect money for this customer's outstanding invoices (see
 L<FS::cust_bill>).  Usually used after the bill method.
@@ -3247,25 +3257,24 @@ Use this time when deciding when to print invoices and late notices on those inv
 
 Retry card/echeck/LEC transactions even when not scheduled by invoice events.
 
-=item quiet
-
-set true to surpress email card/ACH decline notices.
-
 =item check_freq
 
 "1d" for the traditional, daily events (the default), or "1m" for the new monthly events (part_event.check_freq)
 
-=item payby
+=item quiet
 
-allows for one time override of normal customer billing method
+set true to surpress email card/ACH decline notices.
 
 =item debug
 
 Debugging level.  Default is 0 (no debugging), or can be set to 1 (passed-in options), 2 (traces progress), 3 (more information), or 4 (include full search queries)
 
-
 =back
 
+# =item payby
+#
+# allows for one time override of normal customer billing method
+
 =cut
 
 sub collect {
@@ -3303,12 +3312,107 @@ sub collect {
     }
   }
 
+  my $error = $self->do_cust_event(
+    'debug'      => ( $options{'debug'} || 0 ),
+    'time'       => $invoice_time,
+    'check_freq' => $options{'check_freq'},
+    'stage'      => 'collect',
+  );
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+=item do_cust_event [ HASHREF | OPTION => VALUE ... ]
+
+Runs billing events; see L<FS::part_event> and the billing events web
+interface.
+
+If there is an error, returns the error, otherwise returns false.
+
+Options are passed as name-value pairs.
+
+Currently available options are:
+
+=over 4
+
+=item time
+
+Use this time when deciding when to print invoices and late notices on those invoices.  The default is now.  It is specified as a UNIX timestamp; see L<perlfunc/"time">).  Also see L<Time::Local> and L<Date::Parse> for conversion functions.
+
+=item check_freq
+
+"1d" for the traditional, daily events (the default), or "1m" for the new monthly events (part_event.check_freq)
+
+=item stage
+
+"collect" (the default) or "pre-bill"
+
+=item quiet
+ 
+set true to surpress email card/ACH decline notices.
+
+=item debug
+
+Debugging level.  Default is 0 (no debugging), or can be set to 1 (passed-in options), 2 (traces progress), 3 (more information), or 4 (include full search queries)
+
+=cut
+
+# =item payby
+#
+# allows for one time override of normal customer billing method
+
+# =item retry
+#
+# Retry card/echeck/LEC transactions even when not scheduled by invoice events.
+
+sub do_cust_event {
+  my( $self, %options ) = @_;
+  my $time = $options{'time'} || time;
+
+  #put below somehow?
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  $self->select_for_update; #mutex
+
+  if ( $DEBUG ) {
+    my $balance = $self->balance;
+    warn "$me do_cust_event customer ". $self->custnum. ": balance $balance\n"
+  }
+
+#  if ( exists($options{'retry_card'}) ) {
+#    carp 'retry_card option passed to collect is deprecated; use retry';
+#    $options{'retry'} ||= $options{'retry_card'};
+#  }
+#  if ( exists($options{'retry'}) && $options{'retry'} ) {
+#    my $error = $self->retry_realtime;
+#    if ( $error ) {
+#      $dbh->rollback if $oldAutoCommit;
+#      return $error;
+#    }
+#  }
+
   # false laziness w/pay_batch::import_results
 
   my $due_cust_event = $self->due_cust_event(
     'debug'      => ( $options{'debug'} || 0 ),
-    'time'       => $invoice_time,
+    'time'       => $time,
     'check_freq' => $options{'check_freq'},
+    'stage'      => ( $options{'stage'} || 'collect' ),
   );
   unless( ref($due_cust_event) ) {
     $dbh->rollback if $oldAutoCommit;
@@ -3320,7 +3424,7 @@ sub collect {
     #XXX lock event
     
     #re-eval event conditions (a previous event could have changed things)
-    unless ( $cust_event->test_conditions( 'time' => $invoice_time ) ) {
+    unless ( $cust_event->test_conditions( 'time' => $time ) ) {
       #don't leave stray "new/locked" records around
       my $error = $cust_event->delete;
       if ( $error ) {
@@ -3373,6 +3477,10 @@ options are:
 
 Search only for events of this check frequency (how often events of this type are checked); currently "1d" (daily, the default) and "1m" (monthly) are recognized.
 
+=item stage
+
+"collect" (the default) or "pre-bill"
+
 =item time
 
 "Current time" for the events.
@@ -3428,7 +3536,7 @@ sub due_cust_event {
     unless $opt{testonly};
 
   ###
-  # 1: find possible events (initial search)
+  # find possible events (initial search)
   ###
   
   my @cust_event = ();
@@ -3519,8 +3627,20 @@ sub due_cust_event {
        " total possible cust events found in initial search\n"
     if $DEBUG; # > 1;
 
+
+  ##
+  # test stage
+  ##
+
+  $opt{stage} ||= 'collect';
+  @cust_event =
+    grep { my $stage = $_->part_event->event_stage;
+           $opt{stage} eq $stage or ( ! $stage && $opt{stage} eq 'collect' )
+         }
+         @cust_event;
+
   ##
-  # 2: test conditions
+  # test conditions
   ##
   
   my %unsat = ();
@@ -3537,7 +3657,7 @@ sub due_cust_event {
     if $DEBUG; # > 1;
 
   ##
-  # 3: insert
+  # insert
   ##
 
   unless( $opt{testonly} ) {
@@ -3555,7 +3675,7 @@ sub due_cust_event {
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   ##
-  # 4: return
+  # return
   ##
 
   warn "  returning events: ". Dumper(@cust_event). "\n"
diff --git a/FS/FS/part_event/Action.pm b/FS/FS/part_event/Action.pm
index 57239d78e..45219a321 100644
--- a/FS/FS/part_event/Action.pm
+++ b/FS/FS/part_event/Action.pm
@@ -54,6 +54,19 @@ sub eventtable_hashref {
     };
 }
 
+=item event_stage
+
+Action classes may define an event_stage method to indicate a preference
+for being run at a non-standard stage of the billing and collection process.
+
+This method may currently return "collect" (the default) or "pre-bill".
+
+=cut
+
+sub event_stage {
+  'collect';
+}
+
 =item option_fields
 
 Action classes may define an option_fields method to indicate that they
diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index 354778f7d..9206c6a33 100644
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -9,6 +9,8 @@ sub eventtable_hashref {
   { 'cust_bill' => 1 };
 }
 
+sub event_stage { 'pre-bill'; }
+
 sub option_fields {
   ( 
     'percent'  => { label=>'Percent', size=>2, },
diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index 6ea7103ab..6450225a2 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -5,6 +5,8 @@ use base qw( FS::part_event::Action );
 
 sub description { 'Late fee (flat)'; }
 
+sub event_stage { 'pre-bill'; }
+
 sub option_fields {
   ( 
     'charge'   => { label=>'Amount', type=>'money', }, # size=>7, },
-- 
cgit v1.2.1


From 56a2965996454a0649d43ecbc062beda61106e21 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 12 Aug 2009 14:58:50 +0000
Subject: internalize billco-upload and automate the transfer to the provider
 RT#5902

---
 FS/FS/Conf.pm           |  72 +++++++++++++++-----
 FS/FS/Cron/upload.pm    | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-daily   |   4 ++
 FS/bin/freeside-monthly |   3 +
 4 files changed, 240 insertions(+), 15 deletions(-)
 create mode 100644 FS/FS/Cron/upload.pm

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1da55837c..66d8be903 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -76,11 +76,23 @@ sub base_dir {
   $1;
 }
 
-=item config KEY [ AGENTNUM ]
+=item conf KEY [ AGENTNUM [ NODEFAULT ] ]
+
+Returns the L<FS::conf> record for the key and agent.
+
+=cut
+
+sub conf {
+  my $self = shift;
+  $self->_config(@_);
+}
+
+=item config KEY [ AGENTNUM [ NODEFAULT ] ]
 
 Returns the configuration value or values (depending on context) for key.
 The optional agent number selects an agent specific value instead of the
-global default if one is present.
+global default if one is present.  If NODEFAULT is true only the agent
+specific value(s) is returned.
 
 =cut
 
@@ -92,14 +104,13 @@ sub _usecompat {
   $compat->$method(@_);
 }
 
-# needs a non _ name, called externally by config-view now (and elsewhere?)
 sub _config {
-  my($self,$name,$agentnum)=@_;
+  my($self,$name,$agentnum,$agentonly)=@_;
   my $hashref = { 'name' => $name };
   $hashref->{agentnum} = $agentnum;
   local $FS::Record::conf = undef;  # XXX evil hack prevents recursion
   my $cv = FS::Record::qsearchs('conf', $hashref);
-  if (!$cv && defined($agentnum) && $agentnum) {
+  if (!$agentonly && !$cv && defined($agentnum) && $agentnum) {
     $hashref->{agentnum} = '';
     $cv = FS::Record::qsearchs('conf', $hashref);
   }
@@ -110,12 +121,10 @@ sub config {
   my $self = shift;
   return $self->_usecompat('config', @_) if use_confcompat;
 
-  my($name, $agentnum)=@_;
-
-  carp "FS::Conf->config($name, $agentnum) called"
+  carp "FS::Conf->config(". join(', ', @_). ") called"
     if $DEBUG > 1;
 
-  my $cv = $self->_config($name, $agentnum) or return;
+  my $cv = $self->_config(@_) or return;
 
   if ( wantarray ) {
     my $v = $cv->value;
@@ -126,7 +135,7 @@ sub config {
   }
 }
 
-=item config_binary KEY [ AGENTNUM ]
+=item config_binary KEY [ AGENTNUM [ NODEFAULT ] ]
 
 Returns the exact scalar value for key.
 
@@ -136,12 +145,11 @@ sub config_binary {
   my $self = shift;
   return $self->_usecompat('config_binary', @_) if use_confcompat;
 
-  my($name,$agentnum)=@_;
-  my $cv = $self->_config($name, $agentnum) or return;
+  my $cv = $self->_config(@_) or return;
   decode_base64($cv->value);
 }
 
-=item exists KEY [ AGENTNUM ]
+=item exists KEY [ AGENTNUM [ NODEFAULT ] ]
 
 Returns true if the specified key exists, even if the corresponding value
 is undefined.
@@ -154,10 +162,10 @@ sub exists {
 
   my($name, $agentnum)=@_;
 
-  carp "FS::Conf->exists($name, $agentnum) called"
+  carp "FS::Conf->exists(". join(', ', @_). ") called"
     if $DEBUG > 1;
 
-  defined($self->_config($name, $agentnum));
+  defined($self->_config(@_));
 }
 
 =item config_orbase KEY SUFFIX
@@ -619,6 +627,40 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'textarea',
   },
 
+  {
+    'key'         => 'billco-url',
+    'section'     => 'billing',
+    'description' => 'The url to use for performing uploads to the invoice mailing service.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
+  {
+    'key'         => 'billco-username',
+    'section'     => 'billing',
+    'description' => 'The login name to use for uploads to the invoice mailing service.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+    'agentonly'   => 1,
+  },
+
+  {
+    'key'         => 'billco-password',
+    'section'     => 'billing',
+    'description' => 'The password to use for uploads to the invoice mailing service.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+    'agentonly'   => 1,
+  },
+
+  {
+    'key'         => 'billco-clicode',
+    'section'     => 'billing',
+    'description' => 'The clicode to use for uploads to the invoice mailing service.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'business-onlinepayment',
     'section'     => 'billing',
diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm
new file mode 100644
index 000000000..fea3d2cc7
--- /dev/null
+++ b/FS/FS/Cron/upload.pm
@@ -0,0 +1,176 @@
+package FS::Cron::upload;
+
+use strict;
+use vars qw( @ISA @EXPORT_OK $me $DEBUG );
+use Exporter;
+use Date::Format;
+use FS::UID qw(dbh);
+use FS::Record qw( qsearch qsearchs );
+use FS::Conf;
+use FS::queue;
+use FS::agent;
+use LWP::UserAgent;
+use HTTP::Request;
+use HTTP::Request::Common;
+use HTTP::Response;
+
+@ISA = qw( Exporter );
+@EXPORT_OK = qw ( upload );
+$DEBUG = 0;
+$me = '[FS::Cron::upload]';
+
+#freeside-daily %opt:
+#  -v: enable debugging
+#  -l: debugging level
+#  -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+#  -r: Multi-process mode dry run option
+#  -a: Only process customers with the specified agentnum
+
+
+sub upload {
+  my %opt = @_;
+
+  my $debug = 0;
+  $debug = 1 if $opt{'v'};
+  $debug = $opt{'l'} if $opt{'l'};
+
+  local $DEBUG = $debug if $debug;
+
+  warn "$me upload called\n" if $DEBUG;
+
+  my $conf = new FS::Conf;
+  my @agent = grep { $conf->config( 'billco-username', $_->agentnum, 1 ) }
+              grep { $conf->config( 'billco-password', $_->agentnum, 1 ) }
+              qsearch( 'agent', {} );
+
+  my $date =  time2str('%Y%m%d%H%M%S', $^T); # more?
+
+  @agent = grep { $_ == $opt{'a'} } @agent if $opt{'a'};
+
+  foreach my $agent ( @agent ) {
+
+    my $agentnum = $agent->agentnum;
+
+    if ( $opt{'m'} ) {
+
+      if ( $opt{'r'} ) {
+        warn "DRY RUN: would add agent $agentnum for queued upload\n";
+      } else {
+
+        my $queue = new FS::queue {
+          'job'      => 'FS::Cron::upload::billco_upload',
+        };
+        my $error = $queue->insert(
+                                    'agentnum' => $agentnum,
+                                    'date'     => $date,
+                                    'l'        => $opt{'l'} || '',
+                                    'm'        => $opt{'m'} || '',
+                                    'v'        => $opt{'v'} || '',
+                                  );
+
+      }
+
+    } else {
+
+      eval "&billco_upload( 'agentnum' => $agentnum, 'date' => $date );";
+      warn "billco_upload failed: $@\n"
+        if ( $@ );
+
+    }
+
+  }
+
+}
+
+sub billco_upload {
+  my %opt = @_;
+
+  warn "$me billco_upload called\n" if $DEBUG;
+  my $conf = new FS::Conf;
+  my $dir = '%%%FREESIDE_EXPORT%%%/export.'. $FS::UID::datasrc. '/cust_bill';
+
+  my $agentnum = $opt{agentnum} or die "no agentnum provided\n";
+  my $url      = $conf->config( 'billco-url', $agentnum )
+    or die "no url for agent $agentnum\n";
+  my $username = $conf->config( 'billco-username', $agentnum, 1 )
+    or die "no username for agent $agentnum\n";
+  my $password = $conf->config( 'billco-password', $agentnum, 1 )
+    or die "no password for agent $agentnum\n";
+  my $clicode  = $conf->config( 'billco-clicode', $agentnum )
+    or die "no clicode for agent $agentnum\n";
+
+  die "no date provided\n" unless $opt{date};
+  my $zipfile  = "$dir/agentnum$agentnum-$opt{date}.zip";
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $agent = qsearchs( 'agent', { agentnum => $agentnum } )
+    or die "no such agent: $agentnum";
+  $agent->select_for_update; #mutex 
+
+  unless ( -f "$dir/agentnum$agentnum-header.csv" ||
+           -f "$dir/agentnum$agentnum-detail.csv" )
+  {
+    warn "$me neither $dir/agentnum$agentnum-header.csv nor ".
+         "$dir/agentnum$agentnum-detail.csv found\n" if $DEBUG;
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+    return;
+  }
+
+  # a better way?
+  if ($opt{m}) {
+    my $sql = "SELECT count(*) FROM queue LEFT JOIN cust_main USING(custnum) ".
+      "WHERE queue.job='FS::cust_main::queued_bill' AND cust_main.agentnum = ?";
+    my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+    while (1) {
+      $sth->execute( $agentnum )
+        or die "Unexpected error executing statement $sql: ". $sth->errstr;
+      last if $sth->fetchow_arrayref->[0];
+      sleep 300;
+    }
+  }
+
+  foreach ( qw ( header detail ) ) {
+    rename "$dir/agentnum$agentnum-$_.csv",
+           "$dir/agentnum$agentnum-$opt{date}-$_.csv";
+  }
+
+  my $command = "cd $dir; zip $zipfile ".
+                "agentnum$agentnum-$opt{date}-header.csv ".
+                "agentnum$agentnum-$opt{date}-detail.csv";
+
+  system($command) and die "$command failed\n";
+
+  unlink "agentnum$agentnum-$opt{date}-header.csv",
+         "agentnum$agentnum-$opt{date}-detail.csv";
+
+  my $ua = new LWP::UserAgent;
+  my $res = $ua->request( POST( $url,
+                                'Content_Type' => 'form-data',
+                                'Content' => [ 'username' => $username,
+                                               'pass'     => $password,
+                                               'custid'   => $username,
+                                               'clicode'  => $clicode,
+                                               'file1'    => [ $zipfile ],
+                                             ],
+                              )
+                        );
+
+  die "upload failed: ". $res->status_line. "\n"
+    unless $res->is_success;
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+1;
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 119f93a59..728fa969a 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -15,6 +15,10 @@ adminsuidsetup $user;
 use FS::Cron::bill qw(bill);
 bill(%opt);
 
+#you can skip this just by not having the config
+use FS::Cron::upload qw(upload);
+upload(%opt);
+
 # Send alerts about upcoming credit card expiration.
 use FS::Cron::alert_expiration qw(alert_expiration);
 my $conf = new FS::Conf;
diff --git a/FS/bin/freeside-monthly b/FS/bin/freeside-monthly
index 1e41b780e..a81e3e9ed 100755
--- a/FS/bin/freeside-monthly
+++ b/FS/bin/freeside-monthly
@@ -15,6 +15,9 @@ adminsuidsetup $user;
 use FS::Cron::bill qw(bill);
 bill(%opt, 'check_freq'=>'1m' );
 
+use FS::Cron::upload qw(upload);
+upload(%opt);
+
 ###
 # subroutines
 ###
-- 
cgit v1.2.1


From 63c2ab383e128f36d00d997617183489d1a88b76 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Thu, 13 Aug 2009 15:13:49 +0000
Subject: fix fix multiple pkgpart search (need sanity check): don't let empty
 set limit search

---
 FS/FS/cust_pkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4e57fbf2d..e7f84845f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2476,7 +2476,7 @@ sub search_sql {
 
     @pkgpart = grep /^(\d+)$/, @pkgpart;
 
-    push @where, 'pkgpart IN ('. join(',', @pkgpart). ')';
+    push @where, 'pkgpart IN ('. join(',', @pkgpart). ')' if scalar(@pkgpart);
 
   } elsif ( $params->{'pkgpart'} =~ /^(\d+)$/ ) {
     push @where, "pkgpart = $1";
-- 
cgit v1.2.1


From 551fdee7a6769ee503d2d193c8df1d40395d0809 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Thu, 13 Aug 2009 22:53:31 +0000
Subject: Add option to freeside-void-payments to cancel customers

---
 FS/bin/freeside-void-payments | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-void-payments b/FS/bin/freeside-void-payments
index 9aa04d671..412033ccc 100755
--- a/FS/bin/freeside-void-payments
+++ b/FS/bin/freeside-void-payments
@@ -15,7 +15,7 @@ use Date::Parse 'str2time';
 use Date::Format 'time2str';
 
 my %opt;
-getopts("r:f:ca:g:s:e:vn", \%opt);
+getopts("r:f:ca:g:s:e:vnX:", \%opt);
 
 $user = shift or die &usage;
 &adminsuidsetup( $user );
@@ -34,6 +34,11 @@ elsif($opt{'a'}) {
     or die "Agent has no payment gateway for method '$method'.";
 }
 
+if(defined($opt{'X'})) {
+  die "Cancellation reason not found: '".$opt{'X'}."'" 
+    if(! qsearchs('reason', { reasonnum => $opt{'X'} } ) );
+}
+
 my ($processor, $login, $password, $action, @bop_options) =
   FS::cust_main->default_payment_gateway($method);
 my $gatewaynum = '';
@@ -83,14 +88,20 @@ else {
 $opt{'r'} ||= 'freeside-void-payments';
 my $success = 0;
 my $notfound = 0;
+my $canceled = 0;
 print "Voiding ".scalar(@auths)." transactions:\n" if $opt{'v'};
 foreach my $authnum (@auths) {
   my $paybatch = $gatewaynum . $processor . ':' . $authnum;
   my $cust_pay = qsearchs('cust_pay', { paybatch => $paybatch } );
   my $error;
+  my $cancel_error;
   if($cust_pay) {
     $error = $cust_pay->void($opt{'r'});
     $success++ if not $error;
+    if($opt{'X'} and not $error) {
+      $cancel_error = join(';',$cust_pay->cust_main->cancel('reason' => $opt{'X'}));
+      $canceled++ if !$cancel_error;
+    }
   }
   else {
     my $cpv = qsearchs('cust_pay_void', { paybatch => $paybatch });
@@ -105,17 +116,24 @@ foreach my $authnum (@auths) {
   }
   if($opt{'v'}) {
     print $authnum;
-    print "\t($error)" if $error; 
+    if($error) {
+      print "\t($error)";
+    }
+    elsif($opt{'X'}) {
+      print "\t(canceled service)" if !$cancel_error;
+      print "\n\t(cancellation failed: $cancel_error)" if $cancel_error;
+    }
     print "\n";
   }
 }
 
 if($opt{'v'}) {
   print scalar(@auths)." transactions: $success voided, $notfound not found\n";
+  print "$canceled customer".($canceled == 1 ? '' : 's')." canceled\n" if $opt{'X'};
 }
 
 sub usage {
-    die "Usage:\n\n  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] [ -v ] [ -n ]user\n";
+    die "Usage:\n\n  freeside-void-payments [ -f file | [ -s start-date ] [ -e end-date ] ] [ -r 'reason' ] [ -g gatewaynum | -a agentnum ] [ -c ] [ -v ] [ -n ] [-X reasonnum ] user\n";
 }
 
 __END__
@@ -168,6 +186,9 @@ generally how the processor will identify them later.
       credit cards.
 
   -v: Be verbose.
+  
+  -X: Automatically cancel all packages belonging to customers whose payments 
+      were returned.  Requires a cancellation reasonnum (from L<FS::reason>).
 
 A warning will be emitted for each transaction that can't be found.  
 This may happen if it's already been voided, or if the gateway 
-- 
cgit v1.2.1


From 94667348a71b2d7186861871ec6516958e6c4583 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 14 Aug 2009 17:24:18 +0000
Subject: Move note/attachment rights to new section

---
 FS/FS/AccessRight.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 17d2d76fd..fc309fa48 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -98,15 +98,6 @@ tie my %rights, 'Tie::IxHash',
     'Cancel customer',
     'Complimentary customer', #aka users-allow_comp 
     { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers
-    'Add customer note', #NEW
-    'Edit customer note', #NEW
-    'Download attachment', #NEW
-    'Add attachment', #NEW
-    'Edit attachment', #NEW
-    'Delete attachment', #NEW
-    'View deleted attachments', #NEW
-    'Undelete attachment', #NEW
-    'Purge attachment', #NEW
     'Bill customer now', #NEW
     'Bulk send customer notices', #NEW
   ],
@@ -207,6 +198,21 @@ tie my %rights, 'Tie::IxHash',
     
   
   ],
+ 
+  ###
+  # note/attachment rights...
+  ###
+  'Customer note and attachment rights' => [
+    'Add customer note', #NEW
+    'Edit customer note', #NEW
+    'Download attachment', #NEW
+    'Add attachment', #NEW
+    'Edit attachment', #NEW
+    'Delete attachment', #NEW
+    'View deleted attachments', #NEW
+    'Undelete attachment', #NEW
+    'Purge attachment', #NEW
+  ],
   
   ###
   # report/listing rights...
-- 
cgit v1.2.1


From 9d7ba1bad5c6db5c1c03b5c2c0aad1315d1f6705 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 14 Aug 2009 21:51:44 +0000
Subject: add pkgnum and custnum to use as external ids

---
 FS/FS/part_export/shellcommands.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index ed51f5d72..cec9619aa 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -175,6 +175,8 @@ old_ for replace operations):
   <LI><code>$reasontext (when suspending)</code>
   <LI><code>$reasontypenum (when suspending)</code>
   <LI><code>$reasontypetext (when suspending)</code>
+  <LI><code>$pkgnum</code>
+  <LI><code>$custnum</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_acct">svc_acct</a> are also available.
 </UL>
 END
@@ -299,6 +301,8 @@ sub _export_command {
   $finger = shell_quote $finger;
   $crypt_password = shell_quote $crypt_password;
   $ldap_password  = shell_quote $ldap_password;
+  $pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
+  $custnum = $cust_pkg ? $cust_pkg->custnum : '';
 
   my $command_string = eval(qq("$command"));
   my @ssh_cmd_args = (
@@ -330,6 +334,8 @@ sub _export_replace {
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
+  my $old_cust_pkg = $old->cust_svc->cust_pkg;
+  my $new_cust_pkg = $new->cust_svc->cust_pkg;
   $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $quoted_new__password = shell_quote $new__password; #old, wrong?
@@ -377,6 +383,10 @@ sub _export_replace {
   $new_finger = shell_quote $new_finger;
   $new_crypt_password = shell_quote $new_crypt_password;
   $new_ldap_password  = shell_quote $new_ldap_password;
+  $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
+  $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
+  $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
+  $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
 
   my $command_string = eval(qq("$command"));
 
-- 
cgit v1.2.1


From 9225a3b647c95313ea9f152b1255cd2c794ce3fd Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Fri, 14 Aug 2009 22:13:02 +0000
Subject: add svcnum lookup for svc_acct

---
 FS/FS/svc_acct.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 74bbd1ac4..e2f79291f 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -429,7 +429,13 @@ sub search_sql {
       $class->search_sql_field('username', $string ).
     ' ) ';
   } else {
-    $class->search_sql_field('username', $string);
+    ' ( '.
+      $class->search_sql_field('username', $string).
+      ( $string =~ /^\d+$/
+          ? 'OR '. $class->search_sql_field('svcnum', $string)
+          : ''
+      ).
+    ' ) ';
   }
 }
 
-- 
cgit v1.2.1


From 36ac94ae711ab27d5f8d352ed7d2cba2e872ac31 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 17 Aug 2009 20:48:27 +0000
Subject: improve emailed cdr csv file (#5727 again)

---
 FS/FS/Record.pm               | 16 ++++++++++++++++
 FS/FS/Schema.pm               |  1 +
 FS/FS/cust_bill.pm            | 37 ++++++++++++++++++++++++++++---------
 FS/FS/cust_bill_pkg.pm        |  3 ++-
 FS/FS/cust_bill_pkg_detail.pm | 17 +++++++++++++++++
 FS/FS/cust_svc.pm             |  3 ++-
 FS/FS/part_pkg/voip_cdr.pm    |  7 +++++--
 7 files changed, 71 insertions(+), 13 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 11afd9ff6..c8216eca8 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1988,6 +1988,22 @@ sub ut_money {
   '';
 }
 
+=item ut_moneyn COLUMN
+
+Check/untaint monetary numbers.  May be negative.  If there
+is an error, returns the error, otherwise returns false.
+
+=cut
+
+sub ut_moneyn {
+  my($self,$field)=@_;
+  if ($self->getfield($field) eq '') {
+    $self->setfield($field, '');
+    return '';
+  }
+  $self->ut_money($field);
+}
+
 =item ut_text COLUMN
 
 Check/untaint text.  Alphanumerics, spaces, and the following punctuation
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 0ede00031..877cf1442 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -550,6 +550,7 @@ sub tables_hashref {
         'amount',  @money_typen, '', '', 
         'format',  'char', 'NULL', 1, '', '',
         'classnum', 'int', 'NULL', '', '', '',
+        'phonenum', 'varchar', 'NULL', 15, '', '',
         'detail',  'varchar', '', 255, '', '', 
       ],
       'primary_key' => 'detailnum',
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 4acdd85a3..a35ea0028 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -794,8 +794,11 @@ sub generate_email {
       push @otherparts, build MIME::Entity
         'Type'        => 'text/csv',
         'Encoding'    => '7bit',
-        'Data'        => [ map { "$_\n" } $self->call_details ],
+        'Data'        => [ map { "$_\n" }
+                             $self->call_details('prepend_billed_number' => 1)
+                         ],
         'Disposition' => 'attachment',
+        'Filename'    => 'usage-'. $self->invnum. '.csv',
       ;
 
     }
@@ -3129,20 +3132,36 @@ sub _items_payments {
 
 }
 
-=item call_details
+=item call_details [ OPTION => VALUE ... ]
 
 Returns an array of CSV strings representing the call details for this invoice
+The only option available is the boolean prepend_billed_number
 
 =cut
 
 sub call_details {
-  my $self = shift;
-  map { $_->details( 'format_function' => sub{ shift },
-                     'escape_function' => sub{ return() },
-                   )
-      }
-    grep { $_->pkgnum }
-    $self->cust_bill_pkg;
+  my ($self, %opt) = @_;
+
+  my $format_function = sub { shift };
+
+  if ($opt{prepend_billed_number}) {
+    $format_function = sub {
+      my $detail = shift;
+      my $row = shift;
+
+      $row->amount ? $row->phonenum. ",". $detail : '"Billed number",'. $detail;
+      
+    };
+  }
+
+  my @details = map { $_->details( 'format_function' => $format_function,
+                                   'escape_function' => sub{ return() },
+                                 )
+                    }
+                  grep { $_->pkgnum }
+                  $self->cust_bill_pkg;
+  my $header = $details[0];
+  ( $header, grep { $_ ne $header } @details );
 }
 
 
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index bb30f03cd..b6e852897 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -119,6 +119,7 @@ sub insert {
         'detail'     => (ref($detail) ? $detail->[1] : $detail ),
         'amount'     => (ref($detail) ? $detail->[2] : '' ),
         'classnum'   => (ref($detail) ? $detail->[3] : '' ),
+        'phonenum'   => (ref($detail) ? $detail->[4] : '' ),
       };
       $error = $cust_bill_pkg_detail->insert;
       if ( $error ) {
@@ -371,7 +372,7 @@ sub details {
   $format_sub = $opt{format_function} if $opt{format_function};
 
   map { ( $_->format eq 'C'
-          ? &{$format_sub}( $_->detail )
+          ? &{$format_sub}( $_->detail, $_ )
           : &{$escape_function}( $_->detail )
         )
       }
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 9a90936ed..008f3ff77 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw( @ISA $me $DEBUG %GetInfoType );
 use FS::Record qw( qsearch qsearchs dbdef dbh );
 use FS::cust_bill_pkg;
+use FS::Conf;
 
 @ISA = qw(FS::Record);
 $me = '[ FS::cust_bill_pkg_detail ]';
@@ -102,10 +103,26 @@ and replace methods.
 sub check {
   my $self = shift;
 
+  my $conf = new FS::Conf;
+
+  my $phonenum = $self->phonenum;
+  my $phonenum_check_method;
+  if ( $conf->exists('svc_phone-allow_alpha_phonenum') ) {
+    $phonenum =~ s/\W//g;
+    $phonenum_check_method = 'ut_alphan';
+  } else {
+    $phonenum =~ s/\D//g;
+    $phonenum_check_method = 'ut_numbern';
+  }
+  $self->phonenum($phonenum);
+
   $self->ut_numbern('detailnum')
     || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg', 'billpkgnum')
+    || $self->ut_moneyn('amount')
     || $self->ut_enum('format', [ '', 'C' ] )
     || $self->ut_text('detail')
+    || $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum')
+    || $self->$phonenum_check_method('phonenum')
     || $self->SUPER::check
     ;
 
diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index fe831381f..3c2820412 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -741,7 +741,8 @@ sub get_cdrs {
     qsearch( {
       'table'      => 'cdr',
       'hashref'    => \%hash,
-      'extra_sql'  => "$extra_sql $for_update",
+      'extra_sql'  => $extra_sql,
+      'order_by'   => "ORDER BY startdate $for_update",
     } );
 
   @cdrs;
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 4f05963ef..9f150d6dd 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -558,13 +558,16 @@ sub calc_usage {
         if ( $charge > 0 ) {
           #just use FS::cust_bill_pkg_detail objects?
           my $call_details;
+          my $phonenum = $cust_svc->svc_x->phonenum;
 
           #if ( $self->option('rating_method') eq 'upstream_simple' ) {
           if ( scalar(@call_details) == 1 ) {
-            $call_details = [ 'C', $call_details[0], $charge, $classnum ];
+            $call_details =
+              [ 'C', $call_details[0], $charge, $classnum, $phonenum ];
           } else { #only used for $rating_method eq 'upstream' now
             $csv->combine(@call_details);
-            $call_details = [ 'C', $csv->string, $charge, $classnum ];
+            $call_details =
+              [ 'C', $csv->string, $charge, $classnum, $phonenum ];
           }
           warn "  adding details on charge to invoice: [ ".
               join(', ', @{$call_details} ). " ]"
-- 
cgit v1.2.1


From 46c05dd754895d3d9511763998f9ef505c8d2bd7 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Mon, 17 Aug 2009 23:08:47 +0000
Subject: Add more fine-grained queue options

---
 FS/FS/part_export/shellcommands.pm            | 25 ++++++++++++++++++++-----
 FS/FS/part_export/shellcommands_withdomain.pm | 21 +++++++++++++++++----
 2 files changed, 37 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index cec9619aa..7baf2dabe 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -14,6 +14,9 @@ tie my %options, 'Tie::IxHash',
                  default=>'useradd -c $finger -d $dir -m -s $shell -u $uid -p $crypt_password $username'
                 #default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
                },
+  'useradd_no_queue' => { label=>'Run immediately',
+                          type => 'checkbox',
+                        },
   'useradd_stdin' => { label=>'Insert command STDIN',
                        type =>'textarea',
                        default=>'',
@@ -22,6 +25,9 @@ tie my %options, 'Tie::IxHash',
                  default=>'userdel -r $username',
                  #default=>'rm -rf $dir',
                },
+  'userdel_no_queue' => { label=>'Run immediately',
+                          type =>'checkbox',
+                        },
   'userdel_stdin' => { label=>'Delete command STDIN',
                        type =>'textarea',
                        default=>'',
@@ -35,6 +41,9 @@ tie my %options, 'Tie::IxHash',
                  #  'rm -rf $old_dir'.
                  #')'
                },
+  'usermod_no_queue' => { label=>'Run immediately',
+                          type =>'checkbox',
+                        },
   'usermod_stdin' => { label=>'Modify command STDIN',
                        type =>'textarea',
                        default=>'',
@@ -48,12 +57,18 @@ tie my %options, 'Tie::IxHash',
   'suspend' => { label=>'Suspension command',
                  default=>'usermod -L $username',
                },
+  'suspend_no_queue' => { label=>'Run immediately',
+                          type =>'checkbox',
+                        },
   'suspend_stdin' => { label=>'Suspension command STDIN',
                        default=>'',
                      },
   'unsuspend' => { label=>'Unsuspension command',
                    default=>'usermod -U $username',
                  },
+  'unsuspend_no_queue' => { label=>'Run immediately',
+                            type =>'checkbox',
+                          },
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
                        },
@@ -65,9 +80,9 @@ tie my %options, 'Tie::IxHash',
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
-  'no_queue' => { label => 'Run command immediately',
-                   type  => 'checkbox',
-                },
+#  'no_queue' => { label => 'Run command immediately',
+#                   type  => 'checkbox',
+#                },
 ;
 
 %info = (
@@ -312,7 +327,7 @@ sub _export_command {
     stdin_string  => $stdin_string,
   );
 
-  if($self->option('no_queue')) {
+  if($self->option($action . '_no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
@@ -397,7 +412,7 @@ sub _export_replace {
     stdin_string  => $stdin_string,
   );
 
-  if($self->option('no_queue')) {
+  if($self->option('usermod_no_queue')) {
     # discard return value just like freeside-queued.
     eval { ssh_cmd(@ssh_cmd_args) };
     $error = $@;
diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 448f0b77b..916d328c2 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -15,6 +15,9 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
+  'useradd_no_queue' => { label => 'Run immediately',
+                 type  => 'checkbox',
+           },
   'userdel' => { label=>'Delete command',
                  #default=>'',
                },
@@ -22,6 +25,9 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>'',
                      },
+  'userdel_no_queue' => { label => 'Run immediately',
+                 type  => 'checkbox',
+           },
   'usermod' => { label=>'Modify command',
                  default=>'',
                },
@@ -29,6 +35,9 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
+  'usermod_no_queue' => { label => 'Run immediately',
+                 type  => 'checkbox',
+           },
   'usermod_pwonly' => { label=>'Disallow username, domain, uid, dir and RADIUS group changes',
                         type =>'checkbox',
                       },
@@ -41,19 +50,22 @@ tie my %options, 'Tie::IxHash',
   'suspend_stdin' => { label=>'Suspension command STDIN',
                        default=>'',
                      },
+  'suspend_no_queue' => { label => 'Run immediately',
+                 type  => 'checkbox',
+           },
   'unsuspend' => { label=>'Unsuspension command',
                    default=>'',
                  },
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
                        },
+  'unsuspend_no_queue' => { label => 'Run immediately',
+                 type  => 'checkbox',
+           },
   'crypt' => { label   => 'Default password encryption',
                type=>'select', options=>[qw(crypt md5)],
                default => 'crypt',
              },
-  'no_queue' => { label => 'Run command immediately',
-                 type  => 'checkbox',
-           },
 ;
 
 %info = (
@@ -90,13 +102,14 @@ the same username with different domains.  You will need to
   <LI><INPUT TYPE="button" VALUE="MagicMail" onClick='
     this.form.useradd.value = "/usr/bin/mm_create_email_service -e $svcnum -d $domain -u $username -p $quoted_password -f $first -l $last -m $svcnum -g EMAIL";
     this.form.useradd_stdin.value = "";
+    this.form.useradd_no_queue.checked = 1;
     this.form.userdel.value = "/usr/bin/mm_delete_user -e ${username}\\\@${domain}";
     this.form.userdel_stdin.value = "";
+    this.form.userdel_no_queue.checked = 1;
     this.form.suspend.value = "/usr/bin/mm_suspend_user -e ${username}\\\@${domain}";
     this.form.suspend_stdin.value = "";
     this.form.unsuspend.value = "/usr/bin/mm_activate_user -e ${username}\\\@${domain}";
     this.form.unsuspend_stdin.value = "";
-    this.form.no_queue.checked = 1;
   '>
 </UL>
 
-- 
cgit v1.2.1


From a8a4c0572d5b0335e06cdb3fd75226db956c007f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 18 Aug 2009 12:21:41 +0000
Subject: support 2009 - a better way?

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 66d8be903..1ee0214c2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2735,7 +2735,7 @@ worry that config_items is freeside-specific and icky.
     'section'     => 'UI',
     'description' => 'The year to use in census tract lookups',
     'type'        => 'select',
-    'select_enum' => [ qw( 2008 2007 2006 ) ],
+    'select_enum' => [ qw( 2009 2008 2007 2006 ) ],
   },
 
   {
-- 
cgit v1.2.1


From 2e1d2a91264e8441bc31583be7352ae1b3c31bb8 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 19 Aug 2009 06:15:14 +0000
Subject: option to count subpackages outside packages in sales report #5588

---
 FS/FS/Report/Table/Monthly.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index d75f0be79..d015f9116 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -311,11 +311,21 @@ sub cust_bill_pkg {
   my( $self, $speriod, $eperiod, $agentnum, %opt ) = @_;
 
   my $where = '';
+  my $comparison = '';
   if ( $opt{'classnum'} =~ /^(\d+)$/ ) {
     if ( $1 == 0 ) {
-      $where = "classnum IS NULL";
+      $comparison = "IS NULL";
     } else {
-      $where = "classnum = $1";
+      $comparison = "= $1";
+    }
+
+    if ( $opt{'use_override'} ) {
+      $where = "(
+        part_pkg.classnum $comparison AND pkgpart_override IS NULL OR
+        override.classnum $comparison AND pkgpart_override IS NOT NULL
+      )";
+    } else {
+      $where = "part_pkg.classnum $comparison";
     }
   }
 
@@ -328,6 +338,7 @@ sub cust_bill_pkg {
         LEFT JOIN cust_main USING ( custnum )
         LEFT JOIN cust_pkg USING ( pkgnum )
         LEFT JOIN part_pkg USING ( pkgpart )
+        LEFT JOIN part_pkg AS override ON pkgpart_override = override.pkgpart
       WHERE pkgnum != 0
         AND $where
         AND ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
-- 
cgit v1.2.1


From 6884c9a9d164124a188c1653ba63b71a416c38b3 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Wed, 19 Aug 2009 07:05:16 +0000
Subject: Turn off userdel_no_queue for MagicMail export

---
 FS/FS/part_export/shellcommands_withdomain.pm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 916d328c2..c209002c8 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -105,7 +105,6 @@ the same username with different domains.  You will need to
     this.form.useradd_no_queue.checked = 1;
     this.form.userdel.value = "/usr/bin/mm_delete_user -e ${username}\\\@${domain}";
     this.form.userdel_stdin.value = "";
-    this.form.userdel_no_queue.checked = 1;
     this.form.suspend.value = "/usr/bin/mm_suspend_user -e ${username}\\\@${domain}";
     this.form.suspend_stdin.value = "";
     this.form.unsuspend.value = "/usr/bin/mm_activate_user -e ${username}\\\@${domain}";
-- 
cgit v1.2.1


From 5470df9cd0062a366aaf8ff7d1e66cf6fac60311 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 19 Aug 2009 21:27:16 +0000
Subject: add option to disable late fee taxes

---
 FS/FS/part_event/Action/cust_bill_fee_percent.pm   | 12 ++++++++----
 FS/FS/part_event/Action/fee.pm                     |  8 ++++++--
 FS/FS/part_event/Action/pkg_referral_credit_pkg.pm |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index 9206c6a33..c85339398 100644
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -16,7 +16,10 @@ sub option_fields {
     'percent'  => { label=>'Percent', size=>2, },
     'reason'   => 'Reason',
     'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
-    'nextbill' => { label=>'Hold late fee until next invoice', type=>'checkbox', value=>'Y' },
+    'nextbill' => { label=>'Hold late fee until next invoice',
+                    type=>'checkbox', value=>'Y' },
+    'setuptax' => { label=>'Late fee is tax exempt',
+                    type=>'checkbox', value=>'Y' },
   );
 }
 
@@ -32,9 +35,10 @@ sub do_action {
     sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 );
 
   my %charge = (
-    'amount'     => $amount,
-    'pkg'        => $self->option('reason'),
-    'taxclass'   => $self->option('taxclass'),
+    'amount'   => $amount,
+    'pkg'      => $self->option('reason'),
+    'taxclass' => $self->option('taxclass'),
+    'setuptax' => $self->option('setuptax'),
   );
 
   $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index 6450225a2..c700301e2 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -12,7 +12,10 @@ sub option_fields {
     'charge'   => { label=>'Amount', type=>'money', }, # size=>7, },
     'reason'   => 'Reason',
     'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
-    'nextbill' => { label=>'Hold late fee until next invoice', type=>'checkbox', value=>'Y' },
+    'nextbill' => { label=>'Hold late fee until next invoice',
+                    type=>'checkbox', value=>'Y' },
+    'setuptax' => { label=>'Late fee is tax exempt',
+                    type=>'checkbox', value=>'Y' },
   );
 }
 
@@ -26,7 +29,8 @@ sub do_action {
   my %charge = (
     'amount'   => $self->option('charge'),
     'pkg'      => $self->option('reason'),
-    'taxclass' => $self->option('taxclass')
+    'taxclass' => $self->option('taxclass'),
+    'setuptax' => $self->option('setuptax'),
   );
 
   $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
diff --git a/FS/FS/part_event/Action/pkg_referral_credit_pkg.pm b/FS/FS/part_event/Action/pkg_referral_credit_pkg.pm
index 08cf9a8fd..eb9b5107c 100644
--- a/FS/FS/part_event/Action/pkg_referral_credit_pkg.pm
+++ b/FS/FS/part_event/Action/pkg_referral_credit_pkg.pm
@@ -38,6 +38,7 @@ sub _calc_referral_credit {
 
   my $what = $self->option('what');
 
+  #false laziness w/Condition/cust_payments_pkg.pm
   if ( $what eq 'base_recur_permonth' ) { #huh.  yuck.
     if ( $part_pkg->freq !~ /^\d+$/ ) {
       die 'WARNING: Not crediting customer '. $cust_main->referral_custnum.
-- 
cgit v1.2.1


From ed7d3ad7e00fb57f8ded643de5d5217ee64061ad Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Aug 2009 02:40:39 +0000
Subject: eliminate unnecessary lookup

---
 FS/FS/part_event/Action/cust_bill_send.pm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_event/Action/cust_bill_send.pm b/FS/FS/part_event/Action/cust_bill_send.pm
index 663caf174..587a7c664 100644
--- a/FS/FS/part_event/Action/cust_bill_send.pm
+++ b/FS/FS/part_event/Action/cust_bill_send.pm
@@ -14,9 +14,6 @@ sub default_weight { 50; }
 sub do_action {
   my( $self, $cust_bill ) = @_;
 
-  #my $cust_main = $self->cust_main($cust_bill);
-  my $cust_main = $cust_bill->cust_main;
-
   $cust_bill->send;
 }
 
-- 
cgit v1.2.1


From 5c35f5323f1cdcf7eabe6632d0352ea417d3047e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Aug 2009 04:03:35 +0000
Subject: Emailing statements of accounts, RT#4860

---
 FS/FS.pm                                       |   2 +
 FS/FS/Cron/bill.pm                             |   3 +-
 FS/FS/Schema.pm                                |  26 ++-
 FS/FS/cust_main.pm                             |  12 ++
 FS/FS/cust_statement.pm                        | 251 +++++++++++++++++++++++++
 FS/FS/part_event.pm                            |   6 +-
 FS/FS/part_event/Action/cust_statement.pm      |  38 ++++
 FS/FS/part_event/Action/cust_statement_send.pm |  26 +++
 FS/MANIFEST                                    |   2 +
 FS/t/cust_statement.t                          |   5 +
 10 files changed, 361 insertions(+), 10 deletions(-)
 create mode 100644 FS/FS/cust_statement.pm
 create mode 100644 FS/FS/part_event/Action/cust_statement.pm
 create mode 100644 FS/FS/part_event/Action/cust_statement_send.pm
 create mode 100644 FS/t/cust_statement.t

(limited to 'FS')

diff --git a/FS/FS.pm b/FS/FS.pm
index 09ef298e7..7ce97414c 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -242,6 +242,8 @@ L<FS::banned_pay> - Banned payment information class
 
 L<FS::cust_bill> - Invoice class
 
+L<FS::cust_statement> - Informational statement class
+
 L<FS::cust_bill_pkg> - Invoice line item class
 
 L<FS::cust_bill_pkg_detail> - Invoice line item detail class
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 1feba7948..2bdb12025 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -194,13 +194,14 @@ END
     my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
                                                                 'time'=>$time,
                                                               );
+    my $where = "AND $where" if $where;
 
     my $are_part_event = 
       "EXISTS ( SELECT 1 FROM part_event $join
                   WHERE check_freq = '$check_freq'
                     AND eventtable = '$eventtable'
                     AND ( disabled = '' OR disabled IS NULL )
-                    AND $where
+                    $where
               )
       ";
 
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 877cf1442..9a7c4ce7a 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -390,16 +390,28 @@ sub tables_hashref {
 
     'cust_bill' => {
       'columns' => [
-        'invnum',    'serial',  '', '', '', '', 
-        'custnum',   'int',  '', '', '', '', 
-        '_date',     @date_type, '', '', 
-        'charged',   @money_type, '', '', 
-        'printed',   'int',  '', '', '', '', 
-        'closed',    'char', 'NULL', 1, '', '', 
+        'invnum',    'serial',     '', '', '', '', 
+        'custnum',      'int',     '', '', '', '', 
+        '_date',        @date_type,        '', '', 
+        'charged',      @money_type,       '', '', 
+        'printed',      'int',     '', '', '', '', 
+        'closed',      'char', 'NULL',  1, '', '', 
+        'statementnum', 'int', 'NULL', '', '', '',
       ],
       'primary_key' => 'invnum',
       'unique' => [],
-      'index' => [ ['custnum'], ['_date'] ],
+      'index' => [ ['custnum'], ['_date'], ['statementnum'], ],
+    },
+
+    'cust_statement' => {
+      'columns' => [
+        'statementnum', 'serial', '', '', '', '',
+        'custnum',         'int', '', '', '', '',
+        '_date',           @date_type,    '', '',
+      ],
+      'primary_key' => 'statementnum',
+      'unique' => [],
+      'index' => [ ['custnum'], ['_date'], ],
     },
 
     'cust_bill_event' => {
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b278e9b14..ca5a4e83f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7251,6 +7251,18 @@ sub open_cust_bill {
 
 }
 
+=item cust_statements
+
+Returns all the statements (see L<FS::cust_statement>) for this customer.
+
+=cut
+
+sub cust_statement {
+  my $self = shift;
+  sort { $a->_date <=> $b->_date }
+    qsearch('cust_statement', { 'custnum' => $self->custnum, } )
+}
+
 =item cust_credit
 
 Returns all the credits (see L<FS::cust_credit>) for this customer.
diff --git a/FS/FS/cust_statement.pm b/FS/FS/cust_statement.pm
new file mode 100644
index 000000000..cd3e7cec8
--- /dev/null
+++ b/FS/FS/cust_statement.pm
@@ -0,0 +1,251 @@
+package FS::cust_statement;
+
+use strict;
+use base qw( FS::cust_bill );
+use FS::Record qw( dbh qsearch ); #qsearchs );
+use FS::cust_main;
+use FS::cust_bill;
+
+=head1 NAME
+
+FS::cust_statement - Object methods for cust_statement records
+
+=head1 SYNOPSIS
+
+  use FS::cust_statement;
+
+  $record = new FS::cust_statement \%hash;
+  $record = new FS::cust_statement { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::cust_statement object represents an informational statement which
+aggregates one or more invoices.  FS::cust_statement inherits from
+FS::cust_bill.
+
+The following fields are currently supported:
+
+=over 4
+
+=item statementnum
+
+primary key
+
+=item custnum
+
+customer
+
+=item _date
+
+date
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new record.  To add the record to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub new { FS::Record::new(@_); }
+
+sub table { 'cust_statement'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  FS::Record::insert($self);
+
+  foreach my $cust_bill (
+                          qsearch({
+                            'table'     => 'cust_bill',
+                            'hashref'   => { 'custnum'      => $self->custnum,
+                                             'statementnum' => '',
+                                           },
+                            'extra_sql' => 'FOR UPDATE' ,
+                          })
+                        )
+  {
+    $cust_bill->statementnum( $self->statementnum );
+    my $error = $cust_bill->replace;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error associating invoice: $error";
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  ''; #no error
+
+}
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete { FS::Record::delete(@_); }
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+sub replace { FS::Record::replace(@_); }
+
+sub replace_check { ''; }
+
+=item check
+
+Checks all fields to make sure this is a valid record.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my $error = 
+    $self->ut_numbern('statementnum')
+    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum' )
+    || $self->ut_numbern('_date')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+  #don't want to call cust_bill, and Record just checks virtual fields
+  #$self->SUPER::check;
+  '';
+
+}
+
+=item cust_bill
+
+Returns the associated invoices (cust_bill records) for this statement.
+
+=cut
+
+sub cust_bill {
+  my $self = shift;
+  qsearch('cust_bill', { 'statementnum' => $self->statementnum } );
+}
+
+sub _aggregate {
+  my( $self, $method ) = ( shift, shift );
+
+  my @agg = ();
+
+  foreach my $cust_bill ( $self->cust_bill ) {
+    push @agg, $cust_bill->$method( @_ );
+  }
+
+  @agg;
+}
+
+=item cust_bill_pkg
+
+Returns the line items (see L<FS::cust_bill_pkg>) for all associated invoices.
+
+=item cust_bill_pkg_pkgnum PKGNUM
+
+Returns the line items (see L<FS::cust_bill_pkg>) for all associated invoices
+and specified pkgnum.
+
+=item cust_bill_pay
+
+Returns all payment applications (see L<FS::cust_bill_pay>) for all associated
+invoices.
+
+=item cust_credited
+
+Returns all applied credits (see L<FS::cust_credit_bill>) for all associated
+invoices.
+
+=item cust_bill_pay_pkgnum PKGNUM
+
+Returns all payment applications (see L<FS::cust_bill_pay>) for all associated
+invoices with matching pkgnum.
+
+=item cust_credited_pkgnum PKGNUM
+
+Returns all applied credits (see L<FS::cust_credit_bill>) for all associated
+invoices with matching pkgnum.
+
+=cut
+
+sub cust_bill_pay        { shift->_aggregate('cust_bill_pay',        @_); }
+sub cust_credited        { shift->_aggregate('cust_credited',        @_); }
+sub cust_bill_pay_pkgnum { shift->_aggregate('cust_bill_pay_pkgnum', @_); }
+sub cust_credited_pkgnum { shift->_aggregate('cust_credited_pkgnum', @_); }
+
+sub cust_bill_pkg        { shift->_aggregate('cust_bill_pkg',        @_); }
+sub cust_bill_pkg_pkgnum { shift->_aggregate('cust_bill_pkg_pkgnum', @_); }
+
+=item tax
+
+Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
+
+=cut
+
+sub tax {
+  my $self = shift;
+
+  my $total = 0;
+
+  foreach my $cust_bill ( $self->cust_bill ) {
+    $total += $cust_bill->tax;
+  }
+
+  $total;
+}
+
+=back
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::cust_bill>, L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+
diff --git a/FS/FS/part_event.pm b/FS/FS/part_event.pm
index 6f2c5366d..c98c3f87a 100644
--- a/FS/FS/part_event.pm
+++ b/FS/FS/part_event.pm
@@ -52,7 +52,7 @@ following fields are currently supported:
 
 =item event - event name
 
-=item eventtable - table name against which this event is triggered; currently "cust_bill" (the traditional invoice events), "cust_main" (customer events) or "cust_pkg (package events)
+=item eventtable - table name against which this event is triggered; currently "cust_bill" (the traditional invoice events), "cust_main" (customer events) or "cust_pkg (package events) (or "cust_statement")
 
 =item check_freq - how often events of this type are checked; currently "1d" (daily) and "1m" (monthly) are recognized.  Note that the apprioriate freeside-daily and/or freeside-monthly cron job needs to be in place.
 
@@ -133,7 +133,7 @@ sub check {
   my $error = 
        $self->ut_numbern('eventpart')
     || $self->ut_text('event')
-    || $self->ut_enum('eventtable', [ 'cust_bill', 'cust_main', 'cust_pkg' ] )
+    || $self->ut_enum('eventtable', [ $self->eventtables ] )
     || $self->ut_enum('check_freq', [ '1d', '1m' ])
     || $self->ut_number('weight')
     || $self->ut_alpha('action')
@@ -273,6 +273,7 @@ sub eventtable_labels {
     'cust_bill'      => 'Invoice',
     'cust_main'      => 'Customer',
     'cust_pay_batch' => 'Batch payment',
+    'cust_statement' => 'Statement',  #too general a name here? "Invoice group"?
   ;
 
   \%hash
@@ -310,6 +311,7 @@ sub eventtable_pkey {
     'cust_bill'      => 'invnum',
     'cust_pkg'       => 'pkgnum',
     'cust_pay_batch' => 'paybatchnum',
+    'cust_statement' => 'statementnum',
   };
 }
 
diff --git a/FS/FS/part_event/Action/cust_statement.pm b/FS/FS/part_event/Action/cust_statement.pm
new file mode 100644
index 000000000..8d8f12770
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_statement.pm
@@ -0,0 +1,38 @@
+package FS::part_event::Action::cust_statement;
+
+use strict;
+
+use base qw( FS::part_event::Action );
+
+use FS::cust_statement;
+
+sub description {
+  'Group invoices into an informational statement.';
+}
+
+sub eventtable_hashref {
+    { 'cust_main' => 1, };
+    { 'cust_pkg'  => 1, };
+}
+
+sub default_weight {
+  90;
+}
+
+sub do_action {
+  my( $self, $cust_main ) = @_;
+
+  #my( $self, $object ) = @_;
+  #my $cust_main = $self->cust_main($object);
+
+  my $cust_statement = new FS::cust_statement {
+    'custnum' => $cust_main->custnum
+  };
+  my $error = $cust_statement->insert;
+  die $error if $error;
+
+  '';
+
+}
+
+1;
diff --git a/FS/FS/part_event/Action/cust_statement_send.pm b/FS/FS/part_event/Action/cust_statement_send.pm
new file mode 100644
index 000000000..34f023e0c
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_statement_send.pm
@@ -0,0 +1,26 @@
+package FS::part_event::Action::cust_statement_send;
+
+use strict;
+
+use base qw( FS::part_event::Action );
+
+sub description {
+  'Send statement (email/print/fax)';
+}
+
+sub eventtable_hashref {
+  { 'cust_statement' => 1, };
+}
+
+sub default_weight {
+  95;
+}
+
+sub do_action {
+  my( $self, $cust_statement ) = @_;
+
+  $cust_statement->send;
+
+}
+
+1;
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 8082610d7..a45489700 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -449,3 +449,5 @@ FS/part_device.pm
 t/part_device.t
 FS/cdr_termination.pm
 t/cdr_termination.t
+FS/cust_statement.pm
+t/cust_statement.t
diff --git a/FS/t/cust_statement.t b/FS/t/cust_statement.t
new file mode 100644
index 000000000..c57d94c40
--- /dev/null
+++ b/FS/t/cust_statement.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_statement;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From 1e34f4a5d142bd58f5918219db0931e81ad0418e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Aug 2009 09:47:05 +0000
Subject: email statements, RT#4860

---
 FS/FS/Cron/bill.pm                             |  2 +-
 FS/FS/Mason.pm                                 |  1 +
 FS/FS/cust_statement.pm                        | 37 ++++++++++++++++++-----
 FS/FS/part_event/Action/cust_statement.pm      |  5 ++--
 FS/FS/part_event/Action/cust_statement_send.pm |  2 +-
 FS/FS/part_event/Condition/has_pkg_class.pm    | 40 +++++++++++++++++++++++++
 FS/FS/part_event/Condition/has_pkgpart.pm      | 41 ++++++++++++++++++++++++++
 FS/FS/part_event/Condition/hasnt_pkgpart.pm    | 40 +++++++++++++++++++++++++
 8 files changed, 156 insertions(+), 12 deletions(-)
 create mode 100644 FS/FS/part_event/Condition/has_pkg_class.pm
 create mode 100644 FS/FS/part_event/Condition/has_pkgpart.pm
 create mode 100644 FS/FS/part_event/Condition/hasnt_pkgpart.pm

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 2bdb12025..d727d923d 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -194,7 +194,7 @@ END
     my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
                                                                 'time'=>$time,
                                                               );
-    my $where = "AND $where" if $where;
+    $where = $where ? "AND $where" : '';
 
     my $are_part_event = 
       "EXISTS ( SELECT 1 FROM part_event $join
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index d73d3810a..f71db208e 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -197,6 +197,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::h_svc_phone;
   #use FS::h_phone_device;
   use FS::h_svc_www;
+  use FS::cust_statement;
   # Sammath Naur
 
   if ( %%%RT_ENABLED%%% ) {
diff --git a/FS/FS/cust_statement.pm b/FS/FS/cust_statement.pm
index cd3e7cec8..83dd5c1be 100644
--- a/FS/FS/cust_statement.pm
+++ b/FS/FS/cust_statement.pm
@@ -180,6 +180,18 @@ sub _aggregate {
   @agg;
 }
 
+sub _total {
+  my( $self, $method ) = ( shift, shift );
+
+  my $total = 0;
+
+  foreach my $cust_bill ( $self->cust_bill ) {
+    $total += $cust_bill->$method( @_ );
+  }
+
+  $total;
+}
+
 =item cust_bill_pkg
 
 Returns the line items (see L<FS::cust_bill_pkg>) for all associated invoices.
@@ -221,20 +233,29 @@ sub cust_bill_pkg_pkgnum { shift->_aggregate('cust_bill_pkg_pkgnum', @_); }
 
 =item tax
 
-Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
+Returns the total tax amount for all assoicated invoices.0
 
 =cut
 
-sub tax {
-  my $self = shift;
+=item charged
 
-  my $total = 0;
+Returns the total amount charged for all associated invoices.
 
-  foreach my $cust_bill ( $self->cust_bill ) {
-    $total += $cust_bill->tax;
-  }
+=cut
 
-  $total;
+=item owed
+
+Returns the total amount owed for all associated invoices.
+
+=cut
+
+sub tax     { shift->_total('tax',     @_); }
+sub charged { shift->_total('charged', @_); }
+sub owed    { shift->_total('owed',    @_); }
+
+#don't show previous info
+sub previous {
+  ( 0 ); # 0, empty list
 }
 
 =back
diff --git a/FS/FS/part_event/Action/cust_statement.pm b/FS/FS/part_event/Action/cust_statement.pm
index 8d8f12770..2d9e8773c 100644
--- a/FS/FS/part_event/Action/cust_statement.pm
+++ b/FS/FS/part_event/Action/cust_statement.pm
@@ -11,8 +11,9 @@ sub description {
 }
 
 sub eventtable_hashref {
-    { 'cust_main' => 1, };
-    { 'cust_pkg'  => 1, };
+  { 'cust_main' => 1,
+    'cust_pkg'  => 1,
+  };
 }
 
 sub default_weight {
diff --git a/FS/FS/part_event/Action/cust_statement_send.pm b/FS/FS/part_event/Action/cust_statement_send.pm
index 34f023e0c..74cc48ca8 100644
--- a/FS/FS/part_event/Action/cust_statement_send.pm
+++ b/FS/FS/part_event/Action/cust_statement_send.pm
@@ -19,7 +19,7 @@ sub default_weight {
 sub do_action {
   my( $self, $cust_statement ) = @_;
 
-  $cust_statement->send;
+  $cust_statement->send( 'statement' ); #XXX configure
 
 }
 
diff --git a/FS/FS/part_event/Condition/has_pkg_class.pm b/FS/FS/part_event/Condition/has_pkg_class.pm
new file mode 100644
index 000000000..59a3675c3
--- /dev/null
+++ b/FS/FS/part_event/Condition/has_pkg_class.pm
@@ -0,0 +1,40 @@
+package FS::part_event::Condition::has_pkg_class;
+
+use strict;
+
+use base qw( FS::part_event::Condition );
+use FS::Record qw( qsearch );
+use FS::pkg_class;
+
+sub description {
+  'Customer has uncancelled package with class';
+}
+
+sub eventtable_hashref {
+    { 'cust_main' => 1,
+      'cust_bill' => 1,
+      'cust_pkg'  => 1,
+    };
+}
+
+#something like this
+sub option_fields {
+  (
+    'pkgclass'  => { 'label'    => 'Package Class',
+                     'type'     => 'select-pkg_class',
+                     'multiple' => 1,
+                   },
+  );
+}
+
+sub condition {
+  my( $self, $object ) = @_;
+
+  my $cust_main = $self->cust_main($object);
+
+  #XXX test
+  my $hashref = $self->option('pkgclass') || {};
+  grep $hashref->{ $_->part_pkg->classnum }, $cust_main->ncancelled_pkgs;
+}
+
+1;
diff --git a/FS/FS/part_event/Condition/has_pkgpart.pm b/FS/FS/part_event/Condition/has_pkgpart.pm
new file mode 100644
index 000000000..c54b7e256
--- /dev/null
+++ b/FS/FS/part_event/Condition/has_pkgpart.pm
@@ -0,0 +1,41 @@
+package FS::part_event::Condition::has_pkgpart;
+
+use strict;
+
+use base qw( FS::part_event::Condition );
+
+sub description { 'Customer has uncancelled package of specified definitions'; }
+
+sub eventtable_hashref {
+    { 'cust_main' => 1,
+      'cust_bill' => 1,
+      'cust_pkg'  => 1,
+    };
+}
+
+sub option_fields {
+  ( 
+    'if_pkgpart' => { 'label'    => 'Only packages: ',
+                      'type'     => 'select-part_pkg',
+                      'multiple' => 1,
+                    },
+  );
+}
+
+sub condition {
+  my( $self, $object) = @_;
+
+  my $cust_main = $self->cust_main($object);
+
+  #XXX test
+  my $if_pkgpart = $self->option('if_pkgpart') || {};
+  grep $if_pkgpart->{ $_->pkgpart }, $cust_main->ncancelled_pkgs;
+
+}
+
+#XXX 
+#sub condition_sql {
+#
+#}
+
+1;
diff --git a/FS/FS/part_event/Condition/hasnt_pkgpart.pm b/FS/FS/part_event/Condition/hasnt_pkgpart.pm
new file mode 100644
index 000000000..421d0232c
--- /dev/null
+++ b/FS/FS/part_event/Condition/hasnt_pkgpart.pm
@@ -0,0 +1,40 @@
+package FS::part_event::Condition::hasnt_pkgpart;
+
+use strict;
+
+use base qw( FS::part_event::Condition );
+
+sub description { 'Customer does not have uncancelled package of specified definitions'; }
+
+sub eventtable_hashref {
+    { 'cust_main' => 1,
+      'cust_bill' => 1,
+      'cust_pkg'  => 1,
+    };
+}
+
+sub option_fields {
+  ( 
+    'unless_pkgpart' => { 'label'    => 'Packages: ',
+                          'type'     => 'select-part_pkg',
+                          'multiple' => 1,
+                        },
+  );
+}
+
+sub condition {
+  my( $self, $object ) = @_;
+
+  my $cust_main = $self->cust_main($object);
+
+  #XXX test
+  my $unless_pkgpart = $self->option('unless_pkgpart') || {};
+  ! grep $unless_pkgpart->{ $_->pkgpart }, $cust_main->ncancelled_pkgs;
+}
+
+#XXX
+#sub condition_sql {
+#
+#}
+
+1;
-- 
cgit v1.2.1


From d9baa1b16a6419108ab98d40bd05b1d62f1551bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 20 Aug 2009 09:55:58 +0000
Subject: allow generic conditions for cust_statement, RT#4860

---
 FS/FS/part_event/Condition.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/part_event/Condition.pm b/FS/FS/part_event/Condition.pm
index 544b560b6..ddd8a616f 100644
--- a/FS/FS/part_event/Condition.pm
+++ b/FS/FS/part_event/Condition.pm
@@ -41,6 +41,7 @@ of eventtables (values set true indicate the condition can be tested):
       'cust_bill'      => 1,
       'cust_pkg'       => 0,
       'cust_pay_batch' => 0,
+      'cust_statement' => 0,
     };
   }
 
@@ -52,6 +53,7 @@ sub eventtable_hashref {
       'cust_bill'      => 1,
       'cust_pkg'       => 1,
       'cust_pay_batch' => 1,
+      'cust_statement' => 1,
     };
 }
 
-- 
cgit v1.2.1


From beb9681db0ee4c0912c82849267a82dd434784b3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Aug 2009 00:22:08 +0000
Subject: order svc_phone services from self-service too, RT#5085

---
 FS/FS/ClientAPI/MasonComponent.pm | 33 ++++++++++++++++++++++++++++++++-
 FS/FS/ClientAPI/MyAccount.pm      |  2 +-
 FS/FS/Conf.pm                     |  7 +++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm
index d158ce842..88baf0764 100644
--- a/FS/FS/ClientAPI/MasonComponent.pm
+++ b/FS/FS/ClientAPI/MasonComponent.pm
@@ -6,8 +6,9 @@ use subs qw( _cache );
 use FS::Mason qw( mason_interps );
 use FS::Conf;
 use FS::ClientAPI_SessionCache;
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_main;
+use FS::part_pkg;
 
 $DEBUG = 0;
 $me = '[FS::ClientAPI::MasonComponent]';
@@ -19,13 +20,17 @@ my %allowed_comps = map { $_=>1 } qw(
   /misc/phonenums.cgi
   /misc/states.cgi
   /misc/counties.cgi
+  /misc/svc_acct-domains.cgi
+  /misc/part_svc-columns.cgi
 );
 
 my %session_comps = map { $_=>1 } qw(
   /elements/location.html
+  /edit/cust_main/first_pkg/select-part_pkg.html
 );
 
 my %session_callbacks = (
+
   '/elements/location.html' => sub {
     my( $custnum, $argsref ) = @_;
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
@@ -35,6 +40,32 @@ my %session_callbacks = (
     @$argsref = ( %args );
     return ''; #no error
   },
+
+  '/edit/cust_main/first_pkg/select-part_pkg.html' => sub {
+    my( $custnum, $argsref ) = @_;
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+      or return "unknown custnum $custnum";
+
+    my $pkgpart = $cust_main->agent->pkgpart_hashref;
+
+    #false laziness w/ edit/cust_main/first_pkg.html
+    my @first_svc = ( 'svc_acct', 'svc_phone' );
+
+    my @part_pkg =
+      grep { $_->svcpart(\@first_svc)
+             && ( $pkgpart->{ $_->pkgpart } 
+                  || ( $_->agentnum && $_->agentnum == $cust_main->agentnum )
+                )
+           }
+      qsearch( 'part_pkg', { 'disabled' => '' }, '', 'ORDER BY pkg' ); # case?
+
+    my %args = @$argsref;
+    $args{part_pkg} = \@part_pkg;
+    @$argsref = ( %args );
+    return ''; #no error
+
+  },
+
 );
 
 my $outbuf;
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index b6934f8bd..e1d4c9225 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1110,7 +1110,7 @@ sub order_pkg {
     my %fields = (
       'svc_acct'     => [ qw( username domsvc _password sec_phrase popnum ) ],
       'svc_domain'   => [ qw( domain ) ],
-      'svc_phone'    => [ qw( phonenum pin sip_password ) ],
+      'svc_phone'    => [ qw( phonenum pin sip_password phone_name ) ],
       'svc_external' => [ qw( id title ) ],
     );
   
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1ee0214c2..d8e111b35 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3079,6 +3079,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_acct-disable_access_number',
+    'section'     => 'UI',
+    'descritpion' => 'Disable access number selection.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
-- 
cgit v1.2.1


From 7c16d49fb99733c29f25f96b9d22c3c639994d29 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Aug 2009 00:26:24 +0000
Subject: cleaner??

---
 FS/FS/Record.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index c8216eca8..58b2555f0 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -1207,7 +1207,10 @@ sub replace {
   
   # Encrypt for replace
   my $saved = {};
-  if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . '::encrypted_fields')) {
+  if (    $conf->exists('encryption')
+       && defined(eval '@FS::'. $new->table . '::encrypted_fields')
+       && scalar( eval '@FS::'. $new->table . '::encrypted_fields')
+  ) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
       $saved->{$field} = $new->getfield($field);
       $new->setfield($field, $new->encrypt($new->getfield($field)));
-- 
cgit v1.2.1


From 18e3e7df2646ec1f39d4c25588445a7c3f585600 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Aug 2009 00:27:47 +0000
Subject: fewer false positives

---
 FS/FS/Cron/check.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index 7e4655f75..c4e712c61 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -72,7 +72,7 @@ sub check_apache {
 }
 
 #and now for something entirely different...
-my $num_consecutive_bop_failures = 40;
+my $num_consecutive_bop_failures = 50;
 sub check_bop_failures {
 
   return 1 if grep { $_->statustext eq 'captured' }
-- 
cgit v1.2.1


From 000f20dff74059f44950c7191beaab951aeae316 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Aug 2009 00:30:34 +0000
Subject: doc

---
 FS/FS/cust_bill.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a35ea0028..68571f77e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -451,7 +451,7 @@ sub cust_credited {
   ;
 }
 
-=item cust_bill_pay_pkgnum
+=item cust_bill_pay_pkgnum PKGNUM
 
 Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice
 with matching pkgnum.
@@ -467,7 +467,7 @@ sub cust_bill_pay_pkgnum {
            );
 }
 
-=item cust_credited_pkgnum
+=item cust_credited_pkgnum PKGNUM
 
 Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice
 with matching pkgnum.
-- 
cgit v1.2.1


From b53214c810513eda313fb7aea5405fb02a3b94c5 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 24 Aug 2009 05:09:27 +0000
Subject: add rated call sales report and option to sales report to count usage
 separately from recurring #5588

---
 FS/FS/Report/Table/Monthly.pm | 62 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index d015f9116..845ab150b 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -331,7 +331,9 @@ sub cust_bill_pkg {
 
   $agentnum ||= $opt{'agentnum'};
 
-  $self->scalar_sql("
+  my $usage = cust_bill_pkg_detail(@_);
+
+  my $total = $self->scalar_sql("
     SELECT SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)
       FROM cust_bill_pkg
         LEFT JOIN cust_bill USING ( invnum )
@@ -344,6 +346,64 @@ sub cust_bill_pkg {
         AND ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
   );
   
+  if ($opt{use_usage} && $opt{use_usage} eq 'recurring') {
+    return $total-$usage;
+  } elsif ($opt{use_usage} && $opt{use_usage} eq 'usage') {
+    return $usage;
+  } else {
+    return $total;
+  }
+}
+
+sub cust_bill_pkg_detail {
+  my( $self, $speriod, $eperiod, $agentnum, %opt ) = @_;
+
+  my @where = ( "cust_bill_pkg.pkgnum != 0" );
+  my $comparison = '';
+  if ( $opt{'classnum'} =~ /^(\d+)$/ ) {
+    if ( $1 == 0 ) {
+      $comparison = "IS NULL";
+    } else {
+      $comparison = "= $1";
+    }
+
+    if ( $opt{'use_override'} ) {
+      push @where, "(
+        part_pkg.classnum $comparison AND pkgpart_override IS NULL OR
+        override.classnum $comparison AND pkgpart_override IS NOT NULL
+      )";
+    } else {
+      push @where, "part_pkg.classnum $comparison";
+    }
+  }
+
+  if ( $opt{'usageclass'} =~ /^(\d+)$/ ) {
+    if ( $1 == 0 ) {
+      $comparison = "IS NULL";
+    } else {
+      $comparison = "= $1";
+    }
+
+    push @where, "cust_bill_pkg_detail.classnum $comparison";
+  }
+
+  $agentnum ||= $opt{'agentnum'};
+
+  my $where = join( ' AND ', @where );
+
+  $self->scalar_sql("
+    SELECT SUM(amount)
+      FROM cust_bill_pkg_detail
+        LEFT JOIN cust_bill_pkg USING ( billpkgnum )
+        LEFT JOIN cust_bill ON cust_bill_pkg.invnum = cust_bill.invnum
+        LEFT JOIN cust_main USING ( custnum )
+        LEFT JOIN cust_pkg ON cust_bill_pkg.pkgnum = cust_pkg.pkgnum
+        LEFT JOIN part_pkg USING ( pkgpart )
+        LEFT JOIN part_pkg AS override ON pkgpart_override = override.pkgpart
+      WHERE $where
+        AND ". $self->in_time_period_and_agent($speriod, $eperiod, $agentnum)
+  );
+  
 }
 
 sub setup_pkg  { shift->pkg_field( @_, 'setup' ); }
-- 
cgit v1.2.1


From a58bd9386e1e5fa1cdd16936fc29093ed67714db Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 2009 06:39:58 +0000
Subject: (start of) customer move script, RT#5351

---
 FS/FS/cust_bill_ApplicationCommon.pm |  6 ++++-
 FS/FS/part_pkg.pm                    | 45 ++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 21 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill_ApplicationCommon.pm b/FS/FS/cust_bill_ApplicationCommon.pm
index ec694ca58..d4627c0b4 100644
--- a/FS/FS/cust_bill_ApplicationCommon.pm
+++ b/FS/FS/cust_bill_ApplicationCommon.pm
@@ -1,7 +1,7 @@
 package FS::cust_bill_ApplicationCommon;
 
 use strict;
-use vars qw( @ISA $DEBUG $me );
+use vars qw( @ISA $DEBUG $me $skip_apply_to_lineitems_hack );
 use List::Util qw(min);
 use FS::Schema qw( dbdef );
 use FS::Record qw( qsearch qsearchs dbh );
@@ -11,6 +11,8 @@ use FS::Record qw( qsearch qsearchs dbh );
 $DEBUG = 0;
 $me = '[FS::cust_bill_ApplicationCommon]';
 
+$skip_apply_to_lineitems_hack = 0;
+
 =head1 NAME
 
 FS::cust_bill_ApplicationCommon - Base class for bill application classes
@@ -113,6 +115,8 @@ Auto-applies this invoice application to specific line items, if possible.
 sub apply_to_lineitems {
   my $self = shift;
 
+  return '' if $skip_apply_to_lineitems_hack;
+
   my @apply = ();
 
   my $conf = new FS::Conf;
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index 3ee9e7f01..287453f3c 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -1,7 +1,7 @@
 package FS::part_pkg;
 
 use strict;
-use vars qw( @ISA %plans $DEBUG $setup_hack );
+use vars qw( @ISA %plans $DEBUG $setup_hack $skip_pkg_svc_hack );
 use Carp qw(carp cluck confess);
 use Scalar::Util qw( blessed );
 use Time::Local qw( timelocal_nocheck );
@@ -23,6 +23,7 @@ use FS::part_pkg_link;
 @ISA = qw( FS::m2m_Common FS::option_Common );
 $DEBUG = 0;
 $setup_hack = 0;
+$skip_pkg_svc_hack = 0;
 
 =head1 NAME
 
@@ -217,26 +218,30 @@ sub insert {
     }
   }
 
-  warn "  inserting pkg_svc records" if $DEBUG;
-  my $pkg_svc = $options{'pkg_svc'} || {};
-  foreach my $part_svc ( qsearch('part_svc', {} ) ) {
-    my $quantity = $pkg_svc->{$part_svc->svcpart} || 0;
-    my $primary_svc =
-      ( $options{'primary_svc'} && $options{'primary_svc'}==$part_svc->svcpart )
-        ? 'Y'
-        : '';
-
-    my $pkg_svc = new FS::pkg_svc( {
-      'pkgpart'     => $self->pkgpart,
-      'svcpart'     => $part_svc->svcpart,
-      'quantity'    => $quantity, 
-      'primary_svc' => $primary_svc,
-    } );
-    my $error = $pkg_svc->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
+  unless ( $skip_pkg_svc_hack ) {
+
+    warn "  inserting pkg_svc records" if $DEBUG;
+    my $pkg_svc = $options{'pkg_svc'} || {};
+    foreach my $part_svc ( qsearch('part_svc', {} ) ) {
+      my $quantity = $pkg_svc->{$part_svc->svcpart} || 0;
+      my $primary_svc =
+        ( $options{'primary_svc'} && $options{'primary_svc'}==$part_svc->svcpart )
+          ? 'Y'
+          : '';
+
+      my $pkg_svc = new FS::pkg_svc( {
+        'pkgpart'     => $self->pkgpart,
+        'svcpart'     => $part_svc->svcpart,
+        'quantity'    => $quantity, 
+        'primary_svc' => $primary_svc,
+      } );
+      my $error = $pkg_svc->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
     }
+
   }
 
   if ( $options{'cust_pkg'} ) {
-- 
cgit v1.2.1


From d9a702d507ac900c84a21b9336db3112da313ed8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 24 Aug 2009 08:50:47 +0000
Subject: (start of) customer move script, RT#5351

---
 FS/FS/cust_main.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ca5a4e83f..cdfe93848 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1845,6 +1845,8 @@ sub check {
     my( $m, $y );
     if ( $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) {
       ( $m, $y ) = ( $1, length($2) == 4 ? $2 : "20$2" );
+    } elsif ( $self->paydate =~ /^19(\d{2})[\/\-](\d{1,2})[\/\-]\d+$/ ) {
+      ( $m, $y ) = ( $2, "19$1" );
     } elsif ( $self->paydate =~ /^(20)?(\d{2})[\/\-](\d{1,2})[\/\-]\d+$/ ) {
       ( $m, $y ) = ( $3, "20$2" );
     } else {
-- 
cgit v1.2.1


From 2b1f6ef77f0ef347897a060cfe94bbff2e3f6c76 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 25 Aug 2009 17:03:42 +0000
Subject: support listref to qsearch as UNION

---
 FS/FS/Record.pm | 216 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 134 insertions(+), 82 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 58b2555f0..f17b24036 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -244,6 +244,9 @@ fine in the common case where there are only two parameters:
 
   my @records = qsearch( 'table', { 'field' => 'value' } );
 
+Also possible is an experimental LISTREF of PARAMS_HASHREFs for a UNION of
+the individual PARAMS_HASHREF queries
+
 ###oops, argh, FS::Record::new only lets us create database fields.
 #Normal behaviour if SELECT is not specified is `*', as in
 #C<SELECT * FROM table WHERE ...>.  However, there is an experimental new
@@ -300,104 +303,146 @@ sub _is_fs_float {
 }
 
 sub qsearch {
-  my($stable, $record, $cache );
-  my( $select, $extra_sql, $extra_param, $order_by, $addl_from );
-  my $debug = '';
-  if ( ref($_[0]) ) { #hashref for now, eventually maybe accept a list too
+  my( @stable, @record, @cache );
+  my( @select, @extra_sql, @extra_param, @order_by, @addl_from );
+  my @debug = ();
+  my %union_options = ();
+  if ( ref($_[0]) eq 'ARRAY' ) {
+    my $optlist = shift;
+    %union_options = @_;
+    foreach my $href ( @$optlist ) {
+      push @stable,      ( $href->{'table'} or die "table name is required" );
+      push @record,      ( $href->{'hashref'}     || {} );
+      push @select,      ( $href->{'select'}      || '*' );
+      push @extra_sql,   ( $href->{'extra_sql'}   || '' );
+      push @extra_param, ( $href->{'extra_param'} || [] );
+      push @order_by,    ( $href->{'order_by'}    || '' );
+      push @cache,       ( $href->{'cache_obj'}   || '' );
+      push @addl_from,   ( $href->{'addl_from'}   || '' );
+      push @debug,       ( $href->{'debug'}       || '' );
+    }
+    die "at least one hashref is required" unless scalar(@stable);
+  } elsif ( ref($_[0]) eq 'HASH' ) {
     my $opt = shift;
-    $stable      = $opt->{'table'}       or die "table name is required";
-    $record      = $opt->{'hashref'}     || {};
-    $select      = $opt->{'select'}      || '*';
-    $extra_sql   = $opt->{'extra_sql'}   || '';
-    $extra_param = $opt->{'extra_param'} || [];
-    $order_by    = $opt->{'order_by'}    || '';
-    $cache       = $opt->{'cache_obj'}   || '';
-    $addl_from   = $opt->{'addl_from'}   || '';
-    $debug       = $opt->{'debug'}       || '';
+    $stable[0]      = $opt->{'table'}       or die "table name is required";
+    $record[0]      = $opt->{'hashref'}     || {};
+    $select[0]      = $opt->{'select'}      || '*';
+    $extra_sql[0]   = $opt->{'extra_sql'}   || '';
+    $extra_param[0] = $opt->{'extra_param'} || [];
+    $order_by[0]    = $opt->{'order_by'}    || '';
+    $cache[0]       = $opt->{'cache_obj'}   || '';
+    $addl_from[0]   = $opt->{'addl_from'}   || '';
+    $debug[0]       = $opt->{'debug'}       || '';
   } else {
-    ($stable, $record, $select, $extra_sql, $cache, $addl_from ) = @_;
-    $select ||= '*';
+    ( $stable[0],
+      $record[0],
+      $select[0],
+      $extra_sql[0],
+      $cache[0],
+      $addl_from[0]
+    ) = @_;
+    $select[0] ||= '*';
   }
+  my $cache = $cache[0];
 
-  #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
-  #for jsearch
-  $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
-  $stable = $1;
+  my @statement = ();
+  my @value = ();
+  my @bind_type = ();
   my $dbh = dbh;
+  foreach my $stable ( @stable ) {
+    my $record      = shift @record;
+    my $select      = shift @select;
+    my $extra_sql   = shift @extra_sql;
+    my $extra_param = shift @extra_param;
+    my $order_by    = shift @order_by;
+    my $cache       = shift @cache;
+    my $addl_from   = shift @addl_from;
+    my $debug       = shift @debug;
+
+    #$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
+    #for jsearch
+    $stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
+    $stable = $1;
+
+    my $table = $cache ? $cache->table : $stable;
+    my $dbdef_table = dbdef->table($table)
+      or die "No schema for table $table found - ".
+             "do you need to run freeside-upgrade?";
+    my $pkey = $dbdef_table->primary_key;
+
+    my @real_fields = grep exists($record->{$_}), real_fields($table);
+    my @virtual_fields;
+    if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
+      @virtual_fields = grep exists($record->{$_}), "FS::$table"->virtual_fields;
+    } else {
+      cluck "warning: FS::$table not loaded; virtual fields not searchable"
+        unless $nowarn_classload;
+      @virtual_fields = ();
+    }
 
-  my $table = $cache ? $cache->table : $stable;
-  my $dbdef_table = dbdef->table($table)
-    or die "No schema for table $table found - ".
-           "do you need to run freeside-upgrade?";
-  my $pkey = $dbdef_table->primary_key;
+    my $statement .= "SELECT $select FROM $stable";
+    $statement .= " $addl_from" if $addl_from;
+    if ( @real_fields or @virtual_fields ) {
+      $statement .= ' WHERE '. join(' AND ',
+        get_real_fields($table, $record, \@real_fields) ,
+        get_virtual_fields($table, $pkey, $record, \@virtual_fields),
+        );
+    }
 
-  my @real_fields = grep exists($record->{$_}), real_fields($table);
-  my @virtual_fields;
-  if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
-    @virtual_fields = grep exists($record->{$_}), "FS::$table"->virtual_fields;
-  } else {
-    cluck "warning: FS::$table not loaded; virtual fields not searchable"
-      unless $nowarn_classload;
-    @virtual_fields = ();
-  }
+    $statement .= " $extra_sql" if defined($extra_sql);
+    $statement .= " $order_by"  if defined($order_by);
 
-  my $statement = "SELECT $select FROM $stable";
-  $statement .= " $addl_from" if $addl_from;
-  if ( @real_fields or @virtual_fields ) {
-    $statement .= ' WHERE '. join(' AND ',
-      get_real_fields($table, $record, \@real_fields) ,
-      get_virtual_fields($table, $pkey, $record, \@virtual_fields),
-      );
-  }
+    push @statement, $statement;
 
-  $statement .= " $extra_sql" if defined($extra_sql);
-  $statement .= " $order_by"  if defined($order_by);
+    warn "[debug]$me $statement\n" if $DEBUG > 1 || $debug;
+ 
 
-  warn "[debug]$me $statement\n" if $DEBUG > 1 || $debug;
-  my $sth = $dbh->prepare($statement)
-    or croak "$dbh->errstr doing $statement";
+    foreach my $field (
+      grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
+    ) {
 
-  my $bind = 1;
+      my $value = $record->{$field};
+      my $op = (ref($value) && $value->{op}) ? $value->{op} : '=';
+      $value = $value->{'value'} if ref($value);
+      my $type = dbdef->table($table)->column($field)->type;
 
-  foreach my $field (
-    grep defined( $record->{$_} ) && $record->{$_} ne '', @real_fields
-  ) {
+      my $bind_type = _bind_type($type, $value);
 
-    my $value = $record->{$field};
-    my $op = (ref($value) && $value->{op}) ? $value->{op} : '=';
-    $value = $value->{'value'} if ref($value);
-    my $type = dbdef->table($table)->column($field)->type;
-
-    my $bind_type = _bind_type($type, $value);
-
-    #if ( $DEBUG > 2 ) {
-    #  no strict 'refs';
-    #  %TYPE = map { &{"DBI::$_"}() => $_ } @{ $DBI::EXPORT_TAGS{sql_types} }
-    #    unless keys %TYPE;
-    #  warn "  bind_param $bind (for field $field), $value, TYPE $TYPE{$TYPE}\n";
-    #}
-
-    #if this needs to be re-enabled, it needs to use a custom op like
-    #"APPROX=" or something (better name?, not '=', to avoid affecting other
-    # searches
-    #if ($TYPE eq SQL_DECIMAL && $op eq 'APPROX=' ) {
-    #  # these values are arbitrary; better (faster?) ones welcome
-    #  $sth->bind_param($bind++, $value*1.00001, { TYPE => $TYPE } );
-    #  $sth->bind_param($bind++, $value*.99999, { TYPE => $TYPE } );
-    #} else {
-      $sth->bind_param($bind++, $value, $bind_type );
-    #}
+      #if ( $DEBUG > 2 ) {
+      #  no strict 'refs';
+      #  %TYPE = map { &{"DBI::$_"}() => $_ } @{ $DBI::EXPORT_TAGS{sql_types} }
+      #    unless keys %TYPE;
+      #  warn "  bind_param $bind (for field $field), $value, TYPE $TYPE{$TYPE}\n";
+      #}
 
-  }
+      push @value, $value;
+      push @bind_type, $bind_type;
+
+    }
 
-  foreach my $param ( @$extra_param ) {
-    my $bind_type = { TYPE => SQL_VARCHAR };
-    my $value = $param;
-    if ( ref($param) ) {
-      $value = $param->[0];
-      my $type = $param->[1];
-      $bind_type = _bind_type($type, $value);
+    foreach my $param ( @$extra_param ) {
+      my $bind_type = { TYPE => SQL_VARCHAR };
+      my $value = $param;
+      if ( ref($param) ) {
+        $value = $param->[0];
+        my $type = $param->[1];
+        $bind_type = _bind_type($type, $value);
+      }
+      push @value, $value;
+      push @bind_type, $bind_type;
     }
+  }
+
+  my $statement = join( ' ) UNION ( ', @statement );
+  $statement = "( $statement )" if scalar(@statement) > 1;
+  $statement .= " $union_options{order_by}" if $union_options{order_by};
+
+  my $sth = $dbh->prepare($statement)
+    or croak "$dbh->errstr doing $statement";
+
+  my $bind = 1;
+  foreach my $value ( @value ) {
+    my $bind_type = shift @bind_type;
     $sth->bind_param($bind++, $value, $bind_type );
   }
 
@@ -407,6 +452,13 @@ sub qsearch {
 
   $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
 
+  # virtual fields and blessings are nonsense in a heterogeneous UNION, right?
+  my $table = $stable[0];
+  my $pkey = '';
+  $table = '' if grep { $_ ne $table } @stable;
+  $pkey = dbdef->table($table)->primary_key if $table;
+
+  my @virtual_fields = ();
   if ( eval 'scalar(@FS::'. $table. '::ISA);' ) {
     @virtual_fields = "FS::$table"->virtual_fields;
   } else {
-- 
cgit v1.2.1


From 5f92e7e7cb4a87f4e1b823a4684497cbda498b23 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 26 Aug 2009 10:18:28 +0000
Subject: add granularity to single_price CDR rating, RT#5495

---
 FS/FS/part_pkg/voip_cdr.pm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 9f150d6dd..ee0091469 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -35,6 +35,8 @@ tie my %temporalities, 'Tie::IxHash',
   'preceding' => "Preceding (past)",
 ;
 
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+
 %info = (
   'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
   'shortname' => 'VoIP/telco CDR rating (standard)',
@@ -84,6 +86,11 @@ tie my %temporalities, 'Tie::IxHash',
     'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
                     },
 
+    'sec_granularity' => { 'name' => 'Granularity when using "single price per minute" rating method',
+                           'type' => 'select',
+                           'select_options' => \%granularity,
+                         },
+
     'ignore_unrateable' => { 'name' => 'Ignore calls without a rate in the rate tables.  By default, the system will throw a fatal error upon encountering unrateable calls.',
                              'type' => 'checkbox',
                            },
@@ -199,7 +206,8 @@ tie my %temporalities, 'Tie::IxHash',
   'fieldorder' => [qw(
                        setup_fee recur_fee recur_temporality unused_credit
                        recur_method cutoff_day
-                       rating_method ratenum min_charge ignore_unrateable
+                       rating_method ratenum min_charge sec_granularity
+                       ignore_unrateable
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
@@ -464,16 +472,18 @@ sub calc_usage {
 
         # a little false laziness w/below
 
-        my $granularity = 60;
+        my $granularity = length($self->option('sec_granularity'))
+                            ? $self->option('sec_granularity')
+                            : 60;
 
                     # length($cdr->billsec) ? $cdr->billsec : $cdr->duration;
         my $seconds = $use_duration ? $cdr->duration : $cdr->billsec;
 
         $seconds += $granularity - ( $seconds % $granularity )
           if $seconds      # don't granular-ize 0 billsec calls (bills them)
-          ;#&& $granularity; # 0 is per call
-        my $minutes = sprintf("%.1f", $seconds / 60);
-        $minutes =~ s/\.0$// ;# if $granularity == 60;
+          && $granularity; # 0 is per call
+        my $minutes = $seconds / 60; # sprintf("%.1f", 
+        #$minutes =~ s/\.0$// if $granularity == 60;
 
         # XXX config?
         #$charge = sprintf('%.2f', ( $self->option('min_charge') * $minutes )
-- 
cgit v1.2.1


From c97606ae5b88ae471c9815e45d332bf01f89cade Mon Sep 17 00:00:00 2001
From: rsiddall <rsiddall>
Date: Wed, 26 Aug 2009 16:19:21 +0000
Subject: OpenSRS support for domain registration first appears in Net::DRI
 0.95.

---
 FS/FS/part_export/domreg_net_dri.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/domreg_net_dri.pm b/FS/FS/part_export/domreg_net_dri.pm
index d25945d60..bf0160243 100644
--- a/FS/FS/part_export/domreg_net_dri.pm
+++ b/FS/FS/part_export/domreg_net_dri.pm
@@ -355,7 +355,7 @@ sub get_dri {
 
 #  return $self->{dri} if $self->{dri}; #!!!TBD!!! connection caching.
 
-  eval "use Net::DRI;";
+  eval "use Net::DRI 0.95;";
   return $@ if $@;
 
 # $dri=Net::DRI->new(...) to create the global object. Save the result,
-- 
cgit v1.2.1


From c4c4db9c670aa7ce9a6e2e3d824233d37f3f6881 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 27 Aug 2009 06:52:35 +0000
Subject: amazon ec2 provisioning

---
 FS/FS/part_export/amazon_ec2.pm | 169 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 FS/FS/part_export/amazon_ec2.pm

(limited to 'FS')

diff --git a/FS/FS/part_export/amazon_ec2.pm b/FS/FS/part_export/amazon_ec2.pm
new file mode 100644
index 000000000..0e65ca00c
--- /dev/null
+++ b/FS/FS/part_export/amazon_ec2.pm
@@ -0,0 +1,169 @@
+package FS::part_export::amazon_ec2;
+
+use base qw( FS::part_export );
+
+use vars qw(@ISA %info $replace_ok_kludge);
+use Tie::IxHash;
+use FS::Record qw( qsearchs );
+use FS::svc_external;
+
+tie my %options, 'Tie::IxHash',
+  'access_key' => { label => 'AWS access key', },
+  'secret_key' => { label => 'AWS secret key', },
+  'ami'        => { label => 'AMI', 'default' => 'ami-ff46a796', },
+  'keyname'    => { label => 'Keypair name', },
+  #option to turn off (or on) ip address allocation
+;
+
+%info = (
+  'svc'      => 'svc_external',
+  'desc'     =>
+    'Export to Amazon EC2',
+  'options'  => \%options,
+  'notes'    => <<'END'
+Create instances in the Amazon EC2 (Elastic compute cloud).  Install
+Net::Amazon::EC2 perl module.  Advisable to set svc_external-skip_manual config
+option.
+END
+);
+
+$replace_ok_kludge = 0;
+
+sub rebless { shift; }
+
+sub _export_insert {
+  my($self, $svc_external) = (shift, shift);
+  $err_or_queue = $self->amazon_ec2_queue( $svc_external->svcnum, 'insert',
+    $svc_external->svcnum,
+    $self->option('ami'),
+    $self->option('keyname'),
+  );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_replace {
+  my( $self, $new, $old ) = (shift, shift, shift);
+  return '' if $replace_ok_kludge;
+  return "can't change instance id or IP address";
+  #$err_or_queue = $self->amazon_ec2_queue( $new->svcnum,
+  #  'replace', $new->username, $new->_password );
+  #ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+sub _export_delete {
+  my( $self, $svc_external ) = (shift, shift);
+  my( $instance_id, $ip ) = split(/:/, $svc_external->title );
+  $err_or_queue = $self->amazon_ec2_queue( $svc_external->svcnum, 'delete',
+    $instance_id,
+    $ip,
+  );
+  ref($err_or_queue) ? '' : $err_or_queue;
+}
+
+#these three are optional
+# fallback for svc_acct will change and restore password
+#sub _export_suspend {
+#  my( $self, $svc_something ) = (shift, shift);
+#  $err_or_queue = $self->amazon_ec2_queue( $svc_something->svcnum,
+#    'suspend', $svc_something->username );
+#  ref($err_or_queue) ? '' : $err_or_queue;
+#}
+#
+#sub _export_unsuspend {
+#  my( $self, $svc_something ) = (shift, shift);
+#  $err_or_queue = $self->amazon_ec2_queue( $svc_something->svcnum,
+#    'unsuspend', $svc_something->username );
+#  ref($err_or_queue) ? '' : $err_or_queue;
+#}
+
+sub export_links {
+  my($self, $svc_external, $arrayref) = (shift, shift, shift);
+  my( $instance_id, $ip ) = split(/:/, $svc_external->title );
+   
+  push @$arrayref, qq!<A HREF="http://$ip/">http://$ip/</A>!;
+  '';
+}
+
+###
+
+#a good idea to queue anything that could fail or take any time
+sub amazon_ec2_queue {
+  my( $self, $svcnum, $method ) = (shift, shift, shift);
+  my $queue = new FS::queue {
+    'svcnum' => $svcnum,
+    'job'    => "FS::part_export::amazon_ec2::amazon_ec2_$method",
+  };
+  $queue->insert( $self->option('access_key'),
+                  $self->option('secret_key'),
+                  @_
+                )
+    or $queue;
+}
+
+sub amazon_ec2_new {
+  my( $access_key, $secret_key, @rest ) = @_;
+
+  eval 'use Net::Amazon::EC2;';
+  die $@ if $@;
+
+  my $ec2 = new Net::Amazon::EC2 'AWSAccessKeyId'  => $access_key,
+                                 'SecretAccessKey' => $secret_key;
+
+  ( $ec2, @rest );
+}
+
+sub amazon_ec2_insert { #subroutine, not method
+  my( $ec2, $svcnum, $ami, $keyname ) = amazon_ec2_new(@_);
+
+  my $reservation_info = $ec2->run_instances( 'ImageId'  => $ami,
+                                              'KeyName'  => $keyname,
+                                              'MinCount' => 1,
+                                              'MaxCount' => 1,
+                                            );
+
+  my $instance_id = $reservation_info->instances_set->[0]->instance_id;
+
+  my $ip = $ec2->allocate_address
+    or die "can't allocate address";
+  $ec2->associate_address('InstanceId' => $instance_id,
+                          'PublicIp'   => $ip,
+                         )
+    or die "can't assocate IP address $ip with instance $instance_id";
+
+  my $svc_external = qsearchs('svc_external', { 'svcnum' => $svcnum } )
+    or die "can't find svc_external.svcnum $svcnum\n";
+
+  $svc_external->title("$instance_id:$ip");
+
+  local($replace_ok_kludge) = 1;
+  my $error = $svc_external->replace;
+  die $error if $error;
+
+}
+
+#sub amazon_ec2_replace { #subroutine, not method
+#}
+
+sub amazon_ec2_delete { #subroutine, not method
+  my( $ec2, $id, $ip ) = amazon_ec2_new(@_);
+
+  my $instance_id = sprintf('i-%x', $id);
+  $ec2->disassociate_address('PublicIp'=>$ip)
+    or die "can't dissassocate $ip";
+
+  $ec2->release_address('PublicIp'=>$ip)
+    or die "can't release $ip";
+
+  my $result = $ec2->terminate_instances('InstanceId'=>$instance_id);
+  #check for instance_id match or something?
+
+}
+
+#sub amazon_ec2_suspend { #subroutine, not method
+#}
+
+#sub amazon_ec2_unsuspend { #subroutine, not method
+#}
+
+1;
+
-- 
cgit v1.2.1


From 07560581aedba753147fcb3f6a5e7c30bdc2f77f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Aug 2009 18:51:41 +0000
Subject: hopefully fix self-service when not using real-time gateway

---
 FS/FS/ClientAPI/MyAccount.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index e1d4c9225..b73442421 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -209,12 +209,12 @@ sub access_info {
 
   $info->{hide_payment_fields} =
   [
-    map { FS::payby->realtime($_) &&
-          $cust_main
-            ->agent
-            ->payment_gateway( 'method' => FS::payby->payby2bop($_) )
-            ->gateway_namespace
-            eq 'Business::OnlineThirdPartyPayment'
+    map { return 0 unless FS::payby->realtime($_);
+          my $pg = $cust_main->agent->payment_gateway(
+            'method'  => FS::payby->payby2bop($_),
+            'nofatal' => 1,
+          ) or return 0;
+          $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
         }
     @{ $info->{cust_paybys} }
   ];
@@ -469,12 +469,12 @@ sub payment_info {
 
   $return{hide_payment_fields} =
   [
-    map { FS::payby->realtime($_) &&
-          $cust_main
-            ->agent
-            ->payment_gateway( 'method' => FS::payby->payby2bop($_) )
-            ->gateway_namespace
-            eq 'Business::OnlineThirdPartyPayment'
+    map { return 0 unless FS::payby->realtime($_);
+          my $pg = $cust_main->agent->payment_gateway(
+            'method'  => FS::payby->payby2bop($_),
+            'nofatal' => 1,
+          ) or return 0;
+          $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
         }
     @{ $return{cust_paybys} }
   ];
-- 
cgit v1.2.1


From dbb986792ad5d9f4d7e409234b7a78719179dfa2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Aug 2009 19:05:22 +0000
Subject: hopefully really fix self-service when not using real-time gateway

---
 FS/FS/ClientAPI/MyAccount.pm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index b73442421..73d27b544 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -209,12 +209,14 @@ sub access_info {
 
   $info->{hide_payment_fields} =
   [
-    map { return 0 unless FS::payby->realtime($_);
-          my $pg = $cust_main->agent->payment_gateway(
-            'method'  => FS::payby->payby2bop($_),
-            'nofatal' => 1,
-          ) or return 0;
-          $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
+    map { my $pg = '';
+          if ( FS::payby->realtime($_) ) {
+            $pg = $cust_main->agent->payment_gateway(
+              'method'  => FS::payby->payby2bop($_),
+              'nofatal' => 1,
+            );
+          }
+          $pg && $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
         }
     @{ $info->{cust_paybys} }
   ];
@@ -469,12 +471,14 @@ sub payment_info {
 
   $return{hide_payment_fields} =
   [
-    map { return 0 unless FS::payby->realtime($_);
-          my $pg = $cust_main->agent->payment_gateway(
-            'method'  => FS::payby->payby2bop($_),
-            'nofatal' => 1,
-          ) or return 0;
-          $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
+    map { my $pg = '';
+          if ( FS::payby->realtime($_) ) {
+            $pg = $cust_main->agent->payment_gateway(
+              'method'  => FS::payby->payby2bop($_),
+              'nofatal' => 1,
+            );
+          }
+          $pg && $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
         }
     @{ $return{cust_paybys} }
   ];
-- 
cgit v1.2.1


From b00b50462bcc1dcc03bfc50d91a72914f055adf2 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sat, 29 Aug 2009 22:45:13 +0000
Subject: Add FTP support

---
 FS/bin/freeside-cdr-sftp_and_import | 85 ++++++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 21 deletions(-)

(limited to 'FS')

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 18de94ddf..e87698fc5 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -2,7 +2,8 @@
 
 use strict;
 use Getopt::Std;
-use Net::SFTP::Foreign;
+use Net::SFTP::Foreign::Compat;
+use Net::FTP;
 use FS::UID qw(adminsuidsetup datasrc);
 use FS::cdr;
 
@@ -10,8 +11,8 @@ use FS::cdr;
 # parse command line
 ###
 
-use vars qw( $opt_p $opt_r $opt_e $opt_d $opt_v );
-getopts('p:r:e:d:v');
+use vars qw( $opt_m $opt_p $opt_r $opt_e $opt_d $opt_v );
+getopts('m:p:r:e:d:v');
 
 $opt_e ||= 'csv';
 #$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
@@ -35,28 +36,50 @@ $servername = shift or die &usage;
 # get the file list
 ###
 
-warn "Retreiving directory listing\n" if $opt_v;
+warn "Retrieving directory listing\n" if $opt_v;
 
-my $ls_sftp = sftp();
+$opt_m = 'sftp' if !defined($opt_m);
+$opt_m = lc($opt_m);
 
-$ls_sftp->setcwd($opt_r) or die "can't chdir to $opt_r\n"
-  if $opt_r;
+my $ls;
 
-my $ls = $ls_sftp->ls('.', wanted => qr/^$opt_p.*\.$opt_e$/i );
+if($opt_m eq 'ftp') {
+  my $ls_ftp = ftp();
+
+  $ls = [ grep { /^$opt_p.*\.$opt_e$/i } $ls_ftp->ls ];
+}
+elsif($opt_m eq 'sftp') {
+  my $ls_sftp = sftp();
+
+  $ls_sftp->setcwd($opt_r) or die "can't chdir to $opt_r\n"
+    if $opt_r;
+
+  $ls = $ls_sftp->ls('.', wanted => qr/^$opt_p.*\.$opt_e$/i,
+                          names_only => 1 );
+}
+else {
+  die "Method '$opt_m' not supported; must be ftp or sftp\n";
+}
 
 ###
 # import each file
 ###
 
-foreach my $file ( @$ls ) {
+foreach my $filename ( @$ls ) {
 
-  my $filename = $file->{filename};
   warn "Downloading $filename\n" if $opt_v;
 
   #get the file
-  my $get_sftp = sftp();
-  $get_sftp->get($filename, "$cachedir/$filename")
-    or die "Can't get $filename: ". $get_sftp->error;
+  if($opt_m eq 'ftp') {
+    my $ftp = ftp();
+    $ftp->get($filename, "$cachedir/$filename")
+      or die "Can't get $filename: ". $ftp->message . "\n";
+  }
+  else {
+    my $sftp = sftp();
+    $sftp->get($filename, "$cachedir/$filename")
+      or die "Can't get $filename: ". $sftp->error . "\n";
+  }
 
   warn "Processing $filename\n" if $opt_v;
 
@@ -69,9 +92,16 @@ foreach my $file ( @$ls ) {
   die $error if $error;
 
   if ( $opt_d ) {
-    my $mv_sftp = sftp();
-    $mv_sftp->rename($filename, "$opt_d/$filename")
-      or die "can't move $filename to $opt_d: ". $mv_sftp->error;
+    if($opt_m eq 'ftp') {
+      my $ftp = ftp();
+      $ftp->rename($filename, "$opt_d/$filename")
+        or die "Can't move $filename to $opt_d: ".$ftp->message . "\n";
+    }
+    else {
+      my $sftp = sftp();
+      $sftp->rename($filename, "$opt_d/$filename")
+        or die "can't move $filename to $opt_d: ". $sftp->error . "\n";
+    }
   }
 
   unlink "$cachedir/$filename";
@@ -86,7 +116,19 @@ sub usage {
   "Usage: \n  cdr.import user format servername\n";
 }
 
-use vars qw( $sftp );
+use vars qw( $sftp $ftp );
+
+sub ftp {
+  return $ftp if $ftp && $ftp->pwd;
+  
+  my ($hostname, $user) = reverse split('@', $servername);
+  my ($user, $pass) = split(':', $user);
+
+  my $ftp = Net::FTP->new($hostname) or die "FTP connection to '$hostname' failed.";
+  $ftp->login($user, $pass) or die "FTP login failed: ".$ftp->message;
+  $ftp->cwd($opt_r) or die "can't chdir to $opt_r\n" if $opt_r;
+  return $ftp;
+}
 
 sub sftp {
 
@@ -107,13 +149,15 @@ cdr.sftp_and_import - Download CDR files from a remote server via SFTP
 
 =head1 SYNOPSIS
 
-  cdr.sftp_and_import [ -p prefix ] [ -e extension ] [ -r remotefolder ] [ -d donefolder ] [ -v ] user format [sftpuser@]servername
+  cdr.sftp_and_import [ -m method ][ -p prefix ] [ -e extension ] [ -r remotefolder ] [ -d donefolder ] [ -v ] user format [sftpuser@]servername
 
 =head1 DESCRIPTION
 
-Command line tool to download CDR files from a remote server via SFTP and then
+Command line tool to download CDR files from a remote server via SFTP or FTP and then
 import them into the database.
 
+-m: transfer method (sftp or ftp), defaults to sftp
+
 -p: file prefix, if specified
 
 -e: file extension, defaults to .csv
@@ -129,11 +173,10 @@ user: freeside username
 format: CDR format name
 
 [sftpuser@]servername: remote server
+(or ftpuser:ftppass@servername)
 
 =head1 BUGS
 
-Only supports SFTP right now.
-
 =head1 SEE ALSO
 
 L<FS::cdr>
-- 
cgit v1.2.1


From b86aeb14ba5f160450175b430c1132ef56ad7c08 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sat, 29 Aug 2009 22:47:04 +0000
Subject: Add Broadsoft CDR record format

---
 FS/FS/cdr.pm           |   3 ++
 FS/FS/cdr/broadsoft.pm | 108 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 FS/FS/cdr/broadsoft.pm

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 373527498..c5b2ab90c 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -715,6 +715,9 @@ sub _cdr_date_parse {
     ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 );
   } elsif ( $date  =~ /^\s*(\d{1,2})\D(\d{1,2})\D(\d{4})\s+(\d{1,2})\D(\d{1,2})\D(\d{1,2})(\D|$)/ ) {
     ($mon, $day, $year, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6 );
+  } elsif ( $date  =~ /^\s*(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d+\.\d+)(\D|$)/ ) {
+    # broadsoft: 20081223201938.314
+    ($year, $mon, $day, $hour, $min, $sec) = ( $1, $2, $3, $4, $5, $6);
   } else {
      die "unparsable date: $date"; #maybe we shouldn't die...
   }
diff --git a/FS/FS/cdr/broadsoft.pm b/FS/FS/cdr/broadsoft.pm
new file mode 100644
index 000000000..423e96fcc
--- /dev/null
+++ b/FS/FS/cdr/broadsoft.pm
@@ -0,0 +1,108 @@
+package FS::cdr::broadsoft;
+
+use strict;
+use base qw( FS::cdr );
+use vars qw( %info );
+use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+
+%info = (
+  'name'          => 'Broadsoft',
+  'weight'        => 500,
+  'header'        => 1,     #0 default, set to 1 to ignore the first line, or
+                            # to higher numbers to ignore that number of lines
+  'type'          => 'csv', #csv (default), fixedlength or xls
+  'sep_char'      => ',',   #for csv, defaults to ,
+  'disabled'      => 0,     #0 default, set to 1 to disable
+
+  #listref of what to do with each field from the CDR, in order
+  'import_fields' => [
+    
+    skip(2),
+    sub { my($cdr, $data, $conf, $param) = @_;
+          $param->{skiprow} = 1 if lc($data) ne 'normal';
+          '' },                                   #  3: type
+            
+    trim('accountcode'),                          #  4: userNumber
+    skip(2),
+    trim('src'),                                  #  7: callingNumber
+    skip(1),
+    trim('dst'),                                  #  9: calledNumber
+
+    _cdr_date_parser_maker('startdate'),          # 10: startTime
+    skip(1),
+    sub { my($cdr, $data) = @_;
+          $cdr->disposition(
+            lc($data) eq 'yes' ? 
+            'ANSWERED' : 'NO ANSWER') },          # 12: answerIndicator
+    _cdr_date_parser_maker('answerdate'),         # 13: answerTime
+    _cdr_date_parser_maker('enddate'),            # 14: releaseTime
+    
+  ],
+
+);
+
+sub trim {
+  my $fieldname = shift;
+  return sub {
+    my($cdr, $data) = @_;
+    $data =~ s/^\+1//;
+    $cdr->$fieldname($data);
+    ''
+  }
+}
+
+sub skip {
+  map { undef } (1..$_[0]);
+}
+
+1;
+
+__END__
+
+list of freeside CDR fields, useful ones marked with *
+
+           acctid - primary key
+    *[1]   calldate - Call timestamp (SQL timestamp)
+           clid - Caller*ID with text
+7   *      src - Caller*ID number / Source number
+9   *      dst - Destination extension
+           dcontext - Destination context
+           channel - Channel used
+           dstchannel - Destination channel if appropriate
+           lastapp - Last application if appropriate
+           lastdata - Last application data
+10  *      startdate - Start of call (UNIX-style integer timestamp)
+13         answerdate - Answer time of call (UNIX-style integer timestamp)
+14  *      enddate - End time of call (UNIX-style integer timestamp)
+    *      duration - Total time in system, in seconds
+    *      billsec - Total time call is up, in seconds
+12  *[2]   disposition - What happened to the call: ANSWERED, NO ANSWER, BUSY
+           amaflags - What flags to use: BILL, IGNORE etc, specified on a per
+           channel basis like accountcode.
+4   *[3]   accountcode - CDR account number to use: account
+           uniqueid - Unique channel identifier
+           userfield - CDR user-defined field
+           cdr_type - CDR type - see FS::cdr_type (Usage = 1, S&E = 7, OC&C = 8)
+    *[4]   charged_party - Service number to be billed
+           upstream_currency - Wholesale currency from upstream
+    *[5]   upstream_price - Wholesale price from upstream
+           upstream_rateplanid - Upstream rate plan ID
+           rated_price - Rated (or re-rated) price
+           distance - km (need units field?)
+           islocal - Local - 1, Non Local = 0
+    *[6]   calltypenum - Type of call - see FS::cdr_calltype
+           description - Description (cdr_type 7&8 only) (used for
+           cust_bill_pkg.itemdesc)
+           quantity - Number of items (cdr_type 7&8 only)
+           carrierid - Upstream Carrier ID (see FS::cdr_carrier)
+           upstream_rateid - Upstream Rate ID
+           svcnum - Link to customer service (see FS::cust_svc)
+           freesidestatus - NULL, done (or something)
+
+[1] Auto-populated from startdate if not present
+[2] Package options available to ignore calls without a specific disposition
+[3] When using 'cdr-charged_party-accountcode' config
+[4] Auto-populated from src (normal calls) or dst (toll free calls) if not present
+[5] When using 'upstream_simple' rating method.
+[6] Set to usage class classnum when using pre-rated CDRs and usage class-based
+    taxation (local/intrastate/interstate/international)
-- 
cgit v1.2.1


From 811ef22565f3673e8239a443c0ccefd1b701b4e7 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Mon, 31 Aug 2009 22:17:11 +0000
Subject: Add Vitelity CDR format

---
 FS/FS/cdr/vitelity.pm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 FS/FS/cdr/vitelity.pm

(limited to 'FS')

diff --git a/FS/FS/cdr/vitelity.pm b/FS/FS/cdr/vitelity.pm
new file mode 100644
index 000000000..97ed0c375
--- /dev/null
+++ b/FS/FS/cdr/vitelity.pm
@@ -0,0 +1,25 @@
+package FS::cdr::vitelity;
+
+use strict;
+use vars qw( @ISA %info );
+use FS::cdr qw(_cdr_date_parser_maker);
+
+@ISA = qw(FS::cdr);
+
+%info = (
+  'name'          => 'Vitelity',
+  'weight'        => 100,
+  'header'        => 1,
+  'import_fields' => [
+    # Cheers to Vitelity for their concise, readable CDR format.
+    _cdr_date_parser_maker('startdate'),
+    'src',
+    'dst',
+    'duration',
+    'clid',
+    'disposition',
+    'upstream_price',
+    ],
+);
+
+1;
-- 
cgit v1.2.1


From 539b6216a17a5423431d430022c4e0f9581a9d2f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Sep 2009 15:51:38 +0000
Subject: fix (hopefully the rest of the) fallout from rating CDRs to sub-penny
 amounts

---
 FS/FS/Schema.pm               |  2 +-
 FS/FS/cust_bill_pkg.pm        | 16 ++++++++--------
 FS/FS/cust_bill_pkg_detail.pm |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 9a7c4ce7a..52af77bf0 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -559,7 +559,7 @@ sub tables_hashref {
         'billpkgnum', 'int', 'NULL', '', '', '',        # should not be nullable
         'pkgnum',  'int', 'NULL', '', '', '',           # deprecated
         'invnum',  'int', 'NULL', '', '', '',           # deprecated
-        'amount',  @money_typen, '', '', 
+        'amount',  'decimal', 'NULL', '10,4', '', '',
         'format',  'char', 'NULL', 1, '', '',
         'classnum', 'int', 'NULL', '', '', '',
         'phonenum', 'varchar', 'NULL', 15, '', '',
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index b6e852897..96f09c915 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -111,7 +111,7 @@ sub insert {
     return $error;
   }
 
-  if ( defined dbdef->table('cust_bill_pkg_detail') && $self->get('details') ) {
+  if ( $self->get('details') ) {
     foreach my $detail ( @{$self->get('details')} ) {
       my $cust_bill_pkg_detail = new FS::cust_bill_pkg_detail {
         'billpkgnum' => $self->billpkgnum,
@@ -124,18 +124,18 @@ sub insert {
       $error = $cust_bill_pkg_detail->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "error inserting cust_bill_pkg_detail: $error";
       }
     }
   }
 
-  if ( defined dbdef->table('cust_bill_pkg_display') && $self->get('display') ){
+  if ( $self->get('display') ) {
     foreach my $cust_bill_pkg_display ( @{ $self->get('display') } ) {
       $cust_bill_pkg_display->billpkgnum($self->billpkgnum);
       $error = $cust_bill_pkg_display->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "error inserting cust_bill_pkg_display: $error";
       }
     }
   }
@@ -146,7 +146,7 @@ sub insert {
       $error = $cust_tax_exempt_pkg->insert;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "error inserting cust_tax_exempt_pkg: $error";
       }
     }
   }
@@ -160,7 +160,7 @@ sub insert {
       warn $error;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "error inserting cust_bill_pkg_tax_location: $error";
       }
     }
   }
@@ -173,7 +173,7 @@ sub insert {
       warn $error;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
-        return $error;
+        return "error inserting cust_bill_pkg_tax_rate_location: $error";
       }
     }
   }
@@ -185,7 +185,7 @@ sub insert {
     warn $error;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return "error replacing cust_tax_adjustment: $error";
     }
   }
 
diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 008f3ff77..886944138 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -118,7 +118,8 @@ sub check {
 
   $self->ut_numbern('detailnum')
     || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg', 'billpkgnum')
-    || $self->ut_moneyn('amount')
+    #|| $self->ut_moneyn('amount')
+    || $self->ut_float('amount')
     || $self->ut_enum('format', [ '', 'C' ] )
     || $self->ut_text('detail')
     || $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum')
-- 
cgit v1.2.1


From 49fbd7cc643b1c474d9a6777dac512a24504a99d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 11 Sep 2009 17:40:58 +0000
Subject: preserve allowing empty values, doh, RT#6101

---
 FS/FS/cust_bill_pkg_detail.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm
index 886944138..f8c9d1a3d 100644
--- a/FS/FS/cust_bill_pkg_detail.pm
+++ b/FS/FS/cust_bill_pkg_detail.pm
@@ -119,7 +119,7 @@ sub check {
   $self->ut_numbern('detailnum')
     || $self->ut_foreign_key('billpkgnum', 'cust_bill_pkg', 'billpkgnum')
     #|| $self->ut_moneyn('amount')
-    || $self->ut_float('amount')
+    || $self->ut_floatn('amount')
     || $self->ut_enum('format', [ '', 'C' ] )
     || $self->ut_text('detail')
     || $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum')
-- 
cgit v1.2.1


From 9ecb64360568b205334ae23e1051249cb56491b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 14 Sep 2009 23:52:01 +0000
Subject: ping tool, RT#5845

---
 FS/FS/Mason.pm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index f71db208e..1918d9d36 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -52,6 +52,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use Date::Format;
   use Date::Parse;
   use Time::Local;
+  use Time::HiRes;
   use Time::Duration;
   use DateTime;
   use DateTime::Format::Strptime;
@@ -77,6 +78,17 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use Spreadsheet::WriteExcel;
   use Business::CreditCard 0.30; #for mask-aware cardtype()
   use NetAddr::IP;
+  use Net::Ping;
+  use Net::Ping::External;
+  #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 ) {
+    eval 'sub Net::Ping::External::_ping_linux { 
+            my %args = @_;
+            my $command = "ping -s $args{size} -c $args{count} -w $args{timeout} $args{host}";
+            return Net::Ping::External::_ping_system($command, 0);
+          }
+         ';
+    die $@ if $@;
+  #}
   use String::Approx qw(amatch);
   use Chart::LinesPoints;
   use Chart::Mountain;
-- 
cgit v1.2.1


From b6f55ef84f3d57448ec7aa7556457c03b9226c27 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Sep 2009 20:44:00 +0000
Subject: fix display_custnum on reports, RT#

---
 FS/FS/UI/Web.pm          |  3 +++
 FS/FS/cust_main_Mixin.pm | 24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 14af6a467..148085c4c 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -338,6 +338,8 @@ sub cust_sql_fields {
     grep { my $field = $_; grep { $_ eq $field } @cust_fields }
          ( @add_fields, ( map "ship_$_", @add_fields ), 'payby' );
 
+  push @fields, 'agent_custid';
+
   my @extra_fields = ();
   if (grep { $_ eq 'current_balance' } @cust_fields) {
     push @extra_fields, FS::cust_main->balance_sql . " AS current_balance";
@@ -595,6 +597,7 @@ sub job_status {
     @return = ( 'error', $job ? $job->statustext : $jobnum );
   }
 
+  #to_json(\@return);  #waiting on deb 5.0 for new JSON.pm?
   objToJson(\@return);
 
 }
diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index ced0a1f55..86751b1cb 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -26,7 +26,12 @@ for example, from a JOINed search.  See httemplate/search/ for examples.
 
 =over 4
 
-=item name
+=cut
+
+sub cust_unlinked_msg { '(unlinked)'; }
+sub cust_linked { $_[0]->custnum; }
+
+=item display_custnum
 
 Given an object that contains fields from cust_main (say, from a JOINed
 search; see httemplate/search/ for examples), returns the equivalent of the
@@ -35,8 +40,21 @@ a customer.
 
 =cut
 
-sub cust_unlinked_msg { '(unlinked)'; }
-sub cust_linked { $_[0]->custnum; }
+sub display_custnum {
+  my $self = shift;
+  $self->cust_linked
+    ? FS::cust_main::display_custnum($self)
+    : $self->cust_unlinked_msg;
+}
+
+=item name
+
+Given an object that contains fields from cust_main (say, from a JOINed
+search; see httemplate/search/ for examples), returns the equivalent of the
+FS::cust_main I<name> method, or "(unlinked)" if this object is not linked to
+a customer.
+
+=cut
 
 sub name {
   my $self = shift;
-- 
cgit v1.2.1


From 8e37628d7bbba59e26c50bb380dc096379bc2127 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Sep 2009 22:58:54 +0000
Subject: hopefully really finish fixing for good "Real timeprocessing not
 enabled!" error when using signup without any real-time processor, RT#6043

---
 FS/FS/ClientAPI/Signup.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 1f007981e..01c756e3f 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -471,14 +471,12 @@ sub new_customer {
     return { 'error' => "Unknown reseller" }
       unless $agent;
 
-    my $payment_gateway =
-      $agent->payment_gateway( 'method' => FS::payby->payby2bop($payby) );
+    my $gw = $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
+                                      'nofatal' => 1,
+                                    );
 
-    if ($payment_gateway->gateway_namespace eq
-        'Business::OnlineThirdPartyPayment'
-       ) {
-      $cust_main->payby('BILL');   # MCRD better?
-    }
+    $cust_main->payby('BILL')   # MCRD better?
+      if $gw && $gw->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
   }
 
   $cust_main->payinfo($cust_main->daytime)
-- 
cgit v1.2.1


From 551634efa453c7dd6d19cf7de461650cab1b1690 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Sep 2009 23:13:34 +0000
Subject: set svcnum when rating CDR, RT#5495

---
 FS/FS/cdr.pm               | 5 +++--
 FS/FS/part_pkg/voip_cdr.pm | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index c5b2ab90c..d9c602f9d 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -375,7 +375,7 @@ sub set_charged_party {
 
 }
 
-=item set_status_and_rated_price STATUS [ RATED_PRICE ]
+=item set_status_and_rated_price STATUS [ RATED_PRICE [ SVCNUM ] ]
 
 Sets the status to the provided string.  If there is an error, returns the
 error, otherwise returns false.
@@ -383,9 +383,10 @@ error, otherwise returns false.
 =cut
 
 sub set_status_and_rated_price {
-  my($self, $status, $rated_price) = @_;
+  my($self, $status, $rated_price, $svcnum) = @_;
   $self->freesidestatus($status);
   $self->rated_price($rated_price);
+  $self->svcnum($svcnum) if $svcnum;
   $self->replace();
 }
 
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index ee0091469..f851b41d9 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -591,7 +591,10 @@ sub calc_usage {
         #$downstream_cdr .= $cdr->downstream_csv( 'format' => 'XXX format' )
         #  if $spool_cdr;
 
-        my $error = $cdr->set_status_and_rated_price('done', $charge);
+        my $error = $cdr->set_status_and_rated_price( 'done',
+                                                      $charge,
+                                                      $cust_svc->svcnum,
+                                                    );
         die $error if $error;
 
       }
-- 
cgit v1.2.1


From df2b4d94d5eaef3e9635d7a519fa297d017d42ea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 16 Sep 2009 00:52:23 +0000
Subject: quiet warning: Subroutine Net::Ping::External::_ping_linux redefined

---
 FS/FS/Mason.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 1918d9d36..877864eee 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -80,7 +80,9 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use NetAddr::IP;
   use Net::Ping;
   use Net::Ping::External;
-  #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 ) {
+  #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 )
+  {
+    no warnings 'redefine';
     eval 'sub Net::Ping::External::_ping_linux { 
             my %args = @_;
             my $command = "ping -s $args{size} -c $args{count} -w $args{timeout} $args{host}";
@@ -88,7 +90,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
           }
          ';
     die $@ if $@;
-  #}
+  }
   use String::Approx qw(amatch);
   use Chart::LinesPoints;
   use Chart::Mountain;
-- 
cgit v1.2.1


From 790efa50f8968d9d18028ef8aeaa7a8c7c16965c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Sep 2009 23:45:21 +0000
Subject: eliminate mystery "min ( N.NN, M.MM )" warning

---
 FS/FS/cust_bill.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 68571f77e..03c1c1d92 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -628,7 +628,7 @@ sub apply_payments_and_credits {
     }
     next unless $owed > 0;
 
-    warn "min ( $unapp_amount, $owed )\n";
+    warn "min ( $unapp_amount, $owed )\n" if $DEBUG;
     $app->amount( sprintf('%.2f', min( $unapp_amount, $owed ) ) );
 
     $app->invnum( $self->invnum );
-- 
cgit v1.2.1


From fa80d5673f5ae567506da8177d163c770647b0d4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Sep 2009 22:41:25 +0000
Subject: add active option to has_referral_custnum condition, RT#6150

---
 FS/FS/cust_main.pm                                 | 23 +++++++++++++++++++
 FS/FS/part_event/Condition/has_referral_custnum.pm | 26 +++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index cdfe93848..bf95fa9c9 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6951,6 +6951,24 @@ sub invoicing_list_emailonly_scalar {
   join(', ', $self->invoicing_list_emailonly);
 }
 
+=item referral_custnum_cust_main
+
+Returns the customer who referred this customer (or the empty string, if
+this customer was not referred).
+
+Note the difference with referral_cust_main method: This method,
+referral_custnum_cust_main returns the single customer (if any) who referred
+this customer, while referral_cust_main returns an array of customers referred
+BY this customer.
+
+=cut
+
+sub referral_custnum_cust_main {
+  my $self = shift;
+  return '' unless $self->referral_custnum;
+  qsearchs('cust_main', { 'custnum' => $self->referral_custnum } );
+}
+
 =item referral_cust_main [ DEPTH [ EXCLUDE_HASHREF ] ]
 
 Returns an array of customers referred by this customer (referral_custnum set
@@ -6958,6 +6976,11 @@ to this custnum).  If DEPTH is given, recurses up to the given depth, returning
 customers referred by customers referred by this customer and so on, inclusive.
 The default behavior is DEPTH 1 (no recursion).
 
+Note the difference with referral_custnum_cust_main method: This method,
+referral_cust_main, returns an array of customers referred BY this customer,
+while referral_custnum_cust_main returns the single customer (if any) who
+referred this customer.
+
 =cut
 
 sub referral_cust_main {
diff --git a/FS/FS/part_event/Condition/has_referral_custnum.pm b/FS/FS/part_event/Condition/has_referral_custnum.pm
index d43d6c0c7..61a815579 100644
--- a/FS/FS/part_event/Condition/has_referral_custnum.pm
+++ b/FS/FS/part_event/Condition/has_referral_custnum.pm
@@ -7,18 +7,42 @@ use base qw( FS::part_event::Condition );
 
 sub description { 'Customer has a referring customer'; }
 
+sub option_fields {
+  (
+    'active' => { 'label' => 'Referring customer is active',
+                  'type'  => 'checkbox',
+                  'value' => 'Y',
+                },
+  );
+}
+
 sub condition {
   my($self, $object) = @_;
 
   my $cust_main = $self->cust_main($object);
 
-  $cust_main->referral_custnum;
+  if ( $self->option('active') ) {
+
+    return 0 unless $cust_main->referral_custnum;
+
+    #check for no cust_main for referral_custnum? (deleted?)
+
+    $cust_main->referral_custnum_cust_main->status eq 'active';
+
+  } else {
+
+    $cust_main->referral_custnum; # ? 1 : 0;
+
+  }
+
 }
 
 sub condition_sql {
   #my( $class, $table ) = @_;
 
   "cust_main.referral_custnum IS NOT NULL";
+
+  #XXX a bit harder to check active status here
 }
 
 1;
-- 
cgit v1.2.1


From 87ddf7284561e5c912aefe2ecc3f348649b78183 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 2009 02:41:43 +0000
Subject: add ability to trigger receipts when payment is used against a
 specific package instead of when it was made, RT#5199

---
 FS/FS/Conf.pm                        |  30 +++-
 FS/FS/cust_bill.pm                   |  56 ++++++-
 FS/FS/cust_bill_ApplicationCommon.pm |   7 +-
 FS/FS/cust_bill_pay.pm               |  19 +++
 FS/FS/cust_bill_pay_pkg.pm           |  78 +++++++++-
 FS/FS/cust_main.pm                   |  21 ++-
 FS/FS/cust_pay.pm                    | 275 ++++++++++++++++++++---------------
 7 files changed, 353 insertions(+), 133 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d8e111b35..ea83c6c5a 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1015,10 +1015,21 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'payment_receipt_email',
     'section'     => 'billing',
-    'description' => 'Template file for payment receipts.  Payment receipts are sent to the customer email invoice destination(s) when a payment is received.  See the <a href="http://search.cpan.org/dist/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance</ul>',
+    'description' => 'Template file for payment receipts.  Payment receipts are sent to the customer email invoice destination(s) when a payment is received.  See the <a href="http://search.cpan.org/dist/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance<li><code>$pkg</code> - Package (requires payment_receipt-trigger set to cust_bill_pay_pkg)</ul>',
     'type'        => [qw( checkbox textarea )],
   },
 
+  {
+    'key'         => 'payment_receipt-trigger',
+    'section'     => 'billing',
+    'description' => 'When payment receipts are triggered.  Defaults to when payment is made.',
+    'type'        => 'select',
+    'select_hash' => [
+                       'cust_pay'          => 'When payment is made.',
+                       'cust_bill_pay_pkg' => 'When payment is applied.',
+                     ],
+  },
+
   {
     'key'         => 'lpr',
     'section'     => 'required',
@@ -2486,6 +2497,14 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'dashboard-install_welcome',
+    'section'     => 'UI',
+    'description' => 'New install welcome screen.',
+    'type'        => 'select',
+    'select_enum' => [ '', 'ITSP_fsinc_hosted', ],
+  },
+
   {
     'key'         => 'dashboard-toplist',
     'section'     => 'UI',
@@ -2769,7 +2788,14 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'cust_main-default_agent_custid',
     'section'     => 'UI',
-    'description' => 'Display the agent_custid field instead of the custnum field.',
+    'description' => 'Display the agent_custid field when available instead of the custnum field.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'cust_bill-default_agent_invid',
+    'section'     => 'UI',
+    'description' => 'Display the agent_invid field when available instead of the invnum field.',
     'type'        => 'checkbox',
   },
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 03c1c1d92..f6c5eeb81 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -16,6 +16,7 @@ use FS::Misc qw( send_email send_fax generate_ps generate_pdf do_print );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_main_Mixin;
 use FS::cust_main;
+use FS::cust_statement;
 use FS::cust_bill_pkg;
 use FS::cust_bill_pkg_display;
 use FS::cust_credit;
@@ -82,6 +83,8 @@ owes you money.  The specific charges are itemized as B<cust_bill_pkg> records
 (see L<FS::cust_bill_pkg>).  FS::cust_bill inherits from FS::Record.  The
 following fields are currently supported:
 
+Regular fields
+
 =over 4
 
 =item invnum - primary key (assigned automatically for new invoices)
@@ -93,10 +96,26 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item charged - amount of this invoice
 
+=back
+
+Deprecated
+
+=over 4
+
 =item printed - deprecated
 
+=back
+
+Specific use cases
+
+=over 4
+
 =item closed - books closed flag, empty or `Y'
 
+=item statementnum - invoice aggregation (see L<FS::cust_statement>)
+
+=item agent_invid - legacy invoice number
+
 =back
 
 =head1 METHODS
@@ -183,17 +202,16 @@ sub check {
 
   my $error =
     $self->ut_numbern('invnum')
-    || $self->ut_number('custnum')
+    || $self->ut_foreign_key('custnum', 'cust_main', 'custnum' )
     || $self->ut_numbern('_date')
     || $self->ut_money('charged')
     || $self->ut_numbern('printed')
     || $self->ut_enum('closed', [ '', 'Y' ])
+    || $self->ut_foreign_keyn('statementnum', 'cust_statement', 'statementnum' )
+    || $self->ut_numbern('agent_invid') #varchar?
   ;
   return $error if $error;
 
-  return "Unknown customer"
-    unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-
   $self->_date(time) unless $self->_date;
 
   $self->printed(0) if $self->printed eq '';
@@ -201,6 +219,22 @@ sub check {
   $self->SUPER::check;
 }
 
+=item display_invnum
+
+Returns the displayed invoice number for this invoice: agent_invid if
+cust_bill-default_agent_invid is set and it has a value, invnum otherwise.
+
+=cut
+
+sub display_invnum {
+  my $self = shift;
+  if ( $conf->exists('cust_bill-default_agent_invid') && $self->agent_invid ){
+    return $self->agent_invid;
+  } else {
+    return $self->invnum;
+  }
+}
+
 =item previous
 
 Returns a list consisting of the total previous balance for this customer, 
@@ -531,12 +565,20 @@ sub owed_pkgnum {
   $balance;
 }
 
-=item apply_payments_and_credits
+=item apply_payments_and_credits [ OPTION => VALUE ... ]
+
+Applies unapplied payments and credits to this invoice.
+
+A hash of optional arguments may be passed.  Currently "manual" is supported.
+If true, a payment receipt is sent instead of a statement when
+'payment_receipt_email' configuration option is set.
+
+If there is an error, returns the error, otherwise returns false.
 
 =cut
 
 sub apply_payments_and_credits {
-  my $self = shift;
+  my( $self, %options ) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -633,7 +675,7 @@ sub apply_payments_and_credits {
 
     $app->invnum( $self->invnum );
 
-    my $error = $app->insert;
+    my $error = $app->insert(%options);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "Error inserting ". $app->table. " record: $error";
diff --git a/FS/FS/cust_bill_ApplicationCommon.pm b/FS/FS/cust_bill_ApplicationCommon.pm
index d4627c0b4..7449679a8 100644
--- a/FS/FS/cust_bill_ApplicationCommon.pm
+++ b/FS/FS/cust_bill_ApplicationCommon.pm
@@ -56,7 +56,7 @@ sub insert {
   my $dbh = dbh;
 
   my $error =    $self->SUPER::insert(@_)
-              || $self->apply_to_lineitems;
+              || $self->apply_to_lineitems(@_);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -113,7 +113,8 @@ Auto-applies this invoice application to specific line items, if possible.
 =cut
 
 sub apply_to_lineitems {
-  my $self = shift;
+  #my $self = shift;
+  my( $self, %options ) = @_;
 
   return '' if $skip_apply_to_lineitems_hack;
 
@@ -322,7 +323,7 @@ sub apply_to_lineitems {
       'sdate'      => $cust_bill_pkg->sdate,
       'edate'      => $cust_bill_pkg->edate,
     });
-    my $error = $application->insert;
+    my $error = $application->insert(%options);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
diff --git a/FS/FS/cust_bill_pay.pm b/FS/FS/cust_bill_pay.pm
index e1b02aecb..831d7f26c 100644
--- a/FS/FS/cust_bill_pay.pm
+++ b/FS/FS/cust_bill_pay.pm
@@ -150,6 +150,25 @@ sub cust_pay {
   qsearchs( 'cust_pay', { 'paynum' => $self->paynum } );
 }
 
+=item send_receipt HASHREF | OPTION => VALUE ...
+
+
+Sends a payment receipt for the associated payment, against this specific
+invoice.  If there is an error, returns the error, otherwise returns false.
+
+See L<FS::cust_pay/send_receipt>.
+
+=cut
+
+sub send_receipt {
+  my $self = shift;
+  my $opt = ref($_[0]) ? shift : { @_ };
+  $self->cust_pay->send_receipt(
+    'cust_bill' => $self->cust_bill,
+    %$opt,
+  );
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_bill_pay_pkg.pm b/FS/FS/cust_bill_pay_pkg.pm
index cdbace960..48c436483 100644
--- a/FS/FS/cust_bill_pay_pkg.pm
+++ b/FS/FS/cust_bill_pay_pkg.pm
@@ -2,7 +2,10 @@ package FS::cust_bill_pay_pkg;
 
 use strict;
 use vars qw( @ISA );
+use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
+use FS::cust_bill_pay;
+use FS::cust_bill_pkg;
 
 @ISA = qw(FS::Record);
 
@@ -77,7 +80,39 @@ otherwise returns false.
 
 =cut
 
-# the insert method can be inherited from FS::Record
+sub insert {
+  my($self, %options) = @_;
+
+  #local $SIG{HUP} = 'IGNORE';
+  #local $SIG{INT} = 'IGNORE';
+  #local $SIG{QUIT} = 'IGNORE';
+  #local $SIG{TERM} = 'IGNORE';
+  #local $SIG{TSTP} = 'IGNORE';
+  #local $SIG{PIPE} = 'IGNORE';
+  #
+  #my $oldAutoCommit = $FS::UID::AutoCommit;
+  #local $FS::UID::AutoCommit = 0;
+  #my $dbh = dbh;
+
+  my $error = $self->SUPER::insert;
+  if ( $error ) {
+    #$dbh->rollback if $oldAutoCommit;
+    return "error inserting $self: $error";
+  }
+
+  #payment receipt
+  my $conf = new FS::Conf;
+  my $trigger = $conf->config('payment_receipt-trigger') || 'cust_pay';
+  if ( $trigger eq 'cust_bill_pay_pkg' ) {
+    my $error = $self->send_receipt(
+      'manual'    => $options{'manual'},
+    );
+    warn "can't send payment receipt/statement: $error" if $error;
+  }
+
+  '';
+
+}
 
 =item delete
 
@@ -124,6 +159,47 @@ sub check {
   $self->SUPER::check;
 }
 
+=item cust_bill_pay
+
+Returns the FS::cust_bill_pay object (payment application to the overall
+invoice).
+
+=cut
+
+sub cust_bill_pay {
+  my $self = shift;
+  qsearchs('cust_bill_pay', { 'billpaynum' => $self->billpaynum } );
+}
+
+=item cust_bill_pkg
+
+Returns the FS::cust_bill_pkg object (line item to which payment is applied).
+
+=cut
+
+sub cust_bill_pkg {
+  my $self = shift;
+  qsearchs('cust_bill_pkg', { 'billpkgnum' => $self->billpkgnum } );
+}
+
+=item send_receipt
+
+Sends a payment receipt for the associated payment, against this specific
+invoice and packages.  If there is an error, returns the error, otherwise
+returns false.
+
+=cut
+
+sub send_receipt {
+  my $self = shift;
+  my $opt = ref($_[0]) ? shift : { @_ };
+  $self->cust_bill_pay->send_receipt(
+    'cust_pkg' => $self->cust_bill_pkg->cust_pkg,
+    %$opt,
+  );
+}
+
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index bf95fa9c9..9f85e796b 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -6168,19 +6168,23 @@ sub batch_card {
   '';
 }
 
-=item apply_payments_and_credits
+=item apply_payments_and_credits [ OPTION => VALUE ... ]
 
 Applies unapplied payments and credits.
 
 In most cases, this new method should be used in place of sequential
 apply_payments and apply_credits methods.
 
+A hash of optional arguments may be passed.  Currently "manual" is supported.
+If true, a payment receipt is sent instead of a statement when
+'payment_receipt_email' configuration option is set.
+
 If there is an error, returns the error, otherwise returns false.
 
 =cut
 
 sub apply_payments_and_credits {
-  my $self = shift;
+  my( $self, %options ) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -6196,7 +6200,7 @@ sub apply_payments_and_credits {
   $self->select_for_update; #mutex
 
   foreach my $cust_bill ( $self->open_cust_bill ) {
-    my $error = $cust_bill->apply_payments_and_credits;
+    my $error = $cust_bill->apply_payments_and_credits(%options);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "Error applying: $error";
@@ -6305,19 +6309,24 @@ sub apply_credits {
   return $total_unapplied_credits;
 }
 
-=item apply_payments
+=item apply_payments  [ OPTION => VALUE ... ]
 
 Applies (see L<FS::cust_bill_pay>) unapplied payments (see L<FS::cust_pay>)
 to outstanding invoice balances in chronological order.
 
  #and returns the value of any remaining unapplied payments.
 
+A hash of optional arguments may be passed.  Currently "manual" is supported.
+If true, a payment receipt is sent instead of a statement when
+'payment_receipt_email' configuration option is set.
+
+
 Dies if there is an error.
 
 =cut
 
 sub apply_payments {
-  my $self = shift;
+  my( $self, %options ) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -6381,7 +6390,7 @@ sub apply_payments {
     } );
     $cust_bill_pay->pkgnum( $payment->pkgnum )
       if $conf->exists('pkg-balances') && $payment->pkgnum;
-    my $error = $cust_bill_pay->insert;
+    my $error = $cust_bill_pay->insert(%options);
     if ( $error ) {
       $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
       die $error;
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index e1e6df2a2..69bcd8717 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -132,21 +132,22 @@ sub cust_unlinked_msg {
   ' (cust_pay.paynum '. $self->paynum. ')';
 }
 
-=item insert
+=item insert [ OPTION => VALUE ... ]
 
 Adds this payment to the database.
 
 For backwards-compatibility and convenience, if the additional field invnum
 is defined, an FS::cust_bill_pay record for the full amount of the payment
-will be created.  In this case, custnum is optional.  An hash of optional
-arguments may be passed.  Currently "manual" is supported.  If true, a
-payment receipt is sent instead of a statement when 'payment_receipt_email'
-configuration option is set.
+will be created.  In this case, custnum is optional.
+
+A hash of optional arguments may be passed.  Currently "manual" is supported.
+If true, a payment receipt is sent instead of a statement when
+'payment_receipt_email' configuration option is set.
 
 =cut
 
 sub insert {
-  my ($self, %options) = @_;
+  my($self, %options) = @_;
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -169,7 +170,6 @@ sub insert {
     $self->custnum($cust_bill->custnum );
   }
 
-
   my $error = $self->check;
   return $error if $error;
 
@@ -189,7 +189,7 @@ sub insert {
       'amount' => $self->paid,
       '_date'  => $self->_date,
     };
-    $error = $cust_bill_pay->insert;
+    $error = $cust_bill_pay->insert(%options);
     if ( $error ) {
       if ( $ignore_noapply ) {
         warn "warning: error inserting $cust_bill_pay: $error ".
@@ -216,74 +216,15 @@ sub insert {
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
-  #my $cust_main = $self->cust_main;
-  if ( $conf->exists('payment_receipt_email')
-       && grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list
-  ) {
-
-    $cust_bill ||= ($cust_main->cust_bill)[-1]; #rather inefficient though?
-
-    my $error;
-    if (    ( exists($options{'manual'}) && $options{'manual'} )
-         || ! $conf->exists('invoice_html_statement')
-         || ! $cust_bill
-       ) {
-
-      my $receipt_template = new Text::Template (
-        TYPE   => 'ARRAY',
-        SOURCE => [ map "$_\n", $conf->config('payment_receipt_email') ],
-      ) or do {
-        warn "can't create payment receipt template: $Text::Template::ERROR";
-        return '';
-      };
-
-      my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ }
-                             $cust_main->invoicing_list;
-
-      my $payby = $self->payby;
-      my $payinfo = $self->payinfo;
-      $payby =~ s/^BILL$/Check/ if $payinfo;
-      if ( $payby eq 'CARD' || $payby eq 'CHEK' ) {
-        $payinfo = $self->paymask
-      } else {
-        $payinfo = $self->decrypt($payinfo);
-      }
-      $payby =~ s/^CHEK$/Electronic check/;
-
-      $error = send_email(
-        'from'    => $conf->config('invoice_from', $cust_main->agentnum),
-                                   #invoice_from??? well as good as any
-        'to'      => \@invoicing_list,
-        'subject' => 'Payment receipt',
-        'body'    => [ $receipt_template->fill_in( HASH => {
-                       'date'         => time2str("%a %B %o, %Y", $self->_date),
-                       'name'         => $cust_main->name,
-                       'paynum'       => $self->paynum,
-                       'paid'         => sprintf("%.2f", $self->paid),
-                       'payby'        => ucfirst(lc($payby)),
-                       'payinfo'      => $payinfo,
-                       'balance'      => $cust_main->balance,
-                       'company_name' => $conf->config('company_name'),
-                     } ) ],
-      );
-
-    } else {
-
-      my $queue = new FS::queue {
-         'paynum' => $self->paynum,
-         'job'    => 'FS::cust_bill::queueable_email',
-      };
-      $error = $queue->insert(
-        'invnum' => $cust_bill->invnum,
-        'template' => 'statement',
-      );
-
-    }
-
-    if ( $error ) {
-      warn "can't send payment receipt/statement: $error";
-    }
-
+  #payment receipt
+  my $trigger = $conf->config('payment_receipt-trigger') || 'cust_pay';
+  if ( $trigger eq 'cust_pay' ) {
+    my $error = $self->send_receipt(
+      'manual'    => $options{'manual'},
+      'cust_bill' => $cust_bill,
+      'cust_main' => $cust_main,
+    );
+    warn "can't send payment receipt/statement: $error" if $error;
   }
 
   '';
@@ -471,58 +412,109 @@ sub check {
   $self->SUPER::check;
 }
 
-=item batch_insert CUST_PAY_OBJECT, ...
+=item send_receipt HASHREF | OPTION => VALUE ...
 
-Class method which inserts multiple payments.  Takes a list of FS::cust_pay
-objects.  Returns a list, each element representing the status of inserting the
-corresponding payment - empty.  If there is an error inserting any payment, the
-entire transaction is rolled back, i.e. all payments are inserted or none are.
+Sends a payment receipt for this payment..
 
-For example:
+Available options:
 
-  my @errors = FS::cust_pay->batch_insert(@cust_pay);
-  my $num_errors = scalar(grep $_, @errors);
-  if ( $num_errors == 0 ) {
-    #success; all payments were inserted
-  } else {
-    #failure; no payments were inserted.
-  }
+=over 4
+
+=item manual
+
+Flag indicating the payment is being made manually.
+
+=item cust_bill
+
+Invoice (FS::cust_bill) object.  If not specified, the most recent invoice
+will be assumed.
+
+=item cust_main
+
+Customer (FS::cust_main) object (for efficiency).
+
+=back
 
 =cut
 
-sub batch_insert {
-  my $self = shift; #class method
+sub send_receipt {
+  my $self = shift;
+  my $opt = ref($_[0]) ? shift : { @_ };
 
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
+  my $cust_bill = $opt->{'cust_bill'};
+  my $cust_main = $opt->{'cust_main'} || $self->cust_main;
 
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
+  my $conf = new FS::Conf;
 
-  my $errors = 0;
-  
-  my @errors = map {
-    my $error = $_->insert( 'manual' => 1 );
-    if ( $error ) { 
-      $errors++;
+  return ''
+    unless $conf->exists('payment_receipt_email')
+        && grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list;
+
+  $cust_bill ||= ($cust_main->cust_bill)[-1]; #rather inefficient though?
+
+  if (    ( exists($opt->{'manual'}) && $opt->{'manual'} )
+       || ! $conf->exists('invoice_html_statement')
+       || ! $cust_bill
+     ) {
+
+    my $receipt_template = new Text::Template (
+      TYPE   => 'ARRAY',
+      SOURCE => [ map "$_\n", $conf->config('payment_receipt_email') ],
+    ) or do {
+      warn "can't create payment receipt template: $Text::Template::ERROR";
+      return '';
+    };
+
+    my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ }
+                           $cust_main->invoicing_list;
+
+    my $payby = $self->payby;
+    my $payinfo = $self->payinfo;
+    $payby =~ s/^BILL$/Check/ if $payinfo;
+    if ( $payby eq 'CARD' || $payby eq 'CHEK' ) {
+      $payinfo = $self->paymask
     } else {
-      $_->cust_main->apply_payments;
+      $payinfo = $self->decrypt($payinfo);
     }
-    $error;
-  } @_;
+    $payby =~ s/^CHEK$/Electronic check/;
+
+    my %fill_in = (
+      'date'         => time2str("%a %B %o, %Y", $self->_date),
+      'name'         => $cust_main->name,
+      'paynum'       => $self->paynum,
+      'paid'         => sprintf("%.2f", $self->paid),
+      'payby'        => ucfirst(lc($payby)),
+      'payinfo'      => $payinfo,
+      'balance'      => $cust_main->balance,
+      'company_name' => $conf->config('company_name', $cust_main->agentnum),
+    );
+
+    if ( $opt->{'cust_pkg'} ) {
+      $fill_in{'pkg'} = $opt->{'cust_pkg'}->part_pkg->pkg;
+      #setup date, other things?
+    }
+
+    send_email(
+      'from'    => $conf->config('invoice_from', $cust_main->agentnum),
+                                 #invoice_from??? well as good as any
+      'to'      => \@invoicing_list,
+      'subject' => 'Payment receipt',
+      'body'    => [ $receipt_template->fill_in( HASH => \%fill_in ) ],
+    );
 
-  if ( $errors ) {
-    $dbh->rollback if $oldAutoCommit;
   } else {
-    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  }
 
-  @errors;
+    my $queue = new FS::queue {
+       'paynum' => $self->paynum,
+       'job'    => 'FS::cust_bill::queueable_email',
+    };
+
+    $queue->insert(
+      'invnum'   => $cust_bill->invnum,
+      'template' => 'statement',
+    );
+
+  }
 
 }
 
@@ -603,6 +595,61 @@ sub amount {
 
 =over 4
 
+=item batch_insert CUST_PAY_OBJECT, ...
+
+Class method which inserts multiple payments.  Takes a list of FS::cust_pay
+objects.  Returns a list, each element representing the status of inserting the
+corresponding payment - empty.  If there is an error inserting any payment, the
+entire transaction is rolled back, i.e. all payments are inserted or none are.
+
+For example:
+
+  my @errors = FS::cust_pay->batch_insert(@cust_pay);
+  my $num_errors = scalar(grep $_, @errors);
+  if ( $num_errors == 0 ) {
+    #success; all payments were inserted
+  } else {
+    #failure; no payments were inserted.
+  }
+
+=cut
+
+sub batch_insert {
+  my $self = shift; #class method
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $errors = 0;
+  
+  my @errors = map {
+    my $error = $_->insert( 'manual' => 1 );
+    if ( $error ) { 
+      $errors++;
+    } else {
+      $_->cust_main->apply_payments;
+    }
+    $error;
+  } @_;
+
+  if ( $errors ) {
+    $dbh->rollback if $oldAutoCommit;
+  } else {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  }
+
+  @errors;
+
+}
+
 =item unapplied_sql
 
 Returns an SQL fragment to retreive the unapplied amount.
-- 
cgit v1.2.1


From 11e56fb111de3f251a895992c78e9a6318b50aa2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 2009 05:35:03 +0000
Subject: left debugging on

---
 FS/FS/TicketSystem/RT_Internal.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index 6ac3fc61f..033c746ba 100644
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -9,7 +9,7 @@ use RT::CurrentUser;
 
 @ISA = qw( FS::TicketSystem::RT_Libs );
 
-$DEBUG = 1;
+$DEBUG = 0;
 
 sub sql_num_customer_tickets {
   "( select count(*) from tickets
-- 
cgit v1.2.1


From 0e299c99f0161317a1f78ee7c05dd20ab19937d9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 2009 06:05:38 +0000
Subject: doc clarification

---
 FS/FS/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ea83c6c5a..aa6a13321 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1015,7 +1015,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'payment_receipt_email',
     'section'     => 'billing',
-    'description' => 'Template file for payment receipts.  Payment receipts are sent to the customer email invoice destination(s) when a payment is received.  See the <a href="http://search.cpan.org/dist/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance<li><code>$pkg</code> - Package (requires payment_receipt-trigger set to cust_bill_pay_pkg)</ul>',
+    'description' => 'Template file for payment receipts.  Payment receipts are sent to the customer email invoice destination(s) when a payment is received.  See the <a href="http://search.cpan.org/dist/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available: <ul><li><code>$date</code> <li><code>$name</code> <li><code>$paynum</code> - Freeside payment number <li><code>$paid</code> - Amount of payment <li><code>$payby</code> - Payment type (Card, Check, Electronic check, etc.) <li><code>$payinfo</code> - Masked credit card number or check number <li><code>$balance</code> - New balance<li><code>$pkg</code> - Package (requires payment_receipt-trigger set to "when payment is applied".)</ul>',
     'type'        => [qw( checkbox textarea )],
   },
 
-- 
cgit v1.2.1


From 35f9c8a5ed701f9e9362d69084f2f334b8634a5c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 21 Sep 2009 20:48:49 +0000
Subject: i think it is new Pg (or... new Record.pm???) that causes this
 problem... before it just returned nothing for the search instead of erroring
 out?

---
 FS/FS/cust_bill.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f6c5eeb81..79f85c807 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1857,7 +1857,7 @@ sub print_generic {
 
   my( $self, %params ) = @_;
   my $today = $params{today} ? $params{today} : time;
-  warn "FS::cust_bill::print_generic called on $self with suffix $params{template}\n"
+  warn "$me print_generic called on $self with suffix $params{template}\n"
     if $DEBUG;
 
   my $format = $params{format};
@@ -2208,7 +2208,7 @@ sub print_generic {
   $invoice_data{'total_items'} = \@total_items;
   $invoice_data{'buf'} = \@buf;
   $invoice_data{'sections'} = \@sections;
-  
+
   my $previous_section = { 'description' => 'Previous Charges',
                            'subtotal'    => $other_money_char.
                                             sprintf('%.2f', $pr_total),
@@ -2381,7 +2381,7 @@ sub print_generic {
     }
   }
   $invoice_data{'taxtotal'} = sprintf('%.2f', $taxtotal);
-  
+
   push @buf,['','-----------'];
   push @buf,[( $conf->exists('disable_previous_balance') 
                ? 'Total Charges'
@@ -2456,7 +2456,7 @@ sub print_generic {
     foreach my $credit ( $self->_items_credits('trim_len'=>32) ) {
       push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
     }
-  
+
     # payments
     my $paymenttotal = 0;
     foreach my $payment ( $self->_items_payments ) {
@@ -2965,8 +2965,6 @@ sub _items_cust_bill_pkg {
 
       my $type = $display->type;
 
-      my $cust_pkg = $cust_bill_pkg->cust_pkg;
-
       my $desc = $cust_bill_pkg->desc;
       $desc = substr($desc, 0, 50). '...'
         if $format eq 'latex' && length($desc) > 50;
@@ -2978,6 +2976,8 @@ sub _items_cust_bill_pkg {
 
       if ( $cust_bill_pkg->pkgnum > 0 ) {
 
+        my $cust_pkg = $cust_bill_pkg->cust_pkg;
+
         if ( $cust_bill_pkg->setup != 0 && (!$type || $type eq 'S') ) {
 
           my $description = $desc;
-- 
cgit v1.2.1


From 4e1e828e7ef0437b002544cc30f9934ca1c9751b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Sep 2009 03:08:19 +0000
Subject: add addl_comp_root.pl and addl_handler_use.pl config files, RT#4743

---
 FS/FS/Mason.pm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 877864eee..6e6072ef7 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -1,8 +1,9 @@
 package FS::Mason;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
+use vars qw( @ISA @EXPORT_OK $addl_handler_use );
 use Exporter;
+use File::Slurp qw( slurp );
 use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect
 use HTML::Mason::Interp;
 use HTML::Mason::Compiler::ToObject;
@@ -30,6 +31,12 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
 
 =cut
 
+$addl_handler_use = '';
+my $addl_handler_use_file = '%%%FREESIDE_CONF%%%/addl_handler_use.pl';
+if ( -e $addl_handler_use_file ) {
+  $addl_handler_use = slurp( $addl_handler_use_file );
+}
+
 # List of modules that you want to use from components (see Admin
 # manual for details)
 {
@@ -214,6 +221,11 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::cust_statement;
   # Sammath Naur
 
+  if ( $FS::Mason::addl_handler_use ) {
+    eval $FS::Mason::addl_handler_use;
+    die $@ if $@;
+  }
+
   if ( %%%RT_ENABLED%%% ) {
     eval '
       use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" );
@@ -389,6 +401,21 @@ sub mason_interps {
     RT::LoadConfig();
   }
 
+  # A hook supporting strange legacy ways people have added stuff on
+
+  my @addl_comp_root = ();
+  my $addl_comp_root_file = '%%%FREESIDE_CONF%%%/addl_comp_root.pl';
+  if ( -e $addl_comp_root_file ) {
+    warn "reading $addl_comp_root_file\n";
+    my $text = slurp( $addl_comp_root_file );
+    my @addl = eval $text;
+    if ( @addl && ! $@ ) {
+      @addl_comp_root = @addl;
+    } elsif ($@) {
+      warn "error parsing $addl_comp_root_file: $@\n";
+    }
+  }
+
   my %interp = (
     request_class        => $request_class,
     data_dir             => '%%%MASONDATA%%%',
@@ -398,6 +425,7 @@ sub mason_interps {
     comp_root            => [
                               [ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
                               [ 'rt'      =>'%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
+                              @addl_comp_root,
                             ],
   );
 
-- 
cgit v1.2.1


From 345710417c36b3521bc44def48e1a85ece4ae4df Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Sep 2009 23:47:25 +0000
Subject: this should fix the occasional extra ticket showing up on wrong
 customer record

---
 FS/FS/TicketSystem/RT_External.pm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index c788c03a1..8ccc93712 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -156,14 +156,16 @@ sub _from_customer {
   }
 
   my $sql = "
-                    FROM Tickets
-                    JOIN Queues ON ( Tickets.Queue = Queues.id       )
-                    JOIN Links  ON ( Tickets.id    = Links.LocalBase )
-                    JOIN Users  ON ( Tickets.Owner = Users.id        )
-                    $join 
-       WHERE ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " )
-         AND Target = 'freeside://freeside/cust_main/$custnum'
-         $where
+    FROM Tickets
+      JOIN Queues ON ( Tickets.Queue = Queues.id )
+      JOIN Users  ON ( Tickets.Owner = Users.id  )
+      JOIN Links  ON ( Tickets.id    = Links.LocalBase
+                       AND Links.Base LIKE '%/ticket/' || Tickets.id )
+      $join 
+
+    WHERE ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " )
+      AND Target = 'freeside://freeside/cust_main/$custnum'
+      $where
   ";
 
   ( $sql, @param );
-- 
cgit v1.2.1


From 25cf511573ebff303700ce71611450ad72debcbc Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 2009 03:14:27 +0000
Subject: add SG and SGNG ping, RT#4610

---
 FS/FS/ClientAPI/SGNG.pm |  7 +++++++
 FS/FS/Cron/check.pm     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 FS/bin/freeside-check   |  9 +++++++--
 3 files changed, 63 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/SGNG.pm b/FS/FS/ClientAPI/SGNG.pm
index 872148abd..7f784dcd0 100644
--- a/FS/FS/ClientAPI/SGNG.pm
+++ b/FS/FS/ClientAPI/SGNG.pm
@@ -20,6 +20,13 @@ sub _cache {
              } );
 }
 
+sub ping {
+  #my $p = shift;
+
+  return { 'pong' => '1' };
+
+}
+
 #this might almost be general-purpose
 sub decompify_pkgs {
   my $p = shift;
diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index c4e712c61..b331014ab 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -13,6 +13,7 @@ use FS::cust_pay_pending;
 @ISA = qw( Exporter );
 @EXPORT_OK = qw(
   check_queued check_selfservice check_apache check_bop_failures
+  check_sg check_sgng
   alert error_msg
 );
 
@@ -44,6 +45,54 @@ sub check_selfservice {
   return 1;
 }
 
+sub check_sg {
+  my $conf = new FS::Conf;
+  return 1 unless $conf->exists('sg-multicustomer_hack');
+
+  my $ua = new LWP::UserAgent;
+  $ua->agent("FreesideCronCheck/0.1 " . $ua->agent);
+
+  #XXX shiiiiit.
+  my $USER = '';
+  my $PASS = '';
+  my $req = new HTTP::Request GET=>"https://$USER:$PASS\@localhost/sg/ping.cgi";
+  my $res = $ua->request($req);
+
+  return 1 if $res->is_success
+           && $res->content =~ /OK/;
+
+  $error_msg = $res->is_success ? $res->content : Rres->status_line;
+  return 0;
+
+}
+
+sub check_sgng {
+  my $conf = new FS::Conf;
+  return 1 unless $conf->exists('sg-multicustomer_hack');
+
+  eval 'use RPC::XML; use RPC::XML::Client;';
+  if ($@) { $error_msg = $@; return 0; };
+
+  my $cli = RPC::XML::Client->new('https://localhost/selfservice/xmlrpc.cgi');
+  my $resp = $cli->send_request('FS.SelfService.XMLRPC.ping');
+
+  return 1 if ref($resp)
+           && ! $resp->is_fault
+           && ref($resp->value)
+           && $resp->value->{'pong'} == 1;
+
+  #hua
+  $error_msg = ref($resp)
+                 ? ( $resp->is_fault
+                       ? $resp->string
+                       : ( ref($resp->value) ? $resp->value->{'error'}
+                                             : $resp->value
+                         )
+                 )
+                 : $resp;
+  return 0;
+}
+
 sub _check_fsproc {
   my $arg = shift;
   _check_pidfile( "freeside-$arg.pid" );
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index f2d596b80..ac2fc3d03 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -6,6 +6,7 @@ use Email::Send;
 use FS::UID qw( adminsuidsetup );
 use FS::Cron::check qw(
   check_queued check_selfservice check_apache check_bop_failures
+  check_sg check_sgng
   alert error_msg
 );
 
@@ -17,9 +18,13 @@ eval { adminsuidsetup $user };
 
 if ( $@ ) { alert("Database down: $@", @emails); exit; }
 
-check_queued       or alert("Queue daemon not running", @emails);
+check_queued       or alert('Queue daemon not running', @emails);
 check_selfservice  or alert(error_msg(), @emails);
-check_apache       or alert("Apache not running: ". error_msg(), @emails);
+check_apache       or alert('Apache not running: '. error_msg(), @emails);
+
+#no-ops unless you are sg
+check_sg           or alert('FS::ClientAPI::SG not responding',   @emails);
+check_sgng         or alert('FS::ClientAPI::SGNG not responding', @emails);
 
 check_bop_failures or alert(error_msg(), @emails);
 
-- 
cgit v1.2.1


From a6e423aa1070bde95bd2f55d656e9685e58de452 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 24 Sep 2009 19:59:58 +0000
Subject: get the ping username/pass from a config, good enough, RT#4610

---
 FS/FS/Conf.pm       | 14 ++++++++++++++
 FS/FS/Cron/check.pm |  7 ++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index aa6a13321..09545720c 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3003,6 +3003,20 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'sg-ping_username',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'sg-ping_password',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'disable-cust-pkg_class',
     'section'     => 'UI',
diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index b331014ab..b50140ca1 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -47,14 +47,14 @@ sub check_selfservice {
 
 sub check_sg {
   my $conf = new FS::Conf;
+  #different trigger if they ever stop using multicustomer_hack ?
   return 1 unless $conf->exists('sg-multicustomer_hack');
 
   my $ua = new LWP::UserAgent;
   $ua->agent("FreesideCronCheck/0.1 " . $ua->agent);
 
-  #XXX shiiiiit.
-  my $USER = '';
-  my $PASS = '';
+  my $USER = $conf->config('sg-ping_username');
+  my $PASS = $conf->config('sg-ping_password');
   my $req = new HTTP::Request GET=>"https://$USER:$PASS\@localhost/sg/ping.cgi";
   my $res = $ua->request($req);
 
@@ -68,6 +68,7 @@ sub check_sg {
 
 sub check_sgng {
   my $conf = new FS::Conf;
+  #different trigger if they ever stop using multicustomer_hack ?
   return 1 unless $conf->exists('sg-multicustomer_hack');
 
   eval 'use RPC::XML; use RPC::XML::Client;';
-- 
cgit v1.2.1


From 03bd5bb743b3b39e4e00fd169543532598d3b5e5 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 25 Sep 2009 01:04:00 +0000
Subject: Add cust_attachment

---
 FS/MANIFEST | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'FS')

diff --git a/FS/MANIFEST b/FS/MANIFEST
index a45489700..f5511f04d 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -449,5 +449,7 @@ FS/part_device.pm
 t/part_device.t
 FS/cdr_termination.pm
 t/cdr_termination.t
+FS/cust_attachment.pm
+t/cust_attachment.t
 FS/cust_statement.pm
 t/cust_statement.t
-- 
cgit v1.2.1


From 25b0525eb1f0d018b893a7bdc96b92a8f446020f Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Fri, 25 Sep 2009 02:30:21 +0000
Subject: Batch payment refactoring

---
 FS/FS/Conf.pm                      |   7 +
 FS/FS/pay_batch.pm                 | 429 +++++++++++++++++--------------------
 FS/FS/pay_batch/BoM.pm             |  73 +++++++
 FS/FS/pay_batch/PAP.pm             | 103 +++++++++
 FS/FS/pay_batch/ach_spiritone.pm   |  65 ++++++
 FS/FS/pay_batch/chase_canada.pm    | 104 +++++++++
 FS/FS/pay_batch/paymentech.pm      | 112 ++++++++++
 FS/FS/pay_batch/td_canada_trust.pm | 104 +++++++++
 8 files changed, 759 insertions(+), 238 deletions(-)
 create mode 100644 FS/FS/pay_batch/BoM.pm
 create mode 100644 FS/FS/pay_batch/PAP.pm
 create mode 100644 FS/FS/pay_batch/ach_spiritone.pm
 create mode 100644 FS/FS/pay_batch/chase_canada.pm
 create mode 100644 FS/FS/pay_batch/paymentech.pm
 create mode 100644 FS/FS/pay_batch/td_canada_trust.pm

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 09545720c..bd1c004f4 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2385,6 +2385,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'batchconfig-paymentech',
+    'section'     => 'billing',
+    'description' => 'Configuration for Chase Paymentech batching, four lines: 1. BIN, 2. Terminal ID, 3. Merchant ID, 4. Username',
+    'type'        => 'textarea',
+  },
+
   {
     'key'         => 'payment_history-years',
     'section'     => 'UI',
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 5448b031e..ffa6e200e 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -1,11 +1,13 @@
 package FS::pay_batch;
 
 use strict;
-use vars qw( @ISA );
+use vars qw( @ISA $DEBUG %import_info %export_info $conf );
 use Time::Local;
 use Text::CSV_XS;
+use XML::Simple qw(XMLin XMLout);
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_pay;
+use FS::Conf;
 
 @ISA = qw(FS::Record);
 
@@ -137,6 +139,42 @@ sub set_status {
   $self->replace();
 }
 
+# further false laziness
+
+%import_info = %export_info = ();
+foreach my $INC (@INC) {
+  warn "globbing $INC/FS/pay_batch/*.pm\n" if $DEBUG;
+  foreach my $file ( glob("$INC/FS/pay_batch/*.pm")) {
+    warn "attempting to load batch format from $file\n" if $DEBUG;
+    $file =~ /\/(\w+)\.pm$/;
+    next if !$1;
+    my $mod = $1;
+    my ($import, $export, $name) = 
+      eval "use FS::pay_batch::$mod; 
+           ( \\%FS::pay_batch::$mod\::import_info,
+             \\%FS::pay_batch::$mod\::export_info,
+             \$FS::pay_batch::$mod\::name)";
+    $name ||= $mod; # in case it's not defined
+    if( $@) {
+      # in FS::cdr this is a die, not a warn.  That's probably a bug.
+      warn "error using FS::pay_batch::$mod (skipping): $@\n";
+      next;
+    }
+    if(!keys(%$import)) {
+      warn "no \%import_info found in FS::pay_batch::$mod (skipping)\n";
+    }
+    else {
+      $import_info{$name} = $import;
+    }
+    if(!keys(%$export)) {
+      warn "no \%export_info found in FS::pay_batch::$mod (skipping)\n";
+    }
+    else {
+      $export_info{$name} = $export;
+    }
+  }
+}
+
 =item import_results OPTION => VALUE, ...
 
 Import batch results.
@@ -155,222 +193,19 @@ sub import_results {
   my $param = ref($_[0]) ? shift : { @_ };
   my $fh = $param->{'filehandle'};
   my $format = $param->{'format'};
-
-  my $filetype;      # CSV, Fixed80, Fixed264
-  my @fields;
-  my $formatre;      # for Fixed.+
-  my @values;
-  my $begin_condition;
-  my $end_condition;
-  my $end_hook;
-  my $hook;
-  my $approved_condition;
-  my $declined_condition;
-
-  if ( $format eq 'csv-td_canada_trust-merchant_pc_batch' ) {
-
-    $filetype = "CSV";
-
-    @fields = (
-      'paybatchnum', # Reference#:  Invoice number of the transaction
-      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
-                     #          with no decimal entered.
-      '',            # Card Type:  0 - MCrd, 1 - Visa, 2 - AMEX, 3 - Discover,
-                     #             4 - Insignia, 5 - Diners/EnRoute, 6 - JCB
-      '_date',       # Transaction Date:  Date the Transaction was processed
-      'time',        # Transaction Time:  Time the transaction was processed
-      'payinfo',     # Card Number:  Card number for the transaction
-      '',            # Expiry Date:  Expiry date of the card
-      '',            # Auth#:  Authorization number entered for force post
-                     #         transaction
-      'type',        # Transaction Type:  0 - purchase, 40 - refund,
-                     #                    20 - force post
-      'result',      # Processing Result: 3 - Approval,
-                     #                    4 - Declined/Amount over limit,
-                     #                    5 - Invalid/Expired/stolen card,
-                     #                    6 - Comm Error
-      '',            # Terminal ID: Terminal ID used to process the transaction
-    );
-
-    $end_condition = sub {
-      my $hash = shift;
-      $hash->{'type'} eq '0BC';
-    };
-
-    $end_hook = sub {
-      my( $hash, $total) = @_;
-      $total = sprintf("%.2f", $total);
-      my $batch_total = sprintf("%.2f", $hash->{'paybatchnum'} / 100 );
-      return "Our total $total does not match bank total $batch_total!"
-        if $total != $batch_total;
-      '';
-    };
-
-    $hook = sub {
-      my $hash = shift;
-      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
-      $hash->{'_date'} = timelocal( substr($hash->{'time'},  4, 2),
-                                    substr($hash->{'time'},  2, 2),
-                                    substr($hash->{'time'},  0, 2),
-                                    substr($hash->{'_date'}, 6, 2),
-                                    substr($hash->{'_date'}, 4, 2)-1,
-                                    substr($hash->{'_date'}, 0, 4)-1900, );
-    };
-
-    $approved_condition = sub {
-      my $hash = shift;
-      $hash->{'type'} eq '0' && $hash->{'result'} == 3;
-    };
-
-    $declined_condition = sub {
-      my $hash = shift;
-      $hash->{'type'} eq '0' && (    $hash->{'result'} == 4
-                                  || $hash->{'result'} == 5 );
-    };
-
-
-  }elsif ( $format eq 'csv-chase_canada-E-xactBatch' ) {
-
-    $filetype = "CSV";
-
-    @fields = (
-      '',            # Internal(bank) id of the transaction
-      '',            # Transaction Type:  00 - purchase,      01 - preauth,
-                     #                    02 - completion,    03 - forcepost,
-                     #                    04 - refund,        05 - auth,
-                     #                    06 - purchase corr, 07 - refund corr,
-                     #                    08 - void           09 - void return
-      '',            # gateway used to process this transaction
-      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
-                     #          with decimal entered.
-      'auth',        # Auth#:  Authorization number (if approved)
-      'payinfo',     # Card Number:  Card number for the transaction
-      '',            # Expiry Date:  Expiry date of the card
-      '',            # Cardholder Name
-      'bankcode',    # Bank response code (3 alphanumeric)
-      'bankmess',    # Bank response message
-      'etgcode',     # ETG response code (2 alphanumeric)
-      'etgmess',     # ETG response message
-      '',            # Returned customer number for the transaction
-      'paybatchnum', # Reference#:  paybatch number of the transaction
-      '',            # Reference#:  Invoice number of the transaction
-      'result',      # Processing Result: Approved of Declined
-    );
-
-    $end_condition = sub {
-      '';
-    };
-
-    $hook = sub {
-      my $hash = shift;
-      my $cpb = shift;
-      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'}); #hmmmm
-      $hash->{'_date'} = time;  # got a better one?
-      $hash->{'payinfo'} = $cpb->{'payinfo'}
-        if( substr($hash->{'payinfo'}, -4) eq substr($cpb->{'payinfo'}, -4) );
-    };
-
-    $approved_condition = sub {
-      my $hash = shift;
-      $hash->{'etgcode'} eq '00' && $hash->{'result'} eq "Approved";
-    };
-
-    $declined_condition = sub {
-      my $hash = shift;
-      $hash->{'etgcode'} ne '00' # internal processing error
-        || ( $hash->{'result'} eq "Declined" );
-    };
-
-
-  }elsif ( $format eq 'PAP' ) {
-
-    $filetype = "Fixed264";
-
-    @fields = (
-      'recordtype',  # We are interested in the 'D' or debit records
-      'batchnum',    # Record#:  batch number we used when sending the file
-      'datacenter',  # Where in the bowels of the bank the data was processed
-      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
-                     #          with no decimal entered.
-      '_date',       # Transaction Date:  Date the Transaction was processed
-      'bank',        # Routing information
-      'payinfo',     # Account number for the transaction
-      'paybatchnum', # Reference#:  Invoice number of the transaction
-    );
-
-    $formatre = '^(.).{19}(.{4})(.{3})(.{10})(.{6})(.{9})(.{12}).{110}(.{19}).{71}$'; 
-
-    $end_condition = sub {
-      my $hash = shift;
-      $hash->{'recordtype'} eq 'W';
-    };
-
-    $end_hook = sub {
-      my( $hash, $total) = @_;
-      $total = sprintf("%.2f", $total);
-      my $batch_total = $hash->{'datacenter'}.$hash->{'paid'}.
-                        substr($hash->{'_date'},0,1);          # YUCK!
-      $batch_total = sprintf("%.2f", $batch_total / 100 );
-      return "Our total $total does not match bank total $batch_total!"
-        if $total != $batch_total;
-      '';
-    };
-
-    $hook = sub {
-      my $hash = shift;
-      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
-      my $tmpdate = timelocal( 0,0,1,1,0,substr($hash->{'_date'}, 0, 3)+2000); 
-      $tmpdate += 86400*(substr($hash->{'_date'}, 3, 3)-1) ;
-      $hash->{'_date'} = $tmpdate;
-      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
-    };
-
-    $approved_condition = sub {
-      1;
-    };
-
-    $declined_condition = sub {
-      0;
-    };
-
-  }elsif ( $format eq 'ach-spiritone' ) {
-
-    $filetype = "CSV";
-
-    @fields = (
-      '',            # Name
-      'paybatchnum', # ID: Number of the transaction
-      'aba',         # ABA Number for the transaction
-      'payinfo',     # Bank Account Number for the transaction
-      '',            # Transaction Type:  27 - debit
-      'paid',        # Amount:  Amount of the transaction.  Dollars and cents
-                     #          with decimal entered.
-      '',            # Default Transaction Type
-      '',            # Default Amount:  Dollars and cents with decimal entered.
-    );
-
-    $end_condition = sub {
-      '';
-    };
-
-    $hook = sub {
-      my $hash = shift;
-      $hash->{'_date'} = time;  # got a better one?
-      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'aba'};
-    };
-
-    $approved_condition = sub {
-      1;
-    };
-
-    $declined_condition = sub {
-      0;
-    };
-
-
-  } else {
-    return "Unknown format $format";
-  }
+  my $info = $import_info{$format}
+    or die "unknown format $format";
+
+  my $filetype            = $info->{'filetype'};      # CSV or fixed
+  my @fields              = @{ $info->{'fields'} };
+  my $formatre            = $info->{'formatre'};      # for fixed
+  my @all_values;
+  my $begin_condition     = $info->{'begin_condition'};
+  my $end_condition       = $info->{'end_condition'};
+  my $end_hook            = $info->{'end_hook'};
+  my $hook                = $info->{'hook'};
+  my $approved_condition  = $info->{'approved'};
+  my $declined_condition  = $info->{'declined'};
 
   my $csv = new Text::CSV_XS;
 
@@ -390,36 +225,66 @@ sub import_results {
   unless ( $reself->status eq 'I' ) {
     $dbh->rollback if $oldAutoCommit;
     return "batchnum ". $self->batchnum. "no longer in transit";
-  };
+  }
 
   my $error = $self->set_status('R');
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    return $error
+    return $error;
   }
 
   my $total = 0;
   my $line;
-  while ( defined($line=<$fh>) ) {
 
-    next if $line =~ /^\s*$/; #skip blank lines
+  # Order of operations has been changed here.
+  # We now slurp everything into @all_values, then 
+  # process one line at a time.
 
-    if ($filetype eq "CSV") {
-      $csv->parse($line) or do {
-        $dbh->rollback if $oldAutoCommit;
-        return "can't parse: ". $csv->error_input();
-      };
-      @values = $csv->fields();
-    }elsif ($filetype eq "Fixed80" || $filetype eq "Fixed264"){
-      @values = $line =~ /$formatre/;
-      unless (@values) {
-        $dbh->rollback if $oldAutoCommit;
-        return "can't parse: ". $line;
-      };
-    }else{
+  if ($filetype eq 'XML') {
+    my @xmlkeys = @{ $info->{'xmlkeys'} };  # for XML
+    my $xmlrow  = $info->{'xmlrow'};        # also for XML
+
+    # Do everything differently.
+    my $data = XMLin($fh, KeepRoot => 1);
+    my $rows = $data;
+    # $xmlrow = [ RootKey, FirstLevelKey, SecondLevelKey... ]
+    $rows = $rows->{$_} foreach( @$xmlrow );
+    if(!defined($rows)) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unknown file type $filetype";
+      return "can't find rows in XML file";
+    }
+    $rows = [ $rows ] if ref($rows) ne 'ARRAY';
+    foreach my $row (@$rows) {
+      push @all_values, [ @{$row}{@xmlkeys} ];
     }
+  }
+  else {
+    while ( defined($line=<$fh>) ) {
+
+      next if $line =~ /^\s*$/; #skip blank lines
+
+      if ($filetype eq "CSV") {
+        $csv->parse($line) or do {
+          $dbh->rollback if $oldAutoCommit;
+          return "can't parse: ". $csv->error_input();
+        };
+        push @all_values, [ $csv->fields() ];
+      }elsif ($filetype eq 'fixed'){
+        my @values = $line =~ /$formatre/;
+        unless (@values) {
+          $dbh->rollback if $oldAutoCommit;
+          return "can't parse: ". $line;
+        };
+        push @all_values, \@values;
+      }else{
+        $dbh->rollback if $oldAutoCommit;
+        return "Unknown file type $filetype";
+      }
+    }
+  }
+
+  foreach (@all_values) {
+    my @values = @$_;
 
     my %hash;
     foreach my $field ( @fields ) {
@@ -428,8 +293,9 @@ sub import_results {
       $hash{$field} = $value;
     }
 
-    if ( &{$end_condition}(\%hash) ) {
-      my $error = &{$end_hook}(\%hash, $total);
+    if ( defined($end_condition) and &{$end_condition}(\%hash) ) {
+      my $error;
+      $error = &{$end_hook}(\%hash, $total) if defined($end_hook);
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return $error;
@@ -514,7 +380,6 @@ sub import_results {
 
     }
 
-
   }
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -522,6 +387,94 @@ sub import_results {
 
 }
 
+sub export_batch {
+# Formerly httemplate/misc/download-batch.cgi
+  my $self = shift;
+  my $conf = new FS::Conf;
+  my $format = shift || $conf->config('batch-default_format')
+               or die "No batch format configured\n";
+  my $info = $export_info{$format} or die "Format not found: '$format'\n";
+  &{$info->{'init'}}($conf) if exists($info->{'init'});
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;  
+
+  my $error;
+
+  my $first_download;
+  if($self->status eq 'O') {
+    $first_download = 1;
+  }
+  elsif($self->status eq 'I' and
+        $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')) {
+    $first_download = 0;
+  }
+  else {
+    die "No pending batch.\n"
+  }
+
+  $error = $self->set_status('I');
+  die "error updating pay_batch status: $error\n" if $error;
+
+  my $batch = '';
+  my $batchtotal = 0;
+  my $batchcount = 0;
+
+  my @cust_pay_batch = sort { $a->paybatchnum <=> $b->paybatchnum }
+                      qsearch('cust_pay_batch', { batchnum => $self->batchnum } );
+
+  my $h = $info->{'header'};
+  if(ref($h) eq 'CODE') {
+    $batch .= &$h($self, \@cust_pay_batch) . "\n";
+  }
+  else {
+    $batch .= $h . "\n";
+  }
+  foreach my $cust_pay_batch (@cust_pay_batch) {
+    if($first_download) {
+      my $balance = $cust_pay_batch->cust_main->balance;
+      $error = '';
+      if($balance <= 0) { # then don't charge this customer
+        $error = $cust_pay_batch->delete;
+        undef $cust_pay_batch;
+      }
+      elsif($balance < $cust_pay_batch->amount) { # then reduce the charge to the remaining balance
+        $cust_pay_batch->amount($balance);
+        $error = $cust_pay_batch->replace;
+      }
+      # else $balance >= $cust_pay_batch->amount
+      if($error) {
+        $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+        die $error;
+      }
+    }
+    if($cust_pay_batch) { # that is, it wasn't deleted
+      $batchcount++;
+      $batchtotal += $cust_pay_batch->amount;
+      $batch .= &{$info->{'row'}}($cust_pay_batch, $self) . "\n";
+    }
+  }
+  my $f = $info->{'footer'};
+  if(ref($f) eq 'CODE') {
+    $batch .= &$f($self, $batchcount, $batchtotal) . "\n";
+  }
+  else {
+    $batch .= $f . "\n";
+  }
+
+  if ($info->{'autopost'}) {
+    $error = &{$info->{'autopost'}}($self, $batch);
+    if($error) {
+      $dbh->rollback or die $dbh->errstr if $oldAutoCommit;
+      die $error;
+    }
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  return $batch;
+}
+
 =back
 
 =head1 BUGS
diff --git a/FS/FS/pay_batch/BoM.pm b/FS/FS/pay_batch/BoM.pm
new file mode 100644
index 000000000..7bfc22a64
--- /dev/null
+++ b/FS/FS/pay_batch/BoM.pm
@@ -0,0 +1,73 @@
+package FS::pay_batch::BoM;
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local 'timelocal';
+use FS::Conf;
+
+my $conf;
+my ($origid, $datacenter, $typecode, $shortname, $longname, $mybank, $myacct);
+
+$name = 'BoM';
+
+%import_info = (
+  'filetype'    => 'CSV',
+  'fields'      => [],
+  'hook'        => sub { die "Can't import BoM" },
+  'approved'    => sub { 1 },
+  'declined'    => sub { 0 },
+);
+
+%export_info = (
+  init => sub {
+    $conf = shift;
+    ($origid,
+     $datacenter,
+     $typecode, 
+     $shortname, 
+     $longname, 
+     $mybank, 
+     $myacct) = $conf->config("batchconfig-BoM");
+  },
+  header => sub { 
+    my $pay_batch = shift;
+    sprintf( "A%10s%04u%06u%05u%54s\n", 
+      $origid,
+      $pay_batch->batchnum,
+      jdate($pay_batch->download),
+      $datacenter,
+      "") .
+    sprintf( "XD%03u%06u%-15s%-30s%09u%-12s   \n",
+      $typecode,
+      jdate($pay_batch->download),
+      $shortname,
+      $longname,
+      $mybank,
+      $myacct);
+  },
+  row => sub {
+    my ($cust_pay_batch, $pay_batch) = @_;
+    my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
+    sprintf( "D%010.0f%09u%-12s%-29s%-19s\n",
+      $cust_pay_batch->amount * 100,
+      $aba,
+      $account,
+      $cust_pay_batch->payname,
+      $cust_pay_batch->paybatchnum
+      );
+  },
+  footer => sub {
+    my ($pay_batch, $batchcount, $batchtotal) = @_;
+    sprintf( "YD%08u%014.0f%56s\n", $batchcount, $batchtotal*100, "").
+    sprintf( "Z%014u%04u%014u%05u%41s\n", 
+      $batchtotal*100, $batchcount, "0", "0", "");
+  },
+);
+
+sub jdate {
+  my (@date) = localtime(shift);
+  sprintf("%03d%03d", $date[5] % 100, $date[7] + 1);
+}
+
+1;
+
diff --git a/FS/FS/pay_batch/PAP.pm b/FS/FS/pay_batch/PAP.pm
new file mode 100644
index 000000000..432ef07ed
--- /dev/null
+++ b/FS/FS/pay_batch/PAP.pm
@@ -0,0 +1,103 @@
+package FS::pay_batch::PAP;
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local 'timelocal';
+use FS::Conf;
+
+my $conf;
+my ($origid, $datacenter, $typecode, $shortname, $longname, $mybank, $myacct);
+
+$name = 'PAP';
+
+%import_info = (
+  'filetype'    => 'fixed',
+  'formatre'    => '^(.).{19}(.{4})(.{3})(.{10})(.{6})(.{9})(.{12}).{110}(.{19}).{71}$',
+  'fields'      => [
+    'recordtype',
+    'batchnum',
+    'datacenter',
+    'paid',
+    '_date',
+    'bank',
+    'payinfo',
+    'paybatchnum',
+  ],
+  'hook'        => sub {
+      my $hash = shift;
+      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100 );
+      my $tmpdate = timelocal( 0,0,1,1,0,substr($hash->{'_date'}, 0, 3)+2000);
+      $tmpdate += 86400*(substr($hash->{'_date'}, 3, 3)-1) ;
+      $hash->{'_date'} = $tmpdate;
+      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'bank'};
+  },
+  'approved'    => sub { 1 },
+  'declined'    => sub { 0 },
+# Why does pay_batch.pm have approved_condition and declined_condition?
+# It doesn't even try to handle the case of neither condition being met.
+  'end_hook'    => sub {
+      my( $hash, $total) = @_;
+      $total = sprintf("%.2f", $total);
+      my $batch_total = $hash->{'datacenter'}.$hash->{'paid'}.
+                        substr($hash->{'_date'},0,1);          # YUCK!
+      $batch_total = sprintf("%.2f", $batch_total / 100 );
+      return "Our total $total does not match bank total $batch_total!"
+        if $total != $batch_total;
+      '';
+  },
+  'end_condition' => sub {
+      my $hash = shift;
+      $hash->{recordtype} eq 'W';
+  },
+);
+
+%export_info = (
+  init => sub {
+    $conf = shift;
+    ($origid,
+     $datacenter,
+     $typecode, 
+     $shortname, 
+     $longname, 
+     $mybank, 
+     $myacct) = $conf->config("batchconfig-PAP");
+  },
+  header => sub { 
+    my $pay_batch = shift;
+    sprintf( "H%10sD%3s%06u%-15s%09u%-12s%04u%19s\n",
+      $origid,
+      $typecode,
+      cdate($pay_batch->download),
+      $shortname,
+      $mybank,
+      $myacct,
+      $pay_batch->batchnum,
+      "" )
+  },
+  row => sub {
+    my ($cust_pay_batch, $pay_batch) = @_;
+    my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
+    sprintf( "D%-23s%06u%-19s%09u%-12s%010.0f\n",
+      $cust_pay_batch->payname,
+      cdate($pay_batch->download),
+      $cust_pay_batch->paybatchnum,
+      $aba,
+      $account,
+      $cust_pay_batch->amount*100 );
+  },
+  footer => sub {
+    my ($pay_batch, $batchcount, $batchtotal) = @_;
+    sprintf( "T%08u%014.0f%57s\n",
+      $batchcount,
+      $batchtotal*100,
+      "" );
+  },
+);
+
+sub cdate {
+  my (@date) = localtime(shift);
+  sprintf("%02d%02d%02d", $date[3], $date[4] + 1, $date[5] % 100);
+}
+
+1;
+
diff --git a/FS/FS/pay_batch/ach_spiritone.pm b/FS/FS/pay_batch/ach_spiritone.pm
new file mode 100644
index 000000000..bd3bb14c3
--- /dev/null
+++ b/FS/FS/pay_batch/ach_spiritone.pm
@@ -0,0 +1,65 @@
+package FS::pay_batch::ach_spiritone;
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local 'timelocal';
+use FS::Conf;
+use File::Temp;
+
+my $conf;
+my ($origid, $datacenter, $typecode, $shortname, $longname, $mybank, $myacct);
+
+$name = 'ach-spiritone'; # note spelling
+
+%import_info = (
+  'filetype'    => 'CSV',
+  'fields'      => [
+    '', #name
+    'paybatchnum',  
+    'aba',
+    'payinfo', 
+    '', #transaction type
+    'paid',
+    '', #default transaction type
+    '', #default amount
+  ],
+  'hook'        => sub {
+      my $hash = shift;
+      $hash->{'_date'} = time;
+      $hash->{'payinfo'} = $hash->{'payinfo'} . '@' . $hash->{'aba'};
+  },
+  'approved'    => sub { 1 },
+  'declined'    => sub { 0 },
+);
+
+%export_info = (
+# This is the simplest case.
+  row => sub {
+    my ($cust_pay_batch, $pay_batch) = @_;
+    my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
+    my $payname = $cust_pay_batch->first . ' ' . $cust_pay_batch->last;
+    $payname =~ tr/",/  /; 
+    qq!"$payname","!.$cust_pay_batch->paybatchnum.
+    qq!","$aba","$account","27","!.$cust_pay_batch->amount.
+    qq!","27","0.00"!; #"
+  },
+  autopost => sub {
+    my ($pay_batch, $batch) = @_;
+    my $dir = $FS::UID::conf_dir. "/cache.". $FS::UID::datasrc;
+    my $fh = new File::Temp(
+      TEMPLATE => 'paybatch.'. $pay_batch->batchnum .'.XXXXXXXX',
+      DIR      => $dir,
+    ) or return "can't open temp file: $!\n";
+
+    print $fh $batch;
+    seek $fh, 0, 0;
+
+    my $error = $pay_batch->import_results( 'filehandle' => $fh,
+                                         'format'     => $name,
+                                       );
+    return $error if $error;
+  },
+);
+
+1;
+
diff --git a/FS/FS/pay_batch/chase_canada.pm b/FS/FS/pay_batch/chase_canada.pm
new file mode 100644
index 000000000..909e4ae18
--- /dev/null
+++ b/FS/FS/pay_batch/chase_canada.pm
@@ -0,0 +1,104 @@
+package FS::pay_batch::chase_canada;
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local 'timelocal';
+use FS::Conf;
+
+my $conf;
+my $origid;
+
+$name = 'csv-chase_canada-E-xactBatch';
+
+%import_info = (
+  'filetype'    => 'CSV',
+  'fields'      => [
+    '',
+    '',
+    '',
+    'paid',
+    'auth',
+    'payinfo',
+    '',
+    '',
+    'bankcode',
+    'bankmess',
+    'etgcode',
+    'etgmess',
+    '',
+    'paybatchnum',
+    '',
+    'result',
+  ],
+  'hook'        => sub {
+    my $hash = shift;
+    my $cpb = shift;
+    $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} );
+    $hash->{'_date'} = time;
+    $hash->{'payinfo'} = $cpb->{'payinfo'}
+      if( substr($hash->{'payinfo'}, -4) eq substr($cpb->{'payinfo'}, -4) );
+  },
+  'approved'    => sub { 
+    my $hash = shift;
+    $hash->{'etgcode'} eq '00' && $hash->{'result'} eq 'Approved';
+  },
+  'declined'    => sub { 
+    my $hash = shift;
+    $hash->{'etgcode'} ne '00' || $hash->{'result'} eq 'Declined';
+  },
+);
+
+%export_info = (
+  init => sub {
+    $conf = shift;
+    ($origid) = $conf->config("batchconfig-$name");
+  },
+  header => sub { 
+    my $pay_batch = shift;
+    sprintf( '$$E-xactBatchFileV1.0$$%s:%03u$$%s',
+      sdate($pay_batch->download),
+      $pay_batch->batchnum, 
+      $origid );
+  },
+  row => sub {
+    my ($cust_pay_batch, $pay_batch) = @_;
+    my $payname = $cust_pay_batch->payname;
+    $payname =~ tr/",/  /;
+                
+    join(',', 
+      $cust_pay_batch->paybatchnum,
+      $cust_pay_batch->custnum,
+      $cust_pay_batch->invnum,
+      qq!"$payname"!,
+      '00',
+      $cust_pay_batch->payinfo,
+      $cust_pay_batch->amount,
+      expdate($cust_pay_batch->exp),
+      '',
+      ''
+    );
+  },
+  # no footer
+);
+
+sub sdate {
+  my (@date) = localtime(shift);
+  sprintf('%02d/%02d/%02d', $date[5] % 100, $date[4] + 1, $date[3]);
+}
+
+sub expdate {
+  my $exp = shift;
+  $exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my ($mon, $y) = ($2, $1);
+  if($conf->exists('batch-increment_expiration')) {
+    my ($curmon, $curyear) = (localtime(time))[4,5];
+    $curmon++;
+    $curyear -=  100;
+    $y++ while $y < $curyear || ($y == $curyear && $mon < $curmon);
+  }
+  $mon = "0$mon" if $mon =~ /^\d$/;
+  $y = "0$y" if $y =~ /^\d$/;
+  return "$mon$y";
+}
+
+1;
diff --git a/FS/FS/pay_batch/paymentech.pm b/FS/FS/pay_batch/paymentech.pm
new file mode 100644
index 000000000..33a9fda73
--- /dev/null
+++ b/FS/FS/pay_batch/paymentech.pm
@@ -0,0 +1,112 @@
+package FS::pay_batch::paymentech;
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local;
+use Date::Format 'time2str';
+use Date::Parse 'str2time';
+use FS::Conf;
+use XML::Simple qw(XMLin XMLout);
+
+my $conf;
+my ($bin, $merchantID, $terminalID, $username);
+$name = 'paymentech';
+
+%import_info = (
+  filetype    => 'XML',
+  xmlrow         => [ qw(transResponse newOrderResp) ],
+  fields      => [
+    'paybatchnum',
+    '_date',
+    'approvalStatus',
+    ],
+  xmlkeys     => [
+    'orderID',
+    'respDateTime',
+    'approvalStatus',
+    ],
+  'hook'        => sub {
+      my ($hash, $oldhash) = @_;
+      my ($mon, $day, $year, $hour, $min, $sec) = 
+        $hash->{'_date'} =~ /^(..)(..)(....)(..)(..)(..)$/;
+      $hash->{'_date'} = timelocal($sec, $min, $hour, $day, $mon-1, $year);
+      $hash->{'paid'} = $oldhash->{'amount'};
+    },
+  'approved'    => sub { my $hash = shift;
+                            $hash->{'approvalStatus'} 
+    },
+  'declined'    => sub { my $hash = shift;
+                            ! $hash->{'approvalStatus'} 
+    },
+);
+
+my %paytype = (
+  'personal checking' => 'C',
+  'personal savings'  => 'S',
+  'business checking' => 'X',
+  'business savings'  => 'X',
+  );
+
+%export_info = (
+  init  => sub {
+    my $conf = shift;
+    ($bin, $terminalID, $merchantID, $username) =
+       $conf->config('batchconfig-paymentech');
+    },
+# Here we do all the work in the header function.
+  header => sub {
+    my $pay_batch = shift;
+    my @cust_pay_batch = @{(shift)};
+    my $count = 0;
+    XMLout( {
+      transRequest => {
+        RequestCount => scalar(@cust_pay_batch),
+        batchFileID  => {
+          userID        => $username,
+          fileDateTime  => time2str('%Y%m%d%H%M%s',time),
+          fileID        => 'batch'.time2str('%Y%m%d',time),
+        },
+        newOrder => [ map { {
+          # $_ here refers to a cust_pay_batch record.
+          BatchRequestNo => $count++,
+          industryType   => 'EC',
+          transType      => 'AC',
+          bin            => $bin,
+          merchantID     => $merchantID,
+          terminalID     => $terminalID,
+          ($_->payby eq 'CARD') ? (
+            # Credit card stuff
+            ccAccountNum   => $_->payinfo,
+            ccExp          => time2str('%y%m',str2time($_->exp)),
+          ) : (
+            # ECP (electronic check) stuff
+            ecpCheckRT     => ($_->payinfo =~ /@(\d+)/),
+            ecpCheckDDA    => ($_->payinfo =~ /(\d+)@/),
+            ecpBankAcctType => $paytype{lc($_->cust_main->paytype)},
+            ecpDelvMethod  => 'B'
+          ),
+          avsZip         => $_->zip,
+          avsAddress1    => $_->address1,
+          avsAddress2    => $_->address2,
+          avsCity        => $_->city,
+          avsState       => $_->state,
+          avsName        => $_->first . ' ' . $_->last,
+          avsCountryCode => $_->country,
+          orderID        => $_->paybatchnum,
+          amount         => $_->amount * 100,
+          } } @cust_pay_batch
+        ],
+        endOfDay => {
+          BatchRequestNo => $count++,
+          bin            => $bin,
+          merchantID     => $merchantID,
+          terminalID     => $terminalID
+        },
+      } 
+    }, KeepRoot => 1, NoAttr => 1);
+  },
+  row => sub {},
+);
+
+1;
+
diff --git a/FS/FS/pay_batch/td_canada_trust.pm b/FS/FS/pay_batch/td_canada_trust.pm
new file mode 100644
index 000000000..43b92371e
--- /dev/null
+++ b/FS/FS/pay_batch/td_canada_trust.pm
@@ -0,0 +1,104 @@
+package FS::pay_batch::td_canada_trust;
+
+# Formerly known as csv-td_canada_trust-merchant_pc_batch,
+# which I'm sure we can all agree is both a terrible name 
+# and an illegal Perl identifier.
+
+use strict;
+use vars qw(@ISA %import_info %export_info $name);
+use Time::Local 'timelocal';
+use FS::Conf;
+
+my $conf;
+my ($origid, $datacenter, $typecode, $shortname, $longname, $mybank, $myacct);
+
+$name = 'csv-td_canada_trust-merchant_pc_batch';
+
+%import_info = (
+  'filetype'    => 'CSV',
+  'fields'      => [
+    'paybatchnum',  
+    'paid',
+    '', # card type
+    '_date',
+    'time',
+    'payinfo', 
+    '', # expiry date
+    '', # auth number
+    'type', # transaction type
+    'result', # processing result
+    '', # terminal ID
+  ],
+  'hook'        => sub {
+      my $hash = shift;
+      my $date = $hash->{'_date'};
+      my $time = $hash->{'time'};
+      $hash->{'paid'} = sprintf("%.2f", $hash->{'paid'} / 100);
+      $hash->{'_date'} = timelocal( substr($time, 4, 2),
+                                    substr($time, 2, 2),
+                                    substr($time, 0, 2),
+                                    substr($date, 6, 2),
+                                    substr($date, 4, 2)-1,
+                                    substr($date, 0, 4)-1900 );
+  },
+  'approved'    => sub { 
+    my $hash = shift;
+    $hash->{'type'} eq '0' && $hash->{'result'} == 3
+  },
+  'declined'    => sub { 
+    my $hash = shift;
+    $hash->{'type'} eq '0' && ( $hash->{'result'} == 4
+                            ||  $hash->{'result'} == 5 )
+  },
+  'end_condition' => sub {
+    my $hash = shift;
+    $hash->{'type'} eq '0BC';
+  },
+  'end_hook' => sub {
+    my ($hash, $total) = @_;
+    $total = sprintf("%.2f", $total);
+    my $batch_total = sprintf("%.2f", $hash->{'paybatchnum'} / 100);
+    return "Our total $total does not match bank total $batch_total!"
+      if $total != $batch_total;
+  },
+);
+
+%export_info = (
+  init => sub { 
+    $conf = shift; 
+  },
+  # no header
+  row => sub {
+    my ($cust_pay_batch, $pay_batch) = @_;
+
+    return join(',', 
+      '',
+      '',
+      '',
+      '', 
+      $cust_pay_batch->payinfo,
+      expdate($cust_pay_batch->exp),
+      $cust_pay_batch->amount,
+      $cust_pay_batch->paybatchnum
+      );
+  },
+# no footer
+);
+
+sub expdate {
+  my $exp = shift;
+  $exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+  my ($mon, $y) = ($2, $1);
+  if($conf->exists('batch-increment_expiration')) {
+    my ($curmon, $curyear) = (localtime(time))[4,5];
+    $curmon++;
+    $curyear -=  100;
+    $y++ while $y < $curyear || ($y == $curyear && $mon < $curmon);
+  }
+  $mon = "0$mon" if $mon =~ /^\d$/;
+  $y = "0$y" if $y =~ /^\d$/;
+  return "$mon$y";
+}
+
+1;
+
-- 
cgit v1.2.1


From 81e426fe755eaea508041bc2d7b25ac44c777434 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 2009 10:14:30 +0000
Subject: nomadix, RT#5876

---
 FS/FS/ClientAPI/Signup.pm | 47 ++++++++++++++++++++++++++++++++++++++---------
 FS/FS/Conf.pm             | 37 +++++++++++++++++++------------------
 FS/FS/svc_acct.pm         |  5 +++--
 3 files changed, 60 insertions(+), 29 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 01c756e3f..c376476c3 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -107,6 +107,8 @@ sub signup_info {
 
       'security_phrase' => $conf->exists('security_phrase'),
 
+      'nomadix' => $conf->exists('signup_server-nomadix'),
+
       'payby' => [ $conf->config('signup_server-payby') ],
 
       'card_types' => card_types(),
@@ -512,14 +514,14 @@ sub new_customer {
   #return { 'error' => $error } if $error;
 
   #should be all auto-magic and shit
-  my $svc;
+  my @svc = ();
   if ( $svc_x eq 'svc_acct' ) {
 
-    $svc = new FS::svc_acct ( {
+    my $svc = new FS::svc_acct {
       'svcpart'   => $svcpart,
       map { $_ => $packet->{$_} }
         qw( username _password sec_phrase popnum ),
-    } );
+    };
 
     my @acct_snarf;
     my $snarfnum = 1;
@@ -536,21 +538,48 @@ sub new_customer {
     }
     $svc->child_objects( \@acct_snarf );
 
+    push @svc, $svc;
+
   } elsif ( $svc_x eq 'svc_phone' ) {
 
-    $svc = new FS::svc_phone ( {
+    my $svc = new FS::svc_phone ( {
       'svcpart' => $svcpart,
        map { $_ => $packet->{$_} }
          qw( countrycode phonenum sip_password pin ),
     } );
 
+    push @svc, $svc;
+
   } else {
     die "unknown signup service $svc_x";
   }
-
-  my $y = $svc->setdefault; # arguably should be in new method
+  my $y = $svc[0]->setdefault; # arguably should be in new method
   return { 'error' => $y } if $y && !ref($y);
 
+  if ($packet->{'mac_addr'} && $conf->exists('signup_server-mac_addr_svcparts'))
+  {
+
+    my %mac_addr_svcparts = map { $_ => 1 }
+                            $conf->config('signup_server-mac_addr_svcparts');
+    my @pkg_svc = grep { $_->quantity && $mac_addr_svcparts{$_->svcpart} }
+                  $cust_pkg->part_pkg->pkg_svc;
+
+    return { 'error' => 'No service defined to assign mac address' }
+      unless @pkg_svc;
+
+    my $svc = new FS::svc_acct {
+      'svcpart'   => $pkg_svc[0]->svcpart, #multiple matches? alas..
+      'username'  => $packet->{'mac_addr'},
+      '_password' => '', #blank as requested (set passwordmin to 0)
+    };
+
+    my $y = $svc->setdefault; # arguably should be in new method
+    return { 'error' => $y } if $y && !ref($y);
+
+    push @svc, $svc;
+
+  }
+
   #$error = $svc->check;
   #return { 'error' => $error } if $error;
 
@@ -564,7 +593,7 @@ sub new_customer {
 
   use Tie::RefHash;
   tie my %hash, 'Tie::RefHash';
-  %hash = ( $cust_pkg => [ $svc ] );
+  %hash = ( $cust_pkg => \@svc );
   #msgcat
   $error = $cust_main->insert(
     \%hash,
@@ -648,9 +677,9 @@ sub new_customer {
                );
 
   if ( $svc_x eq 'svc_acct' ) {
-    $return{$_} = $svc->$_() for qw( username _password );
+    $return{$_} = $svc[0]->$_() for qw( username _password );
   } elsif ( $svc_x eq 'svc_phone' ) {
-    $return{$_} = $svc->$_() for qw( countrycode phonenum sip_password pin );
+    $return{$_} = $svc[0]->$_() for qw( countrycode phonenum sip_password pin );
   } else {
     die "unknown signup service $svc_x";
   }
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bd1c004f4..048f47f42 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1452,22 +1452,23 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'signup_server-default_svcpart',
     'section'     => '',
-    'description' => 'Default svcpart for the signup server - only necessary for services that trigger special provisioning widgets (such as DID provisioning).',
-    'type'        => 'select-sub',
-    'options_sub' => sub { require FS::Record;
-                           require FS::part_svc;
-                           map { $_->svcpart => $_->svc }
-                               FS::Record::qsearch( 'part_svc',
-			                            { 'disabled' => ''}
-						  );
-			 },
-    'option_sub'  => sub { require FS::Record;
-                           require FS::part_svc;
-                           my $part_svc = FS::Record::qsearchs(
-			     'part_svc', { 'svcpart'=>shift }
-			   );
-                           $part_svc ? $part_svc->svc : '';
-			 },
+    'description' => 'Default service definition for the signup server - only necessary for services that trigger special provisioning widgets (such as DID provisioning).',
+    'type'        => 'select-part_svc',
+  },
+
+  {
+    'key'         => 'signup_server-mac_addr_svcparts',
+    'section'     => '',
+    'description' => 'Service definitions which can receive mac addresses (current mapped to username for svc_acct).',
+    'type'        => 'select-part_svc',
+    'multiple'    => 1,
+  },
+
+  {
+    'key'         => 'signup_server-nomadix',
+    'section'     => '',
+    'description' => 'Signup page Nomadix integration',
+    'type'        => 'checkbox',
   },
 
   {
@@ -1866,7 +1867,7 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'svc_www-usersvc_svcpart',
     'section'     => '',
     'description' => 'Allowable service definition svcparts for virtual hosts, one per line.',
-    'type'        => 'textarea',
+    'type'        => 'textarea', #select-part_svc ... multiple
   },
 
   {
@@ -2827,7 +2828,7 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'mcp_svcpart',
     'section'     => '',
     'description' => 'Master Control Program svcpart.  Leave this blank.',
-    'type'        => 'text',
+    'type'        => 'text', #select-part_svc
   },
 
   {
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index e2f79291f..9f54317c6 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -56,7 +56,8 @@ FS::UID->install_callback( sub {
   @shells = $conf->config('shells');
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
-  $passwordmin = $conf->config('passwordmin') || 6;
+  $passwordmin = $conf->config('passwordmin'); # || 6;
+  $passwordmin = ( $passwordmin =~ /\d+/ ) ? $passwordmin : 6; #blank->6, keep 0
   $passwordmax = $conf->config('passwordmax') || 8;
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
@@ -1231,7 +1232,7 @@ sub check {
     #carp "warning: _password_encoding unspecified\n";
 
     #generate a password if it is blank
-    unless ( length( $recref->{_password} ) ) {
+    unless ( length($recref->{_password}) || ! $passwordmin ) {
 
       $recref->{_password} =
         join('',map($pw_set[ int(rand $#pw_set) ], (0..7) ) );
-- 
cgit v1.2.1


From 5f0e4d1d57c18d5bb8a52de4f7d4f519db5327f0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 2009 10:29:29 +0000
Subject: this one too

---
 FS/FS/Conf.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 048f47f42..e7a9c1601 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1867,7 +1867,8 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'svc_www-usersvc_svcpart',
     'section'     => '',
     'description' => 'Allowable service definition svcparts for virtual hosts, one per line.',
-    'type'        => 'textarea', #select-part_svc ... multiple
+    'type'        => 'select-part_svc',
+    'multiple'    => 1,
   },
 
   {
-- 
cgit v1.2.1


From 8800e519dc0e4b8eee4ab2cddc74d52c205bc536 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 25 Sep 2009 12:29:16 +0000
Subject: processing fee on credit card recharges, RT#5889

---
 FS/FS/Conf.pm | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e7a9c1601..d5304afab 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1430,23 +1430,7 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'signup_server-default_pkgpart',
     'section'     => '',
     'description' => 'Default package for the signup server',
-    'type'        => 'select-sub',
-    'options_sub' => sub { require FS::Record;
-                           require FS::part_pkg;
-                           map { $_->pkgpart => $_->pkg.' - '.$_->comment }
-                               FS::Record::qsearch( 'part_pkg',
-			                            { 'disabled' => ''}
-						  );
-			 },
-    'option_sub'  => sub { require FS::Record;
-                           require FS::part_pkg;
-                           my $part_pkg = FS::Record::qsearchs(
-			     'part_pkg', { 'pkgpart'=>shift }
-			   );
-                           $part_pkg
-			     ? $part_pkg->pkg.' - '.$part_pkg->comment
-			     : '';
-			 },
+    'type'        => 'select-part_pkg',
   },
 
   {
@@ -1822,6 +1806,13 @@ worry that config_items is freeside-specific and icky.
     'select_enum' => \@card_types,
   },
 
+  {
+    'key'         => 'manual_process-pkgpart',
+    'section'     => 'billing',
+    'description' => 'Package to add to each manual credit card and ACH payments entered from the backend.  Enabling this option may be in violation of your merchant agreement(s), so please check them carefully before enabling this option.',
+    'type'        => 'select-part_pkg',
+  },
+
   {
     'key'         => 'allow_negative_charges',
     'section'     => 'billing',
@@ -2283,19 +2274,7 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'postal_invoice-fee_pkgpart',
     'section'     => 'billing',
     'description' => 'This allows selection of a package to insert on invoices for customers with postal invoices selected.',
-    'type'        => 'select-sub',
-    'options_sub' => sub { require FS::Record;
-                           require FS::part_pkg;
-			   map { $_->pkgpart => $_->pkg }
-                               FS::Record::qsearch('part_pkg', { disabled=>'' } );
-			 },
-    'option_sub'  => sub { require FS::Record;
-                           require FS::part_pkg;
-			   my $part_pkg = FS::Record::qsearchs(
-			     'part_pkg', { 'pkgpart'=>shift }
-			   );
-                           $part_pkg ? $part_pkg->pkg : '';
-			 },
+    'type'        => 'select-part_pkg',
   },
 
   {
@@ -2607,7 +2586,8 @@ worry that config_items is freeside-specific and icky.
     'key'         => 'support_packages',
     'section'     => '',
     'description' => 'A list of packages eligible for RT ticket time transfer, one pkgpart per line.', #this should really be a select multiple, or specified in the packages themselves...
-    'type'        => 'textarea',
+    'type'        => 'select-part_pkg',
+    'multiple'    => 1,
   },
 
   {
-- 
cgit v1.2.1


From 1425c9ef765b7fe350dafd5534bc70d20a6ff0ee Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 28 Sep 2009 15:55:12 +0000
Subject: use object copy when billing on cancel to avoid very weird side
 effects ( including 'impossible' history ) RT#5723

---
 FS/FS/cust_pkg.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index e7f84845f..e839eb93e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -603,8 +603,9 @@ sub cancel {
   #resolved by performing a change package instead (which unprovisions) and
   #later cancelling
   if ( !$options{nobill} && !$date && $conf->exists('bill_usage_on_cancel') ) {
+      my $copy = $self->new({$self->hash});
       my $error =
-        $self->cust_main->bill( pkg_list => [ $self ], cancel => 1 );
+        $copy->cust_main->bill( pkg_list => [ $copy ], cancel => 1 );
       warn "Error billing during cancel, custnum ".
         #$self->cust_main->custnum. ": $error"
         ": $error"
-- 
cgit v1.2.1


From c658c668af2f141eabaa0b665ff19d1dd7b0c833 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Sep 2009 22:23:22 +0000
Subject: oops, hopefully fix sg cron check, RT#4610

---
 FS/FS/Cron/check.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index b50140ca1..1474c2ca8 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -61,7 +61,7 @@ sub check_sg {
   return 1 if $res->is_success
            && $res->content =~ /OK/;
 
-  $error_msg = $res->is_success ? $res->content : Rres->status_line;
+  $error_msg = $res->is_success ? $res->content : $res->status_line;
   return 0;
 
 }
-- 
cgit v1.2.1


From 6bef62b1c736c51225505143e0f02e6e93aef768 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Sep 2009 22:35:35 +0000
Subject: correct place for use Email::Send, RT#4610

---
 FS/FS/Cron/check.pm   | 1 +
 FS/bin/freeside-check | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index 1474c2ca8..a7903cec4 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -6,6 +6,7 @@ use vars qw( @ISA @EXPORT_OK $DEBUG $FS_RUN $error_msg
            );
 use Exporter;
 use LWP::UserAgent;
+use Email::Send;
 use FS::Conf;
 use FS::Record qw(qsearch);
 use FS::cust_pay_pending;
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index ac2fc3d03..9c9da7646 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -2,7 +2,6 @@
 #!/usr/bin/perl -w
 
 use strict;
-use Email::Send;
 use FS::UID qw( adminsuidsetup );
 use FS::Cron::check qw(
   check_queued check_selfservice check_apache check_bop_failures
@@ -23,8 +22,9 @@ check_selfservice  or alert(error_msg(), @emails);
 check_apache       or alert('Apache not running: '. error_msg(), @emails);
 
 #no-ops unless you are sg
-check_sg           or alert('FS::ClientAPI::SG not responding',   @emails);
-check_sgng         or alert('FS::ClientAPI::SGNG not responding', @emails);
+my $sg = 'FS::ClientAPI::SG';
+check_sg           or alert("$sg not responding: ". error_msg(),     @emails);
+check_sgng         or alert("${sg}NG not responding: ". error_msg(), @emails);
 
 check_bop_failures or alert(error_msg(), @emails);
 
-- 
cgit v1.2.1


From 6b89c9cf7abe900811cac333fa7133f1be0af488 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Sep 2009 22:45:13 +0000
Subject: more accurate SG check, RT#4610

---
 FS/FS/Cron/check.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index a7903cec4..f38cb5f6b 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -60,7 +60,8 @@ sub check_sg {
   my $res = $ua->request($req);
 
   return 1 if $res->is_success
-           && $res->content =~ /OK/;
+           && $res->content =~ /OK/
+           && $res->content !~ /error/i; #doh, the error message includes "OK"
 
   $error_msg = $res->is_success ? $res->content : $res->status_line;
   return 0;
-- 
cgit v1.2.1


From 505d7cbfbaf382a9477e8e754a0b89676c23f5d1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 29 Sep 2009 06:17:50 +0000
Subject: forgot

---
 FS/t/cust_attachment.t | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 FS/t/cust_attachment.t

(limited to 'FS')

diff --git a/FS/t/cust_attachment.t b/FS/t/cust_attachment.t
new file mode 100644
index 000000000..59862040c
--- /dev/null
+++ b/FS/t/cust_attachment.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::cust_attachment;
+$loaded=1;
+print "ok 1\n";
-- 
cgit v1.2.1


From ea771de9552fe4b22d49ecb6b73614cbcc995223 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Oct 2009 00:29:06 +0000
Subject: add login check to FS::ClientAPI::SG/SGNG checks. RT#4610

---
 FS/FS/Conf.pm         |  7 +++++++
 FS/FS/Cron/check.pm   | 29 +++++++++++++++++++++++++++--
 FS/bin/freeside-check |  5 +++--
 3 files changed, 37 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d5304afab..7112417d5 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3006,6 +3006,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'sg-login_username',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'disable-cust-pkg_class',
     'section'     => 'UI',
diff --git a/FS/FS/Cron/check.pm b/FS/FS/Cron/check.pm
index f38cb5f6b..9d3ffbdbd 100644
--- a/FS/FS/Cron/check.pm
+++ b/FS/FS/Cron/check.pm
@@ -6,6 +6,8 @@ use vars qw( @ISA @EXPORT_OK $DEBUG $FS_RUN $error_msg
            );
 use Exporter;
 use LWP::UserAgent;
+use HTTP::Request;
+use URI::Escape;
 use Email::Send;
 use FS::Conf;
 use FS::Record qw(qsearch);
@@ -14,7 +16,7 @@ use FS::cust_pay_pending;
 @ISA = qw( Exporter );
 @EXPORT_OK = qw(
   check_queued check_selfservice check_apache check_bop_failures
-  check_sg check_sgng
+  check_sg check_sg_login check_sgng
   alert error_msg
 );
 
@@ -65,7 +67,30 @@ sub check_sg {
 
   $error_msg = $res->is_success ? $res->content : $res->status_line;
   return 0;
+}
+
+sub check_sg_login {
+  my $conf = new FS::Conf;
+  #different trigger if they ever stop using multicustomer_hack ?
+  return 1 unless $conf->exists('sg-multicustomer_hack');
+
+  my $ua = new LWP::UserAgent;
+  $ua->agent("FreesideCronCheck/0.1 " . $ua->agent);
 
+  my $USER = $conf->config('sg-ping_username');
+  my $PASS = $conf->config('sg-ping_password');
+  my $USERNAME = $conf->config('sg-login_username');
+  my $req = new HTTP::Request
+    GET=>"https://$USER:$PASS\@localhost/sg/start.cgi?".
+         'username='. uri_escape($USERNAME);
+  my $res = $ua->request($req);
+
+  return 1 if $res->is_success
+           && $res->content =~ /[\da-f]{32}/i #session_id
+           && $res->content !~ /error/i;
+
+  $error_msg = $res->is_success ? $res->content : $res->status_line;
+  return 0;
 }
 
 sub check_sgng {
@@ -124,7 +149,7 @@ sub check_apache {
 }
 
 #and now for something entirely different...
-my $num_consecutive_bop_failures = 50;
+my $num_consecutive_bop_failures = 60;
 sub check_bop_failures {
 
   return 1 if grep { $_->statustext eq 'captured' }
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index 9c9da7646..9930aae6c 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -5,7 +5,7 @@ use strict;
 use FS::UID qw( adminsuidsetup );
 use FS::Cron::check qw(
   check_queued check_selfservice check_apache check_bop_failures
-  check_sg check_sgng
+  check_sg check_sg_login check_sgng
   alert error_msg
 );
 
@@ -23,7 +23,8 @@ check_apache       or alert('Apache not running: '. error_msg(), @emails);
 
 #no-ops unless you are sg
 my $sg = 'FS::ClientAPI::SG';
-check_sg           or alert("$sg not responding: ". error_msg(),     @emails);
+check_sg           or alert("$sg not responding: ".     error_msg(), @emails);
+check_sg_login     or alert("$sg login errort: ".       error_msg(), @emails);
 check_sgng         or alert("${sg}NG not responding: ". error_msg(), @emails);
 
 check_bop_failures or alert(error_msg(), @emails);
-- 
cgit v1.2.1


From ccfb9c38501b36179563cb0876c4f9c7ebddf983 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Oct 2009 23:01:10 +0000
Subject: allow svc_acct._password to be NULL in the schema

---
 FS/FS/Schema.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 52af77bf0..4af026c27 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -1441,7 +1441,7 @@ sub tables_hashref {
       'columns' => [
         'svcnum',    'int',    '',   '', '', '', 
         'username',  'varchar',   '',   $username_len, '', '',
-        '_password', 'varchar',   '',  512, '', '',
+        '_password', 'varchar',   'NULL',  512, '', '',
         '_password_encoding', 'varchar', 'NULL', $char_d, '', '',
         'sec_phrase', 'varchar',  'NULL',   $char_d, '', '', 
         'popnum',    'int',    'NULL',   '', '', '', 
-- 
cgit v1.2.1


From e1578c35520ffb7676a4f1fb2b285ce6020db4b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 1 Oct 2009 23:48:55 +0000
Subject: hopefully fully fix bulk email errors when selecting a single payby

---
 FS/FS/cust_main.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9f85e796b..b5a8f0d2e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -8235,6 +8235,9 @@ sub email_search_sql {
 
   my $job = delete $params->{'job'};
 
+  $params->{'payby'} = [ split(/\0/, $params->{'payby'}) ]
+    unless ref($params->{'payby'});
+
   my $sql_query = $class->search_sql($params);
 
   my $count_query   = delete($sql_query->{'count_query'});
@@ -8296,6 +8299,9 @@ sub process_email_search_sql {
 
   $param->{'job'} = $job;
 
+  $param->{'payby'} = [ split(/\0/, $param->{'payby'}) ]
+    unless ref($param->{'payby'});
+
   my $error = FS::cust_main->email_search_sql( $param );
   die $error if $error;
 
-- 
cgit v1.2.1


From 2715e1715d954c0991df079386df6c05cebc1164 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sat, 3 Oct 2009 20:22:19 +0000
Subject: Load XML::Simple at runtime to avoid breakage

---
 FS/FS/pay_batch.pm            | 5 +++--
 FS/FS/pay_batch/paymentech.pm | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index ffa6e200e..83bf7a3dc 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -4,7 +4,6 @@ use strict;
 use vars qw( @ISA $DEBUG %import_info %export_info $conf );
 use Time::Local;
 use Text::CSV_XS;
-use XML::Simple qw(XMLin XMLout);
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_pay;
 use FS::Conf;
@@ -241,11 +240,13 @@ sub import_results {
   # process one line at a time.
 
   if ($filetype eq 'XML') {
+    eval "use XML::Simple";
+    die $@ if $@;
     my @xmlkeys = @{ $info->{'xmlkeys'} };  # for XML
     my $xmlrow  = $info->{'xmlrow'};        # also for XML
 
     # Do everything differently.
-    my $data = XMLin($fh, KeepRoot => 1);
+    my $data = XML::Simple::XMLin($fh, KeepRoot => 1);
     my $rows = $data;
     # $xmlrow = [ RootKey, FirstLevelKey, SecondLevelKey... ]
     $rows = $rows->{$_} foreach( @$xmlrow );
diff --git a/FS/FS/pay_batch/paymentech.pm b/FS/FS/pay_batch/paymentech.pm
index 33a9fda73..44fa78a10 100644
--- a/FS/FS/pay_batch/paymentech.pm
+++ b/FS/FS/pay_batch/paymentech.pm
@@ -6,7 +6,6 @@ use Time::Local;
 use Date::Format 'time2str';
 use Date::Parse 'str2time';
 use FS::Conf;
-use XML::Simple qw(XMLin XMLout);
 
 my $conf;
 my ($bin, $merchantID, $terminalID, $username);
@@ -49,6 +48,9 @@ my %paytype = (
 
 %export_info = (
   init  => sub {
+# Load this at run time
+    eval "use XML::Simple";
+    die $@ if $@;
     my $conf = shift;
     ($bin, $terminalID, $merchantID, $username) =
        $conf->config('batchconfig-paymentech');
@@ -58,7 +60,7 @@ my %paytype = (
     my $pay_batch = shift;
     my @cust_pay_batch = @{(shift)};
     my $count = 0;
-    XMLout( {
+    XML::Simple::XMLout( {
       transRequest => {
         RequestCount => scalar(@cust_pay_batch),
         batchFileID  => {
-- 
cgit v1.2.1


From 3a02e398ce013116c6ee97fc18472a6f40e0798d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Oct 2009 02:09:14 +0000
Subject: delete invoices, RT#4048

---
 FS/FS/AccessRight.pm     |  31 ++++++++++--
 FS/FS/Conf.pm            |   9 +++-
 FS/FS/Setup.pm           |   2 +-
 FS/FS/cust_bill.pm       |  61 +++++++++++++++++++++++-
 FS/FS/cust_bill_pkg.pm   | 120 ++++++++++++++++++++++++++++++++++++++++-------
 FS/bin/freeside-addgroup |   2 +-
 6 files changed, 200 insertions(+), 25 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index fc309fa48..a54d27082 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -150,6 +150,7 @@ tie my %rights, 'Tie::IxHash',
   'Customer invoice / financial info rights' => [
     'View invoices',
     'Resend invoices', #NEWNEW
+    'Delete invoices', #new, but no need to phase in
     'View customer tax exemptions', #yow
     'Add customer tax adjustment', #new, but no need to phase in
     'View customer batched payments', #NEW
@@ -285,14 +286,38 @@ tie my %rights, 'Tie::IxHash',
   
 =item rights
 
-Returns a list of right names.
+Returns the full list of right names.
 
 =cut
   
-  sub rights {
+sub rights {
   #my $class = shift;
   map { ref($_) ? $_->{'rightname'} : $_ } map @{ $rights{$_} }, keys %rights;
-  }
+}
+
+=item default_superuser_rights
+
+Most (but not all) right names.
+
+=cut
+
+sub default_superuser_rights {
+  my $class = shift;
+  my %omit = map { $_=>1 } (
+    'Delete customer',
+    'Delete invoices',
+    'Delete payment',
+    'Delete credit', #?
+    'Delete refund', #?
+    'Time queue',
+    'Redownload resolved batches',
+    'Raw SQL',
+    'Configuration download',
+  );
+
+  no warnings 'uninitialized';
+  grep { ! $omit{$_} } $class->rights;
+}
   
 =item rights_info
 
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7112417d5..3b37feacc 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -728,7 +728,14 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'deletecustomers',
     'section'     => 'UI',
-    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that the customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'deleteinvoices',
+    'section'     => 'UI',
+    'description' => 'Enable invoices deletions.  Be very careful!  Deleting an invoice will remove all traces that the invoice ever existed!  Normally, you would apply a credit against the invoice instead.',  #invoice voiding?
     'type'        => 'checkbox',
   },
 
diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index cba3c7e3c..edfe912ea 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -364,7 +364,7 @@ sub populate_access {
   use FS::AccessRight;
   use FS::access_right;
 
-  foreach my $rightname ( FS::AccessRight->rights ) {
+  foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {
       'righttype'   => 'FS::access_group',
       'rightobjnum' => 1, #$supergroup->groupnum,
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 79f85c807..55faa36bc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -160,7 +160,50 @@ Really, don't use it.
 sub delete {
   my $self = shift;
   return "Can't delete closed invoice" if $self->closed =~ /^Y/i;
-  $self->SUPER::delete(@_);
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $table (qw(
+    cust_bill_event
+    cust_event
+    cust_credit_bill
+    cust_bill_pay
+    cust_bill_pay
+    cust_credit_bill
+    cust_pay_batch
+    cust_bill_pay_batch
+    cust_bill_pkg
+  )) {
+
+    foreach my $linked ( $self->$table() ) {
+      my $error = $linked->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+
+  }
+
+  my $error = $self->SUPER::delete(@_);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
 }
 
 =item replace OLD_RECORD
@@ -460,6 +503,16 @@ sub cust_pay {
   #;
 }
 
+sub cust_pay_batch {
+  my $self = shift;
+  qsearch('cust_pay_batch', { 'invnum' => $self->invnum } );
+}
+
+sub cust_bill_pay_batch {
+  my $self = shift;
+  qsearch('cust_bill_pay_batch', { 'invnum' => $self->invnum } );
+}
+
 =item cust_bill_pay
 
 Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.
@@ -474,6 +527,8 @@ sub cust_bill_pay {
 
 =item cust_credited
 
+=item cust_credit_bill
+
 Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice.
 
 =cut
@@ -485,6 +540,10 @@ sub cust_credited {
   ;
 }
 
+sub cust_credit_bill {
+  shift->cust_credited(@_);
+}
+
 =item cust_bill_pay_pkgnum PKGNUM
 
 Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 96f09c915..9d7aae23c 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -1,7 +1,7 @@
 package FS::cust_bill_pkg;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use vars qw( @ISA $DEBUG $me );
 use FS::Record qw( qsearch qsearchs dbdef dbh );
 use FS::cust_main_Mixin;
 use FS::cust_pkg;
@@ -12,10 +12,14 @@ use FS::cust_bill_pkg_display;
 use FS::cust_bill_pay_pkg;
 use FS::cust_credit_bill_pkg;
 use FS::cust_tax_exempt_pkg;
+use FS::cust_bill_pkg_tax_location;
+use FS::cust_bill_pkg_tax_rate_location;
+use FS::cust_tax_adjustment;
 
 @ISA = qw( FS::cust_main_Mixin FS::Record );
 
-$DEBUG = 0;
+$DEBUG = 2;
+$me = '[FS::cust_bill_pkg]';
 
 =head1 NAME
 
@@ -40,30 +44,57 @@ supported:
 
 =over 4
 
-=item billpkgnum - primary key
+=item billpkgnum
 
-=item invnum - invoice (see L<FS::cust_bill>)
+primary key
 
-=item pkgnum - package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package, or -1 for the virtual line item (itemdesc is used for the line)
+=item invnum
 
-=item pkgpart_override - optional package definition (see L<FS::part_pkg>) override
-=item setup - setup fee
+invoice (see L<FS::cust_bill>)
 
-=item recur - recurring fee
+=item pkgnum
 
-=item sdate - starting date of recurring fee
+package (see L<FS::cust_pkg>) or 0 for the special virtual sales tax package, or -1 for the virtual line item (itemdesc is used for the line)
 
-=item edate - ending date of recurring fee
+=item pkgpart_override
 
-=item itemdesc - Line item description (overrides normal package description)
+optional package definition (see L<FS::part_pkg>) override
 
-=item quantity - If not set, defaults to 1
+=item setup
 
-=item unitsetup - If not set, defaults to setup
+setup fee
 
-=item unitrecur - If not set, defaults to recur
+=item recur
 
-=item hidden - If set to Y, indicates data should not appear as separate line item on invoice
+recurring fee
+
+=item sdate
+
+starting date of recurring fee
+
+=item edate
+
+ending date of recurring fee
+
+=item itemdesc
+
+Line item description (overrides normal package description)
+
+=item quantity
+
+If not set, defaults to 1
+
+=item unitsetup
+
+If not set, defaults to setup
+
+=item unitrecur
+
+If not set, defaults to recur
+
+=item hidden
+
+If set to Y, indicates data should not appear as separate line item on invoice
 
 =back
 
@@ -196,13 +227,65 @@ sub insert {
 
 =item delete
 
-Currently unimplemented.  I don't remove line items because there would then be
-no record the items ever existed (which is bad, no?)
+Not recommended.
 
 =cut
 
 sub delete {
-  return "Can't delete cust_bill_pkg records!";
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  foreach my $table (qw(
+    cust_bill_pkg_detail
+    cust_bill_pkg_display
+    cust_bill_pkg_tax_location
+    cust_bill_pkg_tax_rate_location
+    cust_tax_exempt_pkg
+    cust_bill_pay_pkg
+    cust_credit_bill_pkg
+  )) {
+
+    foreach my $linked ( qsearch($table, { billpkgnum=>$self->billpkgnum }) ) {
+      my $error = $linked->delete;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return $error;
+      }
+    }
+
+  }
+
+  foreach my $cust_tax_adjustment (
+    qsearch('cust_tax_adjustment', { billpkgnum=>$self->billpkgnum })
+  ) {
+    $cust_tax_adjustment->billpkgnum(''); #NULL
+    my $error = $cust_tax_adjustment->replace;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  my $error = $self->SUPER::delete(@_);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
 }
 
 #alas, bin/follow-tax-rename
@@ -263,6 +346,7 @@ Returns the package (see L<FS::cust_pkg>) for this invoice line item.
 
 sub cust_pkg {
   my $self = shift;
+  warn "$me $self -> cust_pkg";
   qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
 }
 
diff --git a/FS/bin/freeside-addgroup b/FS/bin/freeside-addgroup
index 7b30f7d95..25c23455a 100755
--- a/FS/bin/freeside-addgroup
+++ b/FS/bin/freeside-addgroup
@@ -24,7 +24,7 @@ my $error = $access_group->insert;
 die $error if $error;
 
 if ( $opt_s ) {
-  foreach my $rightname ( FS::AccessRight->rights ) {
+  foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {
       'righttype'   => 'FS::access_group',
       'rightobjnum' => $access_group->groupnum,
-- 
cgit v1.2.1


From df7872c42e90569d6fd6113920ca4b3e1266bb80 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 4 Oct 2009 23:31:03 +0000
Subject: fix problems "re-saving" a masked card.  hopefully the last of it!

---
 FS/FS/ClientAPI/MyAccount.pm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 73d27b544..26cd76f79 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -368,7 +368,8 @@ sub edit_info {
 
     $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
 
-  }elsif ( $payby =~ /^(CHEK|DCHK)$/ ) {
+  } elsif ( $payby =~ /^(CHEK|DCHK)$/ ) {
+
     my $payinfo;
     $p->{'payinfo1'} =~ /^([\dx]+)$/
       or return { 'error' => "illegal account number ". $p->{'payinfo1'} };
@@ -378,15 +379,15 @@ sub edit_info {
     my $payinfo2 = $1;
     $payinfo = $payinfo1. '@'. $payinfo2;
 
-    if ( $payinfo eq $cust_main->paymask ) {
-      $new->payinfo($cust_main->payinfo);
-    } else {
-      $new->payinfo($payinfo);
-    }
+    $new->payinfo( ($payinfo eq $cust_main->paymask)
+                     ? $cust_main->payinfo
+                     : $payinfo
+                 );
 
     $new->set( 'payby' => $p->{'auto'} ? 'CHEK' : 'DCHK' );
 
-  }elsif ( $payby =~ /^(BILL)$/ ) {
+  } elsif ( $payby =~ /^(BILL)$/ ) {
+    #no-op
   } elsif ( $payby ) {  #notyet ready
     return { 'error' => "unknown payby $payby" };
   }
@@ -569,6 +570,8 @@ sub process_payment {
    
     $payinfo = $p->{'payinfo'};
 
+    #more intelligent mathing will be needed here if you change
+    #card_masking_method and don't remove existing paymasks
     $payinfo = $cust_main->payinfo
       if $cust_main->paymask eq $payinfo;
 
@@ -622,16 +625,16 @@ sub process_payment {
     my $new = new FS::cust_main { $cust_main->hash };
     if ($payby eq 'CARD' || $payby eq 'DCRD') {
       $new->set( $_ => $p->{$_} )
-        foreach qw( payinfo payname paystart_month paystart_year payissue payip
+        foreach qw( payname paystart_month paystart_year payissue payip
                     address1 address2 city state zip country );
       $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
     } elsif ($payby eq 'CHEK' || $payby eq 'DCHK') {
       $new->set( $_ => $p->{$_} )
         foreach qw( payname payip paytype paystate
                     stateid stateid_state );
-      $new->set( 'payinfo' => $payinfo );
       $new->set( 'payby' => $p->{'auto'} ? 'CHEK' : 'DCHK' );
     }
+    $new->set( 'payinfo' => $payinfo );
     $new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
     my $error = $new->replace($cust_main);
     return { 'error' => $error } if $error;
-- 
cgit v1.2.1


From 947c1f964f1304242f8a6ffabacccf040f1d505e Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 5 Oct 2009 00:49:34 +0000
Subject: leading summary page invoices #RT5086

---
 FS/FS/Conf.pm                                    |  42 ++++++++
 FS/FS/Schema.pm                                  |   3 +
 FS/FS/Upgrade.pm                                 |   3 +
 FS/FS/cust_bill.pm                               | 129 ++++++++++++++++++++---
 FS/FS/cust_bill_pkg.pm                           |   5 +-
 FS/FS/cust_bill_pkg_display.pm                   |   7 +-
 FS/FS/cust_main.pm                               |  37 ++++++-
 FS/FS/part_event/Action/cust_bill_fee_percent.pm |   3 +
 FS/FS/part_event/Action/fee.pm                   |   3 +
 FS/FS/pkg_category.pm                            |  35 +++++-
 10 files changed, 248 insertions(+), 19 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 3b37feacc..1353df898 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -891,6 +891,13 @@ worry that config_items is freeside-specific and icky.
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'invoice_usesummary',
+    'section'     => 'billing',
+    'description' => 'Indicates that html and latex invoices should be in summary style and make use of invoice_latexsummary.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'invoice_template',
     'section'     => 'billing',
@@ -922,6 +929,14 @@ worry that config_items is freeside-specific and icky.
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'invoice_htmlsummary',
+    'section'     => 'billing',
+    'description' => 'Summary initial page for HTML invoices.',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'invoice_htmlreturnaddress',
     'section'     => 'billing',
@@ -952,6 +967,14 @@ worry that config_items is freeside-specific and icky.
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'invoice_latexsummary',
+    'section'     => 'billing',
+    'description' => 'Summary initial page for LaTeX typeset PostScript invoices.',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'invoice_latexcoupon',
     'section'     => 'billing',
@@ -1005,6 +1028,25 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'finance_pkgclass',
+    'section'     => 'billing',
+    'description' => 'The package class for finance charges',
+    'type'        => 'select-sub',
+    'options_sub' => sub { require FS::Record;
+                           require FS::pkg_class;
+                           map { $_->classnum => $_->classname }
+                               FS::Record::qsearch('pkg_class', {} );
+		         },
+    'option_sub'  => sub { require FS::Record;
+                           require FS::pkg_class;
+                           my $pkg_class = FS::Record::qsearchs(
+			     'pkg_class', { 'classnum'=>shift }
+			   );
+                           $pkg_class ? $pkg_class->classname : '';
+			 },
+  },
+
   { 
     'key'         => 'separate_usage',
     'section'     => 'billing',
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 4af026c27..70f32502b 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -394,6 +394,8 @@ sub tables_hashref {
         'custnum',      'int',     '', '', '', '', 
         '_date',        @date_type,        '', '', 
         'charged',      @money_type,       '', '', 
+        'previous_balance',   @money_typen, '', '',  #eventually not nullable
+        'billing_balance',    @money_typen, '', '',  #eventually not nullable
         'printed',      'int',     '', '', '', '', 
         'closed',      'char', 'NULL',  1, '', '', 
         'statementnum', 'int', 'NULL', '', '', '',
@@ -2073,6 +2075,7 @@ sub tables_hashref {
       'columns' => [
         'categorynum',   'serial',  '', '', '', '', 
         'categoryname',  'varchar', '', $char_d, '', '', 
+        'weight',         'int', 'NULL',  '', '', '',
         'disabled',      'char', 'NULL',   1, '', '', 
       ],
       'primary_key' => 'categorynum',
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 7aecf45d8..e5cd5d32b 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -135,6 +135,9 @@ sub upgrade_data {
     #change recur_flat and enable_prorate
     'part_pkg_option' => [],
 
+    #add weights to pkg_category
+    'pkg_category' => [],
+
   ;
 
   \%hash;
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 55faa36bc..eefcc80bc 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1968,6 +1968,7 @@ sub print_generic {
                  'smallfooter'   => sub { map "$_", @_ },
                  'returnaddress' => sub { map "$_", @_ },
                  'coupon'        => sub { map "$_", @_ },
+                 'summary'       => sub { map "$_", @_ },
                },
     'html'  => {
                  'notes' =>
@@ -2001,6 +2002,7 @@ sub print_generic {
                      }  @_
                    },
                  'coupon'        => sub { "" },
+                 'summary'       => sub { "" },
                },
     'template' => {
                  'notes' =>
@@ -2031,6 +2033,7 @@ sub print_generic {
                      }  @_
                    },
                  'coupon'        => sub { "" },
+                 'summary'       => sub { "" },
                },
   );
 
@@ -2147,6 +2150,14 @@ sub print_generic {
     'unitprices'      => $conf->exists('invoice-unitprice'),
   );
 
+  $invoice_data{finance_section} = '';
+  if ( $conf->config('finance_pkgclass') ) {
+    my $pkg_class =
+      qsearchs('pkg_class', { classnum => $conf->config('finance_pkgclass') });
+    $invoice_data{finance_section} = $pkg_class->categoryname;
+  } 
+ $invoice_data{finance_amount} = '0.00';
+
   my $countrydefault = $conf->config('countrydefault') || 'US';
   my $prefix = $cust_main->has_ship_address ? 'ship_' : '';
   foreach ( qw( contact company address1 address2 city state zip country fax) ){
@@ -2193,11 +2204,19 @@ sub print_generic {
 #  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
   #my $balance_due = $self->owed + $pr_total - $cr_total;
   my $balance_due = $self->owed + $pr_total;
+  $invoice_data{'true_previous_balance'} = sprintf("%.2f", $self->previous_balance);
+  $invoice_data{'balance_adjustments'} = sprintf("%.2f", $self->previous_balance - $self->billing_balance);
   $invoice_data{'previous_balance'} = sprintf("%.2f", $pr_total);
   $invoice_data{'balance'} = sprintf("%.2f", $balance_due);
 
   my $agentnum = $self->cust_main->agentnum;
 
+  my $summarypage = '';
+  if ( $conf->exists('invoice_usesummary', $agentnum) ) {
+    $summarypage = 1;
+  }
+  $invoice_data{'summarypage'} = $summarypage;
+
   #do variable substitution in notes, footer, smallfooter
   foreach my $include (qw( notes footer smallfooter coupon )) {
 
@@ -2257,6 +2276,7 @@ sub print_generic {
                             'template' => '',
                           );
   my $other_money_char = $other_money_chars{$format};
+  $invoice_data{'dollar'} = $other_money_char;
 
   my @detail_items = ();
   my @total_items = ();
@@ -2271,21 +2291,27 @@ sub print_generic {
   my $previous_section = { 'description' => 'Previous Charges',
                            'subtotal'    => $other_money_char.
                                             sprintf('%.2f', $pr_total),
+                           'summarized'  => $summarypage ? 'Y' : '',
                          };
 
   my $taxtotal = 0;
   my $tax_section = { 'description' => 'Taxes, Surcharges, and Fees',
-                      'subtotal'    => $taxtotal }; # adjusted below
+                      'subtotal'    => $taxtotal,   # adjusted below
+                      'summarized'  => $summarypage ? 'Y' : '',
+                    };
 
   my $adjusttotal = 0;
   my $adjust_section = { 'description' => 'Credits, Payments, and Adjustments',
-                         'subtotal'    => 0 }; # adjusted below
+                         'subtotal'    => 0,   # adjusted below
+                         'summarized'  => $summarypage ? 'Y' : '',
+                       };
 
   my $unsquelched = $params{unsquelch_cdr} || $cust_main->squelch_cdr ne 'Y';
   my $multisection = $conf->exists('invoice_sections', $cust_main->agentnum);
   my $late_sections = [];
   if ( $multisection ) {
-    push @sections, $self->_items_sections( $late_sections );
+    push @sections,
+      $self->_items_sections( $late_sections, $summarypage, $escape_function );
   }else{
     push @sections, { 'description' => '', 'subtotal' => '' };
   }
@@ -2330,6 +2356,10 @@ sub print_generic {
 
   foreach my $section (@sections, @$late_sections) {
 
+    $invoice_data{finance_amount} = sprintf('%.2f', $section->{'subtotal'} )
+      if ( $invoice_data{finance_section} &&
+           $section->{'description'} eq $invoice_data{finance_section} );
+
     $section->{'subtotal'} = $other_money_char.
                              sprintf('%.2f', $section->{'subtotal'})
       if $multisection;
@@ -2346,6 +2376,7 @@ sub print_generic {
     $options{'escape_function'} = $escape_function;
     $options{'format_function'} = sub { () } unless $unsquelched;
     $options{'unsquelched'} = $unsquelched;
+    $options{'summary_page'} = $summarypage;
 
     foreach my $line_item ( $self->_items_pkg(%options) ) {
       my $detail = {
@@ -2384,6 +2415,9 @@ sub print_generic {
   
   }
   
+  $invoice_data{current_less_finance} =
+    sprintf('%.2f', $self->charged - $invoice_data{finance_amount} );
+
   if ( $multisection && !$conf->exists('disable_previous_balance') ) {
     unshift @sections, $previous_section if $pr_total;
   }
@@ -2555,7 +2589,11 @@ sub print_generic {
       $total->{'total_item'} = &$embolden_function($self->balance_due_msg);
       $total->{'total_amount'} =
         &$embolden_function(
-          $other_money_char. sprintf('%.2f', $self->owed + $pr_total )
+          $other_money_char. sprintf('%.2f', $summarypage 
+                                               ? $self->charged +
+                                                 $self->billing_balance
+                                               : $self->owed + $pr_total
+                                    )
         );
       if ( $multisection ) {
         $adjust_section->{'posttotal'} = $total->{'total_item'}. ' '.
@@ -2574,6 +2612,49 @@ sub print_generic {
       if $unsquelched;
   }
 
+  my @includelist = ();
+  push @includelist, 'summary' if $summarypage;
+  foreach my $include ( @includelist ) {
+
+    my $inc_file = $conf->key_orbase("invoice_${format}$include", $template);
+    my @inc_src;
+
+    if ( length( $conf->config($inc_file, $agentnum) ) ) {
+
+      @inc_src = $conf->config($inc_file, $agentnum);
+
+    } else {
+
+      $inc_file = $conf->key_orbase("invoice_latex$include", $template);
+
+      my $convert_map = $convert_maps{$format}{$include};
+
+      @inc_src = map { s/\[\@--/$delimiters{$format}[0]/g;
+                       s/--\@\]/$delimiters{$format}[1]/g;
+                       $_;
+                     } 
+                 &$convert_map( $conf->config($inc_file, $agentnum) );
+
+    }
+
+    my $inc_tt = new Text::Template (
+      TYPE       => 'ARRAY',
+      SOURCE     => [ map "$_\n", @inc_src ],
+      DELIMITERS => $delimiters{$format},
+    ) or die "Can't create new Text::Template object: $Text::Template::ERROR";
+
+    unless ( $inc_tt->compile() ) {
+      my $error = "Can't compile $inc_file template: $Text::Template::ERROR\n";
+      warn $error. "Template:\n". join('', map "$_\n", @inc_src);
+      die $error;
+    }
+
+    $invoice_data{$include} = $inc_tt->fill_in( HASH => \%invoice_data );
+
+    $invoice_data{$include} =~ s/\n+$//
+      if ($format eq 'latex');
+  }
+
   $invoice_lines = 0;
   my $wasfunc = 0;
   foreach ( grep /invoice_lines\(\d*\)/, @invoice_template ) { #kludgy
@@ -2850,21 +2931,30 @@ sub _date_pretty {
 sub _items_sections {
   my $self = shift;
   my $late = shift;
+  my $summarypage = shift;
+  my $escape = shift;
 
   my %s = ();
   my %l = ();
+  my %not_tax = ();
 
   foreach my $cust_bill_pkg ( $self->cust_bill_pkg )
   {
 
-    if ( $cust_bill_pkg->pkgnum > 0 ) {
+
       my $usage = $cust_bill_pkg->usage;
 
       foreach my $display ($cust_bill_pkg->cust_bill_pkg_display) {
+        next if ( $display->summary && $summarypage );
+
         my $desc = $display->section;
         my $type = $display->type;
 
-        if ( $display->post_total ) {
+        if ( $cust_bill_pkg->pkgnum > 0 ) {
+          $not_tax{$desc} = 1;
+        }
+
+        if ( $display->post_total && !$summarypage ) {
           if (! $type || $type eq 'S') {
             $l{$desc} += $cust_bill_pkg->setup
               if ( $cust_bill_pkg->setup != 0 );
@@ -2908,16 +2998,29 @@ sub _items_sections {
 
       }
 
-    }
-
   }
 
-  push @$late, map { { 'description' => $_,
+  my %cache = map { $_->categoryname => $_ }
+              qsearch( 'pkg_category', {disabled => 'Y'} );
+  $cache{$_->categoryname} = $_
+    foreach qsearch( 'pkg_category', {disabled => ''} );
+
+  push @$late, map { { 'description' => &{$escape}($_),
                        'subtotal'    => $l{$_},
                        'post_total'  => 1,
-                   } } sort keys %l;
-
-  map { {'description' => $_, 'subtotal' => $s{$_}} } sort keys %s;
+                   } }
+                 sort { $cache{$a}->weight <=> $cache{$b}->weight } keys %l;
+
+  map { { 'description' => &{$escape}($_),
+          'subtotal'    => $s{$_},
+          'summarized'  => $not_tax{$_} ? '' : 'Y',
+          'tax_section' => $not_tax{$_} ? '' : 'Y',
+      } }
+    sort { $cache{$a}->weight <=> $cache{$b}->weight }
+    ( $summarypage
+        ? ( grep { exists($s{$_}) || !$cache{$_}->disabled } keys %cache )
+        : ( keys %s )
+    );
 
 }
 
@@ -2999,6 +3102,7 @@ sub _items_cust_bill_pkg {
   my $format_function = $opt{format_function} || '';
   my $unsquelched = $opt{unsquelched} || '';
   my $section = $opt{section}->{description} if $opt{section};
+  my $summary_page = $opt{summary_page} || '';
 
   my @b = ();
   my ($s, $r, $u) = ( undef, undef, undef );
@@ -3018,6 +3122,7 @@ sub _items_cust_bill_pkg {
                                  ? $_->section eq $section
                                  : 1
                                }
+                          grep { $_->summary || !$summary_page }
                           $cust_bill_pkg->cust_bill_pkg_display
                         )
     {
diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 9d7aae23c..c8c242eb0 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -361,7 +361,10 @@ sub part_pkg {
   if ( $self->pkgpart_override ) {
     qsearchs('part_pkg', { 'pkgpart' => $self->pkgpart_override } );
   } else {
-    $self->cust_pkg->part_pkg;
+    my $part_pkg;
+    my $cust_pkg = $self->cust_pkg;
+    $part_pkg = $cust_pkg->part_pkg if $cust_pkg;
+    $part_pkg;
   }
 }
 
diff --git a/FS/FS/cust_bill_pkg_display.pm b/FS/FS/cust_bill_pkg_display.pm
index 93c6e87d6..cf70cbd8f 100644
--- a/FS/FS/cust_bill_pkg_display.pm
+++ b/FS/FS/cust_bill_pkg_display.pm
@@ -52,7 +52,12 @@ sub section {
   if ( defined($value) ) {
     $self->setfield('section', $value);
   } else {
-    $self->getfield('section') || $self->cust_bill_pkg->part_pkg->categoryname;
+    my $section = $self->getfield('section');
+    unless ($section) {
+      my $part_pkg = $self->cust_bill_pkg->part_pkg;
+      $section = $part_pkg->categoryname if $part_pkg;
+    }
+    $section;
   }
 }
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b5a8f0d2e..16ab0ee0d 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2717,6 +2717,23 @@ sub bill {
     $tax = sprintf('%.2f', $tax );
     $total_setup = sprintf('%.2f', $total_setup+$tax );
   
+    my $pkg_category = qsearchs( 'pkg_category', { 'categoryname' => $taxname,
+                                                   'disabled'     => '',
+                                                 },
+                               );
+
+    my @display = ();
+    if ( $pkg_category and
+         $conf->config('invoice_latexsummary') ||
+         $conf->config('invoice_htmlsummary')
+       )
+    {
+
+      my %hash = (  'section' => $pkg_category->categoryname );
+      push @display, new FS::cust_bill_pkg_display { type => 'S', %hash };
+
+    }
+
     push @cust_bill_pkg, new FS::cust_bill_pkg {
       'pkgnum'   => 0,
       'setup'    => $tax,
@@ -2724,6 +2741,7 @@ sub bill {
       'sdate'    => '',
       'edate'    => '',
       'itemdesc' => $taxname,
+      'display'  => \@display,
       'cust_bill_pkg_tax_location' => \@cust_bill_pkg_tax_location,
       'cust_bill_pkg_tax_rate_location' => \@cust_bill_pkg_tax_rate_location,
     };
@@ -2761,11 +2779,24 @@ sub bill {
 
   my $charged = sprintf('%.2f', $total_setup + $total_recur );
 
+  my @cust_bill = $self->cust_bill;
+  my $balance = $self->balance;
+  my $previous_balance = scalar(@cust_bill)
+                           ?  $cust_bill[$#cust_bill]->billing_balance
+                           :  0;
+
+  $previous_balance += $cust_bill[$#cust_bill]->charged
+    if scalar(@cust_bill);
+  #my $balance_adjustments =
+  #  sprintf('%.2f', $balance - $prior_prior_balance - $prior_charged);
+
   #create the new invoice
   my $cust_bill = new FS::cust_bill ( {
-    'custnum' => $self->custnum,
-    '_date'   => ( $invoice_time ),
-    'charged' => $charged,
+    'custnum'             => $self->custnum,
+    '_date'               => ( $invoice_time ),
+    'charged'             => $charged,
+    'billing_balance'     => $balance,
+    'previous_balance'    => $previous_balance,
   } );
   $error = $cust_bill->insert;
   if ( $error ) {
diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index c85339398..b0397d421 100644
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -31,6 +31,8 @@ sub do_action {
   #my $cust_main = $self->cust_main($cust_bill);
   my $cust_main = $cust_bill->cust_main;
 
+  my $conf = new FS::Conf;
+
   my $amount =
     sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 );
 
@@ -38,6 +40,7 @@ sub do_action {
     'amount'   => $amount,
     'pkg'      => $self->option('reason'),
     'taxclass' => $self->option('taxclass'),
+    'classnum'   => $conf->config('finance_pkgclass'),
     'setuptax' => $self->option('setuptax'),
   );
 
diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index c700301e2..163b4fa24 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -26,10 +26,13 @@ sub do_action {
 
   my $cust_main = $self->cust_main($cust_object);
 
+  my $conf = new FS::Conf;
+
   my %charge = (
     'amount'   => $self->option('charge'),
     'pkg'      => $self->option('reason'),
     'taxclass' => $self->option('taxclass'),
+    'classnum' => $conf->config('finance_pkgclass'),
     'setuptax' => $self->option('setuptax'),
   );
 
diff --git a/FS/FS/pkg_category.pm b/FS/FS/pkg_category.pm
index 69578c9cf..0beaf1c11 100644
--- a/FS/FS/pkg_category.pm
+++ b/FS/FS/pkg_category.pm
@@ -1,11 +1,13 @@
 package FS::pkg_category;
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch );
+use vars qw( @ISA $me $DEBUG );
+use FS::Record qw( qsearch dbh );
 use FS::part_pkg;
 
 @ISA = qw( FS::Record );
+$DEBUG = 0;
+$me = '[FS::pkg_category]';
 
 =head1 NAME
 
@@ -95,10 +97,39 @@ sub check {
 
   $self->ut_numbern('categorynum')
   or $self->ut_text('categoryname')
+  or $self->ut_snumber('weight')
   or $self->SUPER::check;
 
 }
 
+# _ upgrade_data
+#
+# Used by FS::Upgrade to migrate to a new database.
+#
+#
+
+sub _upgrade_data {
+  my ($class, %opts) = @_;
+  my $dbh = dbh;
+
+  warn "$me upgrading $class\n" if $DEBUG;
+
+  my @pkg_category =
+    qsearch('pkg_category', { weight => { op => '!=', value => '' } } );
+
+  unless( scalar(@pkg_category) ) {
+    my @pkg_category = qsearch('pkg_category', {} );
+    my $weight = 0;
+    foreach ( sort { $a->description cmp $b->description } @pkg_category ) {
+      $_->weight($weight);
+      my $error = $_->replace;
+      die "error setting pkg_category weight: $error\n" if $error;
+      $weight += 10;
+    }
+  }
+  '';
+}
+
 =back
 
 =head1 BUGS
-- 
cgit v1.2.1


From 3b53cfb49162c9a1f32027b67ba4cbe86d65d3e5 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 5 Oct 2009 01:00:32 +0000
Subject: invoices with details in separate section but usage not separated

---
 FS/FS/cust_bill.pm         |  5 +++--
 FS/FS/cust_main.pm         | 22 +++++++++++++++++-----
 FS/FS/part_pkg/voip_cdr.pm |  8 ++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index eefcc80bc..57066b474 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3179,7 +3179,8 @@ sub _items_cust_bill_pkg {
         {
 
           my $is_summary = $display->summary;
-          my $description = $is_summary ? "Usage charges" : $desc;
+          my $description = ($is_summary && $type && $type eq 'U')
+                            ? "Usage charges" : $desc;
 
           unless ( $conf->exists('disable_line_item_date_ranges') ) {
             $description .= " (" . time2str("%x", $cust_bill_pkg->sdate).
@@ -3201,7 +3202,7 @@ sub _items_cust_bill_pkg {
             unless $cust_pkg->part_pkg->hide_svc_detail
                 || $cust_bill_pkg->itemdesc
                 || $cust_bill_pkg->hidden
-                || $is_summary;
+                || $is_summary && $type && $type eq 'U';
 
           push @d, $cust_bill_pkg->details(%details_opt)
             unless ($is_summary || $type && $type eq 'R');
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 16ab0ee0d..501fca45a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3147,7 +3147,9 @@ sub _handle_taxes {
   }
  
   my @display = ();
-  if ( $conf->exists('separate_usage') || $cust_bill_pkg->hidden ) {
+  my $separate = $conf->exists('separate_usage');
+  my $usage_mandate = $cust_pkg->part_pkg->option('usage_mandate', 'Hush!');
+  if ( $separate || $cust_bill_pkg->hidden || $usage_mandate ) {
 
     my $temp_pkg = new FS::cust_pkg { pkgpart => $real_pkgpart };
     my %hash = $cust_bill_pkg->hidden  # maybe for all bill linked?
@@ -3156,18 +3158,28 @@ sub _handle_taxes {
 
     my $section = $cust_pkg->part_pkg->option('usage_section', 'Hush!');
     my $summary = $cust_pkg->part_pkg->option('summarize_usage', 'Hush!');
-    push @display, new FS::cust_bill_pkg_display { type => 'S', %hash };
-    push @display, new FS::cust_bill_pkg_display { type => 'R', %hash };
+    if ( $separate ) {
+      push @display, new FS::cust_bill_pkg_display { type => 'S', %hash };
+      push @display, new FS::cust_bill_pkg_display { type => 'R', %hash };
+    } else {
+      push @display, new FS::cust_bill_pkg_display
+                       { type => '',
+                         %hash,
+                         ( ( $usage_mandate ) ? ( 'summary' => 'Y' ) : () ),
+                       };
+    }
 
-    if ($section && $summary) {
+    if ($separate && $section && $summary) {
       push @display, new FS::cust_bill_pkg_display { type    => 'U',
                                                      summary => 'Y',
                                                      %hash,
                                                    };
+    }
+    if ($usage_mandate || $section && $summary) {
       $hash{post_total} = 'Y';
     }
 
-    $hash{section} = $section if $conf->exists('separate_usage');
+    $hash{section} = $section if ($separate || $usage_mandate);
     push @display, new FS::cust_bill_pkg_display { type => 'U', %hash };
 
   }
diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index f851b41d9..eccf2c19f 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -163,12 +163,16 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                          'default'        => 'default', #XXX test
                        },
 
-    'usage_section' => { 'name' => 'Section in which to place separate usage charges',
+    'usage_section' => { 'name' => 'Section in which to place usage charges (whether separated or not)',
                        },
 
     'summarize_usage' => { 'name' => 'Include usage summary with recurring charges when usage is in separate section',
                           'type' => 'checkbox',
                         },
+
+    'usage_mandate' => { 'name' => 'Always put usage details in separate section',
+                          'type' => 'checkbox',
+                       },
     #eofalse
 
     'bill_every_call' => { 'name' => 'Generate an invoice immediately for every call.  Useful for prepaid.',
@@ -218,7 +222,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
                        skip_dst_length_less skip_lastapp
                        use_duration
                        411_rewrite
-                       output_format summarize_usage usage_section
+                       output_format usage_mandate summarize_usage usage_section
                        bill_every_call
                        count_available_phones
                      )
-- 
cgit v1.2.1


From 23c040e33756559d49cf9b66d9c19a3a9d29d9c0 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 5 Oct 2009 01:07:45 +0000
Subject: don't consider setup or recurring taxes when billing usage on cancel

---
 FS/FS/cust_main.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 501fca45a..d61ebd21e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -3036,7 +3036,7 @@ sub _make_lines {
       ###
 
       my $error = 
-        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time}, $real_pkgpart);
+        $self->_handle_taxes($part_pkg, $taxlisthash, $cust_bill_pkg, $cust_pkg, $options{invoice_time}, $real_pkgpart, \%options);
       return $error if $error;
 
       push @$cust_bill_pkgs, $cust_bill_pkg;
@@ -3057,6 +3057,7 @@ sub _handle_taxes {
   my $cust_pkg = shift;
   my $invoice_time = shift;
   my $real_pkgpart = shift;
+  my $options = shift;
 
   my %cust_bill_pkg = ();
   my %taxes = ();
@@ -3064,8 +3065,8 @@ sub _handle_taxes {
   my @classes;
   #push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->type eq 'U';
   push @classes, $cust_bill_pkg->usage_classes if $cust_bill_pkg->usage;
-  push @classes, 'setup' if $cust_bill_pkg->setup;
-  push @classes, 'recur' if $cust_bill_pkg->recur;
+  push @classes, 'setup' if ($cust_bill_pkg->setup && !$options->{cancel});
+  push @classes, 'recur' if ($cust_bill_pkg->recur && !$options->{cancel});
 
   if ( $self->tax !~ /Y/i && $self->payby ne 'COMP' ) {
 
-- 
cgit v1.2.1


From 0c2679eee18b3b073bc91657fcf85c5dd2e5efc0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Oct 2009 02:16:46 +0000
Subject: add manual_process-display config to subtract fee from amount instead
 of adding, RT#5889

---
 FS/FS/Conf.pm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1353df898..b125b6253 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1862,6 +1862,18 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'select-part_pkg',
   },
 
+  {
+    'key'         => 'manual_process-display',
+    'section'     => 'billing',
+    'description' => 'When using manual_process-pkgpart, add the fee to the amount entered (default), or subtract the fee from the amount entered.',
+    'type'        => 'select',
+    'select_hash' => [
+                       'add'      => 'Add fee to amount entered',
+                       'subtract' => 'Subtract fee from amount entered',
+                     ],
+  },
+
+
   {
     'key'         => 'allow_negative_charges',
     'section'     => 'billing',
-- 
cgit v1.2.1


From 357b4e26965895666685590d59f72de331fecb08 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Oct 2009 02:36:03 +0000
Subject: add manual_process-skip_first option, RT#5889

---
 FS/FS/Conf.pm      |  6 ++++++
 FS/FS/cust_main.pm | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b125b6253..be4c74413 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1873,6 +1873,12 @@ worry that config_items is freeside-specific and icky.
                      ],
   },
 
+  {
+    'key'         => 'manual_process-skip_first',
+    'section'     => 'billing',
+    'description' => "When using manual_process-pkgpart, omit the fee if it is the customer's first payment.",
+    'type'        => 'checkbox',
+  },
 
   {
     'key'         => 'allow_negative_charges',
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index d61ebd21e..638036a15 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7377,10 +7377,26 @@ Returns all the payments (see L<FS::cust_pay>) for this customer.
 
 sub cust_pay {
   my $self = shift;
+  return $self->num_cust_pay unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_pay', { 'custnum' => $self->custnum } )
 }
 
+=item num_cust_pay
+
+Returns the number of payments (see L<FS::cust_pay>) for this customer.  Also
+called automatically when the cust_pay method is used in a scalar context.
+
+=cut
+
+sub num_cust_pay {
+  my $self = shift;
+  my $sql = "SELECT COUNT(*) FROM cust_pay WHERE custnum = ?";
+  my $sth = dbh->prepare($sql) or die dbh->errstr;
+  $sth->execute($self->custnum) or die $sth->errstr;
+  $sth->fetchrow_arrayref->[0];
+}
+
 =item cust_pay_pkgnum
 
 Returns all the payments (see L<FS::cust_pay>) for this customer's specific
-- 
cgit v1.2.1


From 5a7134df962defd3d7771a77952be07d1610959a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 5 Oct 2009 23:36:08 +0000
Subject: remove annoying warning: Use of uninitialized value
 $FS::svc_acct::passwordmin in pattern match (m//) at
 /usr/local/share/perl/5.10.0/FS/svc_acct.pm line 60.

---
 FS/FS/svc_acct.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9f54317c6..1b1265476 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -57,7 +57,10 @@ FS::UID->install_callback( sub {
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
   $passwordmin = $conf->config('passwordmin'); # || 6;
-  $passwordmin = ( $passwordmin =~ /\d+/ ) ? $passwordmin : 6; #blank->6, keep 0
+  #blank->6, keep 0
+  $passwordmin = ( defined($passwordmin) && $passwordmin =~ /\d+/ )
+                   ? $passwordmin
+                   : 6;
   $passwordmax = $conf->config('passwordmax') || 8;
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');
-- 
cgit v1.2.1


From 2d0724a44131e2c9394ba1d7b3f2a8ac6e747ad0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 6 Oct 2009 23:51:45 +0000
Subject: remove inadvertant debugging warnings

---
 FS/FS/cust_bill_pkg.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index c8c242eb0..d3bdfd12a 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -186,9 +186,7 @@ sub insert {
   if ( $tax_location ) {
     foreach my $cust_bill_pkg_tax_location ( @$tax_location ) {
       $cust_bill_pkg_tax_location->billpkgnum($self->billpkgnum);
-      warn $cust_bill_pkg_tax_location;
       $error = $cust_bill_pkg_tax_location->insert;
-      warn $error;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "error inserting cust_bill_pkg_tax_location: $error";
@@ -201,7 +199,6 @@ sub insert {
     foreach my $cust_bill_pkg_tax_rate_location ( @$tax_rate_location ) {
       $cust_bill_pkg_tax_rate_location->billpkgnum($self->billpkgnum);
       $error = $cust_bill_pkg_tax_rate_location->insert;
-      warn $error;
       if ( $error ) {
         $dbh->rollback if $oldAutoCommit;
         return "error inserting cust_bill_pkg_tax_rate_location: $error";
@@ -213,7 +210,6 @@ sub insert {
   if ( $cust_tax_adjustment ) {
     $cust_tax_adjustment->billpkgnum($self->billpkgnum);
     $error = $cust_tax_adjustment->replace;
-    warn $error;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "error replacing cust_tax_adjustment: $error";
@@ -346,7 +342,7 @@ Returns the package (see L<FS::cust_pkg>) for this invoice line item.
 
 sub cust_pkg {
   my $self = shift;
-  warn "$me $self -> cust_pkg";
+  #warn "$me $self -> cust_pkg"; #carp?
   qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } );
 }
 
-- 
cgit v1.2.1


From cb4443b58fb55f5c2fe28f031616e80922a0431c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Oct 2009 00:43:03 +0000
Subject: bring up-to-date wrt 1.7 Conf.pm 1.180.2.52 (2009-10-03), RT#2873

---
 FS/FS/Conf_compat17.pm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Conf_compat17.pm b/FS/FS/Conf_compat17.pm
index 56bc956be..15d4738f5 100644
--- a/FS/FS/Conf_compat17.pm
+++ b/FS/FS/Conf_compat17.pm
@@ -484,7 +484,14 @@ httemplate/docs/config.html
   {
     'key'         => 'deletecustomers',
     'section'     => 'UI',
-    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'description' => 'Enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that the customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers\' packages if they cancel service.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'deleteinvoices',
+    'section'     => 'UI',
+    'description' => 'Enable invoices deletions.  Be very careful!  Deleting an invoice will remove all traces that the invoice ever existed!  Normally, you would apply a credit against the invoice instead.',  #invoice voiding?
     'type'        => 'checkbox',
   },
 
@@ -2465,6 +2472,27 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'sg-ping_username',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'sg-ping_password',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'sg-login_username',
+    'section'     => '',
+    'description' => "Don't use this.",
+    'type'        => 'text',
+  },
+
   {
     'key'         => 'queued-max_kids',
     'section'     => '',
-- 
cgit v1.2.1


From 06187016fd78ba41fb82846b9e8d461405f316b6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 7 Oct 2009 23:44:26 +0000
Subject: naming follow-up notices from the event rather than creting a slew of
 separate templates, RT#5217

---
 FS/FS/cust_bill.pm                                 | 312 +++++++++++++++------
 FS/FS/part_event/Action/cust_bill_send_reminder.pm |  31 ++
 2 files changed, 262 insertions(+), 81 deletions(-)
 create mode 100644 FS/FS/part_event/Action/cust_bill_send_reminder.pm

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 57066b474..e7c0be892 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -770,6 +770,10 @@ text attachment arrayref, optional
 
 email subject, optional
 
+=item notice_name
+
+notice name instead of "Invoice", optional
+
 =back
 
 Returns an argument list to be passed to L<FS::Misc::send_email>.
@@ -790,13 +794,19 @@ sub generate_email {
     'subject'   => (($args{'subject'}) ? $args{'subject'} : 'Invoice'),
   );
 
-  my %cdrs = ( 'unsquelch_cdr' => $conf->exists('voip-cdr_email') );
+  my %opt = (
+    'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
+    'template'      => $args{'template'},
+    'notice_name'   => ( $args{'notice_name'} || 'Invoice' ),
+  );
+
+  my $cust_main = $self->cust_main;
 
   if (ref($args{'to'}) eq 'ARRAY') {
     $return{'to'} = $args{'to'};
   } else {
     $return{'to'} = [ grep { $_ !~ /^(POST|FAX)$/ }
-                           $self->cust_main->invoicing_list
+                           $cust_main->invoicing_list
                     ];
   }
 
@@ -830,7 +840,7 @@ sub generate_email {
       if ( ref($args{'print_text'}) eq 'ARRAY' ) {
         $data = $args{'print_text'};
       } else {
-        $data = [ $self->print_text('', $args{'template'}, %cdrs) ];
+        $data = [ $self->print_text(\%opt) ];
       }
 
     }
@@ -848,7 +858,7 @@ sub generate_email {
     my $content_id = join('.', rand()*(2**32), $$, time). "\@$from";
 
     my $logo;
-    my $agentnum = $self->cust_main->agentnum;
+    my $agentnum = $cust_main->agentnum;
     if ( defined($args{'template'}) && length($args{'template'})
          && $conf->exists( 'logo_'. $args{'template'}. '.png', $agentnum )
        )
@@ -877,11 +887,7 @@ sub generate_email {
                          '    </title>',
                          '  </head>',
                          '  <body bgcolor="#e8e8e8">',
-                         $self->print_html({ time          => '',
-                                             template      => $args{'template'},
-                                             cid           => $content_id,
-                                             %cdrs,
-                                          }),
+                         $self->print_html({ 'cid'=>$content_id, %opt }),
                          '  </body>',
                          '</html>',
                        ],
@@ -890,7 +896,7 @@ sub generate_email {
     );
 
     my @otherparts = ();
-    if ( $self->cust_main->email_csv_cdr ) {
+    if ( $cust_main->email_csv_cdr ) {
 
       push @otherparts, build MIME::Entity
         'Type'        => 'text/csv',
@@ -929,7 +935,7 @@ sub generate_email {
 
       $related->add_part($image);
 
-      my $pdf = build MIME::Entity $self->mimebuild_pdf('', $args{'template'}, %cdrs);
+      my $pdf = build MIME::Entity $self->mimebuild_pdf(\%opt);
 
       $return{'mimeparts'} = [ $related, $pdf, @otherparts ];
 
@@ -957,7 +963,7 @@ sub generate_email {
 
       #mime parts arguments a la MIME::Entity->build().
       $return{'mimeparts'} = [
-        { $self->mimebuild_pdf('', $args{'template'}, %cdrs) }
+        { $self->mimebuild_pdf(\%opt) }
       ];
     }
   
@@ -977,7 +983,7 @@ sub generate_email {
       if ( ref($args{'print_text'}) eq 'ARRAY' ) {
         $return{'body'} = $args{'print_text'};
       } else {
-        $return{'body'} = [ $self->print_text('', $args{'template'}, %cdrs) ];
+        $return{'body'} = [ $self->print_text(\%opt) ];
       }
 
     }
@@ -1006,22 +1012,27 @@ sub mimebuild_pdf {
   );
 }
 
-=item send [ TEMPLATENAME [ , AGENTNUM [ , INVOICE_FROM ] ] ]
+=item send HASHREF | [ TEMPLATE [ , AGENTNUM [ , INVOICE_FROM [ , AMOUNT ] ] ] ]
 
 Sends this invoice to the destinations configured for this customer: sends
 email, prints and/or faxes.  See L<FS::cust_main_invoice>.
 
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+Options can be passed as a hashref (recommended) or as a list of up to 
+four values for templatename, agentnum, invoice_from and amount.
 
-AGENTNUM, if specified, means that this invoice will only be sent for customers
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<agentnum>, if specified, means that this invoice will only be sent for customers
 of the specified agent or agent(s).  AGENTNUM can be a scalar agentnum (for a
 single agent) or an arrayref of agentnums.
 
-INVOICE_FROM, if specified, overrides the default email invoice From: address.
+I<invoice_from>, if specified, overrides the default email invoice From: address.
 
-AMOUNT, if specified, only sends the invoice if the total amount owed on this
+I<amount>, if specified, only sends the invoice if the total amount owed on this
 invoice and all older invoices is greater than the specified amount.
 
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 sub queueable_send {
@@ -1041,48 +1052,73 @@ sub queueable_send {
 
 sub send {
   my $self = shift;
-  my $template = scalar(@_) ? shift : '';
-  if ( scalar(@_) && $_[0]  ) {
-    my $agentnums = ref($_[0]) ? shift : [ shift ];
-    return 'N/A' unless grep { $_ == $self->cust_main->agentnum } @$agentnums;
-  }
 
-  my $invoice_from =
-    scalar(@_)
-      ? shift
-      : ( $self->_agent_invoice_from ||    #XXX should go away
-          $conf->config('invoice_from', $self->cust_main->agentnum )
-        );
+  my( $template, $invoice_from, $notice_name );
+  my $agentnums = '';
+  my $balance_over = 0;
+
+  if ( ref($_[0]) ) {
+    my $opt = shift;
+    $template = $opt->{'template'} || '';
+    if ( $agentnums = $opt->{'agentnum'} ) {
+      $agentnums = [ $agentnums ] unless ref($agentnums);
+    }
+    $invoice_from = $opt->{'invoice_from'};
+    $balance_over = $opt->{'balance_over'} if $opt->{'balance_over'};
+    $notice_name = $opt=>{'notice_name'};
+  } else {
+    $template = scalar(@_) ? shift : '';
+    if ( scalar(@_) && $_[0]  ) {
+      $agentnums = ref($_[0]) ? shift : [ shift ];
+    }
+    $invoice_from = shift if scalar(@_);
+    $balance_over = shift if scalar(@_) && $_[0] !~ /^\s*$/;
+  }
 
-  my $balance_over = ( scalar(@_) && $_[0] !~ /^\s*$/ ) ? shift : 0;
+  return 'N/A' unless ! $agentnums
+                   or grep { $_ == $self->cust_main->agentnum } @$agentnums;
 
   return ''
     unless $self->cust_main->total_owed_date($self->_date) > $balance_over;
 
+  $invoice_from ||= $self->_agent_invoice_from ||    #XXX should go away
+                    $conf->config('invoice_from', $self->cust_main->agentnum );
+
+  my %opt = (
+    'template'     => $template,
+    'invoice_from' => $invoice_from,
+    'notice_name'  => ( $notice_name || 'Invoice' ),
+  );
+
   my @invoicing_list = $self->cust_main->invoicing_list;
 
-  #$self->email_invoice($template, $invoice_from)
-  $self->email($template, $invoice_from)
+  #$self->email_invoice(\%opt)
+  $self->email(\%opt)
     if grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list;
 
-  #$self->print_invoice($template)
-  $self->print($template)
+  #$self->print_invoice(\%opt)
+  $self->print(\%opt)
     if grep { $_ eq 'POST' } @invoicing_list; #postal
 
-  $self->fax_invoice($template)
+  $self->fax_invoice(\%opt)
     if grep { $_ eq 'FAX' } @invoicing_list; #fax
 
   '';
 
 }
 
-=item email [ TEMPLATENAME  [ , INVOICE_FROM ] ] 
+=item email HASHREF | [ TEMPLATE [ , INVOICE_FROM ] ] 
 
 Emails this invoice.
 
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+Options can be passed as a hashref (recommended) or as a list of up to 
+two values for templatename and invoice_from.
+
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<invoice_from>, if specified, overrides the default email invoice From: address.
 
-INVOICE_FROM, if specified, overrides the default email invoice From: address.
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
 
 =cut
 
@@ -1104,14 +1140,21 @@ sub queueable_email {
 #sub email_invoice {
 sub email {
   my $self = shift;
-  my $template = scalar(@_) ? shift : '';
-  my $invoice_from =
-    scalar(@_)
-      ? shift
-      : ( $self->_agent_invoice_from ||    #XXX should go away
-          $conf->config('invoice_from', $self->cust_main->agentnum )
-        );
 
+  my( $template, $invoice_from, $notice_name );
+  if ( ref($_[0]) ) {
+    my $opt = shift;
+    $template = $opt->{'template'} || '';
+    $invoice_from = $opt->{'invoice_from'};
+    $notice_name = $opt->{'notice_name'} || 'Invoice';
+  } else {
+    $template = scalar(@_) ? shift : '';
+    $invoice_from = shift if scalar(@_);
+    $notice_name = 'Invoice';
+  }
+
+  $invoice_from ||= $self->_agent_invoice_from ||    #XXX should go away
+                    $conf->config('invoice_from', $self->cust_main->agentnum );
 
   my @invoicing_list = grep { $_ !~ /^(POST|FAX)$/ } 
                             $self->cust_main->invoicing_list;
@@ -1123,10 +1166,11 @@ sub email {
 
   my $error = send_email(
     $self->generate_email(
-      'from'       => $invoice_from,
-      'to'         => [ grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ],
-      'subject'    => $subject,
-      'template'   => $template,
+      'from'        => $invoice_from,
+      'to'          => [ grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ],
+      'subject'     => $subject,
+      'template'    => $template,
+      'notice_name' => $notice_name,
     )
   );
   die "can't email invoice: $error\n" if $error;
@@ -1152,48 +1196,98 @@ sub email_subject {
   eval qq("$subject");
 }
 
-=item lpr_data [ TEMPLATENAME ]
+=item lpr_data HASHREF | [ TEMPLATE ]
 
 Returns the postscript or plaintext for this invoice as an arrayref.
 
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+Options can be passed as a hashref (recommended) or as a single optional value
+for template.
+
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
 
 =cut
 
 sub lpr_data {
-  my( $self, $template) = @_;
-  $conf->exists('invoice_latex')
-    ? [ $self->print_ps('', $template) ]
-    : [ $self->print_text('', $template) ];
+  my $self = shift;
+  my( $template, $notice_name );
+  if ( ref($_[0]) ) {
+    my $opt = shift;
+    $template = $opt->{'template'} || '';
+    $notice_name = $opt->{'notice_name'} || 'Invoice';
+  } else {
+    $template = scalar(@_) ? shift : '';
+    $notice_name = 'Invoice';
+  }
+
+  my %opt = (
+    'template'    => $template,
+    'notice_name' => $notice_name,
+  );
+
+  my $method = $conf->exists('invoice_latex') ? 'print_ps' : 'print_text';
+  [ $self->$method( \%opt ) ];
 }
 
-=item print [ TEMPLATENAME ]
+=item print HASHREF | [ TEMPLATE ]
 
 Prints this invoice.
 
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+Options can be passed as a hashref (recommended) or as a single optional
+value for template.
+
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
 
 =cut
 
 #sub print_invoice {
 sub print {
   my $self = shift;
-  my $template = scalar(@_) ? shift : '';
+  my( $template, $notice_name );
+  if ( ref($_[0]) ) {
+    my $opt = shift;
+    $template = $opt->{'template'} || '';
+    $notice_name = $opt->{'notice_name'} || 'Invoice';
+  } else {
+    $template = scalar(@_) ? shift : '';
+    $notice_name = 'Invoice';
+  }
 
-  do_print $self->lpr_data($template);
+  my %opt = (
+    'template'    => $template,
+    'notice_name' => $notice_name,
+  );
+
+  do_print $self->lpr_data(\%opt);
 }
 
-=item fax_invoice [ TEMPLATENAME ] 
+=item fax_invoice HASHREF | [ TEMPLATE ] 
 
 Faxes this invoice.
 
-TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
+Options can be passed as a hashref (recommended) or as a single optional
+value for template.
+
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
 
 =cut
 
 sub fax_invoice {
   my $self = shift;
-  my $template = scalar(@_) ? shift : '';
+  my( $template, $notice_name );
+  if ( ref($_[0]) ) {
+    my $opt = shift;
+    $template = $opt->{'template'} || '';
+    $notice_name = $opt->{'notice_name'} || 'Invoice';
+  } else {
+    $template = scalar(@_) ? shift : '';
+    $notice_name = 'Invoice';
+  }
 
   die 'FAX invoice destination not (yet?) supported with plain text invoices.'
     unless $conf->exists('invoice_latex');
@@ -1201,7 +1295,12 @@ sub fax_invoice {
   my $dialstring = $self->cust_main->getfield('fax');
   #Check $dialstring?
 
-  my $error = send_fax( 'docdata'    => $self->lpr_data($template),
+  my %opt = (
+    'template'    => $template,
+    'notice_name' => $notice_name,
+  );
+
+  my $error = send_fax( 'docdata'    => $self->lpr_data(\%opt),
                         'dialstring' => $dialstring,
                       );
   die $error if $error;
@@ -1805,29 +1904,45 @@ sub _agent_invoice_from {
   $self->cust_main->agent_invoice_from;
 }
 
-=item print_text [ TIME [ , TEMPLATE ] ]
+=item print_text HASHREF | [ TIME [ , TEMPLATE [ , OPTION => VALUE ... ] ] ]
 
 Returns an text invoice, as a list of lines.
 
-TIME an optional value used to control the printing of overdue messages.  The
+Options can be passed as a hashref (recommended) or as a list of time, template
+and then any key/value pairs for any other options.
+
+I<time>, if specified, is used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
 It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 sub print_text {
-  my( $self, $today, $template, %opt ) = @_;
+  my $self = shift;
+  my( $today, $template, %opt );
+  if ( ref($_[0]) ) {
+    %opt = %{ shift() };
+    $today = delete($opt{'time'}) || '';
+    $template = delete($opt{template}) || '';
+  } else {
+    ( $today, $template, %opt ) = @_;
+  }
 
   my %params = ( 'format' => 'template' );
   $params{'time'} = $today if $today;
   $params{'template'} = $template if $template;
-  $params{'unsquelch_cdr'} = $opt{'unsquelch_cdr'} if $opt{'unsquelch_cdr'};
+  $params{$_} = $opt{$_} 
+    foreach grep $opt{$_}, qw( unsquealch_cdr notice_name );
 
   $self->print_generic( %params );
 }
 
-=item print_latex [ TIME [ , TEMPLATE ] ]
+=item print_latex HASHREF | [ TIME [ , TEMPLATE [ , OPTION => VALUE ... ] ] ]
 
 Internal method - returns a filename of a filled-in LaTeX template for this
 invoice (Note: add ".tex" to get the actual filename), and a filename of
@@ -1835,20 +1950,36 @@ an associated logo (with the .eps extension included).
 
 See print_ps and print_pdf for methods that return PostScript and PDF output.
 
-TIME an optional value used to control the printing of overdue messages.  The
+Options can be passed as a hashref (recommended) or as a list of time, template
+and then any key/value pairs for any other options.
+
+I<time>, if specified, is used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
 It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 sub print_latex {
-  my( $self, $today, $template, %opt ) = @_;
+  my $self = shift;
+  my( $today, $template, %opt );
+  if ( ref($_[0]) ) {
+    %opt = %{ shift() };
+    $today = delete($opt{'time'}) || '';
+    $template = delete($opt{template}) || '';
+  } else {
+    ( $today, $template, %opt ) = @_;
+  }
 
   my %params = ( 'format' => 'latex' );
   $params{'time'} = $today if $today;
   $params{'template'} = $template if $template;
-  $params{'unsquelch_cdr'} = $opt{'unsquelch_cdr'} if $opt{'unsquelch_cdr'};
+  $params{$_} = $opt{$_} 
+    foreach grep $opt{$_}, qw( unsquealch_cdr notice_name );
 
   $template ||= $self->_agent_template;
 
@@ -1886,7 +2017,7 @@ sub print_latex {
 
 }
 
-=item print_generic OPTIONS_HASH
+=item print_generic OPTION => VALUE ...
 
 Internal method - returns a filled-in template for this invoice as a scalar.
 
@@ -1908,10 +2039,12 @@ cid -
 
 unsquelch_cdr - overrides any per customer cdr squelching when true
 
+notice_name - overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 #what's with all the sprintf('%10.2f')'s in here?  will it cause any
-# (alignment?) problems to change them all to '%.2f' ?
+# (alignment in text invoice?) problems to change them all to '%.2f' ?
 sub print_generic {
 
   my( $self, %params ) = @_;
@@ -2148,6 +2281,7 @@ sub print_generic {
     'duedate'         => $self->due_date2str('%m/%d/%Y'), #date_format?
     'ship_enable'     => $conf->exists('invoice-ship_address'),
     'unitprices'      => $conf->exists('invoice-unitprice'),
+    'notice_name'     => ($params{'notice_name'} || 'Invoice'),#escape_function?
   );
 
   $invoice_data{finance_section} = '';
@@ -2705,15 +2839,20 @@ sub print_generic {
   }
 }
 
-=item print_ps [ TIME [ , TEMPLATE ] ]
+=item print_ps HASHREF | [ TIME [ , TEMPLATE ] ]
 
 Returns an postscript invoice, as a scalar.
 
-TIME an optional value used to control the printing of overdue messages.  The
+Options can be passed as a hashref (recommended) or as a list of time, template
+and then any key/value pairs for any other options.
+
+I<time> an optional value used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
 It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 sub print_ps {
@@ -2726,15 +2865,22 @@ sub print_ps {
   $ps;
 }
 
-=item print_pdf [ TIME [ , TEMPLATE ] ]
+=item print_pdf HASHREF | [ TIME [ , TEMPLATE ] ]
 
 Returns an PDF invoice, as a scalar.
 
-TIME an optional value used to control the printing of overdue messages.  The
+Options can be passed as a hashref (recommended) or as a list of time, template
+and then any key/value pairs for any other options.
+
+I<time> an optional value used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
 It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
 =cut
 
 sub print_pdf {
@@ -2747,16 +2893,20 @@ sub print_pdf {
   $pdf;
 }
 
-=item print_html [ TIME [ , TEMPLATE [ , CID ] ] ]
+=item print_html HASHREF | [ TIME [ , TEMPLATE [ , CID ] ] ]
 
 Returns an HTML invoice, as a scalar.
 
-TIME an optional value used to control the printing of overdue messages.  The
+I<time> an optional value used to control the printing of overdue messages.  The
 default is now.  It isn't the date of the invoice; that's the `_date' field.
 It is specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
-CID is a MIME Content-ID used to create a "cid:" URL for the logo image, used
+I<template>, if specified, is the name of a suffix for alternate invoices.
+
+I<notice_name>, if specified, overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+
+I<cid> is a MIME Content-ID used to create a "cid:" URL for the logo image, used
 when emailing the invoice as part of a multipart/related MIME email.
 
 =cut
@@ -2764,7 +2914,7 @@ when emailing the invoice as part of a multipart/related MIME email.
 sub print_html {
   my $self = shift;
   my %params;
-  if ( ref $_[0]  ) {
+  if ( ref($_[0]) ) {
     %params = %{ shift() }; 
   }else{
     $params{'time'} = shift;
diff --git a/FS/FS/part_event/Action/cust_bill_send_reminder.pm b/FS/FS/part_event/Action/cust_bill_send_reminder.pm
new file mode 100644
index 000000000..2ba8136dd
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_bill_send_reminder.pm
@@ -0,0 +1,31 @@
+package FS::part_event::Action::cust_bill_send_reminder;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { 'Send invoice (email/print/fax) reminder'; }
+
+sub eventtable_hashref {
+  { 'cust_bill' => 1 };
+}
+
+sub option_fields {
+  (
+    'notice_name'  => 'Reminder name',
+    #'notes' => { 'label' => 'Reminder notes' }, 
+    #include standard notes?  no/prepend/append
+  );
+}
+
+sub default_weight { 50; }
+
+sub do_action {
+  my( $self, $cust_bill ) = @_;
+
+  #my $cust_main = $self->cust_main($cust_bill);
+  #my $cust_main = $cust_bill->cust_main;
+
+  $cust_bill->send({ 'notice_name' => $self->option('notice_name') });
+}
+
+1;
-- 
cgit v1.2.1


From e3e8d316738336108b9b9af65d9adeb2ed085696 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Oct 2009 01:15:06 +0000
Subject: conf switches to turn on smaller notes and footer sections with stock
 templates, RT#5218

---
 FS/FS/Conf.pm      | 18 ++++++++++++++++--
 FS/FS/cust_bill.pm | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 21 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index be4c74413..13bec18b1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2326,14 +2326,28 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'invoice-ship_address',
     'section'     => 'billing',
-    'description' => 'Enable this switch to include the ship address on the invoice.',
+    'description' => 'Include the shipping address on invoices.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'invoice-unitprice',
     'section'     => 'billing',
-    'description' => 'This switch enables unit pricing on the invoice.',
+    'description' => 'Enable unit pricing on invoices.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'invoice-smallernotes',
+    'section'     => 'billing',
+    'description' => 'Display the notes section in a smaller font on invoices.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'invoice-smallerfooter',
+    'section'     => 'billing',
+    'description' => 'Display footers in a smaller font on invoices.',
     'type'        => 'checkbox',
   },
 
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index e7c0be892..961d86e9e 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2252,36 +2252,43 @@ sub print_generic {
   }
 
   my %invoice_data = (
+
+    #invoice from info
     'company_name'    => scalar( $conf->config('company_name', $self->cust_main->agentnum) ),
     'company_address' => join("\n", $conf->config('company_address', $self->cust_main->agentnum) ). "\n",
-    'custnum'         => $cust_main->display_custnum,
+    'returnaddress'   => $returnaddress,
+    'agent'           => &$escape_function($cust_main->agent->agent),
+
+    #invoice info
     'invnum'          => $self->invnum,
     'date'            => time2str($date_format, $self->_date),
     'today'           => time2str('%b %o, %Y', $today),
-    'agent'           => &$escape_function($cust_main->agent->agent),
-    'agent_custid'    => &$escape_function($cust_main->agent_custid),
-    'payname'         => &$escape_function($cust_main->payname),
-    'company'         => &$escape_function($cust_main->company),
-    'address1'        => &$escape_function($cust_main->address1),
-    'address2'        => &$escape_function($cust_main->address2),
-    'city'            => &$escape_function($cust_main->city),
-    'state'           => &$escape_function($cust_main->state),
-    'zip'             => &$escape_function($cust_main->zip),
-    'fax'             => &$escape_function($cust_main->fax),
-    'returnaddress'   => $returnaddress,
-    #'quantity'        => 1,
     'terms'           => $self->terms,
     'template'        => $template, #params{'template'},
-    #'notes'           => join("\n", $conf->config('invoice_latexnotes') ),
-    # better hang on to conf_dir for a while
-    'conf_dir'        => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
-    'page'            => 1,
-    'total_pages'     => 1,
+    'notice_name'     => ($params{'notice_name'} || 'Invoice'),#escape_function?
     'current_charges' => sprintf("%.2f", $self->charged),
     'duedate'         => $self->due_date2str('%m/%d/%Y'), #date_format?
+
+    #customer info
+    'custnum'         => $cust_main->display_custnum,
+    'agent_custid'    => &$escape_function($cust_main->agent_custid),
+    ( map { $_ => &$escape_function($cust_main->$_()) } qw(
+      payname company address1 address2 city state zip fax
+    )),
+
+    #global config
     'ship_enable'     => $conf->exists('invoice-ship_address'),
     'unitprices'      => $conf->exists('invoice-unitprice'),
-    'notice_name'     => ($params{'notice_name'} || 'Invoice'),#escape_function?
+    'smallernotes'    => $conf->exists('invoice-smallernotes'),
+    'smallerfooter'   => $conf->exists('invoice-smallerfooter'),
+   
+    # better hang on to conf_dir for a while (for old templates)
+    'conf_dir'        => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
+
+    #these are only used when doing paged plaintext
+    'page'            => 1,
+    'total_pages'     => 1,
+
   );
 
   $invoice_data{finance_section} = '';
-- 
cgit v1.2.1


From 033f562f4e0b2a1bacf096f3e8f8c99590469dcf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Oct 2009 05:09:27 +0000
Subject: tyop

---
 FS/FS/cust_bill.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 961d86e9e..861bb4cd7 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -521,6 +521,7 @@ Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.
 
 sub cust_bill_pay {
   my $self = shift;
+  map { $_ } #return $self->num_cust_bill_pay unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum } );
 }
@@ -535,6 +536,7 @@ Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice.
 
 sub cust_credited {
   my $self = shift;
+  map { $_ } #return $self->num_cust_credit_bill unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_credit_bill', { 'invnum' => $self->invnum } )
   ;
@@ -553,6 +555,7 @@ with matching pkgnum.
 
 sub cust_bill_pay_pkgnum {
   my( $self, $pkgnum ) = @_;
+  map { $_ } #return $self->num_cust_bill_pay_pkgnum($pkgnum) unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_bill_pay', { 'invnum' => $self->invnum,
                                 'pkgnum' => $pkgnum,
@@ -562,6 +565,8 @@ sub cust_bill_pay_pkgnum {
 
 =item cust_credited_pkgnum PKGNUM
 
+=item cust_credit_bill_pkgnum PKGNUM
+
 Returns all applied credits (see L<FS::cust_credit_bill>) for this invoice
 with matching pkgnum.
 
@@ -569,6 +574,7 @@ with matching pkgnum.
 
 sub cust_credited_pkgnum {
   my( $self, $pkgnum ) = @_;
+  map { $_ } #return $self->num_cust_credit_bill_pkgnum($pkgnum) unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_credit_bill', { 'invnum' => $self->invnum,
                                    'pkgnum' => $pkgnum,
@@ -576,6 +582,10 @@ sub cust_credited_pkgnum {
            );
 }
 
+sub cust_credit_bill_pkgnum {
+  shift->cust_credited_pkgnum(@_);
+}
+
 =item tax
 
 Returns the tax amount (see L<FS::cust_bill_pkg>) for this invoice.
@@ -1065,7 +1075,7 @@ sub send {
     }
     $invoice_from = $opt->{'invoice_from'};
     $balance_over = $opt->{'balance_over'} if $opt->{'balance_over'};
-    $notice_name = $opt=>{'notice_name'};
+    $notice_name = $opt->{'notice_name'};
   } else {
     $template = scalar(@_) ? shift : '';
     if ( scalar(@_) && $_[0]  ) {
-- 
cgit v1.2.1


From bb8d487a57a75d8d55c89c5f7cb593c4bfeace85 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Oct 2009 05:44:40 +0000
Subject: avoid some (look to be harmless) warnings:

Argument "" isn't numeric in sprintf at /usr/local/share/perl/5.10.0/FS/cust_bill.pm line 2358.

Argument "" isn't numeric in subtraction (-) at /usr/local/share/perl/5.10.0/FS/cust_bill.pm line 2359.

Argument "" isn't numeric in addition (+) at /usr/local/share/perl/5.10.0/FS/cust_main.pm line 2788.
---
 FS/FS/cust_bill.pm |  4 ++--
 FS/FS/cust_main.pm | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 861bb4cd7..ac1e450d8 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2355,8 +2355,8 @@ sub print_generic {
 #  my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
   #my $balance_due = $self->owed + $pr_total - $cr_total;
   my $balance_due = $self->owed + $pr_total;
-  $invoice_data{'true_previous_balance'} = sprintf("%.2f", $self->previous_balance);
-  $invoice_data{'balance_adjustments'} = sprintf("%.2f", $self->previous_balance - $self->billing_balance);
+  $invoice_data{'true_previous_balance'} = sprintf("%.2f", ($self->previous_balance || 0) );
+  $invoice_data{'balance_adjustments'} = sprintf("%.2f", ($self->previous_balance || 0) - ($self->billing_balance || 0) );
   $invoice_data{'previous_balance'} = sprintf("%.2f", $pr_total);
   $invoice_data{'balance'} = sprintf("%.2f", $balance_due);
 
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 638036a15..8ec12757a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2782,8 +2782,8 @@ sub bill {
   my @cust_bill = $self->cust_bill;
   my $balance = $self->balance;
   my $previous_balance = scalar(@cust_bill)
-                           ?  $cust_bill[$#cust_bill]->billing_balance
-                           :  0;
+                           ? ( $cust_bill[$#cust_bill]->billing_balance || 0 )
+                           : 0;
 
   $previous_balance += $cust_bill[$#cust_bill]->charged
     if scalar(@cust_bill);
@@ -7306,6 +7306,7 @@ Returns all the invoices (see L<FS::cust_bill>) for this customer.
 
 sub cust_bill {
   my $self = shift;
+  map { $_ } #return $self->num_cust_bill unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch('cust_bill', { 'custnum' => $self->custnum, } )
 }
@@ -7337,6 +7338,7 @@ Returns all the statements (see L<FS::cust_statement>) for this customer.
 
 sub cust_statement {
   my $self = shift;
+  map { $_ } #return $self->num_cust_statement unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch('cust_statement', { 'custnum' => $self->custnum, } )
 }
@@ -7349,6 +7351,7 @@ Returns all the credits (see L<FS::cust_credit>) for this customer.
 
 sub cust_credit {
   my $self = shift;
+  map { $_ } #return $self->num_cust_credit unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_credit', { 'custnum' => $self->custnum } )
 }
@@ -7362,6 +7365,7 @@ package when using experimental package balances.
 
 sub cust_credit_pkgnum {
   my( $self, $pkgnum ) = @_;
+  map { $_ } #return $self->num_cust_credit_pkgnum($pkgnum) unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_credit', { 'custnum' => $self->custnum,
                               'pkgnum'  => $pkgnum,
@@ -7406,6 +7410,7 @@ package when using experimental package balances.
 
 sub cust_pay_pkgnum {
   my( $self, $pkgnum ) = @_;
+  map { $_ } #return $self->num_cust_pay_pkgnum($pkgnum) unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_pay', { 'custnum' => $self->custnum,
                            'pkgnum'  => $pkgnum,
@@ -7421,6 +7426,7 @@ Returns all voided payments (see L<FS::cust_pay_void>) for this customer.
 
 sub cust_pay_void {
   my $self = shift;
+  map { $_ } #return $self->num_cust_pay_void unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_pay_void', { 'custnum' => $self->custnum } )
 }
@@ -7433,6 +7439,7 @@ Returns all batched payments (see L<FS::cust_pay_void>) for this customer.
 
 sub cust_pay_batch {
   my $self = shift;
+  map { $_ } #return $self->num_cust_pay_batch unless wantarray;
   sort { $a->paybatchnum <=> $b->paybatchnum }
     qsearch( 'cust_pay_batch', { 'custnum' => $self->custnum } )
 }
@@ -7480,6 +7487,7 @@ Returns all the refunds (see L<FS::cust_refund>) for this customer.
 
 sub cust_refund {
   my $self = shift;
+  map { $_ } #return $self->num_cust_refund unless wantarray;
   sort { $a->_date <=> $b->_date }
     qsearch( 'cust_refund', { 'custnum' => $self->custnum } )
 }
-- 
cgit v1.2.1


From ce7044bb1112c7d50d2fc4b1e2b3676a87a7847d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Oct 2009 06:00:18 +0000
Subject: freeside-daily -g and -m cooperation (and no HASH() queue noise with
 -m)

---
 FS/FS/Cron/bill.pm | 7 ++++---
 FS/FS/cust_main.pm | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index d727d923d..dbb6c66c2 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -40,8 +40,9 @@ sub bill {
 
   $opt{'invoice_time'} = $opt{'n'} ? $^T : $opt{'time'};
 
-  my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
-                            : {};
+  #hashref here doesn't work with -m
+  #my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
+  #                          : {};
 
   ###
   # get a list of custnums
@@ -78,7 +79,7 @@ sub bill {
                                  #(not, when using -m, freeside-queued)
           'check_freq'   => $check_freq,
           'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
-          'not_pkgpart'  => $not_pkgpart,
+          'not_pkgpart'  => $opt{'g'}, #$not_pkgpart,
       );
 
       if ( $opt{'m'} ) {
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8ec12757a..8dcbd8d71 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2462,7 +2462,7 @@ An array ref of specific packages (objects) to attempt billing, instead trying a
 
 =item not_pkgpart
 
-A hashref of pkgparts to exclude from this billing run.
+A hashref of pkgparts to exclude from this billing run (can also be specified as a comma-separated scalar).
 
 =item invoice_time
 
@@ -2489,6 +2489,10 @@ sub bill {
   my $invoice_time = $options{'invoice_time'} || $time;
 
   $options{'not_pkgpart'} ||= {};
+  $options{'not_pkgpart'} = { map { $_ => 1 }
+                                  split(/\s*,\s*/, $options{'not_pkgpart'})
+                            }
+    unless ref($options{'not_pkgpart'});
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
-- 
cgit v1.2.1


From f04616ad2c32641c1b85820cb97bcb22edbbc9f5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 9 Oct 2009 21:37:02 +0000
Subject: add cust_pkg_ref option to charge

---
 FS/FS/cust_main.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'FS')

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 8dcbd8d71..9d40e7306 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -7169,6 +7169,9 @@ New-style, with a hashref of options:
                                     #vendor taxation
                                     'taxproduct' => 2,  #part_pkg_taxproduct
                                     'override'   => {}, #XXX describe
+
+                                    #will be filled in with the new object
+                                    'cust_pkg_ref' => \$cust_pkg,
                                   }
                                 );
 
@@ -7184,6 +7187,7 @@ sub charge {
   my ( $pkg, $comment, $additional );
   my ( $setuptax, $taxclass );   #internal taxes
   my ( $taxproduct, $override ); #vendor (CCH) taxes
+  my $cust_pkg_ref = '';
   if ( ref( $_[0] ) ) {
     $amount     = $_[0]->{amount};
     $quantity   = exists($_[0]->{quantity}) ? $_[0]->{quantity} : 1;
@@ -7197,6 +7201,7 @@ sub charge {
     $additional = $_[0]->{additional} || [];
     $taxproduct = $_[0]->{taxproductnum};
     $override   = { '' => $_[0]->{tax_override} };
+    $cust_pkg_ref = exists($_[0]->{cust_pkg_ref}) ? $_[0]->{cust_pkg_ref} : '';
   } else {
     $amount     = shift;
     $quantity   = 1;
@@ -7268,6 +7273,8 @@ sub charge {
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
+  } elsif ( $cust_pkg_ref ) {
+    ${$cust_pkg_ref} = $cust_pkg;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-- 
cgit v1.2.1


From bdf4497fd8d3778e9cc0f8b90dd8a742f3a84158 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 10 Oct 2009 00:00:32 +0000
Subject: change invoice terms for one-time charges (& bill them immediately),
 RT#5891

---
 FS/FS/Schema.pm    | 10 +++++++++-
 FS/FS/cust_bill.pm | 23 ++++++++++++++++++-----
 FS/FS/cust_main.pm | 25 ++++++++++++++++++++++++-
 3 files changed, 51 insertions(+), 7 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 70f32502b..6f53b2aa7 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -390,15 +390,23 @@ sub tables_hashref {
 
     'cust_bill' => {
       'columns' => [
+        #regular fields
         'invnum',    'serial',     '', '', '', '', 
         'custnum',      'int',     '', '', '', '', 
         '_date',        @date_type,        '', '', 
         'charged',      @money_type,       '', '', 
+        'invoice_terms', 'varchar', 'NULL', $char_d, '', '',
+
+        #customer balance info at invoice generation time
         'previous_balance',   @money_typen, '', '',  #eventually not nullable
         'billing_balance',    @money_typen, '', '',  #eventually not nullable
+
+        #deprecated (unused by now, right?)
         'printed',      'int',     '', '', '', '', 
+
+        #specific use cases
         'closed',      'char', 'NULL',  1, '', '', 
-        'statementnum', 'int', 'NULL', '', '', '',
+        'statementnum', 'int', 'NULL', '', '', '', #invoice aggregate statements
       ],
       'primary_key' => 'invnum',
       'unique' => [],
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index ac1e450d8..493bc097b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -96,6 +96,18 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item charged - amount of this invoice
 
+=item invoice_terms - optional terms override for this specific invoice
+
+=back
+
+Customer info at invoice generation time
+
+=over 4
+
+=item previous_balance
+
+=item billing_balance
+
 =back
 
 Deprecated
@@ -2989,10 +3001,10 @@ sub _translate_old_latex_format {
         $line_item_line =~ s/\$(\w+)/'. \$_tr_line->{$1}. '/g;
         push @template, "    \$OUT .= '$line_item_line';";
       }
-  
+
       push @template, '}',
                       '--@]';
-
+      #' doh, gvim
     } elsif ( $line =~ /^%%TotalDetails\s*$/ ) {
 
       push @template, '[@--',
@@ -3026,11 +3038,12 @@ sub _translate_old_latex_format {
 sub terms {
   my $self = shift;
 
-  #check for an invoice- specific override (eventually)
+  #check for an invoice-specific override
+  return $self->invoice_terms if $self->invoice_terms;
   
   #check for a customer- specific override
-  return $self->cust_main->invoice_terms
-    if $self->cust_main->invoice_terms;
+  my $cust_main = $self->cust_main;
+  return $cust_main->invoice_terms if $cust_main->invoice_terms;
 
   #use configured default
   $conf->config('invoice_default_terms') || '';
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 9d40e7306..c83acc65e 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2475,6 +2475,11 @@ typically might mean not charging the normal recurring fee but only usage
 fees since the last billing. Setup charges may be charged.  Not all package
 plans support this feature (they tend to charge 0).
 
+=item invoice_terms
+
+Options terms to be printed on this invocice.  Otherwise, customer-specific
+terms or the default terms are used.
+
 =back
 
 =cut
@@ -2801,6 +2806,7 @@ sub bill {
     'charged'             => $charged,
     'billing_balance'     => $balance,
     'previous_balance'    => $previous_balance,
+    'invoice_terms'       => $options{'invoice_terms'},
   } );
   $error = $cust_bill->insert;
   if ( $error ) {
@@ -7172,6 +7178,10 @@ New-style, with a hashref of options:
 
                                     #will be filled in with the new object
                                     'cust_pkg_ref' => \$cust_pkg,
+
+                                    #generate an invoice immediately
+                                    'bill_now' => 0,
+                                    'invoice_terms' => '', #with these terms
                                   }
                                 );
 
@@ -7188,6 +7198,7 @@ sub charge {
   my ( $setuptax, $taxclass );   #internal taxes
   my ( $taxproduct, $override ); #vendor (CCH) taxes
   my $cust_pkg_ref = '';
+  my ( $bill_now, $invoice_terms ) = ( 0, '' );
   if ( ref( $_[0] ) ) {
     $amount     = $_[0]->{amount};
     $quantity   = exists($_[0]->{quantity}) ? $_[0]->{quantity} : 1;
@@ -7202,6 +7213,8 @@ sub charge {
     $taxproduct = $_[0]->{taxproductnum};
     $override   = { '' => $_[0]->{tax_override} };
     $cust_pkg_ref = exists($_[0]->{cust_pkg_ref}) ? $_[0]->{cust_pkg_ref} : '';
+    $bill_now = exists($_[0]->{bill_now}) ? $_[0]->{bill_now} : '';
+    $invoice_terms = exists($_[0]->{invoice_terms}) ? $_[0]->{invoice_terms} : '';
   } else {
     $amount     = shift;
     $quantity   = 1;
@@ -7277,8 +7290,18 @@ sub charge {
     ${$cust_pkg_ref} = $cust_pkg;
   }
 
+  if ( $bill_now ) {
+    my $error = $self->bill( 'invoice_terms' => $invoice_terms,
+                             'pkg_list'      => [ $cust_pkg ],
+                           );
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }   
+  }
+
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
+  return '';
 
 }
 
-- 
cgit v1.2.1


From 0e3d27730f91e10abb8f655d578eb0fd51b82cd1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Oct 2009 01:39:17 +0000
Subject: ::1 becomes 127.0.0.1 in IP checks

---
 FS/FS/Record.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index f17b24036..d4d7ca137 100644
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -2204,12 +2204,14 @@ sub ut_hexn {
 }
 =item ut_ip COLUMN
 
-Check/untaint ip addresses.  IPv4 only for now.
+Check/untaint ip addresses.  IPv4 only for now, though ::1 is auto-translated
+to 127.0.0.1.
 
 =cut
 
 sub ut_ip {
   my( $self, $field ) = @_;
+  $self->setfield($field, '127.0.0.1') if $self->getfield($field) eq '::1';
   $self->getfield($field) =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
     or return "Illegal (IP address) $field: ". $self->getfield($field);
   for ( $1, $2, $3, $4 ) { return "Illegal (IP address) $field" if $_ > 255; }
@@ -2219,7 +2221,8 @@ sub ut_ip {
 
 =item ut_ipn COLUMN
 
-Check/untaint ip addresses.  IPv4 only for now.  May be null.
+Check/untaint ip addresses.  IPv4 only for now, though ::1 is auto-translated
+to 127.0.0.1.  May be null.
 
 =cut
 
-- 
cgit v1.2.1


From 428e8460af396a7fe6d7ae7d3d778fe4ad313118 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Oct 2009 01:41:34 +0000
Subject: remembered to customize this manpage

---
 FS/FS/access_right.pm            | 2 --
 FS/FS/access_usergroup.pm        | 2 --
 FS/FS/clientapi_session_field.pm | 2 --
 FS/FS/cust_svc_option.pm         | 2 --
 4 files changed, 8 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 4f8d1e9a0..bc6dd5d84 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -153,8 +153,6 @@ sub _upgrade_data { # class method
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/access_usergroup.pm b/FS/FS/access_usergroup.pm
index 8e83060fc..8511fe5be 100644
--- a/FS/FS/access_usergroup.pm
+++ b/FS/FS/access_usergroup.pm
@@ -133,8 +133,6 @@ sub access_group {
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/clientapi_session_field.pm b/FS/FS/clientapi_session_field.pm
index bfa487ded..085e95642 100644
--- a/FS/FS/clientapi_session_field.pm
+++ b/FS/FS/clientapi_session_field.pm
@@ -113,8 +113,6 @@ sub check {
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::clientapi_session>, L<FS::ClientAPI>, L<FS::Record>, schema.html from the
diff --git a/FS/FS/cust_svc_option.pm b/FS/FS/cust_svc_option.pm
index 0a242d551..07fec90d0 100644
--- a/FS/FS/cust_svc_option.pm
+++ b/FS/FS/cust_svc_option.pm
@@ -124,8 +124,6 @@ sub check {
 
 =head1 BUGS
 
-The author forgot to customize this manpage.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
-- 
cgit v1.2.1


From 903e3d764f22ec3864da20bd998e22d38305af87 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 11 Oct 2009 01:41:56 +0000
Subject: correct variable initialization

---
 FS/FS/part_export/globalpops_voip.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/part_export/globalpops_voip.pm b/FS/FS/part_export/globalpops_voip.pm
index 3bd578326..67b48bb4a 100644
--- a/FS/FS/part_export/globalpops_voip.pm
+++ b/FS/FS/part_export/globalpops_voip.pm
@@ -32,7 +32,7 @@ sub get_dids {
   my $self = shift;
   my %opt = ref($_[0]) ? %{$_[0]} : @_;
 
-  my %search = ();
+  my %getdids = ();
   #  'orderby' => 'npa', #but it doesn't seem to work :/
 
   if ( $opt{'areacode'} && $opt{'exchange'} ) { #return numbers
-- 
cgit v1.2.1