X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=9b406d34644485d64b8f536e582ef2d38aed8270;hb=2041a9143fac20b79ead4a1ae01224dedf5b27c2;hp=86121f02e16abe3cef5806f6ec93d26163e10b58;hpb=0952f0a9264d575752393a0be1a3d3c6480f96ed;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 86121f02e..9b406d346 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -61,7 +61,7 @@ sub header { - + $title

@@ -214,8 +214,9 @@ Returns current URL with LEVEL levels of path removed from the end (default 0). sub popurl { my($up)=@_; my $cgi = &FS::UID::cgi; - my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url ); - $url->query(''); + my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + $url_string =~ s/\?.*//; + my $url = new URI::URL ( $url_string ); my(@path)=$url->path_components; splice @path, 0-$up; $url->path_components(@path); @@ -251,10 +252,11 @@ Returns HTML tag for beginning an (invisible) table. sub itable { my $col = shift; my $cellspacing = shift || 0; + my $width = ( scalar(@_) && shift ) ? '' : 'WIDTH="100%"'; #bah if ( $col ) { - qq!!; + qq!
!; } else { - qq!
!; + qq!
!; } } @@ -293,6 +295,8 @@ sub small_custview { or die "unknown custnum $arg"; my $html = 'Customer #'. $cust_main->custnum. ''. + ' - '. + ucfirst($cust_main->status). ''. ntable('#e8e8e8'). '
'. ntable("#cccccc",2). '
Billing
Address		'. $cust_main->getfield('last'). ', '. $cust_main->first. '
'; @@ -304,6 +308,20 @@ sub small_custview { $html .= $cust_main->country. '
' if $cust_main->country && $cust_main->country ne $countrydefault; + $html .= '
'; + if ( $cust_main->daytime && $cust_main->night ) { + use FS::Msgcat; + $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ). + ' '. $cust_main->daytime. + '
'. ( FS::Msgcat::_gettext('night') || 'Night' ). + ' '. $cust_main->night; + } elsif ( $cust_main->daytime || $cust_main->night ) { + $html .= $cust_main->daytime || $cust_main->night; + } + if ( $cust_main->fax ) { + $html .= '
Fax '. $cust_main->fax; + } + $html .= '
'; if ( defined $cust_main->dbdef_table->column('ship_last') ) { @@ -326,6 +344,23 @@ sub small_custview { 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"); + } + $html .= ''; }