X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fchange_pkg.cgi;h=f5b807566c40a15ada8192b2543033794de08a67;hb=71231d6bd803d2a3977c3ce2fa1f3c0ed4746b2d;hp=13fc05016689a13b795fa91bb445ca9f4b3a402d;hpb=e122171357abcfb53719a23ffeb8345e1c88381d;p=freeside.git
diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 13fc05016..f5b807566 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -1,5 +1,17 @@
<& /elements/header-popup.html, mt($title) &>
+
+
<& /elements/error.html &>
@@ -78,7 +90,24 @@
% if ( $discount_cust_pkg || $waive_setup_fee ) {
<% mt('Discounting') |h %>
<% ntable("#cccccc") %>
- <& /elements/tr-select-pkg-discount.html, disable_recur => 1, &>
+
+% if ( $waive_setup_fee ) {
+
+ <% mt('Waive setup fee') |h %> |
+ |
+
+% }
+
+% 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,
+ ) %>
+% }
% }
@@ -144,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);