From e0d137dcd3e28fcf8f307120ef86733b5814ffec Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 1 Feb 2016 11:57:16 -0800 Subject: [PATCH] add unused_credit flag to edit/reason.html for cancel reasons, #27911 --- httemplate/browse/reason.html | 16 +++++++++------- httemplate/edit/reason.html | 6 ++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/httemplate/browse/reason.html b/httemplate/browse/reason.html index bdbcf3704..7f62ada84 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 'NO'; } - }, + }; + $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 .= ''; } ; - $align .= 'cl'; + $align .= 'l'; } # reason merge handling diff --git a/httemplate/edit/reason.html b/httemplate/edit/reason.html index 30168d551..331db4439 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', -- 2.11.0