X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=7d0a3f5e9d944d4a7db8723f9d8e3b09a8338659;hb=03ab761a53bffa14d09f23fb8b9702806a1c6b79;hp=2a0908acddd6c714cf92610298022e284e1ab6aa;hpb=c2fd718e7358c4b337f0aa1294c6eb38ea5c6c46;p=freeside.git diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 2a0908acd..7d0a3f5e9 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -56,6 +56,8 @@ if ( -e $addl_handler_use_file ) { #use CGI::Carp qw(fatalsToBrowser); use CGI::Cookie; use List::Util qw( max min sum ); + use List::MoreUtils qw( first_index uniq ); + use Scalar::Util qw( blessed ); use Data::Dumper; use Date::Format; use Time::Local; @@ -64,24 +66,23 @@ if ( -e $addl_handler_use_file ) { use DateTime; use DateTime::Format::Strptime; use FS::Misc::DateTime qw( parse_datetime ); - use FS::Misc::Geo qw( get_censustract get_district ); + use FS::Misc::Geo qw( get_district ); use Lingua::EN::Inflect qw(PL); Lingua::EN::Inflect::classical names=>0; #Categorys use Tie::IxHash; use URI; - use URI::Escape; + use URI::Escape 3.31; use HTML::Entities; use HTML::TreeBuilder; use HTML::TableExtract qw(tree); use HTML::FormatText; use HTML::Defang; - use JSON; -# use XMLRPC::Transport::HTTP; -# use XMLRPC::Lite; # for XMLRPC::Serializer + use JSON::XS; use MIME::Base64; use IO::Handle; use IO::File; use IO::Scalar; + use IO::String; #not actually using this yet anyway...# use IPC::Run3 0.036; use Net::Whois::Raw qw(whois); if ( $] < 5.006 ) { @@ -91,6 +92,10 @@ if ( -e $addl_handler_use_file ) { use Text::CSV_XS; use Spreadsheet::WriteExcel; use Spreadsheet::WriteExcel::Utility; + use OLE::Storage_Lite; + use Excel::Writer::XLSX; + #use Excel::Writer::XLSX::Utility; #redundant with above + use Business::CreditCard 0.30; #for mask-aware cardtype() use NetAddr::IP; use Net::Ping; @@ -114,12 +119,14 @@ if ( -e $addl_handler_use_file ) { use HTML::Widgets::SelectLayers 0.07; #should go away in favor of #selectlayers.html use Locale::Country; + use Locale::Currency; + use Locale::Currency::Format; use Business::US::USPS::WebTools::AddressStandardization; use Geo::GoogleEarth::Pluggable; use LWP::UserAgent; use Storable qw( nfreeze thaw ); use FS; - use FS::UID qw( getotaker dbh datasrc driver_name ); + use FS::UID qw( dbh datasrc driver_name ); use FS::Record qw( qsearch qsearchs fields dbdef str2time_sql str2time_sql_closing midnight_sql @@ -139,6 +146,7 @@ if ( -e $addl_handler_use_file ) { use FS::Report::Table; use FS::Report::Table::Monthly; use FS::Report::Table::Daily; + use FS::Report::Tax; use FS::TicketSystem; use FS::NetworkMonitoringSystem; use FS::Tron qw( tron_lint ); @@ -153,8 +161,10 @@ if ( -e $addl_handler_use_file ) { use FS::cust_credit; use FS::cust_credit_bill; use FS::cust_main; + use FS::h_cust_main; use FS::cust_main::Search qw(smart_search); use FS::cust_main::Import; + use FS::cust_main::Import_Charges; use FS::cust_main_county; use FS::cust_location; use FS::cust_pay; @@ -204,7 +214,6 @@ if ( -e $addl_handler_use_file ) { use FS::usage_class; use FS::payment_gateway; use FS::agent_payment_gateway; - use FS::XMLRPC; use FS::payby; use FS::cdr; use FS::cdr_batch; @@ -305,13 +314,70 @@ if ( -e $addl_handler_use_file ) { use FS::tower; use FS::tower_sector; use FS::sales; - use FS::access_groupsales; use FS::contact_class; use FS::part_svc_class; - use FS::ftp_target; + use FS::upload_target; use FS::quotation; use FS::quotation_pkg; use FS::quotation_pkg_discount; + use FS::cust_bill_void; + use FS::cust_bill_pkg_void; + use FS::cust_bill_pkg_detail_void; + use FS::cust_bill_pkg_display_void; + use FS::cust_bill_pkg_tax_location_void; + use FS::cust_bill_pkg_tax_rate_location_void; + use FS::cust_tax_exempt_pkg_void; + use FS::cust_bill_pkg_discount_void; + use FS::agent_pkg_class; + use FS::svc_export_machine; + use FS::GeocodeCache; + use FS::log; + use FS::log_context; + use FS::part_pkg_usage_class; + use FS::cust_pkg_usage; + use FS::part_pkg_usage_class; + use FS::part_pkg_usage; + use FS::cdr_cust_pkg_usage; + use FS::part_pkg_msgcat; + use FS::svc_cable; + use FS::agent_currency; + use FS::currency_exchange; + use FS::part_pkg_currency; + use FS::cust_payby; + use FS::vend_main; + use FS::vend_class; + use FS::vend_bill; + use FS::vend_pay; + use FS::vend_bill_pay; + use FS::sales_pkg_class; + use FS::svc_alarm; + use FS::cable_model; + use FS::invoice_mode; + use FS::invoice_conf; + use FS::cable_provider; + use FS::cust_credit_void; + use FS::discount_class; + use FS::alarm_system; + use FS::alarm_type; + use FS::alarm_station; + use FS::addr_range; + use FS::svc_conferencing; + use FS::conferencing_type; + use FS::conferencing_quality; + use FS::svc_video; + use FS::part_pkg_usageprice; + use FS::cust_pkg_usageprice; + use FS::pbx_extension; + use FS::pbx_device; + use FS::extension_device; + use FS::cust_main_credit_limit; + use FS::cust_event_fee; + use FS::part_fee; + use FS::cust_bill_pkg_fee; + use FS::part_fee_msgcat; + use FS::part_fee_usage; + use FS::sched_item; + use FS::sched_avail; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { @@ -355,7 +421,7 @@ if ( -e $addl_handler_use_file ) { use RT::Interface::Web::Request; - #nother undeclared web UI dep (for ticket links graph) + #another undeclared web UI dep (for ticket links graph) use IPC::Run::SafeHandles; #slow, unreliable, segfaults and is optional @@ -382,7 +448,7 @@ if ( -e $addl_handler_use_file ) { use vars qw($m); # false laziness w/below - if ( defined(@DBIx::Profile::ISA) ) { + if ( @DBIx::Profile::ISA ) { if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) { @@ -442,7 +508,7 @@ if ( -e $addl_handler_use_file ) { use vars qw($m); $m->clear_buffer; #false laziness w/above - if ( defined(@DBIx::Profile::ISA) ) { + if ( @DBIx::Profile::ISA ) { if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) { @@ -514,28 +580,7 @@ sub mason_interps { RT::LoadConfig(); } - # A hook supporting strange legacy ways people (well, SG) have added stuff on - - my @addl_comp_root = (); - my $addl_comp_root_file = '%%%FREESIDE_CONF%%%/addl_comp_root.pl'; - if ( -e $addl_comp_root_file ) { - warn "reading $addl_comp_root_file\n"; - my $text = slurp( $addl_comp_root_file ); - my @addl = eval $text; - if ( @addl && ! $@ ) { - @addl_comp_root = @addl; - } elsif ($@) { - warn "error parsing $addl_comp_root_file: $@\n"; - } - } - - my $fs_comp_root = - scalar(@addl_comp_root) - ? [ - [ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%' ], - @addl_comp_root, - ] - : '%%%FREESIDE_DOCUMENT_ROOT%%%'; + my $fs_comp_root = '%%%FREESIDE_DOCUMENT_ROOT%%%'; my %interp = ( request_class => $request_class, @@ -588,7 +633,7 @@ sub mason_interps { }, compiler => HTML::Mason::Compiler::ToObject->new( default_escape_flags => 'h', - allow_globals => [qw(%session)], + allow_globals => [qw(%session $DECODED_ARGS)], ), );