[freeside-commits] branch FREESIDE_3_BRANCH updated. e41df0b878914b09c30ee7c75fe3b34fa7bd68b2
Christopher Burger
burgerc at freeside.biz
Mon Dec 3 06:44:44 PST 2018
The branch, FREESIDE_3_BRANCH has been updated
via e41df0b878914b09c30ee7c75fe3b34fa7bd68b2 (commit)
from ce472e5563731dd1982cd97d0cbd4a2c6bdb31e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e41df0b878914b09c30ee7c75fe3b34fa7bd68b2
Author: Christopher Burger <burgerc at freeside.biz>
Date: Fri Nov 30 15:42:53 2018 -0500
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
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 {
'<SPAN STYLE="background-color: #'.$part_tag->tagcolor.'">'. encode_entities($part_tag->tagname). '</SPAN>';
};
+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);
+ "<I>$_</I>:<B>$value</B>";
+ }
+ 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);
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/change_history_common.html | 21 +++++++++++++++++++++
httemplate/view/cust_main/change_history.html | 5 +++++
2 files changed, 26 insertions(+)
More information about the freeside-commits
mailing list