summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2017-11-28 20:45:12 -0500
committerChristopher Burger <burgerc@freeside.biz>2017-11-29 10:26:00 -0500
commit09898d8b692668f6d668624de1e112595a32ec6d (patch)
tree57565515e652d6ab193136a837581d3572084228
parentda200db3d09940a9860bc8bd0926bc53d379363f (diff)
RT# 24643 - fixed error in saving waive setup fee flag when not selected
-rw-r--r--FS/FS/cust_pkg.pm3
-rw-r--r--httemplate/edit/process/change-cust_pkg.html2
2 files changed, 4 insertions, 1 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 4f6910eac..e1fa2ae93 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2379,7 +2379,8 @@ sub change {
$same_pkgpart = 0;
}
- $self->set('waive_setup', $opt->{'waive_setup'}) if $opt->{'waive_setup'};
+ if ($opt->{'waive_setup'}) { $self->set('waive_setup', $opt->{'waive_setup'}) }
+ else { $self->set('waive_setup', ''); }
# Before going any further here: if the package is still in the pre-setup
# state, it's safe to modify it in place. No need to charge/credit for
diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index a90693cae..7fcc1da07 100644
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -40,6 +40,8 @@ if ( $cgi->param('locationnum') == -1 ) {
$change{'cust_location'} = $cust_location;
}
+$change{waive_setup} = '';
+
if ( $cgi->param('setup_discountnum') =~ /^(-?\d+)$/ ) {
if ( $1 == -2 ) {
$change{waive_setup} = 'Y';