projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix dep on HTML::GoogleMaps, RT#15539
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
e74f44e
..
fc45b99
100644
(file)
--- a/
FS/FS/Mason.pm
+++ b/
FS/FS/Mason.pm
@@
-114,6
+114,7
@@
if ( -e $addl_handler_use_file ) {
#selectlayers.html
use Locale::Country;
use Business::US::USPS::WebTools::AddressStandardization;
#selectlayers.html
use Locale::Country;
use Business::US::USPS::WebTools::AddressStandardization;
+ use Geo::GoogleEarth::Pluggable;
use LWP::UserAgent;
use Storable qw( nfreeze thaw );
use FS;
use LWP::UserAgent;
use Storable qw( nfreeze thaw );
use FS;
@@
-133,12
+134,14
@@
if ( -e $addl_handler_use_file ) {
);
use FS::Misc::eps2png qw( eps2png );
use FS::Report::FCC_477;
);
use FS::Misc::eps2png qw( eps2png );
use FS::Report::FCC_477;
+ use FS::Report::Table;
use FS::Report::Table::Monthly;
use FS::Report::Table::Monthly;
+ use FS::Report::Table::Daily;
use FS::TicketSystem;
use FS::NetworkMonitoringSystem;
use FS::Tron qw( tron_lint );
use FS::Locales;
use FS::TicketSystem;
use FS::NetworkMonitoringSystem;
use FS::Tron qw( tron_lint );
use FS::Locales;
- use FS::
L10N
;
+ use FS::
Maketext qw( mt emt js_mt )
;
use FS::agent;
use FS::agent_type;
use FS::agent;
use FS::agent_type;
@@
-276,13
+279,29
@@
if ( -e $addl_handler_use_file ) {
use FS::torrus_srvderive_component;
use FS::areacode;
use FS::svc_dish;
use FS::torrus_srvderive_component;
use FS::areacode;
use FS::svc_dish;
+ use FS::h_svc_dish;
use FS::svc_hardware;
use FS::svc_hardware;
+ use FS::h_svc_hardware;
use FS::hardware_class;
use FS::hardware_type;
use FS::hardware_status;
use FS::did_order_item;
use FS::msa;
use FS::rate_center;
use FS::hardware_class;
use FS::hardware_type;
use FS::hardware_status;
use FS::did_order_item;
use FS::msa;
use FS::rate_center;
+ use FS::cust_msg;
+ use FS::radius_group;
+ use FS::template_content;
+ use FS::dsl_device;
+ use FS::nas;
+ use FS::nas;
+ use FS::export_nas;
+ use FS::legacy_cust_bill;
+ use FS::rate_tier;
+ use FS::rate_tier_detail;
+ use FS::radius_attr;
+ use FS::discount_plan;
+ use FS::tower;
+ use FS::tower_sector;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
@@
-408,11
+427,6
@@
if ( -e $addl_handler_use_file ) {
$m->comp('/elements/errorpage-popup.html', @_);
}
$m->comp('/elements/errorpage-popup.html', @_);
}
- sub mt {
- use vars qw($lh);
- $lh->maketext(@_);
- }
-
sub redirect {
my( $location ) = @_;
use vars qw($m);
sub redirect {
my( $location ) = @_;
use vars qw($m);
@@
-525,6
+539,7
@@
sub mason_interps {
my $html_defang = new HTML::Defang (%defang_opts);
my $html_defang = new HTML::Defang (%defang_opts);
+ #false laziness w/ FS::Maketext js_mt
my $js_string_sub = sub {
#${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
${$_[0]} =~ s/(['\\])/\\$1/g;
my $js_string_sub = sub {
#${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
${$_[0]} =~ s/(['\\])/\\$1/g;