[freeside-commits] branch master updated. 45d02884d15d18e67c1c70cca05c8905243b8117

[Christopher Burger]

The branch, master has been updated
       via  45d02884d15d18e67c1c70cca05c8905243b8117 (commit)
      from  06f4f338cbd47dc9bc37addb971bd0bec2989ffe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45d02884d15d18e67c1c70cca05c8905243b8117
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Nov 28 20:17:28 2017 -0500

    Revert "RT# 24643 - fixed error in saving waive setup fee flag when not selected"
    
    This reverts commit 7e2111f1ebc063df6a0afbb5903ae17a96ca3bb8.

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 7d683235b..c70a6795f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2372,8 +2372,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';

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pkg.pm                            | 3 +--
 httemplate/edit/process/change-cust_pkg.html | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)