projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.
[freeside.git]
/
FS
/
FS
/
agent.pm
diff --git
a/FS/FS/agent.pm
b/FS/FS/agent.pm
index
d291ca0
..
f174275
100644
(file)
--- a/
FS/FS/agent.pm
+++ b/
FS/FS/agent.pm
@@
-269,20
+269,16
@@
sub payment_gateway {
cardtype => '',
taxclass => '', } );
cardtype => '',
taxclass => '', } );
- my $payment_gateway;
- my $conf = new FS::Conf;
+ my $payment_gateway = new FS::payment_gateway;
if ( $override ) { #use a payment gateway override
$payment_gateway = $override->payment_gateway;
if ( $override ) { #use a payment gateway override
$payment_gateway = $override->payment_gateway;
- $payment_gateway->gateway_namespace('Business::OnlinePayment')
- unless $payment_gateway->gateway_name;
-
} else { #use the standard settings from the config
} else { #use the standard settings from the config
-
# the standard settings from the config could be moved to a null agent
# agent_payment_gateway referenced payment_gateway
# the standard settings from the config could be moved to a null agent
# agent_payment_gateway referenced payment_gateway
+ my $conf = new FS::Conf;
unless ( $conf->exists('business-onlinepayment') ) {
if ( $options{'nofatal'} ) {
return '';
unless ( $conf->exists('business-onlinepayment') ) {
if ( $options{'nofatal'} ) {
return '';
@@
-306,8
+302,6
@@
sub payment_gateway {
"did you set the business-onlinepayment configuration value?\n"
unless $processor;
"did you set the business-onlinepayment configuration value?\n"
unless $processor;
- $payment_gateway = new FS::payment_gateway;
-
$payment_gateway->gateway_namespace( $conf->config('business-onlinepayment-namespace') ||
'Business::OnlinePayment');
$payment_gateway->gateway_module($processor);
$payment_gateway->gateway_namespace( $conf->config('business-onlinepayment-namespace') ||
'Business::OnlinePayment');
$payment_gateway->gateway_module($processor);
@@
-318,13
+312,6
@@
sub payment_gateway {
}
}
- unless ( $payment_gateway->gateway_namespace ) {
- $payment_gateway->gateway_namespace(
- scalar($conf->config('business-onlinepayment-namespace'))
- || 'Business::OnlinePayment'
- );
- }
-
$payment_gateway;
}
$payment_gateway;
}