From e0a26680d75fc2000bde195eba7946805a3aaa28 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 28 Mar 2011 02:00:53 +0000
Subject: finish existing customer dsl order, RT#7111

---
 httemplate/edit/process/quick-cust_pkg.cgi | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'httemplate/edit/process/quick-cust_pkg.cgi')

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 704d256e6..a6449b880 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -11,11 +11,9 @@
 % 
 % # for going right to a provision service after ordering a package
 % if ( $svcpart ) { 
-%    my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
-%    if ( $part_svc ) {
-%	$redir_url = popurl(3)."edit/".$part_svc->svcdb.".cgi?"
-%		    ."pkgnum=".$cust_pkg->pkgnum.";svcpart=$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">
@@ -61,13 +59,22 @@ $cgi->param('discountnum') =~ /^(\-?\d*)$/
 my $discountnum = $1;
 
 # for going right to a provision service after ordering a package
-my $svcpart;
+my( $svcpart, $part_svc ) = ( '', '' );
 if ( $cgi->param('svcpart') ) {
-    $cgi->param('svcpart') =~ /^(\-?\d*)$/
-       or die 'illegal svcpart '. $cgi->param('svcpart');
-    $svcpart = $1;
+  $cgi->param('svcpart') =~ /^(\-?\d*)$/
+     or die 'illegal svcpart '. $cgi->param('svcpart');
+  $svcpart = $1;
+  $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } )
+    or die "unknown svcpart $svcpart";
 }
 
+my $qualnum = '';
+if ( $cgi->param('qualnum') ) {
+  $cgi->param('qualnum') =~ /^(\d+)$/ or die 'illegal qualnum';
+  $qualnum = $1;
+}
+
+
 my $cust_pkg = new FS::cust_pkg {
   'custnum'              => $custnum,
   'pkgpart'              => $pkgpart,
-- 
cgit v1.2.1