break _bytecount subroutines out of FS::UI::Web

[freeside.git] / htetc / handler.pl

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 89287d7..755e664 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -60,7 +60,7 @@ my $ah = new HTML::Mason::ApacheHandler (
                 [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
                 [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
               ],
-  data_dir=>'/usr/local/etc/freeside/masondata',
+  data_dir=>'%%%MASONDATA%%%',
   #out_mode=>'stream',
 
   #RT
@@ -97,6 +97,8 @@ sub handler
       use Date::Parse;
       use Time::Local;
       use Time::Duration;
+      use DateTime;
+      use DateTime::Format::Strptime;
       use Lingua::EN::Inflect qw(PL);
       use Tie::IxHash;
       use URI::Escape;
@@ -112,12 +114,12 @@ sub handler
       }
       use Text::CSV_XS;
       use Spreadsheet::WriteExcel;
-      use Business::CreditCard;
+      use Business::CreditCard 0.30; #for mask-aware cardtype()
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
       use Chart::Mountain;
       use Color::Scheme;
-      use HTML::Widgets::SelectLayers 0.05;
+      use HTML::Widgets::SelectLayers 0.07;
       use Locale::Country;
       use FS;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
@@ -125,9 +127,10 @@ sub handler
       use FS::Conf;
       use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
                      eidiot small_custview myexit http_header);
-      use FS::UI::Web;
+      use FS::UI::Web qw(svc_url);
+      use FS::UI::bytecount;
       use FS::Msgcat qw(gettext geterror);
-      use FS::Misc qw( send_email send_fax states_hash state_label );
+      use FS::Misc qw( send_email send_fax states_hash counties state_label );
       use FS::Report::Table::Monthly;
       use FS::TicketSystem;
 
@@ -333,6 +336,8 @@ sub handler
       $ah->interp->set_escape( 'h' => sub { ${$_[0]}; } );
     }
 
+    $ah->interp->ignore_warnings_expr('.');
+
     my %session;
     my $status;
     eval { $status = $ah->handle_request($r); };