X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=9dc635ad22c41960f708e28477f1e8e1ebfa2172;hb=f441bdef352ddd432e305da35e80813ca30e517f;hp=d69aad2fc4bd47e9f3a163c931c6ca312cd419e6;hpb=536d684c3e17375d45a5d62bc5d748fec0224860;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index d69aad2fc..9dc635ad2 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -44,8 +44,10 @@ Returns an HTML header. =cut sub header { + use Carp; + carp 'FS::CGI::header deprecated; include /elements/header.html instead'; + my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc. - #use Carp; $etc = '' unless defined $etc; my $x = < - + $title

@@ -107,6 +109,9 @@ Returns an HTML menubar. =cut sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... ); + use Carp; + carp 'FS::CGI::menubar deprecated; include /elements/menubar.html instead'; + my($item,$url,@html); while (@_) { ($item,$url)=splice(@_,0,2); @@ -209,7 +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 ); + 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); @@ -225,6 +232,9 @@ Returns HTML tag for beginning a table. =cut sub table { + use Carp; + carp 'FS::CGI::table deprecated; include /elements/table.html instead'; + my $col = shift; if ( $col ) { qq!!; @@ -242,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!

!; } } @@ -266,7 +277,7 @@ sub ntable { } -=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT +=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG Sheesh. I should just switch to Mason. @@ -278,13 +289,16 @@ sub small_custview { my $arg = shift; my $countrydefault = shift || 'US'; + my $nobalance = shift; my $cust_main = ref($arg) ? $arg : qsearchs('cust_main', { 'custnum' => $arg } ) or die "unknown custnum $arg"; - my $html = 'Customer #'. $cust_main->custnum. ''. - ntable('#e8e8e8'). '

'. ntable("#cccccc",2). + my $html = 'Customer #'. $cust_main->custnum. ''. + ' - '. + ucfirst($cust_main->status). ''. + ntable('#e8e8e8'). '
'. ntable("#cccccc",2). '
Billing Address	'. $cust_main->getfield('last'). ', '. $cust_main->first. ' '; @@ -295,13 +309,27 @@ 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') ) { my $pre = $cust_main->ship_last ? 'ship_' : ''; - $html .= ''. ntable("#cccccc",2). + $html .= ''. ntable("#cccccc",2). 'Service
Address'. $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first"). '
'; @@ -317,11 +345,33 @@ 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 .= ''; } $html .= ''; + $html .= '
Balance: $'. $cust_main->balance. '
' + unless $nobalance; + + # last payment might be good here too? + $html; }