X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=4c2693db856ea0dd4d302057bc382d02b6c83469;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hp=a3286299bce0f6ea36b2a072f5b995a0d901ee4b;hpb=a7319715290dccc7beb414de8d2de24230278a13;p=freeside.git
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index a3286299b..4c2693db8 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;
@@ -79,14 +79,7 @@ Sets an http header.
sub http_header {
my ( $header, $value ) = @_;
if (exists $ENV{MOD_PERL}) {
- if ( defined $main::Response
- && $main::Response->isa('Apache::ASP::Response') ) { #Apache::ASP
- if ( $header =~ /^Content-Type$/ ) {
- $main::Response->{ContentType} = $value;
- } else {
- $main::Response->AddHeader( $header => $value );
- }
- } elsif ( defined $HTML::Mason::Commands::r ) { #Mason
+ if ( defined $HTML::Mason::Commands::r ) { #Mason
## is this the correct pacakge for $r ??? for 1.0x and 1.1x ?
if ( $header =~ /^Content-Type$/ ) {
$HTML::Mason::Commands::r->content_type($value);
@@ -115,6 +108,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);
@@ -185,12 +179,7 @@ If running under mod_perl, calles Apache::exit, otherwise, calls exit.
sub myexit {
if (exists $ENV{MOD_PERL}) {
- if ( defined $main::Response
- && $main::Response->isa('Apache::ASP::Response') ) { #Apache::ASP
- $main::Response->End();
- require Apache;
- Apache::exit();
- } elsif ( defined $HTML::Mason::Commands::m ) { #Mason
+ if ( defined $HTML::Mason::Commands::m ) { #Mason
#$HTML::Mason::Commands::m->flush_buffer();
$HTML::Mason::Commands::m->abort();
die "shouldn't fall through to here (mason \$m->abort didn't)";
@@ -225,6 +214,40 @@ 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{ / index\.html /? $ }
+ {/}x;
+ $url_string =~
+ s{
+ /
+ (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
+ /
+ (process/)?
+ ([\w\-\.\/]+)
+ $
+ }
+ {}x;
+
+ #elements because of progress-popup.html...
+ #XXX remove anything from elements that is called directly & prevent
+ #those pages from being served up
+
+ $url_string .= '/' unless $url_string =~ /\/$/;
+
+ $url_string;
+
+}
+
=item table
Returns HTML tag for beginning a table.
@@ -252,10 +275,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 +300,7 @@ sub ntable {
}
-=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT
+=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG, URL
Sheesh. I should just switch to Mason.
@@ -288,13 +312,22 @@ sub small_custview {
my $arg = shift;
my $countrydefault = shift || 'US';
+ my $nobalance = shift;
+ my $url = 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;
+
+ $html = qq!View '
+ if $url;
+
+ $html .= 'Customer #'. $cust_main->custnum. ''.
+ ' - '.
+ ucfirst($cust_main->status). ''.
+ ntable('#e8e8e8'). ' |
'. ntable("#cccccc",2).
' |
Billing Address | '.
$cust_main->getfield('last'). ', '. $cust_main->first. ' ';
@@ -305,13 +338,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"). ' ';
@@ -327,12 +374,30 @@ 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. '
';
+ $html .= '
Balance: $'. $cust_main->balance. '
'
+ unless $nobalance;
# last payment might be good here too?