diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-11-28 20:17:28 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-11-29 10:24:36 -0500 |
| commit | da200db3d09940a9860bc8bd0926bc53d379363f (patch) | |
| tree | 366d0e64724fa7577208ba90747e1715c5c0a92e | |
| parent | abb0335193ae83cb7307abdd109e67dd461c5ff7 (diff) | |
Revert "RT# 24643 - fixed error in saving waive setup fee flag when not selected"
This reverts commit 7e2111f1ebc063df6a0afbb5903ae17a96ca3bb8.
| -rw-r--r-- | FS/FS/cust_pkg.pm | 3 | ||||
| -rw-r--r-- | httemplate/edit/process/change-cust_pkg.html | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index e1fa2ae93..4f6910eac 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -2379,8 +2379,7 @@ sub change { $same_pkgpart = 0; } - if ($opt->{'waive_setup'}) { $self->set('waive_setup', $opt->{'waive_setup'}) } - else { $self->set('waive_setup', ''); } + $self->set('waive_setup', $opt->{'waive_setup'}) if $opt->{'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 7fcc1da07..a90693cae 100644 --- a/httemplate/edit/process/change-cust_pkg.html +++ b/httemplate/edit/process/change-cust_pkg.html @@ -40,8 +40,6 @@ 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'; |