X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Freason.html;h=5bb6a3e0cf4bb0263dd3a9b29fd6bca33ce05b5a;hp=14e97bf2f9c6b890ebcc7cc02315113c1709f6d0;hb=92e63d82b0f376e5c8d95df5f916d7b32b018289;hpb=808c72ffcfc256efa5b15a98b5b4b0cf7655135e
diff --git a/httemplate/browse/reason.html b/httemplate/browse/reason.html
index 14e97bf2f..5bb6a3e0c 100644
--- a/httemplate/browse/reason.html
+++ b/httemplate/browse/reason.html
@@ -14,21 +14,10 @@
'addl_from' => 'LEFT JOIN reason_type ON reason_type.typenum = reason.reason_type',
},
'count_query' => $count_query,
- 'header' => [ '#',
- ucfirst($classname) . ' Reason Type',
- ucfirst($classname) . ' Reason',
- ($class eq 'S' ? 'Unsuspension Fee' : ()),
- ],
- 'fields' => [ 'reasonnum',
- sub { shift->reasontype->type },
- 'reason',
- $unsuspend_pkg_comment,
- ],
- 'links' => [ $link,
- $link,
- '',
- $unsuspend_pkg_link,
- ],
+ 'header' => \@header,
+ 'fields' => \@fields,
+ 'links' => \@links,
+ 'align' => $align,
)
%>
<%init>
@@ -53,18 +42,58 @@ my $count_query = 'SELECT COUNT(*) FROM reason LEFT JOIN reason_type on ' .
my $link = [ $p."edit/reason.html?class=$class&reasonnum=", 'reasonnum' ];
-my ($unsuspend_pkg_comment, $unsuspend_pkg_link);
-if ( $class eq 'S' ) {
- $unsuspend_pkg_comment = sub {
- my $pkgpart = shift->unsuspend_pkgpart or return '';
- my $part_pkg = FS::part_pkg->by_key($pkgpart) or return '';
- $part_pkg->pkg_comment;
- };
+my @header = (
+ '#',
+ ucfirst($classname) . ' reason type',
+ ucfirst($classname) . ' reason',
+);
+
+my @fields = (
+ 'reasonnum',
+ sub { shift->reasontype->type },
+ 'reason',
+);
- my $unsuspend_pkg_link = sub {
- my $pkgpart = shift->unsuspend_pkgpart or return '';
- [ $p."edit/part_pkg.cgi?", $pkgpart ];
- };
+my @links = (
+ $link,
+ $link,
+ '',
+);
+
+my $align = 'rll';
+
+if ( $class eq 'S' ) {
+ push @header,
+ 'Credit unused service',
+ 'Unsuspension fee',
+ ;
+ push @fields,
+ sub {
+ my $reason = shift;
+ if ( $reason->unused_credit ) {
+ return 'YES';
+ } else {
+ return 'NO';
+ }
+ },
+ sub {
+ my $reason = shift;
+ my $pkgpart = $reason->unsuspend_pkgpart or return '';
+ my $part_pkg = FS::part_pkg->by_key($pkgpart) or return '';
+ my $text = $part_pkg->pkg_comment;
+ my $href = $p."edit/part_pkg.cgi?$pkgpart";
+ $text = qq!! . encode_entities($text) . "".
+ "";
+ if ( $reason->unsuspend_hold ) {
+ $text .= ' (on next bill)'
+ } else {
+ $text .= ' (immediately)'
+ }
+ $text .= '';
+ }
+ ;
+ $align .= 'cl';
}
+
%init>