X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct_pop.pm;h=3c9ea01309bb7f35bc4b09b585843e0d4bdb7d23;hb=8203228392fc2f15f568dbdfdace2d70baad681c;hp=3b8e9785a7fa13bfb7d53d01507dad1071725e48;hpb=3eb749fd79fec377d4975f69b077b14e5aaf94dd;p=freeside.git

diff --git a/FS/FS/svc_acct_pop.pm b/FS/FS/svc_acct_pop.pm
index 3b8e9785a..3c9ea0130 100644
--- a/FS/FS/svc_acct_pop.pm
+++ b/FS/FS/svc_acct_pop.pm
@@ -107,7 +107,8 @@ Returns:
 
 sub text {
   my $self = shift;
-  $self->city. ', '. $self->state. ' ('. $self->ac. ')/'. $self->exch;
+  $self->city. ', '. $self->state.
+    ' ('. $self->ac. ')/'. $self->exch. '-'. $self->loc;
 }
 
 =back
@@ -120,6 +121,8 @@ sub text {
 
 =cut
 
+#horrible false laziness with signup.cgi (pull special-case for 0 & 1
+# pop code out from signup.cgi??)
 sub popselector {
   my( $popnum, $state ) = @_;
 
@@ -129,7 +132,6 @@ sub popselector {
     push @{$svc_acct_pop{$_->state}}, $_ foreach @svc_acct_pop;
   }
 
-  my $size = 0;
   my $text = <<END;
     <SCRIPT>
     function opt(what,href,text) {
@@ -151,7 +153,6 @@ END
     foreach my $pop ( @{$svc_acct_pop{$popstate}}) {
       my $o_popnum = $pop->popnum;
       my $poptext = $pop->text;
-      $size = length($poptext) if length($poptext) > $size;
       $text .= "opt(what.form.popnum, \"$o_popnum\", \"$poptext\");\n"
     }
     $text .= "}\n";
@@ -173,20 +174,24 @@ END
   }
   $text .= '</SELECT>';
 
+  $text;
+
 }
 
 =back
 
 =head1 VERSION
 
-$Id: svc_acct_pop.pm,v 1.4 2001-09-27 20:41:37 ivan Exp $
+$Id: svc_acct_pop.pm,v 1.7 2002-04-10 13:42:48 ivan Exp $
 
 =head1 BUGS
 
 It should be renamed to part_pop.
 
 popselector?  putting web ui components in here?  they should probably live
-somewhere else...
+somewhere else...  
+
+popselector: pull special-case for 0 & 1 pop code out from signup.cgi
 
 =head1 SEE ALSO