[freeside-commits] branch FREESIDE_4_BRANCH updated. 09898d8b692668f6d668624de1e112595a32ec6d

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  09898d8b692668f6d668624de1e112595a32ec6d (commit)
       via  da200db3d09940a9860bc8bd0926bc53d379363f (commit)
      from  abb0335193ae83cb7307abdd109e67dd461c5ff7 (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 09898d8b692668f6d668624de1e112595a32ec6d
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Nov 28 20:45:12 2017 -0500

    RT# 24643 - fixed error in saving waive setup fee flag when not selected

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';

commit da200db3d09940a9860bc8bd0926bc53d379363f
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 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';

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

Summary of changes: