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

(-)a/C4/SIP/ILS.pm (-2 / +8 lines)
Lines 136-141 sub checkout { Link Here
136
    $circ->item( $item     = C4::SIP::ILS::Item->new($item_id) );
136
    $circ->item( $item     = C4::SIP::ILS::Item->new($item_id) );
137
    if ($fee_ack) {
137
    if ($fee_ack) {
138
        $circ->fee_ack($fee_ack);
138
        $circ->fee_ack($fee_ack);
139
        $circ->registerid($self->{institution}->{policy}->{registerid});
139
    }
140
    }
140
141
141
    if ( !$patron ) {
142
    if ( !$patron ) {
Lines 260-268 sub end_patron_session { Link Here
260
}
261
}
261
262
262
sub pay_fee {
263
sub pay_fee {
263
    my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff, $disallow_overpayment ) = @_;
264
    my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff, $disallow_overpayment, $registerid) = @_;
264
265
265
    my $trans = C4::SIP::ILS::Transaction::FeePayment->new();
266
    my $trans = C4::SIP::ILS::Transaction::FeePayment->new();
267
    if (!defined $registerid) {
268
        syslog('LOG_ERR', 'pay_fee passed undefined tillid');
269
        $registerid = 0;
270
    }
271
266
272
267
    $trans->transaction_id($trans_id);
273
    $trans->transaction_id($trans_id);
268
    my $patron;
274
    my $patron;
Lines 271-277 sub pay_fee { Link Here
271
        $trans->screen_msg('Invalid patron barcode.');
277
        $trans->screen_msg('Invalid patron barcode.');
272
        return $trans;
278
        return $trans;
273
    }
279
    }
274
    my $trans_result = $trans->pay( $patron->{borrowernumber}, $fee_amt, $pay_type, $fee_id, $is_writeoff, $disallow_overpayment );
280
    my $trans_result = $trans->pay( $patron->{borrowernumber}, $fee_amt, $pay_type, $fee_id, $is_writeoff, $disallow_overpayment, $registerid );
275
    my $ok = $trans_result->{ok};
281
    my $ok = $trans_result->{ok};
276
    $trans->ok($ok);
282
    $trans->ok($ok);
277
283
(-)a/C4/SIP/ILS/Transaction.pm (+1 lines)
Lines 24-29 my %fields = ( Link Here
24
	screen_msg    => '',
24
	screen_msg    => '',
25
	print_line    => '',
25
	print_line    => '',
26
    fee_ack       => 'N',
26
    fee_ack       => 'N',
27
    registerid    => undef,
27
);
28
);
28
29
29
our $AUTOLOAD;
30
our $AUTOLOAD;
(-)a/C4/SIP/ILS/Transaction/FeePayment.pm (-5 / +6 lines)
Lines 49-54 sub pay { Link Here
49
    my $fee_id               = shift;
49
    my $fee_id               = shift;
50
    my $is_writeoff          = shift;
50
    my $is_writeoff          = shift;
51
    my $disallow_overpayment = shift;
51
    my $disallow_overpayment = shift;
52
    my $registerid           = shift;
52
53
53
    my $type = $is_writeoff ? 'WRITEOFF' : 'PAYMENT';
54
    my $type = $is_writeoff ? 'WRITEOFF' : 'PAYMENT';
54
55
Lines 86-95 sub pay { Link Here
86
    else {
87
    else {
87
        my $pay_response = $account->pay(
88
        my $pay_response = $account->pay(
88
            {
89
            {
89
                amount       => $amt,
90
                amount        => $amt,
90
                type         => $type,
91
                type          => $type,
91
                payment_type => 'SIP' . $sip_type,
92
                payment_type  => 'SIP' . $sip_type,
92
                interface    => C4::Context->interface
93
                interface     => C4::Context->interface,
94
                cash_register => $registerid
93
            }
95
            }
94
        );
96
        );
95
        return {
97
        return {
96
- 

Return to bug 24828