X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=8b401da363a7f44745169934a0202ae331be8955;hb=633c48448d9468690b7ad77eb6ff7c660a286658;hp=1ddc62c7a55641ea3f212300234312abdce0cedb;hpb=3913f6d159b5b8110061690b7c97642c27abf7eb;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 1ddc62c7a..8b401da36 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -9,7 +9,7 @@ use URI::URL; use FS::UID; @ISA = qw(Exporter); -@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable +@EXPORT_OK = qw(header menubar idiot eidiot popurl rooturl table itable ntable small_custview myexit http_header); =head1 NAME @@ -62,9 +62,9 @@ sub header { - $title +
$title
 -

+
END $x .= $menubar. "

" if $menubar; $x; @@ -115,6 +115,7 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... ); my($item,$url,@html); while (@_) { ($item,$url)=splice(@_,0,2); + next if $item =~ /^\s*Main\s+Menu\s*$/i; push @html, qq!$item!; } join(' | ',@html); @@ -225,6 +226,31 @@ sub popurl { $x; } +=item rooturl + +=cut + +sub rooturl { + # better to start with the client-provided URL + my $cgi = &FS::UID::cgi; + my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + $url_string =~ s/\?.*//; + + #even though this is kludgy + $url_string =~ + s{ + (browse|config|docs|edit|graph|misc|search|view|pref) + / + (process/)? + ([\w\-\.]+) + $ + } + {}x; + + $url_string; + +} + =item table Returns HTML tag for beginning a table. @@ -252,10 +278,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!
!; } } @@ -276,7 +303,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. @@ -288,15 +315,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. ''. + my $html = 'Customer #'. $cust_main->custnum. ''. ' - '. ucfirst($cust_main->status). ''. - ntable('#e8e8e8'). '
'. ntable("#cccccc",2). + ntable('#e8e8e8'). '
'. ntable("#cccccc",2). '
Billing
Address		'. $cust_main->getfield('last'). ', '. $cust_main->first. '
'; @@ -327,7 +355,7 @@ sub small_custview { 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"). '
'; @@ -365,7 +393,8 @@ sub small_custview { $html .= '
'; - $html .= '
Balance: $'. $cust_main->balance. '
'; + $html .= '
Balance: $'. $cust_main->balance. '
' + unless $nobalance; # last payment might be good here too?