summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2018-05-28 00:07:20 -0400
committerChristopher Burger <burgerc@freeside.biz>2017-12-12 11:20:39 -0500
commit020e2df25391da9028dfbd9962b554ac20f54f38 (patch)
treeafd9764c08ef5168fec92faebec1b688d06e0f2c
parente122171357abcfb53719a23ffeb8345e1c88381d (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 c95d31b4d..b2cc874a4 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2363,7 +2363,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 3d50a134e..0e87ad859 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';