Attachment #149755 for bug #33216

View | Details | Raw Unified | Return to bug 33216
Collapse All | Expand All

Lines 310-316 sub pay_fee { Link Here

(-)a/C4/SIP/ILS.pm (-1 / +2 lines)
310		310
311	return {	311	return {
312	status => $trans,	312	status => $trans,
313	pay_response => $trans_result->{pay_response}	313	pay_response => $trans_result->{pay_response},
		314	error => $error,
314	};	315	};
315	}	316	}
316		317




            };
        }
    }

    my $ok = 1;
    my $pay_response;
    my $error;
    try {
        $pay_response = $account->pay($pay_options);
    }
    catch {
        if ( ref($_) =~ /^Koha::Exceptions/ ) {
            $ok    = 0;
            $error = $_->description;
        }
        else {
            $_->rethrow;
        }
    };

    return {
        ok           => $ok,
        pay_response => $pay_response,
        error        => $error
    };
}


Lines 1153-1158 sub handle_fee_paid { Link Here

(-)a/C4/SIP/Sip/MsgType.pm (-1 / +2 lines)
1153	$status = $pay_result->{status};	1153	$status = $pay_result->{status};
1154	my $pay_response = $pay_result->{pay_response};	1154	my $pay_response = $pay_result->{pay_response};
1155		1155
		1156	$resp .= maybe_add( FID_SCREEN_MSG, $pay_result->{error}, $server ) if $pay_result->{error if $pay_result->{error};
		1157
1156	my $failmap = {	1158	my $failmap = {
1157	"no_item" => "No matching item could be found",	1159	"no_item" => "No matching item could be found",
1158	"no_checkout" => "Item is not checked out",	1160	"no_checkout" => "Item is not checked out",
1159	-

Return to bug 33216

Lines 76-85 sub pay { Link Here

(-)a/C4/SIP/ILS/Transaction/FeePayment.pm (-3 / +20 lines)
76	};	76	};
77	}	77	}
78	}	78	}
79	my $pay_response = $account->pay($pay_options);	79
		80	my $ok = 1;
		81	my $pay_response;
		82	my $error;
		83	try {
		84	$pay_response = $account->pay($pay_options);
		85	}
		86	catch {
		87	if ( ref($_) =~ /^Koha::Exceptions/ ) {
		88	$ok = 0;
		89	$error = $_->description;
		90	}
		91	else {
		92	$_->rethrow;
		93	}
		94	};
		95
80	return {	96	return {
81	ok => 1,	97	ok => $ok,
82	pay_response => $pay_response	98	pay_response => $pay_response,
		99	error => $error
83	};	100	};
84	}	101	}
85		102