From 9006e983ebf98b2000a812ab01f99dcb2335534c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Mar 2009 02:36:31 +0000
Subject: bulk price plan: label as Name <email>, supress extraneous service
 list, RT#3519

---
 FS/FS/h_cust_svc.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'FS/FS/h_cust_svc.pm')

diff --git a/FS/FS/h_cust_svc.pm b/FS/FS/h_cust_svc.pm
index e030436..d280d53 100644
--- a/FS/FS/h_cust_svc.pm
+++ b/FS/FS/h_cust_svc.pm
@@ -52,9 +52,15 @@ If a service is found, returns a list consisting of:
 
 =cut
 
-sub label {
+sub label      { shift->_label('svc_label',      @_); }
+sub label_long { shift->_label('svc_label_long', @_); }
+
+sub _label {
   my $self = shift;
-  carp "FS::h_cust_svc::label called on $self" if $DEBUG;
+  my $method = shift;
+
+  #carp "FS::h_cust_svc::_label called on $self" if $DEBUG;
+  warn "FS::h_cust_svc::_label called on $self for $method" if $DEBUG;
   my $svc_x = $self->h_svc_x(@_);
   return () unless $svc_x;
   my $part_svc = $self->part_svc;
@@ -65,7 +71,7 @@ sub label {
   }
 
   my @label;
-  eval { @label = $self->_svc_label($svc_x, @_); };
+  eval { @label = $self->$method($svc_x, @_); };
 
   if ($@) {
     carp 'while resolving history record for svcdb/svcnum ' . 
-- 
cgit v1.1