Merge branch 'master' of git.freeside.biz:/home/git/freeside

8 files changed, 166 insertions, 77 deletions

diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index e776d281c..034c4cc50 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,11 +1,12 @@
 <% include( 'elements/process.html',
-              'table'       => 'agent',
-              'viewall_dir' => 'browse',
-              'viewall_ext' => 'cgi',
-              'process_m2m' => { 'link_table'   => 'access_groupagent',
-                                 'target_table' => 'access_group',
-                               },
-              'edit_ext'    => 'cgi',
+              'table'            => 'agent',
+              'viewall_dir'      => 'browse',
+              'viewall_ext'      => 'cgi',
+              'process_m2m'      => { 'link_table'   => 'access_groupagent',
+                                      'target_table' => 'access_group',
+                                    },
+              'edit_ext'         => 'cgi',
+              'noerror_callback' => $process_agent_pkg_class,
           )
 %>
 <%init>
@@ -18,4 +19,30 @@ if ( FS::Conf->new->exists('disable_acl_changes') ) {
   die "shouldn't be reached";
 }
 
+my $process_agent_pkg_class = sub {
+  my( $cgi, $agent ) = @_;
+
+  #surprising amount of false laziness w/ edit/agent.cgi
+  my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' });
+  foreach my $pkg_class ( '', @pkg_class ) {
+    my %agent_pkg_class = ( 'agentnum' => $agent->agentnum,
+                            'classnum' => $pkg_class ? $pkg_class->classnum : ''
+                          );
+    my $agent_pkg_class =
+      qsearchs( 'agent_pkg_class', \%agent_pkg_class )
+      || new FS::agent_pkg_class   \%agent_pkg_class;
+
+    my $param = 'classnum'. $agent_pkg_class{classnum};
+
+    $agent_pkg_class->commission_percent( $cgi->param($param) );
+
+    my $method = $agent_pkg_class->agentpkgclassnum ? 'replace' : 'insert';
+
+    my $error = $agent_pkg_class->$method;
+    die $error if $error; #XXX push this down into agent.pm w/better/transactional error handling
+
+  }
+
+};
+
 </%init>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 5ee553b32..31ec4ab12 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -110,11 +110,16 @@ if ( $cgi->param('no_credit_limit') ) {
 
 $new->tagnum( [ $cgi->param('tagnum') ] );
 
+$error ||= $new->set_national_id_from_cgi( $cgi );
+
 my %usedatetime = ( 'birthdate'        => 1,
                     'spouse_birthdate' => 1,
+                    'anniversary_date' => 1,
                   );
 
-foreach my $dfield (qw( birthdate spouse_birthdate signupdate )) {
+foreach my $dfield (qw(
+  signupdate birthdate spouse_birthdate anniversary_date
+)) {
 
   if ( $cgi->param($dfield) && $cgi->param($dfield) =~ /^([ 0-9\-\/]{0,10})$/) {
 
diff --git a/httemplate/edit/process/cust_pkg_discount.html b/httemplate/edit/process/cust_pkg_discount.html
index 6f97a791e..4a71f6975 100644
--- a/httemplate/edit/process/cust_pkg_discount.html
+++ b/httemplate/edit/process/cust_pkg_discount.html
@@ -39,7 +39,8 @@ my $cust_pkg_discount = new FS::cust_pkg_discount {
   'amount'      => scalar($cgi->param('discountnum_amount')),
   'percent'     => scalar($cgi->param('discountnum_percent')),
   'months'      => scalar($cgi->param('discountnum_months')),
-  'setup'      => scalar($cgi->param('discountnum_setup')),
+  'setup'       => scalar($cgi->param('discountnum_setup')),
+  #'linked'       => scalar($cgi->param('discountnum_linked')),
   #'disabled'    => $self->discountnum_disabled,
 };
 my $error = $cust_pkg_discount->insert;
diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi
index f4cce6535..bde40727a 100755
--- a/httemplate/edit/process/cust_refund.cgi
+++ b/httemplate/edit/process/cust_refund.cgi
@@ -31,7 +31,7 @@ my $link    = $cgi->param('popup') ? 'popup' : '';
 my $payby = $cgi->param('payby');
 
 my @rights = ();
-push @rights, 'Post refund'                if $payby =~ /^(BILL|CASH)$/;
+push @rights, 'Post refund'                if $payby =~ /^(BILL|CASH|MCRD)$/;
 push @rights, 'Post check refund'          if $payby eq 'BILL';
 push @rights, 'Post cash refund '          if $payby eq 'CASH';
 push @rights, 'Refund payment'             if $payby =~ /^(CARD|CHEK)$/;
diff --git a/httemplate/edit/process/part_export.cgi b/httemplate/edit/process/part_export.cgi
index 21150ef67..6432d6b15 100644
--- a/httemplate/edit/process/part_export.cgi
+++ b/httemplate/edit/process/part_export.cgi
@@ -28,6 +28,11 @@ my $new = new FS::part_export ( {
   } fields('part_export')
 } );
 
+if ( $cgi->param('svc_machine') eq 'Y' ) {
+  $new->machine('_SVC_MACHINE');
+  $new->part_export_machine_textarea( $cgi->param('part_export_machine') );
+}
+
 my $error;
 if ( $exportnum ) {
   #warn $old;
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 306319869..2dadbccdc 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -2,19 +2,24 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(3). 'misc/order_pkg.html?'. $cgi->query_string ) %>
 %} else {
-%  my $frag = "cust_pkg". $cust_pkg->pkgnum;
 %  my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
 %               ? ''
 %               : ';show=packages';
-%  my $redir_url = popurl(3)
-%            ."view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
+%
+%  my $redir_url = popurl(3);
+%  if ( $svcpart ) { # for going straight to service provisining after ordering
+%    $redir_url .= 'edit/'.$part_svc->svcdb.'.cgi?'.
+%                    'pkgnum='.$cust_pkg->pkgnum. ";svcpart=$svcpart";
+%    $redir_url .= ";qualnum=$qualnum" if $qualnum;
+%  } elsif ( $quotationnum ) {
+%    $redir_url .= "view/quotation.html?quotationnum=$quotationnum";
+%  } else {
+%    my $custnum = $cust_main->custnum;
+%    my $frag = "cust_pkg". $cust_pkg->pkgnum;
+%    $redir_url .=
+%      "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
+%  }
 % 
-% # for going right to a provision service after ordering a package
-% if ( $svcpart ) { 
-%   $redir_url = popurl(3)."edit/".$part_svc->svcdb.".cgi?".
-%                  "pkgnum=".$cust_pkg->pkgnum. ";svcpart=$svcpart";
-%   $redir_url .= ";qualnum=$qualnum" if $qualnum;
-% }
 <% header('Package ordered') %>
   <SCRIPT TYPE="text/javascript">
     // XXX fancy ajax rebuild table at some point, but a page reload will do for now
@@ -33,16 +38,27 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied"
   unless $curuser->access_right('Order customer package');
 
-#untaint custnum (probably not necessary, searching for it is escape enough)
-$cgi->param('custnum') =~ /^(\d+)$/
-  or die 'illegal custnum '. $cgi->param('custnum');
-my $custnum = $1;
-my $cust_main = qsearchs({
-  'table'     => 'cust_main',
-  'hashref'   => { 'custnum' => $custnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
-});
-die 'unknown custnum' unless $cust_main;
+my $cust_main;
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+  my $custnum = $1;
+  $cust_main = qsearchs({
+    'table'     => 'cust_main',
+    'hashref'   => { 'custnum' => $custnum },
+    'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  });
+}
+
+my $prospect_main;
+if ( $cgi->param('prospectnum') =~ /^(\d+)$/ ) {
+  my $prospectnum = $1;
+  $prospect_main = qsearchs({
+    'table'     => 'prospect_main',
+    'hashref'   => { 'prospectnum' => $prospectnum },
+    'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  });
+}
+
+die 'no custnum or prospectnum' unless $cust_main || $prospect_main;
 
 #probably not necessary, taken care of by cust_pkg::check
 $cgi->param('pkgpart') =~ /^(\d+)$/
@@ -72,47 +88,70 @@ if ( $cgi->param('svcpart') ) {
 }
 
 my $qualnum = '';
-if ( $cgi->param('qualnum') ) {
-  $cgi->param('qualnum') =~ /^(\d+)$/ or die 'illegal qualnum';
+if ( $cgi->param('qualnum') =~ /^(\d+)$/ ) {
   $qualnum = $1;
 }
+my $quotationnum = '';
+if ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
+  $quotationnum = $1;
+}
+# verify this quotation is visible to this user
 
+my $cust_pkg = '';
+my $quotation_pkg = '';
+my $error = '';
 
-my $cust_pkg = new FS::cust_pkg {
-  'custnum'              => $custnum,
-  'pkgpart'              => $pkgpart,
-  'quantity'             => $quantity,
-  'start_date'           => ( scalar($cgi->param('start_date'))
-                                ? parse_datetime($cgi->param('start_date'))
-                                : ''
-                            ),
-  'no_auto'              => scalar($cgi->param('no_auto')),
-  'refnum'               => $refnum,
-  'locationnum'          => $locationnum,
-  'discountnum'          => $discountnum,
-  #for the create a new discount case
-  'discountnum__type'    => scalar($cgi->param('discountnum__type')),
-  'discountnum_amount'   => scalar($cgi->param('discountnum_amount')),
-  'discountnum_percent'  => scalar($cgi->param('discountnum_percent')),
-  'discountnum_months'   => scalar($cgi->param('discountnum_months')),
-  'discountnum_setup'    => scalar($cgi->param('discountnum_setup')),
-  'contract_end'         => ( scalar($cgi->param('contract_end'))
-                                ? parse_datetime($cgi->param('contract_end'))
-                                : ''
-                            ),
-   'waive_setup'         => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ),
-};
-
-my %opt = ( 'cust_pkg' => $cust_pkg );
-
-if ( $locationnum == -1 ) {
-  my $cust_location = new FS::cust_location {
-    map { $_ => scalar($cgi->param($_)) }
-        qw( custnum address1 address2 city county state zip country geocode )
-  };
-  $opt{'cust_location'} = $cust_location;
-}
+my %hash = (
+    'pkgpart'              => $pkgpart,
+    'quantity'             => $quantity,
+    'start_date'           => ( scalar($cgi->param('start_date'))
+                                  ? parse_datetime($cgi->param('start_date'))
+                                  : ''
+                              ),
+    'refnum'               => $refnum,
+    'locationnum'          => $locationnum,
+    'discountnum'          => $discountnum,
+    #for the create a new discount case
+    'discountnum__type'    => scalar($cgi->param('discountnum__type')),
+    'discountnum_amount'   => scalar($cgi->param('discountnum_amount')),
+    'discountnum_percent'  => scalar($cgi->param('discountnum_percent')),
+    'discountnum_months'   => scalar($cgi->param('discountnum_months')),
+    'discountnum_setup'    => scalar($cgi->param('discountnum_setup')),
+    'contract_end'         => ( scalar($cgi->param('contract_end'))
+                                  ? parse_datetime($cgi->param('contract_end'))
+                                  : ''
+                              ),
+     'waive_setup'         => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ),
+);
+$hash{'custnum'} = $cust_main->custnum if $cust_main;
+
+if ( $quotationnum ) {
+
+  $quotation_pkg = new FS::quotation_pkg \%hash;
+  $quotation_pkg->quotationnum($quotationnum);
+  $quotation_pkg->prospectnum($prospect_main->prospectnum) if $prospect_main;
 
-my $error = $cust_main->order_pkg( \%opt );
+  #XXX handle new location
+  $error = $quotation_pkg->insert;
+
+} else {
+
+  $cust_pkg = new FS::cust_pkg \%hash;
+
+  $cust_pkg->no_auto( scalar($cgi->param('no_auto')) );
+
+  my %opt = ( 'cust_pkg' => $cust_pkg );
+
+  if ( $locationnum == -1 ) {
+    my $cust_location = new FS::cust_location {
+      map { $_ => scalar($cgi->param($_)) }
+          qw( custnum address1 address2 city county state zip country geocode )
+    };
+    $opt{'cust_location'} = $cust_location;
+  }
+
+  $error = $cust_main->order_pkg( \%opt );
+
+}
 
 </%init>
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index a7d5136fb..41aca65ee 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -56,13 +56,14 @@ my $new = new FS::svc_acct ( \%hash );
 
 my $error = '';
 
+my $part_svc = $svcnum ? 
+                $old->part_svc : 
+                qsearchs( 'part_svc', 
+                  { 'svcpart' => $cgi->param('svcpart') }
+                );
+
 # google captcha auth
 if ( $cgi->param('captcha_response') ) {
-  my $part_svc = $svcnum ? 
-                  $old->part_svc : 
-                  qsearchs( 'part_svc', 
-                    { 'svcpart' => $cgi->param('svcpart') }
-                  );
   my ($export) = $part_svc->part_export('acct_google');
   if ( $export and
       ! $export->captcha_auth($cgi->param('captcha_response')) ) { 
@@ -79,6 +80,18 @@ if (     $cgi->param('clear_password') eq '*HIDDEN*'
 }
 
 if ( ! $error ) {
+
+  my $export_info = FS::part_export::export_info();
+
+  my @svc_export_machine =
+    map FS::svc_export_machine->new({
+          'svcnum'     => $svcnum,
+          'exportnum'  => $_->exportnum,
+          'machinenum' => scalar($cgi->param('exportnum'.$_->exportnum.'machinenum')),
+        }),
+      grep { $_->machine eq '_SVC_MACHINE' }
+        $part_svc->part_export;
+
   if ( $svcnum ) {
     foreach ( grep { $old->$_ != $new->$_ }
                    qw( seconds upbytes downbytes totalbytes )
@@ -92,9 +105,9 @@ if ( ! $error ) {
       $error ||= $new->set_usage(\%hash);  #unoverlimit and trigger radius changes
       last;                                #once is enough
     }
-    $error ||= $new->replace($old);
+    $error ||= $new->replace($old, 'child_objects'=>\@svc_export_machine);
   } else {
-    $error ||= $new->insert;
+    $error ||= $new->insert('child_objects'=>\@svc_export_machine);
     $svcnum = $new->svcnum;
   }
 }
diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index 90eab4aad..25644e547 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,11 +1,10 @@
 <& elements/svc_Common.html,
-  table       => 'svc_broadband',
-  fields      => [ fields('svc_broadband'), fields('nas'), 'usergroup' ],
+  table             => 'svc_broadband',
+  fields            => [ fields('svc_broadband'), fields('nas'), 'usergroup' ],
   precheck_callback => \&precheck,
 &>
 <%init>
-# for historical reasons, process_m2m for usergroup tables is done 
-# in the svc_x::insert/replace/delete methods, not here
+
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 die "access denied"