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

(-)a/Koha/Hold.pm (-8 / +4 lines)
Lines 739-746 sub cancel { Link Here
739
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
739
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
740
740
741
            # and, if desired, charge a cancel fee
741
            # and, if desired, charge a cancel fee
742
            my $charge;
742
            if ( $params->{'charge_cancel_fee'} ) {
743
            if (my $item = $self->item) {
743
                my $charge;
744
                my $item = $self->item;
744
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
745
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
745
746
746
                my $rule = Koha::CirculationRules->get_effective_rule(
747
                my $rule = Koha::CirculationRules->get_effective_rule(
Lines 753-763 sub cancel { Link Here
753
                );
754
                );
754
                my $rule_value = $rule && $rule->rule_value // '';
755
                my $rule_value = $rule && $rule->rule_value // '';
755
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
756
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
756
            } else {
757
                $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
758
            }
759
757
760
            if ( $charge && $params->{'charge_cancel_fee'} ) {
761
                my $account =
758
                my $account =
762
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
759
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
763
                $account->add_debit(
760
                $account->add_debit(
Lines 769-775 sub cancel { Link Here
769
                        type       => 'RESERVE_EXPIRED',
766
                        type       => 'RESERVE_EXPIRED',
770
                        item_id    => $self->itemnumber
767
                        item_id    => $self->itemnumber
771
                    }
768
                    }
772
                );
769
                ) if $charge;
773
            }
770
            }
774
771
775
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self )
772
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self )
776
- 

Return to bug 25711