X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fchange_history_common.html;h=f22e093605fd02fa45d8f422b2ca936d5c44f4dd;hb=fad1695f2df61d3fadc5d6fc85527e09d083bf20;hp=5aaf6e691fd0ed09df8b1211ea072c2adfb3a4c4;hpb=0929e7aec153632691a64ae8755c082090fd1de5;p=freeside.git
diff --git a/httemplate/elements/change_history_common.html b/httemplate/elements/change_history_common.html
index 5aaf6e691..f22e09360 100644
--- a/httemplate/elements/change_history_common.html
+++ b/httemplate/elements/change_history_common.html
@@ -44,6 +44,42 @@
% } else {
% $bgcolor = $bgcolor1;
% }
+%
+% ## Create Description and check to see it is not empty, no need to display a record with no description, so skip it.
+% my $description = '';
+% if ( $item->table eq 'legacy_cust_history' ) {
+% $description = $item->description;
+% } elsif ( $item->table eq 'h_cust_tag' ) {
+% $description = &{ $h_table_descripsub{$item->table} }( $item, $tables{'cust_tag'} )
+% if $single_cust && $h_table_descripsub{$item->table};
+% } else {
+% my @fields = $item->fields;
+% push @fields, 'message_dest' if $item->table eq 'h_contact';
+% $description = join(', ',
+% map { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ )
+% ? 'N/A'
+% : $item->get($_);
+% $value = time2str($cust_pkg_date_format, $value)
+% if $item->table eq 'h_cust_pkg'
+% && $cust_pkg_date_fields{$_}
+% && $value;
+%
+% $value = substr($value, 0, 77).'...' if length($value) > 80;
+% $value = encode_entities($value);
+% "$_:$value";
+% }
+% grep { $history_other
+% ? ( $item->get($_) ne $history_other->get($_) )
+% : ( $item->get($_) =~ /\S/ )
+% }
+% grep { ! /^(history|custnum$)/i }
+% @fields
+% );
+% if ( $single_cust && $h_table_descripsub{$item->table} ) {
+% $description = &{ $h_table_descripsub{$item->table} }( $item );
+% }
+% } #else
+% if (!$description) { next; }
@@ -102,34 +138,7 @@
-% if ( $item->table eq 'legacy_cust_history' ) {
- <% $item->description |h %>
-% } else {
- <% join(', ',
- map { my $value = ( $_ =~ /(^pay(info|cvv)|^ss|_password)$/ )
- ? 'N/A'
- : $item->get($_);
- $value = time2str($cust_pkg_date_format, $value)
- if $item->table eq 'h_cust_pkg'
- && $cust_pkg_date_fields{$_}
- && $value;
-
- $value = substr($value, 0, 77).'...' if length($value) > 80;
- $value = encode_entities($value);
- "$_:$value";
- }
- grep { $history_other
- ? ( $item->get($_) ne $history_other->get($_) )
- : ( $item->get($_) =~ /\S/ )
- }
- grep { ! /^(history|custnum$)/i }
- $item->fields
- )
- %>
-% if ( $single_cust && $h_table_descripsub{$item->table} ) {
- <% &{ $h_table_descripsub{$item->table} }( $item ) %>
-% }
-% }
+ <% $description %>
|
@@ -203,6 +212,12 @@ my $tag_labelsub = sub {
$label. ': '. encode_entities($part_tag->tagname). '';
};
+my $contact_labelsub = sub {
+ my($item, $label) = @_;
+ my $contact = qsearchs('h_contact',{ contactnum => $item->contactnum });
+ $label. ': '. encode_entities($contact->first). ' ' . encode_entities($contact->last) . '';
+};
+
my %h_table_labelsub = (
'h_cust_pkg' => $pkg_labelsub,
'h_svc_acct' => $svc_labelsub,
@@ -214,9 +229,17 @@ my %h_table_labelsub = (
'h_svc_external' => $svc_labelsub,
'h_svc_phone' => $svc_labelsub,
#'h_phone_device'
- 'h_cust_tag' => $tag_labelsub,
+ #'h_cust_tag' => $tag_labelsub,
+ 'h_contact' => $contact_labelsub,
+ 'h_cust_contact' => $contact_labelsub,
);
+my $tag_descripsub = sub {
+ my($item, $label) = @_;
+ my $part_tag = qsearchs('part_tag',{ tagnum => $item->tagnum });
+ ''. encode_entities($part_tag->tagname). '';
+};
+
my $discounts = {};
my $discount_descripsub = sub {
my($item) = @_;
@@ -236,6 +259,7 @@ my $discount_descripsub = sub {
my %h_table_descripsub = (
'h_cust_pkg_discount' => $discount_descripsub,
+ 'h_cust_tag' => $tag_descripsub,
);
my $cust_pkg_date_format = '%b %o, %Y';