From e41df0b878914b09c30ee7c75fe3b34fa7bd68b2 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Fri, 30 Nov 2018 15:42:53 -0500 Subject: [PATCH] RT# 71289 - now shows contact email and phone changes while attached to customer Conflicts: httemplate/elements/change_history_common.html httemplate/view/cust_main/change_history.html --- httemplate/elements/change_history_common.html | 21 +++++++++++++++++++++ httemplate/view/cust_main/change_history.html | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/httemplate/elements/change_history_common.html b/httemplate/elements/change_history_common.html index a526493ce..673068ac8 100644 --- a/httemplate/elements/change_history_common.html +++ b/httemplate/elements/change_history_common.html @@ -227,6 +227,8 @@ my %h_table_labelsub = ( #'h_phone_device' #'h_cust_tag' => $tag_labelsub, 'h_contact' => $contact_labelsub, + 'h_contact_phone' => $contact_labelsub, + 'h_contact_email' => $contact_labelsub, ); my $tag_descripsub = sub { @@ -235,6 +237,24 @@ my $tag_descripsub = sub { ''. encode_entities($part_tag->tagname). ''; }; +my $contact_descripsub = sub { + my($item, $label) = @_; + my $phone_type = qsearchs('phone_type',{ phonetypenum => $item->phonetypenum }); + my @fields = $item->fields; + join(', ', + map { + my $value = ( $_ eq "phonetypenum" ) + ? $item->get($_).' ('.$phone_type->typename.')' + : $item->get($_); + $value = substr($value, 0, 77).'...' if length($value) > 80; + $value = encode_entities($value); + "$_:$value"; + } + grep { ! /^(history|custnum$)/i } + @fields + ); +}; + my $discounts = {}; my $discount_descripsub = sub { my($item) = @_; @@ -255,6 +275,7 @@ my $discount_descripsub = sub { my %h_table_descripsub = ( 'h_cust_pkg_discount' => $discount_descripsub, 'h_cust_tag' => $tag_descripsub, + 'h_contact_phone' => $contact_descripsub, ); my $cust_pkg_date_format = '%b %o, %Y'; diff --git a/httemplate/view/cust_main/change_history.html b/httemplate/view/cust_main/change_history.html index 52edca424..7e0b8dfab 100644 --- a/httemplate/view/cust_main/change_history.html +++ b/httemplate/view/cust_main/change_history.html @@ -48,10 +48,13 @@ tie my %tables, 'Tie::IxHash', #? it gets provisioned anyway 'phone_avail' => 'Phone', 'cust_tag' => 'Tag', 'contact' => 'Contact', + 'contact_phone' => 'Contact', + 'contact_email' => 'Contact', ; my $pkg_join = "JOIN cust_pkg USING ( pkgnum )"; my $svc_join = "JOIN cust_svc USING ( svcnum ) $pkg_join"; +my $contact_join = "JOIN contact using (contactnum )"; my @svc_tables = qw( svc_acct @@ -68,6 +71,8 @@ my %table_join = ( 'radius_usergroup' => $svc_join, 'phone_device' => $svc_join, 'cust_pkg_discount'=> $pkg_join, + 'contact_phone' => $contact_join, + 'contact_email' => $contact_join, ); %table_join = (%table_join, map { $_ => $svc_join } @svc_tables); -- 2.11.0