[freeside-commits] branch FREESIDE_4_BRANCH updated. 7fc8d0203dc714bf6d320fed612833d513ba9f27

Jonathan Prykop jonathan at 420.am
Sat Sep 19 20:18:16 PDT 2015


The branch, FREESIDE_4_BRANCH has been updated
       via  7fc8d0203dc714bf6d320fed612833d513ba9f27 (commit)
       via  1c51a226da8214c805733b6cac0f6ce74e11a0bb (commit)
      from  0f3af066f679296c0f4c563f6f8a850072f949f6 (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 7fc8d0203dc714bf6d320fed612833d513ba9f27
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Sat Sep 19 18:11:54 2015 -0500

    RT#35197: Apply changes button in Edit rate plan screen clears the global default [removed preserve_rate_detail, always true]

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 03dde04..d26d116 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -469,11 +469,8 @@ sub process {
     warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG;
 
     my @param = ( 'job'=>$job );
-    if ($param->{'preserve_rate_detail'}) {
-      $rate->default_detailnum($old->default_detailnum);
-    } else {
-      push @param, 'rate_detail'=>\@rate_detail;
-    }
+    
+    $rate->default_detailnum($old->default_detailnum);
 
     $error = $rate->replace( $old, @param );
 
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 183ea8a..1b052d6 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -5,7 +5,7 @@
 
 <% include('/elements/progress-init.html',
               'OneTrueForm',
-              [ 'rate', 'agentnum', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
+              [ 'rate', 'agentnum' ],
               'process/rate.cgi',
               $p.'browse/rate.cgi',
            )
@@ -27,8 +27,6 @@
 </TABLE>
 <BR>
 
-<INPUT TYPE="hidden" NAME="preserve_rate_detail" VALUE="1">
-
 <INPUT NAME="submit" TYPE="button" VALUE="<% 
   $rate->ratenum ? "Apply changes" : "Add rate plan"
 %>" onClick="document.OneTrueForm.submit.disabled=true; process();">

commit 1c51a226da8214c805733b6cac0f6ce74e11a0bb
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Sep 17 19:27:10 2015 -0500

    RT#35197: Apply changes button in Edit rate plan screen clears the global default

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 8ee9a83..03dde04 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -469,8 +469,11 @@ sub process {
     warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG;
 
     my @param = ( 'job'=>$job );
-    push @param, 'rate_detail'=>\@rate_detail
-      unless $param->{'preserve_rate_detail'};
+    if ($param->{'preserve_rate_detail'}) {
+      $rate->default_detailnum($old->default_detailnum);
+    } else {
+      push @param, 'rate_detail'=>\@rate_detail;
+    }
 
     $error = $rate->replace( $old, @param );
 
diff --git a/httemplate/edit/process/rate_detail.html b/httemplate/edit/process/rate_detail.html
index 0709d50..f8a7444 100644
--- a/httemplate/edit/process/rate_detail.html
+++ b/httemplate/edit/process/rate_detail.html
@@ -12,7 +12,6 @@ die "access denied"
 
 my $set_default_detail = sub {
   my ($cgi, $rate_detail) = @_;
-warn Dumper $rate_detail;
   if (!$rate_detail->dest_regionnum) {
     # then this is a global default rate
     my $rate = $rate_detail->rate;

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

Summary of changes:
 FS/FS/rate.pm                            |    4 ++--
 httemplate/edit/process/rate_detail.html |    1 -
 httemplate/edit/rate.cgi                 |    4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)




More information about the freeside-commits mailing list