[freeside-commits] branch FREESIDE_4_BRANCH updated. d024699a657dcafdef6b9161350ae4dc1ccc5d6e

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  d024699a657dcafdef6b9161350ae4dc1ccc5d6e (commit)
      from  5b580ccdc237bea4149ef99c53aa071d8a4abb77 (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 d024699a657dcafdef6b9161350ae4dc1ccc5d6e
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Feb 1 11:57:16 2016 -0800

    add unused_credit flag to edit/reason.html for cancel reasons, #27911

diff --git a/httemplate/browse/reason.html b/httemplate/browse/reason.html
index bdbcf37..7f62ada 100644
--- a/httemplate/browse/reason.html
+++ b/httemplate/browse/reason.html
@@ -65,11 +65,8 @@ my @links = (
 
 my $align = 'rll';
 
-if ( $class eq 'S' ) {
-  push @header,
-    'Credit unused service',
-    'Suspension fee',
-  ;
+if ( $class eq 'S' or $class eq 'C' ) {
+  push @header, 'Credit unused service';
   push @fields,
     sub {
       my $reason = shift;
@@ -78,7 +75,12 @@ if ( $class eq 'S' ) {
       } else {
         return '<SPAN STYLE="background-color:#ff0000">NO</SPAN>';
       }
-    },
+    };
+  $align .= 'c';
+}
+if ( $class eq 'S' ) {
+  push @header, 'Suspension fee';
+  push @fields,
     sub {
       my $reason = shift;
       my $feepart = $reason->feepart;
@@ -107,7 +109,7 @@ if ( $class eq 'S' ) {
       $text .= '</FONT>';
     }
   ;
-  $align .= 'cl';
+  $align .= 'l';
 }
 
 # reason merge handling
diff --git a/httemplate/edit/reason.html b/httemplate/edit/reason.html
index 30168d5..331db44 100644
--- a/httemplate/edit/reason.html
+++ b/httemplate/edit/reason.html
@@ -65,12 +65,14 @@ my @fields = (
   },
 );
 
-if ( $class eq 'S' ) {
+if ( $class eq 'S' or $class eq 'C' ) {
   push @fields,
     { 'field'     => 'unused_credit',
       'type'      => 'checkbox',
       'value'     => 'Y',
-    }, 
+    };
+}
+if ( $class eq 'S' ) {
     { 'type' => 'tablebreak-tr-title' },
     { 'field'     => 'feepart',
       'type'      => 'select-table',

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

Summary of changes:
 httemplate/browse/reason.html |   16 +++++++++-------
 httemplate/edit/reason.html   |    6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)