X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=92564350efd7469a8306e8f9e38a1d9ee61d5a56;hb=85c516c6a894772e101d24a16ad2f4df978c0f7f;hp=9605b8f488c7050d73d91524f0c024b7687ce281;hpb=0ceaaf5af7d83754aa4b1a775071e85b3139bbbf;p=freeside.git diff --git a/htetc/handler.pl b/htetc/handler.pl index 9605b8f48..92564350e 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -37,6 +37,8 @@ if ( %%%RT_ENABLED%%% ) { my %interp = ( request_class => 'HTML::Mason::Request::ApacheHandler', data_dir => '%%%MASONDATA%%%', + error_mode => 'output', + error_format => 'html', ignore_warnings_expr => '.', comp_root => [ [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ], @@ -118,12 +120,15 @@ sub handler use Text::CSV_XS; use Spreadsheet::WriteExcel; use Business::CreditCard 0.30; #for mask-aware cardtype() + use NetAddr::IP; use String::Approx qw(amatch); use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.07; + use HTML::Widgets::SelectLayers 0.07; #should go away in favor of + #selectlayers.html use Locale::Country; + use Business::US::USPS::WebTools::AddressStandardization; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef str2time_sql); @@ -148,6 +153,7 @@ sub handler use FS::cust_main_county; use FS::cust_pay; use FS::cust_pkg; + use FS::part_pkg_taxclass; use FS::cust_pkg_reason; use FS::cust_refund; use FS::cust_svc; @@ -203,6 +209,12 @@ sub handler use FS::reason_type; use FS::reason; use FS::cust_main_note; + use FS::tax_class; + use FS::cust_tax_location; + use FS::part_pkg_taxproduct; + use FS::part_pkg_taxoverride; + use FS::part_pkg_taxrate; + use FS::tax_rate; if ( %%%RT_ENABLED%%% ) { eval ' @@ -221,12 +233,22 @@ sub handler use RT::CustomFieldValues; use RT::ObjectCustomFieldValues; + #blah. manually updated from RT::Interface::Web::Handler use RT::Interface::Web; use MIME::Entity; use Text::Wrapper; use Time::ParseDate; + use Time::HiRes; use HTML::Scrubber; - use Text::Quoted; + + #slow, unreliable, segfaults and is optional + #see rt/html/Ticket/Elements/ShowTransactionAttachments + #use Text::Quoted; + + #?#use File::Path qw( rmtree ); + #?#use File::Glob qw( bsd_glob ); + #?#use File::Spec::Unix; + '; die $@ if $@; } @@ -267,7 +289,11 @@ sub handler }; - unless ( $HTML::Mason::r->filename =~ /\/rt\/.*NoAuth/ ) { #RT + #is this conditional a bad idea entirely, hmm + unless ( + $HTML::Mason::r->filename =~ /\/rt\/.*NoAuth/ #RT images/JS + && $HTML::Mason::r->filename !~ /\/rt\/REST\// #but NOT mail gw + ) { $cgi = new CGI; &cgisuidsetup($cgi); #&cgisuidsetup($r); @@ -335,8 +361,6 @@ sub handler if ( $r->filename =~ /\/rt\// ) { #RT $ah->interp($rt_interp); - # MasonX::Request::ExtendedCompRoot - #$ah->interp->comp_root( '/rt'. $ah->interp->comp_root() ); local $SIG{__WARN__}; local $SIG{__DIE__}; @@ -360,6 +384,7 @@ sub handler # if ( $@ ) { # $RT::Logger->crit($@); # } + warn $@ if $@; undef %session;