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

(-)a/Koha/Hold.pm (-8 / +4 lines)
Lines 785-792 sub cancel { Link Here
785
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
785
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
786
786
787
            # and, if desired, charge a cancel fee
787
            # and, if desired, charge a cancel fee
788
            my $charge;
788
            if ( $params->{'charge_cancel_fee'} ) {
789
            if (my $item = $self->item) {
789
                my $charge;
790
                my $item = $self->item;
790
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
791
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
791
792
792
                my $rule = Koha::CirculationRules->get_effective_rule(
793
                my $rule = Koha::CirculationRules->get_effective_rule(
Lines 799-809 sub cancel { Link Here
799
                );
800
                );
800
                my $rule_value = $rule && $rule->rule_value // '';
801
                my $rule_value = $rule && $rule->rule_value // '';
801
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
802
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
802
            } else {
803
                $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
804
            }
805
803
806
            if ( $charge && $params->{'charge_cancel_fee'} ) {
807
                my $account =
804
                my $account =
808
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
805
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
809
                $account->add_debit(
806
                $account->add_debit(
Lines 815-821 sub cancel { Link Here
815
                        type       => 'RESERVE_EXPIRED',
812
                        type       => 'RESERVE_EXPIRED',
816
                        item_id    => $self->itemnumber
813
                        item_id    => $self->itemnumber
817
                    }
814
                    }
818
                );
815
                ) if $charge;
819
            }
816
            }
820
817
821
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self, undef, $original )
818
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self, undef, $original )
822
- 

Return to bug 25711