From 020e2df25391da9028dfbd9962b554ac20f54f38 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Mon, 28 May 2018 00:07:20 -0400 Subject: [PATCH] RT# 24643 - fixed error in saving waive setup fee flag when not selected --- FS/FS/cust_pkg.pm | 3 ++- httemplate/edit/process/change-cust_pkg.html | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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'; -- 2.11.0