X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fchange_pkg.cgi;h=f5b807566c40a15ada8192b2543033794de08a67;hp=94f32e699d5c178558b2cdf55e802c6bf3f8171c;hb=71231d6bd803d2a3977c3ce2fa1f3c0ed4746b2d;hpb=0ed464c391924a455fc2a9ba3f89eb6ca2ebab6b

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 94f32e699..f5b807566 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -1,5 +1,17 @@
 <& /elements/header-popup.html, mt($title) &>
 
+<SCRIPT TYPE="text/javascript">
+
+  function enable_discount_pkg () {
+    if ( document.DiscountPkgForm.discountnum.selectedIndex > 0 ) {
+      document.DiscountPkgForm.submit.disabled = false;
+    } else {
+      document.DiscountPkgForm.submit.disabled = false;
+    }
+  }
+
+</SCRIPT>
+
 <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT>
 <& /elements/error.html &>
 
@@ -86,6 +98,16 @@
       </TR>
 %   }
 
+% if ( $discount_cust_pkg ) {
+<% include('/elements/tr-select-discount.html',
+             'empty_label' => 'Select discount',
+             #'onchange'    => 'enable_discount_pkg()',
+             'cgi'         => $cgi,
+             'carry_value' => $carry_value,
+             'td_width'    => '125',
+             #'setup_only'  => $setup_only,
+          ) %>
+% }
   </TABLE><BR>
 
 % }
@@ -151,6 +173,16 @@ my $title = "Change Package";
 
 my $use_contract_end = $cust_pkg->get('contract_end') ? 1 : 0;
 
+# Pass previous discountnum to change screen
+my $cust_pkg_discount = qsearchs(cust_pkg_discount => {
+  disabled => '',
+  pkgnum   => $cust_pkg->pkgnum,
+});
+my $carry_value =
+  $cust_pkg_discount
+    ? $cust_pkg_discount->discountnum
+    : undef;
+
 # if there's already a package change ordered, preload it
 if ( $cust_pkg->change_to_pkgnum ) {
   my $change_to = FS::cust_pkg->by_key($cust_pkg->change_to_pkgnum);