X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb%2Fsmall_custview.pm;h=d7cede62a5571f164106fc845e8f224b0621d5ce;hb=d353c1f9bbfee93e96219851af27a78f56837c50;hp=079ae9368f7c0a8b235b74f97d4bb28a32b3145f;hpb=af689cba3b153e212c3c67f518309a03b06186a9;p=freeside.git
diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index 079ae9368..d7cede62a 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -3,6 +3,7 @@ package FS::UI::Web::small_custview;
use strict;
use vars qw(@EXPORT_OK @ISA);
use Exporter;
+use HTML::Entities;
use FS::Msgcat;
use FS::Record qw(qsearchs);
use FS::cust_main;
@@ -28,24 +29,51 @@ sub small_custview {
: qsearchs('cust_main', { 'custnum' => $arg } )
or die "unknown custnum $arg";
- my $html;
+ my $html = '
';
- $html = qq!View
'
+ $html = qq!'
if $url;
- $html .= 'Customer #'. $cust_main->custnum. ''.
+ $html .= 'Customer #
'. $cust_main->display_custnum. ''.
' -
'.
- ucfirst($cust_main->status). ''.
+ $cust_main->status_label. '';
+
+ my @part_tag = $cust_main->part_tag;
+ if ( @part_tag ) {
+ $html .= '
';
+ foreach my $part_tag ( @part_tag ) {
+ $html .= ''.
+ 'tagcolor)
+ ? 'STYLE="background-color:#'.$part_tag->tagcolor.'"'
+ : ''
+ ).
+ '>'.
+ encode_entities($part_tag->tagname.': '. $part_tag->tagdesc).
+ ''.
+ ' |
';
+ }
+ $html .= '
';
+ }
+
+ $html .=
ntable('#e8e8e8'). '
'. ntable("#cccccc",2).
' |
Billing Address | '.
- $cust_main->getfield('last'). ', '. $cust_main->first. ' ';
+ encode_entities($cust_main->getfield('last')). ', '.
+ encode_entities($cust_main->first). ' ';
- $html .= $cust_main->company. ' ' if $cust_main->company;
- $html .= $cust_main->address1. ' ';
- $html .= $cust_main->address2. ' ' if $cust_main->address2;
- $html .= $cust_main->city. ', '. $cust_main->state. ' '. $cust_main->zip. ' ';
- $html .= $cust_main->country. ' '
- if $cust_main->country && $cust_main->country ne $countrydefault;
+ $html .= encode_entities($cust_main->company). ' ' if $cust_main->company;
+
+ if ( $cust_main->bill_locationnum ) {
+
+ $html .= encode_entities($cust_main->address1). ' ';
+ $html .= encode_entities($cust_main->address2). ' '
+ if $cust_main->address2;
+ $html .= encode_entities($cust_main->city). ', '. $cust_main->state. ' '.
+ $cust_main->zip. ' ';
+ $html .= $cust_main->country. ' '
+ if $cust_main->country && $cust_main->country ne $countrydefault;
+
+ }
$html .= ' |
| ';
if ( $cust_main->daytime && $cust_main->night ) {
@@ -62,44 +90,26 @@ sub small_custview {
$html .= ' |
';
- if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+ if ( $cust_main->ship_locationnum ) {
- my $pre = $cust_main->ship_last ? 'ship_' : '';
+ my $ship = $cust_main->ship_location;
$html .= '
'. ntable("#cccccc",2).
- ' | Service Address | '.
- $cust_main->get("${pre}last"). ', '.
- $cust_main->get("${pre}first"). ' ';
- $html .= $cust_main->get("${pre}company"). ' '
- if $cust_main->get("${pre}company");
- $html .= $cust_main->get("${pre}address1"). ' ';
- $html .= $cust_main->get("${pre}address2"). ' '
- if $cust_main->get("${pre}address2");
- $html .= $cust_main->get("${pre}city"). ', '.
- $cust_main->get("${pre}state"). ' '.
- $cust_main->get("${pre}zip"). ' ';
- $html .= $cust_main->get("${pre}country"). ' '
- if $cust_main->get("${pre}country")
- && $cust_main->get("${pre}country") ne $countrydefault;
-
- $html .= ' |
| ';
-
- if ( $cust_main->get("${pre}daytime") && $cust_main->get("${pre}night") ) {
- use FS::Msgcat;
- $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
- ' '. $cust_main->get("${pre}daytime").
- ' '. ( FS::Msgcat::_gettext('night') || 'Night' ).
- ' '. $cust_main->get("${pre}night");
- } elsif ( $cust_main->get("${pre}daytime")
- || $cust_main->get("${pre}night") ) {
- $html .= $cust_main->get("${pre}daytime")
- || $cust_main->get("${pre}night");
- }
- if ( $cust_main->get("${pre}fax") ) {
- $html .= ' Fax '. $cust_main->get("${pre}fax");
- }
+ ' |
Service Address | ';
+ $html .= join(' ',
+ map encode_entities($_), grep $_,
+ $cust_main->contact,
+ $cust_main->company,
+ $ship->address1,
+ $ship->address2,
+ ($ship->city . ', ' . $ship->state . ' ' . $ship->zip),
+ ($ship->country eq $countrydefault ? '' : $ship->country ),
+ );
+
+ # ship phone numbers no longer exist...
$html .= ' |
';
+
}
$html .= '';
@@ -109,6 +119,8 @@ sub small_custview {
# last payment might be good here too?
+ $html .= '
';
+
$html;
}