X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=1ddc62c7a55641ea3f212300234312abdce0cedb;hp=6c7ab78c9cb36b0aa781435d16960cc3bfe5e198;hb=f11341c6ca588f1ff5e46a857540e88d49d7647a;hpb=23c97b258b9b60d558af333166940f11c229f71c diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 6c7ab78c9..1ddc62c7a 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(undef); + 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); @@ -293,6 +294,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 +307,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 +343,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 .= ''; }