X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=23783802994d80f5baa91b3a7e419cd27220093f;hb=93f811c014058da26e734fc621028741b156c5d7;hp=f7b4ddb30a26185d5e84f2973ca0d9b091b0d99e;hpb=efb850eae1c0aae3b43483bd73a7824b105357db;p=freeside.git
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index f7b4ddb30..237838029 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -1,21 +1,43 @@
% if ( scalar(@notes) ) {
- <% include('/elements/init_overlib.html') %>
-
- <% include("/elements/table-grid.html") %>
+
-
- Date |
-% if ( $conf->exists('cust_main_note-display_times') ) {
- Time |
-% }
- Person |
- Note |
-
+ <% include('/elements/init_overlib.html') %>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+% my $last_classnum = -1;
+% my $skipheader = 0;
+% my %classes = ();
%
% foreach my $note (@notes) {
%
@@ -34,7 +56,7 @@
% ";notenum=$notenum",
% 'actionlabel' => 'Edit customer note',
% 'width' => 616,
-% 'height' => 408,
+% 'height' => 538, #575
% 'frame' => 'top',
% );
% my $clickjs = qq!onclick="$onclick"!;
@@ -43,24 +65,80 @@
% if ($curuser->access_right('Edit customer note') ) {
% $edit = qq! (edit)!;
% }
+%
+% if ( $last_classnum != $note->classnum && !$skipheader ) {
+% my $tmp_classnum = $note->classnum ? $note->classnum : 0;
+% $classes{$tmp_classnum} = $note->classname ne '' ? $note->classname
+% : 'Other';
+% if ( $last_classnum != -1 ) {
+
+
+% }
+% my $display = ($tmp_classnum == 0 || !$conf->exists('note-classes')
+% || $conf->config('note-classes') < 2)
+% ? 'block' : 'none';
+
+ <% include("/elements/table-grid.html") %>
+
+ Date |
+% if ( $conf->exists('cust_main_note-display_times') ) {
+ Time |
+% }
+ Person |
+% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
+ Class |
+% }
+ Note |
+% if ($curuser->access_right('Edit customer note') ) {
+ |
+% }
+
+% $skipheader = (!$conf->exists('note-classes') || $conf->config('note-classes') < 2);
+% $last_classnum = $note->classnum;
+% }
<% note_datestr($note,$conf,$bgcolor) %>
- <% $note->otaker%>
+ <% $note->usernum ? $note->access_user->name : $note->otaker %>
|
+% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
- <%$note->comments%><% $edit %>
+ <% $note->classname %>
|
+% }
+
+ <% $note->comments | defang %>
+ |
+% if($edit) {
+ <% $edit %> |
+% }
% } #end display notes
+
+
+% if ( $conf->exists('note-classes') && $conf->config('note-classes') == 2 ) {
+% my($classnum,$classname);
+Show notes of class:
+% foreach my $classnum ( sort { $b <=> $a } (keys %classes) ) {
+ <% $classes{$classnum} %>
+% }
+
+% }
% }
<%init>
+use HTML::Defang;
+
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -69,15 +147,15 @@ my(%opt) = @_;
my $custnum = $opt{'custnum'};
my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} );
-die "Custimer not found!" unless $cust_main;
+die "Customer not found!" unless $cust_main;
-my (@notes) = $cust_main->notes();
+my (@notes) = $cust_main->notes($conf->exists('note-classes') && $conf->config('note-classes') == 2);
#subroutines
sub note_datestr {
my($note, $conf, $bgcolor) = @_ or return '';
- my $td = '';
+ my $td = qq{ | };
my $format = "$td%b %o, %Y | ";
$format .= "$td%l:%M%P"
if $conf->exists('cust_main_note-display_times');