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

(-)a/C4/SIP/ILS.pm (-2 / +2 lines)
Lines 260-266 sub end_patron_session { Link Here
260
}
260
}
261
261
262
sub pay_fee {
262
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 ) = @_;
263
    my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff, $disallow_overpayment, $register_id) = @_;
264
264
265
    my $trans = C4::SIP::ILS::Transaction::FeePayment->new();
265
    my $trans = C4::SIP::ILS::Transaction::FeePayment->new();
266
266
Lines 271-277 sub pay_fee { Link Here
271
        $trans->screen_msg('Invalid patron barcode.');
271
        $trans->screen_msg('Invalid patron barcode.');
272
        return $trans;
272
        return $trans;
273
    }
273
    }
274
    my $trans_result = $trans->pay( $patron->{borrowernumber}, $fee_amt, $pay_type, $fee_id, $is_writeoff, $disallow_overpayment );
274
    my $trans_result = $trans->pay( $patron->{borrowernumber}, $fee_amt, $pay_type, $fee_id, $is_writeoff, $disallow_overpayment, $register_id );
275
    my $ok = $trans_result->{ok};
275
    my $ok = $trans_result->{ok};
276
    $trans->ok($ok);
276
    $trans->ok($ok);
277
277
(-)a/C4/SIP/ILS/Transaction/FeePayment.pm (-4 / +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 $register_id          = 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 => $register_id
93
            }
95
            }
94
        );
96
        );
95
        return {
97
        return {
(-)a/C4/SIP/Sip/MsgType.pm (-1 / +2 lines)
Lines 1092-1097 sub handle_fee_paid { Link Here
1092
1092
1093
    my $disallow_overpayment  = $server->{account}->{disallow_overpayment};
1093
    my $disallow_overpayment  = $server->{account}->{disallow_overpayment};
1094
    my $payment_type_writeoff = $server->{account}->{payment_type_writeoff} || q{};
1094
    my $payment_type_writeoff = $server->{account}->{payment_type_writeoff} || q{};
1095
    my $register_id           = $server->{account}->{register_id};
1095
1096
1096
    my $is_writeoff = $pay_type eq $payment_type_writeoff;
1097
    my $is_writeoff = $pay_type eq $payment_type_writeoff;
1097
1098
Lines 1104-1110 sub handle_fee_paid { Link Here
1104
1105
1105
    $ils->check_inst_id( $inst_id, "handle_fee_paid" );
1106
    $ils->check_inst_id( $inst_id, "handle_fee_paid" );
1106
1107
1107
    my $pay_result = $ils->pay_fee( $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff, $disallow_overpayment );
1108
    my $pay_result = $ils->pay_fee( $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency, $is_writeoff, $disallow_overpayment, $register_id );
1108
    $status = $pay_result->{status};
1109
    $status = $pay_result->{status};
1109
    my $pay_response = $pay_result->{pay_response};
1110
    my $pay_response = $pay_result->{pay_response};
1110
1111
(-)a/etc/SIPconfig.xml (-2 / +2 lines)
Lines 58-64 Link Here
58
             ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
58
             ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
59
             da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
59
             da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
60
             av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
60
             av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
61
             hide_fields="BD,BE,BF,PB">
61
             hide_fields="BD,BE,BF,PB"
62
             register_id=''>
62
          <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
63
          <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
63
          <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
64
          <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
64
          <patron_attribute field="XY" code="CODE" />
65
          <patron_attribute field="XY" code="CODE" />
65
- 

Return to bug 24828