X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=1cd6e0970820d2fe8b6a1dc62178d3c13684a36c;hb=9fae251fc1e3069694ebaf4fae62bde844f45cff;hp=23783802994d80f5baa91b3a7e419cd27220093f;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 237838029..1cd6e0970 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -1,139 +1,91 @@
-% if ( scalar(@notes) ) {
-
-
-
- <% 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) {
-%
-% 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' => 'Edit customer note',
-% 'width' => 616,
-% 'height' => 538, #575
-% 'frame' => 'top',
-% );
-% my $clickjs = qq!onclick="$onclick"!;
-%
-% my $edit = '';
-% 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 ) {
-
-
+% # 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';
-
- <% 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 |
+
+% # Notes, if any
+
+% my $notecount = scalar($cust_main->notes(0));
+% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
+
+% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) {
+
+ <% mt('Notes') |h %>
+
+
% }
- Note |
-% if ($curuser->access_right('Edit customer note') ) {
- |
+
+% if ( $curuser->access_right('Add customer note') &&
+% ! $conf->exists('cust_main-disable_notes')
+% ) {
+
+ <& /elements/popup_link-cust_main.html,
+ 'label' => emt('Add customer note'),
+ 'action' => $p. 'edit/cust_main_note.cgi',
+ 'actionlabel' => emt('Enter customer note'),
+ 'cust_main' => $cust_main,
+ 'width' => 616,
+ 'height' => 538, #575
+ &>
+
% }
-
-% $skipheader = (!$conf->exists('note-classes') || $conf->config('note-classes') < 2);
-% $last_classnum = $note->classnum;
+
+
+% # 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 &>
+% # "Attach file" link
+% if(! $conf->config('disable_cust_attachment')
+% and $curuser->access_right('Add attachment')) {
+<& /elements/popup_link-cust_main.html,
+ 'label' => emt('Attach file'),
+ 'action' => $p.'edit/cust_main_attach.cgi',
+ 'actionlabel' => emt('Upload file'),
+ 'cust_main' => $cust_main,
+ 'width' => 480,
+ 'height' => 296,
+&>
% }
-
- <% 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);
-Show notes of class:
-% foreach my $classnum ( sort { $b <=> $a } (keys %classes) ) {
- <% $classes{$classnum} %>
-% }
-
+% if ($cgi->param('show_deleted')) {
+">(<% mt('Show active attachments') |h %>)
+% } elsif($curuser->access_right('View deleted attachments')) {
+">(<% mt('Show deleted attachments') |h %>)
+% }
% }
+
+% if ( $curuser->access_right('View email logs')
+% and FS::cust_msg->count("custnum = $custnum")) {
+
+% if (!$cgi->param('order_by')) {
+% my $order_by = '_date';
+% $order_by .= ' DESC' if $curuser->option('history_order') eq 'newest';
+% $cgi->param('order_by', $order_by);
+% }
+<& /search/cust_msg.html,
+ nohtmlheader => 1,
+ html_init => mt('Mail sent to this customer: '),
+&>
% }
<%init>
@@ -144,23 +96,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;
%init>