X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=f33a718fa68711b8dda79cd4a1f70c1716776d33;hb=f4cff6248e3340d2321e9d761fec9ea12b28f781;hp=06f740cf5f03c8d7cd075763f7feab1983656be6;hpb=38a7453130448e067e77fbb6966630bca4cc765b;p=freeside.git
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 06f740cf5..f33a718fa 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -9,8 +9,8 @@ use URI::URL;
use FS::UID;
@ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl rooturl table itable ntable
- small_custview myexit http_header);
+@EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable
+ myexit http_header);
=head1 NAME
@@ -194,16 +194,24 @@ sub myexit {
}
}
-=item popurl LEVEL
+=item popurl LEVEL [URL]
-Returns current URL with LEVEL levels of path removed from the end (default 0).
+Returns current (or, optionally, passed) URL with LEVEL levels of path removed
+from the end (default 0).
=cut
sub popurl {
- my($up)=@_;
- my $cgi = &FS::UID::cgi;
- my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ my $up = shift;
+
+ my $url_string;
+ if ( scalar(@_) ) {
+ $url_string = shift;
+ } else {
+ my $cgi = &FS::UID::cgi;
+ $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ }
+
$url_string =~ s/\?.*//;
my $url = new URI::URL ( $url_string );
my(@path)=$url->path_components;
@@ -233,7 +241,7 @@ sub rooturl {
(browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
/
(process/)?
- ([\w\-\.\/]+)
+ ([\w\-\.\/]*)
$
}
{}x;
@@ -300,110 +308,6 @@ sub ntable {
}
-=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG, URL
-
-Sheesh. I should just switch to Mason.
-
-=cut
-
-sub small_custview {
- use FS::Record qw(qsearchs);
- use FS::cust_main;
-
- 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;
-
- $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. ' ';
-
- $html .= $cust_main->company. ' ' if $cust_main->company;
- $html .= $cust_main->address1. ' ';
- $html .= $cust_main->address2. ' ' if $cust_main->address2;
- $html .= $cust_main->city. ', '. $cust_main->state. ' '. $cust_main->zip. ' ';
- $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).
- ' | Service Address | '.
- $cust_main->get("${pre}last"). ', '.
- $cust_main->get("${pre}first"). ' ';
- $html .= $cust_main->get("${pre}company"). ' '
- if $cust_main->get("${pre}company");
- $html .= $cust_main->get("${pre}address1"). ' ';
- $html .= $cust_main->get("${pre}address2"). ' '
- if $cust_main->get("${pre}address2");
- $html .= $cust_main->get("${pre}city"). ', '.
- $cust_main->get("${pre}state"). ' '.
- $cust_main->get("${pre}zip"). ' ';
- $html .= $cust_main->get("${pre}country"). ' '
- 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;
-}
-
=back
=head1 BUGS
@@ -412,8 +316,6 @@ Not OO.
Not complete.
-small_custview sooooo doesn't belong here. i should just switch to Mason.
-
=head1 SEE ALSO
L, L