X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=62502002e660ea207ff02737b62313f0411e2d66;hb=2ffdb485e5534df3d89bcc12d4d02d485e9b28f5;hp=c1a33b0204feb68da566b682d6687a06f1bac936;hpb=30c3ff2acf90e1386fae00759078899c859faf36;p=freeside.git

diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index c1a33b020..62502002e 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -1,74 +1,61 @@
-%
-% my $conf = new FS::Conf;
-%
-% $cgi->param('custnum') =~ /^(\d+)$/
-%   or die "No customer specified (bad URL)!";
-% my $custnum = $1;
-%
-% my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} );
-% die "Custimer not found!" unless $cust_main;
-%
-% my (@notes) = $cust_main->notes();
-% if ( scalar(@notes) ) { 
-
-<STYLE TYPE="text/css">
-
-body { background: #e8e8e8 }
-.inv table { border: none }
-.inv TH { border: none }
-.inv TD { border: none }
-
-</STYLE>
-
-<TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0 BORDER=0 >
-
-%#<% include('/elements/table-grid.html') %>
-%   my $bgcolor1 = '#eeeeee';
-%   my $bgcolor2 = '#ffffff';
-%   my $bgcolor = '';
-%
-%   foreach my $note (@notes) {
-%
-%   if ( $bgcolor eq $bgcolor1 ) {
-%     $bgcolor = $bgcolor2;
-%   } else {
-%     $bgcolor = $bgcolor1;
-%   }
-%
-%
-
+% # Customer comments
+% if ( $cust_main->comments =~ /[^\s\n\r]/ ) {
+<BR><% mt('Comments') |h %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
-  <% note_datestr($note,$conf,$bgcolor) %>
-  <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-    &nbsp;<%$note->otaker%>&nbsp;
-  </TD>
-  <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-    &nbsp;<%$note->comments%>
+  <TD BGCOLOR="#ffffff">
+    <PRE><% encode_entities($cust_main->comments) %></PRE>
   </TD>
 </TR>
+</TABLE></TABLE>
+<BR><BR>
+% }
 
-% } #end display notes
+% # Notes, if any
+<A NAME="notes">
+% my $notecount = scalar($cust_main->notes(0));
+% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
 
-</TABLE>
-% } else { 
+% # actually display notes
+<& notes/notes.html, 'cust_main' => $cust_main &>
+<BR>
+% } # end of notes
+
+% # Attachments
+% # XXX at some point move all of this into notes/attachments.html
+% if( $curuser->access_right('View attachments') ) {
+% # List attachments
+<& notes/attachments.html, 'cust_main' => $cust_main &>
+%   if ($cgi->param('show_deleted')) {
+<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
+           ($view ? ";show=$view" : '') . '#notes' 
+           %>"><I>(<% mt('Show active attachments') |h %>)</I></A>
+%   } elsif($curuser->access_right('View deleted attachments')) {
+<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
+           ($view ? ";show=$view" : '') . ';show_deleted=1#notes'
+           %>"><I>(<% mt('Show deleted attachments') |h %>)</I></A>
+%   }
+% }
 
 <BR>
-% } 
-%
-%#subroutines
-%
-%sub note_datestr {
-% my($note, $conf, $bgcolor) = @_ or return '';
-% my $format=qq{<TD class="inv" bgcolor="$bgcolor" align="left"><B>%b</B></TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" align="right"><B>&nbsp;%o,</B></TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" align="right"><B>&nbsp;%Y&nbsp;</B></TD>};
-% $format .= qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="right"><B>&nbsp;%l</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="center"><B>:</B></TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="left"><B>%M</B></TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="left"><B>&nbsp;%P&nbsp;</B></TD>}
-%     if $conf->exists('cust_main_note-display_times');
-%   ( my $strip = time2str($format, $note->_date) ) =~ s/ (\d)/$1/g;
-%   $strip;
+% if ( $curuser->access_right('View email logs')
+%      and FS::cust_msg->count("custnum = $custnum")) {
+<BR>
+<& notes/email.html, 'cust_main' => $cust_main &>
+<BR>
 % }
-%
+<%init>
+
+use HTML::Defang;
+
+my $conf = new FS::Conf;
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my(%opt) = @_;
+
+my $cust_main = $opt{'cust_main'};
+my $custnum = $cust_main->custnum;
+
+my $view =  $cgi->param('show') || $curuser->default_customer_view;
 
+</%init>