use strict;
use vars qw( $cache $DEBUG $me );
-use subs qw( _cache );
+use subs qw( _cache _mason_comp );
use FS::Mason qw( mason_interps );
use FS::Conf;
use FS::ClientAPI_SessionCache;
/misc/phonenums.cgi
/misc/states.cgi
/misc/counties.cgi
+ /misc/cities.cgi
/misc/svc_acct-domains.cgi
/misc/part_svc-columns.cgi
/edit/elements/svc_forward.html
'process-display' => scalar($conf->config('selfservice_process-display')),
'process-skip_first' => $conf->exists('selfservice_process-skip_first'),
'num_payments' => scalar($cust_main->cust_pay),
- 'surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage')),
+ 'surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum)),
+ 'surcharge_flatfee' => scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum)),
);
@$argsref = ( %args );
sub mason_comp {
my $packet = shift;
+ my $me = 'mason_comp';
+ my $namespace = 'FS::ClientAPI::MyAccount';
- warn "$me mason_comp called on $packet\n" if $DEBUG;
+ _mason_comp($packet, $me, $namespace);
+
+}
+
+sub payment_only_mason_comp {
+ my $packet = shift;
+ my $me = 'payment_only_mason_comp';
+ my $namespace = 'FS::ClientAPI::PaymentOnly';
+
+ _mason_comp($packet, $me, $namespace);
+}
+
+sub _mason_comp {
+ my $packet = shift;
+ my $me = shift;
+ my $namespace = shift;
+
+ warn "$me called on $packet\n" if $DEBUG;
my $comp = $packet->{'comp'};
unless ( $allowed_comps{$comp} || $session_comps{$comp} ) {
if ( $session_comps{$comp} ) {
- my $session = _cache->get($packet->{'session_id'})
+ my $session = _cache($namespace)->get($packet->{'session_id'})
or return ( 'error' => "Can't resume session" ); #better error message
my $custnum = $session->{'custnum'};
#hmm
sub _cache {
+ my $namespace = shift || 'FS::ClientAPI::MyAccount';
+
$cache ||= new FS::ClientAPI_SessionCache( {
- 'namespace' => 'FS::ClientAPI::MyAccount',
+ 'namespace' => $namespace,
} );
}