internationalization/localization, RT12515

[freeside.git] / 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 704d256..fab8525 100644 (file)
--- 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,
@@ -84,11 +91,12 @@ my $cust_pkg = new FS::cust_pkg {
   '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'))
                                 : ''
                             ),
-  #'discountnum_disabled' => scalar($cgi->param('discountnum_disabled')),
+   'waive_setup'         => ( $cgi->param('waive_setup') eq 'Y' ? 'Y' : '' ),
 };
 
 my %opt = ( 'cust_pkg' => $cust_pkg );