projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#37064: Add action link to manually refund a payment
[freeside.git]
/
FS
/
FS
/
cust_main
/
Billing_Realtime.pm
diff --git
a/FS/FS/cust_main/Billing_Realtime.pm
b/FS/FS/cust_main/Billing_Realtime.pm
index
f70bab2
..
790135c
100644
(file)
--- a/
FS/FS/cust_main/Billing_Realtime.pm
+++ b/
FS/FS/cust_main/Billing_Realtime.pm
@@
-343,8
+343,9
@@
sub realtime_bop {
my $cc_surcharge = 0;
my $cc_surcharge_pct = 0;
$cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage')
my $cc_surcharge = 0;
my $cc_surcharge_pct = 0;
$cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage')
- if $conf->config('credit-card-surcharge-percentage');
-
+ if $conf->config('credit-card-surcharge-percentage')
+ && $options{method} eq 'CC';
+
# always add cc surcharge if called from event
if($options{'cc_surcharge_from_event'} && $cc_surcharge_pct > 0) {
$cc_surcharge = $options{'amount'} * $cc_surcharge_pct / 100;
# always add cc surcharge if called from event
if($options{'cc_surcharge_from_event'} && $cc_surcharge_pct > 0) {
$cc_surcharge = $options{'amount'} * $cc_surcharge_pct / 100;
@@
-1107,10
+1108,7
@@
sub _realtime_bop_result {
};
my $error = send_email(
};
my $error = send_email(
- 'from' => $conf->config('invoice_from_name', $self->agentnum ) ?
- $conf->config('invoice_from_name', $self->agentnum ) . ' <' .
- $conf->config('invoice_from', $self->agentnum ) . '>' :
- $conf->config('invoice_from', $self->agentnum ),
+ 'from' => $conf->invoice_from_full( $self->agentnum ),
'to' => [ grep { $_ ne 'POST' } $self->invoicing_list ],
'subject' => 'Your payment could not be processed',
'body' => [ $template->fill_in(HASH => $templ_hash) ],
'to' => [ grep { $_ ne 'POST' } $self->invoicing_list ],
'subject' => 'Your payment could not be processed',
'body' => [ $template->fill_in(HASH => $templ_hash) ],
@@
-1624,6
+1622,7
@@
sub realtime_refund_bop {
$order_number = $refund->order_number if $refund->can('order_number');
$order_number = $refund->order_number if $refund->can('order_number');
+ # change this to just use $cust_pay->delete_cust_bill_pay?
while ( $cust_pay && $cust_pay->unapplied < $amount ) {
my @cust_bill_pay = $cust_pay->cust_bill_pay;
last unless @cust_bill_pay;
while ( $cust_pay && $cust_pay->unapplied < $amount ) {
my @cust_bill_pay = $cust_pay->cust_bill_pay;
last unless @cust_bill_pay;