[freeside-commits] branch master updated. ac44c24787eb093e47b92ee9939d003acf8464e7
Jonathan Prykop
jonathan at 420.am
Wed Jun 8 15:25:40 PDT 2016
The branch, master has been updated
via ac44c24787eb093e47b92ee9939d003acf8464e7 (commit)
from 0de4928e4afae5542b310eeb1ef0cff4750cb038 (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 ac44c24787eb093e47b92ee9939d003acf8464e7
Author: Jonathan Prykop <jonathan at freeside.biz>
Date: Wed Jun 8 17:24:35 2016 -0500
RT#40641: unprovisioning preserved cancelled services [fixed for cust_svc without cust_pkg]
diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 7000e30..b282630 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -21,6 +21,7 @@
},
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
# package?
@@ -39,6 +40,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index ef89f01..ecf37b4 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -356,11 +356,14 @@ foreach my $pkg_field ( @pkg_fields ) {
push @header, emt('Pkg. Status');
push @fields, sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status;
};
push @links, '';
$align .= 'r';
push @color, sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
};
diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index ff2538c..8cdf29d 100755
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -23,6 +23,7 @@
'ip_addr',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -46,6 +47,8 @@
(map '', @tower_fields),
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_circuit.cgi b/httemplate/search/svc_circuit.cgi
index 2174734..3a85375 100644
--- a/httemplate/search/svc_circuit.cgi
+++ b/httemplate/search/svc_circuit.cgi
@@ -21,6 +21,7 @@
'ip_addr',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -38,6 +39,8 @@
'color' => [
('') x 6,
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_dish.cgi b/httemplate/search/svc_dish.cgi
index 1e73308..5c47608 100755
--- a/httemplate/search/svc_dish.cgi
+++ b/httemplate/search/svc_dish.cgi
@@ -15,6 +15,7 @@
'acctnum',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -33,6 +34,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index c8fca9f..23eeba6 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -15,6 +15,7 @@
'domain',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -33,6 +34,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_external.cgi b/httemplate/search/svc_external.cgi
index 5f90561..426ac16 100755
--- a/httemplate/search/svc_external.cgi
+++ b/httemplate/search/svc_external.cgi
@@ -17,6 +17,7 @@
'title',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -38,6 +39,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_fiber.html b/httemplate/search/svc_fiber.html
index 3960a16..a07c5f5 100644
--- a/httemplate/search/svc_fiber.html
+++ b/httemplate/search/svc_fiber.html
@@ -23,6 +23,7 @@
'ont_serial',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -40,6 +41,8 @@
'color' => [
('') x 6,
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index ca2c288..c9b6012 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -17,6 +17,7 @@
$format_dst,
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -37,6 +38,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_hardware.cgi b/httemplate/search/svc_hardware.cgi
index 78f413e..c41cc5a 100644
--- a/httemplate/search/svc_hardware.cgi
+++ b/httemplate/search/svc_hardware.cgi
@@ -25,6 +25,7 @@
'smartcard',
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -38,6 +39,8 @@
'align' => 'rlllllllr' . FS::UI::Web::cust_aligns(),
'color' => [ ('') x 8,
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_phone.cgi b/httemplate/search/svc_phone.cgi
index 29e7456..4c0b654 100644
--- a/httemplate/search/svc_phone.cgi
+++ b/httemplate/search/svc_phone.cgi
@@ -19,6 +19,7 @@
@fields,
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -44,6 +45,8 @@
'',
( map '', @header ),
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index 4f6611f..6e9ba92 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -23,6 +23,7 @@
},
sub {
$cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
$cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
},
\&FS::UI::Web::cust_fields,
@@ -43,6 +44,8 @@
'',
'',
sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
my $c = FS::cust_pkg::statuscolors;
$c->{$cust_pkg_cache{$_[0]->svcnum}->status };
}, # pkg status
-----------------------------------------------------------------------
Summary of changes:
httemplate/search/cust_svc.html | 3 +++
httemplate/search/svc_acct.cgi | 3 +++
httemplate/search/svc_broadband.cgi | 3 +++
httemplate/search/svc_circuit.cgi | 3 +++
httemplate/search/svc_dish.cgi | 3 +++
httemplate/search/svc_domain.cgi | 3 +++
httemplate/search/svc_external.cgi | 3 +++
httemplate/search/svc_fiber.html | 3 +++
httemplate/search/svc_forward.cgi | 3 +++
httemplate/search/svc_hardware.cgi | 3 +++
httemplate/search/svc_phone.cgi | 3 +++
httemplate/search/svc_www.cgi | 3 +++
12 files changed, 36 insertions(+)
More information about the freeside-commits
mailing list