X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=2de68ff469d24473fc2e8fe6cbeb5b26327dbf79;hb=63973c641c4be00765fa27e55c57cc5b9aa4da19;hp=a6378f46aea1233733553d0907347d2f0555689c;hpb=c86fe9ea75d23d3d0c3536b709ac1e086f15a5de;p=freeside.git diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html index a6378f46a..2de68ff46 100755 --- a/httemplate/view/cust_main/notes.html +++ b/httemplate/view/cust_main/notes.html @@ -1,24 +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 -% if ($curuser->access_right('Edit customer note') ) { -   -% } - + + + <& /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) { % @@ -35,25 +54,67 @@ % 'edit/cust_main_note.cgi'. % "?custnum=$custnum". % ";notenum=$notenum", -% 'actionlabel' => 'Edit customer note', +% 'actionlabel' => emt('Edit customer note'), % 'width' => 616, -% 'height' => 580, +% 'height' => 538, #575 % 'frame' => 'top', % ); % my $clickjs = qq!onclick="$onclick"!; % % my $edit = ''; % if ($curuser->access_right('Edit customer note') ) { -% $edit = qq! (edit)!; +% my $delete_url = $fsurl.'misc/delete-note.html?'.$notenum; +% $edit = qq! (!.emt('edit').')'. +% qq! !. +% '('.emt('delete').')'; +% } +% +% if ( $last_classnum != $note->classnum && !$skipheader ) { +% my $tmp_classnum = $note->classnum ? $note->classnum : 0; +% $classes{$tmp_classnum} = $note->classname ne '' ? $note->classname +% : emt('Other'); +% if ( $last_classnum != -1 ) { + + +% } +% my $display = ($tmp_classnum == 0 || !$conf->exists('note-classes') +% || $conf->config('note-classes') < 2) +% ? 'block' : 'none'; +
+ <& /elements/table-grid.html &> + + <% mt('Date') |h %> +% if ( $conf->exists('cust_main_note-display_times') ) { + <% mt('Time') |h %> % } + <% mt('Person') |h %> +% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) { + <% mt('Class') |h %> +% } + <% mt('Note') |h %> +% 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%> + <% $note->classname %> + +% } + + <% $note->comments | defang %> % if($edit) { <% $edit %> @@ -63,10 +124,25 @@ % } #end display notes +
+ +% if ( $conf->exists('note-classes') && $conf->config('note-classes') == 2 ) { +% my($classnum,$classname); +<% mt('Show notes of class:') |h %>   +% foreach my $classnum ( sort { $b <=> $a } (keys %classes) ) { + <% $classes{$classnum} %> +% } +
+% } % } <%init> +use HTML::Defang; + my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; @@ -75,9 +151,9 @@ 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