X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fchange_pkg.cgi;h=c588c9e6c171f9df52dbf365c68ad7ec4a11fd09;hb=cc8b085c509ac0054b457a3b6e5f5ca647529190;hp=243da93089c47b004c819aa0733bc54d840e7da4;hpb=361f46c265aa76ce4fc9b00393e970d4c8b762bd;p=freeside.git

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 243da9308..c588c9e6c 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -90,7 +90,15 @@
 % if ( $discount_cust_pkg || $waive_setup_fee ) {
   <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
   <TABLE CLASS="fsinnerbox">
-    <& /elements/tr-select-pkg-discount.html, disable_recur => 1, &>
+    <& /elements/tr-select-pkg-discount.html,
+      # curr_value_setup    => $discount{setup},
+      # curr_value_recur    => $discount{recur},
+      disable_setup       => 0,
+      disable_recur       => 0,
+      disable_waive_setup => 0,
+      carry_value_setup   => $discount{setup},
+      carry_value_recur   => $discount{recur},
+    &>
   </TABLE><BR>
 
 % }
@@ -168,4 +176,14 @@ if ( $cust_pkg->change_to_pkgnum ) {
   }
   $title = "Edit Scheduled Package Change";
 }
+
+# Get current values of discounts for selectboxes
+my %discount = (setup => undef, recur => undef);
+$discount{$_->setuprecur} = $_->discountnum
+  for qsearch('cust_pkg_discount', {
+    pkgnum   => $cust_pkg->pkgnum,
+    disabled => '',
+  });
+$discount{setup} = '-2' if $cust_pkg->waive_setup;
+
 </%init>