[freeside-commits] branch master updated. dba5666db2791c7c9694969470b452633b74d573

[Ivan]

The branch, master has been updated
       via  dba5666db2791c7c9694969470b452633b74d573 (commit)
       via  361f46c265aa76ce4fc9b00393e970d4c8b762bd (commit)
       via  3c89615ac62161f9477c4d500f7b151c30f05af8 (commit)
      from  1939aff38dd65509468760264659091f4b6b3e78 (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 dba5666db2791c7c9694969470b452633b74d573
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 15:23:11 2017 -0700

    fix package change vs. v4 discount refactor, RT#77513, RT#14092

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b256dae..c70a679 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2622,9 +2622,9 @@ sub change {
     foreach my $old_discount ($self->cust_pkg_discount_active) {
       # don't remove the old discount, we may still need to bill that package.
       my $new_discount = new FS::cust_pkg_discount {
-        'pkgnum'      => $cust_pkg->pkgnum,
-        'discountnum' => $old_discount->discountnum,
-        'months_used' => $old_discount->months_used,
+        'pkgnum' => $cust_pkg->pkgnum,
+        map { $_ => $old_discount->$_() }
+          qw( discountnum months_used end_date usernum setuprecur ),
       };
       $error = $new_discount->insert;
       if ( $error ) {

commit 361f46c265aa76ce4fc9b00393e970d4c8b762bd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 15:01:41 2017 -0700

    4.x style change package popup

diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index 3237845..243da93 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -8,7 +8,7 @@
 
 
 <FONT CLASS="fsinnerbox-title"><% mt('Package') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <TR>
     <TH ALIGN="right"><% mt('Current package') |h %></TH>
@@ -45,7 +45,7 @@
 &>
 
 <FONT CLASS="fsinnerbox-title"><% mt('Change') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <SCRIPT TYPE="text/javascript">
     function delay_changed() {
@@ -89,14 +89,14 @@
 %
 % if ( $discount_cust_pkg || $waive_setup_fee ) {
   <FONT CLASS="fsinnerbox-title"><% mt('Discounting') |h %></FONT>
-  <% ntable("#cccccc") %>
+  <TABLE CLASS="fsinnerbox">
     <& /elements/tr-select-pkg-discount.html, disable_recur => 1, &>
   </TABLE><BR>
 
 % }
 
 <FONT CLASS="fsinnerbox-title"><% mt('Location') |h %></FONT>
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-select-cust_location.html,
                'cgi'       => $cgi,

commit 3c89615ac62161f9477c4d500f7b151c30f05af8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Sep 18 14:58:25 2017 -0700

    fix stickiness of address fields on errors, when entering new address

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 5ff320b..7a2d886 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -214,7 +214,7 @@ Example:
                                         ''
                                       )
                    );
-% } else {
+% } elsif ( $locationnum != -1 ) {
     locationnum_changed(document.getElementById('locationnum'));
 % }
 </SCRIPT>

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

Summary of changes:
 FS/FS/cust_pkg.pm                                |    6 +++---
 httemplate/elements/tr-select-cust_location.html |    2 +-
 httemplate/misc/change_pkg.cgi                   |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)