respect card-types config in backend (one-off payments), RT#39861

[freeside.git] / FS / FS / Mason.pm

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 58b3da7..ff0baee 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -45,13 +45,7 @@ if ( -e $addl_handler_use_file ) {
 
   use strict;
   use vars qw( %session );
-  use CGI 3.29 qw(-private_tempfiles); #3.29 to fix RT attachment problems
-
-  #breaks quick payment entry
-  #http://rt.cpan.org/Public/Bug/Display.html?id=37365
-  die "CGI.pm v3.38 is broken, use any other version >= 3.29".
-      " (Debian 5.0?  aptitude remove libcgi-pm-perl)"
-    if $CGI::VERSION == 3.38;
+  use CGI 3.39 qw(-private_tempfiles); #3.39 for cpan#37365
 
   #use CGI::Carp qw(fatalsToBrowser);
   use CGI::Cookie;
@@ -77,7 +71,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
-  use JSON::XS;
+  use Cpanel::JSON::XS;
   use MIME::Base64;
   use IO::Handle;
   use IO::File;
@@ -121,6 +115,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
                                         #selectlayers.html
   use Locale::Country;
+  #use FS::geocode_Mixin; #for its code2country
   use Locale::Currency;
   use Locale::Currency::Format;
   use Business::US::USPS::WebTools::AddressStandardization;
@@ -143,6 +138,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::Msgcat qw(gettext geterror);
   use FS::Misc qw( send_email send_fax ocr_image
                    states_hash counties cities state_label
+                   card_types
                  );
   use FS::Misc::eps2png qw( eps2png );
   use FS::Report::FCC_477;
@@ -410,6 +406,8 @@ if ( -e $addl_handler_use_file ) {
   use FS::report_batch;
   use FS::report_batch;
   use FS::password_history;
+  use FS::svc_fiber;
+  use FS::fiber_olt;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {