X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fchange-cust_pkg.html;h=a90693cae4ceb8e839922d45fcacf22e44f1f30c;hb=5f2c3a88d92952d13a5231a230e332e1a8e94016;hp=54cafbf18425a0516faff2ccaad6be31935f8c26;hpb=76b22e66bf8e615def0a24cd8cda23c3949eae70;p=freeside.git

diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index 54cafbf18..a90693cae 100644
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'misc/change_pkg.cgi?'. $cgi->query_string );
 % } else {
 
-    <% header(emt("Package changed")) %>
+    <& /elements/header-popup.html, emt("Package changed") &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>
@@ -40,6 +40,16 @@ if ( $cgi->param('locationnum') == -1 ) {
   $change{'cust_location'} = $cust_location;
 }
 
+if ( $cgi->param('setup_discountnum') =~ /^(-?\d+)$/ ) { 
+  if ( $1 == -2 ) {
+    $change{waive_setup} = 'Y';
+  } else {
+    $change{setup_discountnum} = $1;
+    $change{setup_discountnum_amount} = $cgi->param('setup_discountnum_amount');
+    $change{setup_discountnum_percent} = $cgi->param('setup_discountnum_percent');
+  }
+}
+
 my $error;
 my $now = time;
 if (defined($cgi->param('contract_end'))) {
@@ -103,6 +113,7 @@ unless ($error) {
         $change_to->locationnum  == $change{'locationnum'} and
         $change_to->quantity     == $change{'quantity'} and
         $change_to->contract_end == $change{'contract_end'} and
+        $change_to->waive_setup  == $change{'waive_setup'} and
         !$usagechanged
       ) {
         %change = ( 'cust_pkg' => $change_to );