X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=c02af386616f6cedd02a3868676340fed93fc1f1;hb=HEAD;hp=2de68ff469d24473fc2e8fe6cbeb5b26327dbf79;hpb=00755aee33cc3ecdf3634bcc0f50f54814bfc400;p=freeside.git
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 2de68ff46..c02af3866 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -1,143 +1,54 @@
-% if ( scalar(@notes) ) {
-
-
-
- <& /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) {
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-%
-% my $pop = popurl(3);
-% my $notenum = $note->notenum;
-% my $onclick = include( '/elements/popup_link_onclick.html',
-% 'action' => popurl(2).
-% 'edit/cust_main_note.cgi'.
-% "?custnum=$custnum".
-% ";notenum=$notenum",
-% 'actionlabel' => emt('Edit customer note'),
-% 'width' => 616,
-% 'height' => 538, #575
-% 'frame' => 'top',
-% );
-% my $clickjs = qq!onclick="$onclick"!;
-%
-% my $edit = '';
-% if ($curuser->access_right('Edit customer note') ) {
-% 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 ) {
-
-
+% # Customer comments
+% if ( $cust_main->comments =~ /[^\s\n\r]/ ) {
+
<% mt('Comments') |h %>
+<% ntable("#cccccc") %>| <% ntable("#cccccc",2) %>
+ |
+
+ <% encode_entities($cust_main->comments) %>
+ |
+
+
+
% }
-% 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->usernum ? $note->access_user->name : $note->otaker %>
- |
-% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
-
- <% $note->classname %>
- |
-% }
-
- <% $note->comments | defang %>
- |
-% if($edit) {
- <% $edit %> |
-% }
-
-
-% } #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} %>
-% }
-
+% # Notes, if any
+
+% my $notecount = scalar($cust_main->notes(0));
+% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
+
+% # actually display notes
+<& notes/notes.html, 'cust_main' => $cust_main &>
+
+% } # 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')) {
+">(<% mt('Show active attachments') |h %>)
+% } elsif ( $curuser->access_right('View deleted attachments')
+% && FS::Record->scalar_sql(
+% 'SELECT 1 FROM cust_attachment WHERE custnum = ? '.
+% ' AND disabled IS NOT NULL AND disabled > 0 LIMIT 1',
+% $custnum )
+% )
+% {
+">(<% mt('Show deleted attachments') |h %>)
+% }
% }
+
+% if ( $curuser->access_right('View email logs')
+% and FS::cust_msg->count("custnum = $custnum")) {
+
+<& notes/email.html, 'cust_main' => $cust_main &>
+
% }
<%init>
@@ -148,23 +59,9 @@ my $curuser = $FS::CurrentUser::CurrentUser;
my(%opt) = @_;
-my $custnum = $opt{'custnum'};
-
-my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} );
-die "Customer not found!" unless $cust_main;
-
-my (@notes) = $cust_main->notes($conf->exists('note-classes') && $conf->config('note-classes') == 2);
-
-#subroutines
+my $cust_main = $opt{'cust_main'};
+my $custnum = $cust_main->custnum;
-sub note_datestr {
- my($note, $conf, $bgcolor) = @_ or return '';
- my $td = qq{};
- my $format = "$td%b %o, %Y | ";
- $format .= "$td%l:%M%P"
- if $conf->exists('cust_main_note-display_times');
- ( my $strip = time2str($format, $note->_date) ) =~ s/ (\d)/$1/g;
- $strip;
-}
+my $view = $cgi->param('show') || $curuser->default_customer_view;