badly placed small_custview all of a sudden causing fatal errors?! wtf

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 06f740c..96047f6 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -9,8 +9,8 @@ use URI::URL;
 use FS::UID;
 
 @ISA = qw(Exporter);
 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
 
 
 =head1 NAME
 


@@ -300,110 +300,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 <A HREF="$url?! . $cust_main->custnum . '">'
-    if $url;
-
-  $html .= 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
-    ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
-    ucfirst($cust_main->status). '</FONT></B>'.
-    ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
-    '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-    $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
-
-  $html .= $cust_main->company. '<BR>' if $cust_main->company;
-  $html .= $cust_main->address1. '<BR>';
-  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
-  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-  $html .= $cust_main->country. '<BR>'
-    if $cust_main->country && $cust_main->country ne $countrydefault;
-
-  $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
-  if ( $cust_main->daytime && $cust_main->night ) {
-    use FS::Msgcat;
-    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
-             ' '. $cust_main->daytime.
-             '<BR>'. ( 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 .= '<BR>Fax '. $cust_main->fax;
-  }
-
-  $html .= '</TD></TR></TABLE></TD>';
-
-  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-    my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-    $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->get("${pre}last"). ', '.
-      $cust_main->get("${pre}first"). '<BR>';
-    $html .= $cust_main->get("${pre}company"). '<BR>'
-      if $cust_main->get("${pre}company");
-    $html .= $cust_main->get("${pre}address1"). '<BR>';
-    $html .= $cust_main->get("${pre}address2"). '<BR>'
-      if $cust_main->get("${pre}address2");
-    $html .= $cust_main->get("${pre}city"). ', '.
-             $cust_main->get("${pre}state"). '  '.
-             $cust_main->get("${pre}zip"). '<BR>';
-    $html .= $cust_main->get("${pre}country"). '<BR>'
-      if $cust_main->get("${pre}country")
-         && $cust_main->get("${pre}country") ne $countrydefault;
-
-    $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
-
-    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").
-               '<BR>'. ( 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 .= '<BR>Fax '. $cust_main->get("${pre}fax");
-    }
-
-    $html .= '</TD></TR></TABLE></TD>';
-  }
-
-  $html .= '</TR></TABLE>';
-
-  $html .= '<BR>Balance: <B>$'. $cust_main->balance. '</B><BR>'
-    unless $nobalance;
-
-  # last payment might be good here too?
-
-  $html;
-}
-

 =back
 
 =head1 BUGS
 =back
 
 =head1 BUGS


@@ -412,8 +308,6 @@ Not OO.
 
 Not complete.
 
 
 Not complete.
 

-small_custview sooooo doesn't belong here.  i should just switch to Mason.
-

 =head1 SEE ALSO
 
 L<CGI>, L<CGI::Base>
 =head1 SEE ALSO
 
 L<CGI>, L<CGI::Base>

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 3694a78..099affa 100644 (file)
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -7,7 +7,7 @@ use Digest::MD5 qw(md5_hex);
 use Date::Format;
 use Business::CreditCard;
 use Time::Duration;
 use Date::Format;
 use Business::CreditCard;
 use Time::Duration;

-use FS::CGI qw(small_custview); #doh
+use FS::UI::Web::small_custview qw(small_custview); #less doh

 use FS::UI::Web;
 use FS::UI::bytecount;
 use FS::Conf;
 use FS::UI::Web;
 use FS::UI::bytecount;
 use FS::Conf;

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
new file mode 100644 (file)
index 0000000..80540af
--- /dev/null
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -0,0 +1,114 @@
+package FS::UI::Web::small_custview;
+
+use strict;
+use vars qw(@EXPORT_OK @ISA);
+use Exporter;
+use FS::Msgcat;
+use FS::Record qw(qsearchs);
+use FS::cust_main;
+
+@ISA = qw(Exporter);
+@EXPORT_OK = qw( small_custview );
+
+=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG, URL
+
+Sheesh. I did switch to mason, but this is still hanging around.  Figure out
+some better way to sling mason components to self-service & RT.
+
+=cut
+
+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;
+  
+  $html = qq!View <A HREF="$url?! . $cust_main->custnum . '">'
+    if $url;
+
+  $html .= 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
+    ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
+    ucfirst($cust_main->status). '</FONT></B>'.
+    ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
+    '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
+    $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
+
+  $html .= $cust_main->company. '<BR>' if $cust_main->company;
+  $html .= $cust_main->address1. '<BR>';
+  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
+  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
+  $html .= $cust_main->country. '<BR>'
+    if $cust_main->country && $cust_main->country ne $countrydefault;
+
+  $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
+  if ( $cust_main->daytime && $cust_main->night ) {
+    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
+             ' '. $cust_main->daytime.
+             '<BR>'. ( 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 .= '<BR>Fax '. $cust_main->fax;
+  }
+
+  $html .= '</TD></TR></TABLE></TD>';
+
+  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+
+    my $pre = $cust_main->ship_last ? 'ship_' : '';
+
+    $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
+      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
+      $cust_main->get("${pre}last"). ', '.
+      $cust_main->get("${pre}first"). '<BR>';
+    $html .= $cust_main->get("${pre}company"). '<BR>'
+      if $cust_main->get("${pre}company");
+    $html .= $cust_main->get("${pre}address1"). '<BR>';
+    $html .= $cust_main->get("${pre}address2"). '<BR>'
+      if $cust_main->get("${pre}address2");
+    $html .= $cust_main->get("${pre}city"). ', '.
+             $cust_main->get("${pre}state"). '  '.
+             $cust_main->get("${pre}zip"). '<BR>';
+    $html .= $cust_main->get("${pre}country"). '<BR>'
+      if $cust_main->get("${pre}country")
+         && $cust_main->get("${pre}country") ne $countrydefault;
+
+    $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
+
+    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").
+               '<BR>'. ( 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 .= '<BR>Fax '. $cust_main->get("${pre}fax");
+    }
+
+    $html .= '</TD></TR></TABLE></TD>';
+  }
+
+  $html .= '</TR></TABLE>';
+
+  $html .= '<BR>Balance: <B>$'. $cust_main->balance. '</B><BR>'
+    unless $nobalance;
+
+  # last payment might be good here too?
+
+  $html;
+}
+

diff --git a/htetc/handler.pl b/htetc/handler.pl
index ab9fa95..383c5fc 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -136,8 +136,9 @@ sub handler
       use FS::Record qw(qsearch qsearchs fields dbdef str2time_sql);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
       use FS::Record qw(qsearch qsearchs fields dbdef str2time_sql);
       use FS::Conf;
       use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot

-                     eidiot small_custview myexit http_header);
+                     eidiot myexit http_header);

       use FS::UI::Web qw(svc_url);
       use FS::UI::Web qw(svc_url);

+      use FS::UI::Web::small_custview qw(small_custview);

       use FS::UI::bytecount;
       use FS::Msgcat qw(gettext geterror);
       use FS::Misc qw( send_email send_fax states_hash counties state_label );
       use FS::UI::bytecount;
       use FS::Msgcat qw(gettext geterror);
       use FS::Misc qw( send_email send_fax states_hash counties state_label );

diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm
index 0bc4c90..bd7c42c 100644 (file)
--- a/rt/lib/RT/URI/freeside/Internal.pm
+++ b/rt/lib/RT/URI/freeside/Internal.pm
@@ -32,7 +32,8 @@ no warnings qw(redefine);
 
 use FS;
 use FS::UID qw(dbh);
 
 use FS;
 use FS::UID qw(dbh);

-use FS::CGI qw(popurl small_custview);
+use FS::CGI qw(popurl);
+use FS::UI::Web::small_custview qw(small_custview);

 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch dbdef);
 use FS::cust_main;


@@ -115,7 +116,7 @@ sub email_search { #Subroutine
 
 sub small_custview {
 
 
 sub small_custview {
 

-  return &FS::CGI::small_custview(@_);
+  return &FS::UI::Web::small_custview::small_custview(@_);

 
 }
 
 
 }
 

diff --git a/rt/lib/RT/URI/freeside/XMLRPC.pm b/rt/lib/RT/URI/freeside/XMLRPC.pm
index a8a731f..916c20d 100644 (file)
--- a/rt/lib/RT/URI/freeside/XMLRPC.pm
+++ b/rt/lib/RT/URI/freeside/XMLRPC.pm
@@ -115,7 +115,7 @@ sub smart_search { #Subroutine
 
 sub small_custview {
 
 
 sub small_custview {
 

-  return _XMLRPCRequest('CGI.small_custview', @_);
+  return _XMLRPCRequest('Web.UI.small_custview.small_custview', @_);

 
 }
 
 
 }