From a5a4afbb77bbdffc25ae94d10b645b0bcc76e859 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 31 Jan 2006 11:02:54 +0000 Subject: *** empty log message *** --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 2f2b0af4a..06060b20a 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -171,6 +171,7 @@ sub handler use FS::payment_gateway; use FS::agent_payment_gateway; use FS::XMLRPC; + use FS::payby; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From 6d27649c93f3f83c14611c790281a7b667062fc0 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 18 Feb 2006 04:32:57 +0000 Subject: Mason it is --- htetc/global.asa | 263 ------------------------------------------------------- 1 file changed, 263 deletions(-) delete mode 100644 htetc/global.asa (limited to 'htetc') diff --git a/htetc/global.asa b/htetc/global.asa deleted file mode 100644 index bb30608a4..000000000 --- a/htetc/global.asa +++ /dev/null @@ -1,263 +0,0 @@ -BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed... -#BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); } -#use Devel::AutoProfiler; - -use strict; -use vars qw( $cgi $p ); -use Apache::ASP 2.55; -use CGI 2.47; -#use CGI::Carp qw(fatalsToBrowser); -use Date::Format; -use Date::Parse; -use Time::Local; -use Time::Duration; -use Tie::IxHash; -use URI::Escape; -use HTML::Entities; -use JSON; -use IO::Handle; -use IO::File; -use IO::Scalar; -use Net::Whois::Raw qw(whois); -if ( $] < 5.006 ) { - eval "use Net::Whois::Raw 0.32 qw(whois)"; - die $@ if $@; -} -use Text::CSV_XS; -use Spreadsheet::WriteExcel; -use Business::CreditCard; -use String::Approx qw(amatch); -use Chart::LinesPoints; -use HTML::Widgets::SelectLayers 0.05; -use FS; -use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); -use FS::Record qw(qsearch qsearchs fields dbdef); -use FS::Conf; -use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot - small_custview myexit http_header); -use FS::UI::Web; -use FS::Msgcat qw(gettext geterror); -use FS::Misc qw( send_email ); -use FS::Report::Table::Monthly; -use FS::TicketSystem; - -use FS::agent; -use FS::agent_type; -use FS::domain_record; -use FS::cust_bill; -use FS::cust_bill_pay; -use FS::cust_credit; -use FS::cust_credit_bill; -use FS::cust_main qw(smart_search); -use FS::cust_main_county; -use FS::cust_pay; -use FS::cust_pkg; -use FS::cust_refund; -use FS::cust_svc; -use FS::nas; -use FS::part_bill_event; -use FS::part_pkg; -use FS::part_referral; -use FS::part_svc; -use FS::part_svc_router; -use FS::part_virtual_field; -use FS::pkg_svc; -use FS::port; -use FS::queue qw(joblisting); -use FS::raddb; -use FS::session; -use FS::svc_acct; -use FS::svc_acct_pop qw(popselector); -use FS::svc_domain; -use FS::svc_forward; -use FS::svc_www; -use FS::router; -use FS::addr_block; -use FS::svc_broadband; -use FS::svc_external; -use FS::type_pkgs; -use FS::part_export; -use FS::part_export_option; -use FS::export_svc; -use FS::msgcat; -use FS::rate; -use FS::rate_region; -use FS::rate_prefix; -use FS::payment_gateway; -use FS::agent_payment_gateway; - -sub Script_OnStart { - $Response->AddHeader('Cache-control' => 'no-cache'); -# $Response->AddHeader('Expires' => 0); - $Response->{Expires} = -36288000; - - $cgi = new CGI; - &cgisuidsetup($cgi); - $p = popurl(2); - #print $cgi->header( '-expires' => 'now' ); - #dbh->{'private_profile'} = {} if dbh->can('sprintProfile'); - dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile'); - - #really should check for FS::Profiler or something - # Devel::AutoProfiler _our_ VERSION? thanks a fucking lot - if ( Devel::AutoProfiler->can('__recursively_fetch_subs_in_package') ) { - #should check to see it's my special version. well, switch to FS::Profiler - - #nicked from Devel::AutoProfiler::INIT - my %subs = Devel::AutoProfiler::__recursively_fetch_subs_in_package('main'); - - - SUB : while( my ($name, $ref) = each(%subs) ) - { - #next if $name =~ /^(main::)?Apache::/; - next unless $name =~ /FS/; - foreach my $sub (@Devel::AutoProfiler::do_not_instrument_this_sub) - { - if ($name =~ /$sub/) - { - next SUB; - } - } - next if ($Devel::AutoProfiler::do_not_instrument_this_sub{$name}); - #warn "INIT name is $name \n"; - Devel::AutoProfiler::__instrument_sub($name, $ref); - } - - } - -} - -sub Script_OnFlush { - my $ref = $Response->{BinaryRef}; - #$$ref = $cgi->header( @FS::CGI::header ) . $$ref; - #$$ref = $cgi->header() . $$ref; - #warn "Script_OnFlush called with dbh ". dbh. "\n"; - #if ( dbh->can('sprintProfile') ) { - if ( UNIVERSAL::can(dbh, 'sprintProfile') ) { - #warn "dbh can sprintProfile\n"; - if ( lc($Response->{ContentType}) eq 'text/html' ) { #con - #warn "contenttype is sprintProfile\n"; - $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i - or warn "can't remove"; - - #$$ref .= '
'. ("\n"x96). encode_entities(dbh->sprintProfile()). '
'; - # wtf? konqueror... - $$ref .= '
'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
-               "\n\n". &sprintAutoProfile(). '
'; - - $$ref .= ''; - } - dbh->{'private_profile'} = {}; - } -} - -#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) { -#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) { -if ( defined(@DBIx::Profile::ISA) ) { - - #warn "enabling profiling redirects"; - *CGI::redirect = sub { - my( $self, $location) = @_; - my $page = - $cgi->header. - qq!Redirect to $location!. - '

'.
-        ( UNIVERSAL::can(dbh, 'sprintProfile')
-            ? encode_entities(dbh->sprintProfile())
-            : 'DBIx::Profile missing sprintProfile method;'.
-              'unpatched or too old?'                        ).
-      "\n\n". &sprintAutoProfile().  '
'. - ''; - dbh->{'private_profile'} = {}; - return $page; - }; - -} - -sub by_total_time -{ - return $a->{total_time_in_sub} <=> $b->{total_time_in_sub}; -} - -sub sprintAutoProfile { - my %caller_info = %Devel::AutoProfiler::caller_info; - return unless keys %caller_info; - - %Devel::AutoProfiler::caller_info = (); - - my @keys = keys(%caller_info); - - foreach my $key (@keys) - { - my $href = $caller_info{$key}; - - $href->{who_am_i} = $key; - } - - my @subs = values(%caller_info); - - #my @sorted = sort by_total_time ( @subs ); - my @sorted = reverse sort by_total_time ( @subs ); - - # print Dumper \@sorted; - - my @readable_info; - - foreach my $sort (@sorted) - { - push(@readable_info, delete($sort->{who_am_i})); - push(@readable_info, $sort); - } - - use Data::Dumper; - return encode_entities(Dumper(\@readable_info)); - -} - -sub include { - my $file = shift; - my $shift = 0; - if ( $file =~ m(^([^/].*)/[^/]+) ) { - unshift @{$Response->{asp}{includes_dir}}, "./$1"; - $shift = 1; - } - $file =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/); - #broken in 5.005# ${$Response->TrapInclude($file, @_)}; - my $ref = $Response->TrapInclude($file, @_); - shift @{$Response->{asp}{includes_dir}} if $shift; - $$ref; -} - -if ( defined(@DBIx::Profile::ISA) ) { - - #false laziness w/above - *redirect = sub { - my($location) = @_; - - ${$Response->{BinaryRef}} = - $cgi->header. - qq!Redirect to $location!. - '

'.
-        ( UNIVERSAL::can(dbh, 'sprintProfile')
-            ? encode_entities(dbh->sprintProfile())
-            : 'DBIx::Profile missing sprintProfile method;'.
-              'unpatched or too old?'                        ).
-      "\n\n". &sprintAutoProfile().  '
'. - ''; - - dbh->{'private_profile'} = {}; - - $Response->End; - - }; - -} else { - - *redirect = sub { - $Response->Redirect(@_); - } - -} - -1; - -- cgit v1.2.1 From fadaa67e77ad8d5d966e252aba7f193e9e3840e3 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 18 Feb 2006 11:14:21 +0000 Subject: CDR schema and class --- htetc/handler.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 06060b20a..1bbea16d1 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -88,7 +88,7 @@ sub handler #rar { package HTML::Mason::Commands; use strict; - use vars qw( $cgi $p ); + use vars qw( $cgi $p $fsurl); use vars qw( %session ); use CGI 2.47 qw(-private_tempfiles); #use CGI::Carp qw(fatalsToBrowser); @@ -118,8 +118,8 @@ sub handler use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; - use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot - small_custview myexit http_header); + use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot + eidiot small_custview myexit http_header); use FS::UI::Web; use FS::Msgcat qw(gettext geterror); use FS::Misc qw( send_email send_fax ); @@ -172,6 +172,7 @@ sub handler use FS::agent_payment_gateway; use FS::XMLRPC; use FS::payby; + use FS::cdr; if ( %%%RT_ENABLED%%% ) { eval ' @@ -234,9 +235,9 @@ sub handler &cgisuidsetup($cgi); #&cgisuidsetup($r); $p = popurl(2); + $fsurl = rooturl(); } - sub include { use vars qw($m); $m->scomp(@_); -- cgit v1.2.1 From 600a0939e7e7e589dae4f4f5bfef3650728940b7 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 8 Mar 2006 10:05:01 +0000 Subject: Add a new table for inventory with for DIDs/serials/etc., and an additional new table for inventory category (i.e. to distinguish DIDs, serials, MACs, etc.) --- htetc/handler.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 1bbea16d1..15f9203f8 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -173,6 +173,8 @@ sub handler use FS::XMLRPC; use FS::payby; use FS::cdr; + use FS::inventory_class; + use FS::inventory_item; if ( %%%RT_ENABLED%%% ) { eval ' @@ -245,8 +247,10 @@ sub handler sub redirect { my( $location ) = @_; + warn 'redir1 $m='.$m; use vars qw($m); $m->clear_buffer; + warn 'redir3-prof'; #false laziness w/above if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect @@ -263,10 +267,14 @@ sub handler ); dbh->{'private_profile'} = {}; - $m->abort(200); + warn 'redir9-prof'; + my $rv = $m->abort(200); + warn "redir10-prof: $rv"; + $rv; } else { #normal redirect + warn 'redir9-redirect'; $m->redirect($location); } -- cgit v1.2.1 From 9f69daa6b11920b84840c17bf95955dee959367e Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 9 Mar 2006 13:42:40 +0000 Subject: fix that blank-page-instead-of-profiling-redirect-when-called-from-an-include bug triggered by mason 1.32 :) --- htetc/handler.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 15f9203f8..9b808e68c 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -247,10 +247,8 @@ sub handler sub redirect { my( $location ) = @_; - warn 'redir1 $m='.$m; use vars qw($m); $m->clear_buffer; - warn 'redir3-prof'; #false laziness w/above if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect @@ -267,14 +265,13 @@ sub handler ); dbh->{'private_profile'} = {}; - warn 'redir9-prof'; - my $rv = $m->abort(200); - warn "redir10-prof: $rv"; - $rv; + #whew. removing this is all that's needed to fix the annoying + #blank-page-instead-of-profiling-redirect-when-called-from-an-include + #bug triggered by mason 1.32 + #my $rv = $m->abort(200); } else { #normal redirect - warn 'redir9-redirect'; $m->redirect($location); } -- cgit v1.2.1 From 929f432c766bbe3bdeed5b80818a12ddf6ec6339 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 3 Apr 2006 09:46:57 +0000 Subject: have the UI use full country names, and state names outside the US... --- htetc/handler.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 9b808e68c..008b0b5f9 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -114,6 +114,7 @@ sub handler use String::Approx qw(amatch); use Chart::LinesPoints; use HTML::Widgets::SelectLayers 0.05; + use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); @@ -122,7 +123,7 @@ sub handler eidiot small_custview myexit http_header); use FS::UI::Web; use FS::Msgcat qw(gettext geterror); - use FS::Misc qw( send_email send_fax ); + use FS::Misc qw( send_email send_fax states_hash state_label ); use FS::Report::Table::Monthly; use FS::TicketSystem; @@ -208,6 +209,7 @@ sub handler my( $self, $location ) = @_; use vars qw($m); + # false laziness w/below if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect my $page = -- cgit v1.2.1 From 1a033848671cad2cbe7687b37fc718b3b2a68b83 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 22 Apr 2006 00:58:40 +0000 Subject: start of package class web UI (add/edit package classes, package class selection in package def edit) --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 008b0b5f9..dcbe72733 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -176,6 +176,7 @@ sub handler use FS::cdr; use FS::inventory_class; use FS::inventory_item; + use FS::pkg_class; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From e65c6a26ca778166aec2b2d1dd3012ab84fa611a Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 7 May 2006 20:27:21 +0000 Subject: first pass at sales reports per agent and package class --- htetc/handler.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index dcbe72733..e8cd3333b 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -113,6 +113,8 @@ sub handler use Business::CreditCard; use String::Approx qw(amatch); use Chart::LinesPoints; + use Chart::Mountain; + use Color::Scheme; use HTML::Widgets::SelectLayers 0.05; use Locale::Country; use FS; -- cgit v1.2.1 From 2c757d7db4cb6a7b9655de13206fcc84fb7ce61f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 14 May 2006 16:47:31 +0000 Subject: first part of ACL and re-skinning work and some other small stuff --- htetc/handler.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index e8cd3333b..cbe2dd35d 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -179,6 +179,8 @@ sub handler use FS::inventory_class; use FS::inventory_item; use FS::pkg_class; + use FS::access_user; + use FS::access_group; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From 50f25b285b2caf77d267ed66f03e56924ad7229f Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 20 May 2006 20:06:30 +0000 Subject: first stab at BoM download --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index cbe2dd35d..d400a55ea 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -149,6 +149,7 @@ sub handler use FS::part_svc; use FS::part_svc_router; use FS::part_virtual_field; + use FS::pay_batch; use FS::pkg_svc; use FS::port; use FS::queue qw(joblisting); -- cgit v1.2.1 From c738a3c4923774b64960aa87fa58bd0751487edb Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 18 Jun 2006 12:54:49 +0000 Subject: ACLs: finish group edit (agents + rights) & browse --- htetc/handler.pl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index d400a55ea..1dfa1376e 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -182,6 +182,10 @@ sub handler use FS::pkg_class; use FS::access_user; use FS::access_group; + use FS::access_usergroup; + use FS::access_groupagent; + use FS::access_right; + use FS::AccessRight; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From 1053db7f76169cbbc87840539959a4c362aff242 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 12 Jul 2006 00:20:23 +0000 Subject: svc_phone service and CDR billing from imported CDRs --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 1dfa1376e..ef3aed7e7 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -186,6 +186,7 @@ sub handler use FS::access_groupagent; use FS::access_right; use FS::AccessRight; + use FS::svc_phone; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From d910b7f61a6e4dfcfe57b14bde21158a199d91c2 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 26 Aug 2006 02:20:00 +0000 Subject: i want max and min! --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index ef3aed7e7..cfb48722b 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -92,6 +92,7 @@ sub handler use vars qw( %session ); use CGI 2.47 qw(-private_tempfiles); #use CGI::Carp qw(fatalsToBrowser); + use List::Util qw( max min ); use Date::Format; use Date::Parse; use Time::Local; -- cgit v1.2.1 From 22c70177969f30e2e419b32cb5d475c143f10b12 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 8 Oct 2006 08:17:06 +0000 Subject: add menu items for credit card batching, debug last-minute changes to payby.pm, add ACL for re-processing batches, separate CARD and CHEK batches, fixed defaults for batch formats --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index cfb48722b..183a5534b 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -97,6 +97,7 @@ sub handler use Date::Parse; use Time::Local; use Time::Duration; + use Lingua::EN::Inflect qw(PL); use Tie::IxHash; use URI::Escape; use HTML::Entities; -- cgit v1.2.1 From bb04a0b87f89345d98c43aca0586e88f6e963e16 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 9 Oct 2006 00:13:03 +0000 Subject: add cust_main_note to handler.pl --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 183a5534b..c03313e0b 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -189,6 +189,7 @@ sub handler use FS::access_right; use FS::AccessRight; use FS::svc_phone; + use FS::cust_main_note; if ( %%%RT_ENABLED%%% ) { eval ' -- cgit v1.2.1 From 52281cbeaf8d4e02345eca3c1aa0500133823558 Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 18 Oct 2006 23:07:08 +0000 Subject: suspension and cancellation reasons --- htetc/handler.pl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index c03313e0b..89287d754 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -142,6 +142,7 @@ sub handler use FS::cust_main_county; use FS::cust_pay; use FS::cust_pkg; + use FS::cust_pkg_reason; use FS::cust_refund; use FS::cust_svc; use FS::nas; @@ -189,6 +190,8 @@ sub handler use FS::access_right; use FS::AccessRight; use FS::svc_phone; + use FS::reason_type; + use FS::reason; use FS::cust_main_note; if ( %%%RT_ENABLED%%% ) { -- cgit v1.2.1 From 7422aa77086326ba1e6032150ce5704d1003ea6f Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 14 Dec 2006 09:27:26 +0000 Subject: make the config directory configurable --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 89287d754..3f3886b3a 100644 --- 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=>'%%%FREESIDE_CONF%%%/masondata', #out_mode=>'stream', #RT -- cgit v1.2.1 From 1163d4d5044ca487ae9cf2176346e297979aa1e1 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 15 Dec 2006 00:28:46 +0000 Subject: tiny bit of cleanup from the conf merge --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 3f3886b3a..2d82673b6 100644 --- 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=>'%%%FREESIDE_CONF%%%/masondata', + data_dir=>'%%%MASONDATA%%%', #out_mode=>'stream', #RT -- cgit v1.2.1 From ba1f19e48ec2f2ac293b07a41042de59e744db1e Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 15 Dec 2006 00:56:12 +0000 Subject: add DateTime as a proper rather than hidden dependency --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 2d82673b6..cce39be1f 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -97,6 +97,7 @@ sub handler use Date::Parse; use Time::Local; use Time::Duration; + use DateTime::Format::Strptime; use Lingua::EN::Inflect qw(PL); use Tie::IxHash; use URI::Escape; -- cgit v1.2.1 From 02b9c53fb85b0a87d959e140dc30ae21cccb0902 Mon Sep 17 00:00:00 2001 From: jeff Date: Fri, 15 Dec 2006 05:29:48 +0000 Subject: move use statements to handler.pl, do not show 1/1/70 for new birthdates, and improve error handling --- htetc/handler.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index cce39be1f..0da7a80fe 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -97,6 +97,7 @@ 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; -- cgit v1.2.1 From 25c113d3edad9809e3834a298f79987fa65e6d7c Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 18 Dec 2006 11:01:14 +0000 Subject: fix tax class not adding when there is only one pkg_class choice (triggers javascript error --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 0da7a80fe..d7a6c6a53 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -119,7 +119,7 @@ sub handler use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.05; + use HTML::Widgets::SelectLayers 0.06; use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); -- cgit v1.2.1 From a0ddcb6b2ac38076c48e8f0b69e0758d5283303a Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 19 Dec 2006 10:02:06 +0000 Subject: clean up payinfo_Mixin to use payby.pm for payby info and have card masking full 6-digit BIN prefix for card identification. have cust_pay_batch use payinfo_Mixin. require B:CC 0.30 for mask-aware cardtype(). fix payment reports to use mask too if available, so credit card type selection still works with encryption. --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index d7a6c6a53..2272e2603 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -114,7 +114,7 @@ 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; -- cgit v1.2.1 From 3c8870ee619416f126a65c93d5ef7a2f2e24bc96 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 27 Dec 2006 02:37:17 +0000 Subject: Add a (magically appearing and disappearing) label on the county selector. confusing when labeled "state" --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 2272e2603..f47d4c9bf 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -129,7 +129,7 @@ sub handler eidiot small_custview myexit http_header); use FS::UI::Web; 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; -- cgit v1.2.1 From 625f6e43b7345f04cf4ece8dd9ff963b9b09f338 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 21 Jan 2007 13:26:44 +0000 Subject: mod_perl v2, it finally happened --- htetc/freeside-base.conf | 15 --------------- htetc/freeside-base1.conf | 18 ++++++++++++++++++ htetc/freeside-base2.conf | 21 +++++++++++++++++++++ 3 files changed, 39 insertions(+), 15 deletions(-) delete mode 100644 htetc/freeside-base.conf create mode 100644 htetc/freeside-base1.conf create mode 100644 htetc/freeside-base2.conf (limited to 'htetc') diff --git a/htetc/freeside-base.conf b/htetc/freeside-base.conf deleted file mode 100644 index f8ebece9e..000000000 --- a/htetc/freeside-base.conf +++ /dev/null @@ -1,15 +0,0 @@ -PerlModule HTML::Mason - -AuthName Freeside -AuthType Basic -AuthUserFile /usr/local/etc/freeside/htpasswd -require valid-user - -AddHandler perl-script .cgi .html -PerlHandler HTML::Mason - - -require "/usr/local/etc/freeside/handler.pl"; - - - diff --git a/htetc/freeside-base1.conf b/htetc/freeside-base1.conf new file mode 100644 index 000000000..3f6bd0ee3 --- /dev/null +++ b/htetc/freeside-base1.conf @@ -0,0 +1,18 @@ +#PerlModule Apache::DBI + +PerlModule HTML::Mason + + +AuthName Freeside +AuthType Basic +AuthUserFile /usr/local/etc/freeside/htpasswd +require valid-user + +AddHandler perl-script .cgi .html +PerlHandler HTML::Mason + + +require "%%%MASON_HANDLER%%%"; + + + diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf new file mode 100644 index 000000000..38f784068 --- /dev/null +++ b/htetc/freeside-base2.conf @@ -0,0 +1,21 @@ +PerlModule Apache2::compat + +#PerlModule Apache::DBI + +PerlModule HTML::Mason +PerlSetVar MasonArgsMethod CGI +PerlModule HTML::Mason::ApacheHandler + +PerlRequire "%%%MASON_HANDLER%%%" + + +AuthName Freeside +AuthType Basic +AuthUserFile /usr/local/etc/freeside/htpasswd +require valid-user + +SetHandler perl-script +PerlHandler HTML::Mason + + + -- cgit v1.2.1 From 9ac1427c435133138288745b1072540a6b8b030f Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 22 Jan 2007 17:05:15 +0000 Subject: halfass v2 too --- htetc/freeside-base1.99.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 htetc/freeside-base1.99.conf (limited to 'htetc') diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf new file mode 100644 index 000000000..c1c187c8d --- /dev/null +++ b/htetc/freeside-base1.99.conf @@ -0,0 +1,21 @@ +PerlModule Apache::compat + +#PerlModule Apache::DBI + +PerlModule HTML::Mason +PerlSetVar MasonArgsMethod CGI +PerlModule HTML::Mason::ApacheHandler + +PerlRequire "%%%MASON_HANDLER%%%" + + +AuthName Freeside +AuthType Basic +AuthUserFile /usr/local/etc/freeside/htpasswd +require valid-user + +SetHandler perl-script +PerlHandler HTML::Mason + + + -- cgit v1.2.1 From 69fd69806c7801578864509d42719e2f2dcaed8a Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 29 Jan 2007 12:07:09 +0000 Subject: warnings in <%once> sections should not be fatal --- htetc/handler.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index f47d4c9bf..f742e91b9 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -335,6 +335,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); }; -- cgit v1.2.1 From 83a6a677f62ca501011d9bac6371344dbb5a13b3 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 8 Feb 2007 01:46:45 +0000 Subject: agent type on package add/edit (ticket 1446) --- htetc/handler.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index f742e91b9..164da3702 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -119,7 +119,7 @@ sub handler use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.06; + use HTML::Widgets::SelectLayers 0.07; use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); -- cgit v1.2.1 From 5f5d2124d615efbcdbb34eea691f2ca8724b3e47 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 8 Feb 2007 09:13:21 +0000 Subject: hold off until 1.7.2 --- htetc/handler.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'htetc') diff --git a/htetc/handler.pl b/htetc/handler.pl index 164da3702..c1ca954e1 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -119,7 +119,8 @@ sub handler use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.07; + use HTML::Widgets::SelectLayers 0.06; + #use HTML::Widgets::SelectLayers 0.07; # after 1.7.2 use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); -- cgit v1.2.1