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

(-)a/Koha/CirculationRules.pm (+1 lines)
Lines 98-103 our $RULE_KINDS = { Link Here
98
    },
98
    },
99
    expire_reserves_charge => {
99
    expire_reserves_charge => {
100
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
100
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
101
        can_be_blank => 0,
101
    },
102
    },
102
    chargeperiod => {
103
    chargeperiod => {
103
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
104
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
(-)a/Koha/Hold.pm (-2 / +1 lines)
Lines 752-759 sub cancel { Link Here
752
                        rule_name    => 'expire_reserves_charge',
752
                        rule_name    => 'expire_reserves_charge',
753
                    }
753
                    }
754
                );
754
                );
755
                my $rule_value = $rule && $rule->rule_value // '';
755
                $charge = $rule ? $rule->rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
756
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
757
756
758
                my $account =
757
                my $account =
759
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
758
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
(-)a/t/db_dependent/Holds/Holdfine.t (-258 lines)
Lines 1-258 Link Here
1
#!/usr/bin/perl
2
3
# Copyright The National Library of Finland, University of Helsinki 2020
4
# Copyright Petro Vashchuk <stalkernoid@gmail.com> 2020
5
#
6
# This file is part of Koha.
7
#
8
# Koha is free software; you can redistribute it and/or modify it under the
9
# terms of the GNU General Public License as published by the Free Software
10
# Foundation; either version 3 of the License, or (at your option) any later
11
# version.
12
#
13
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
14
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
15
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License along
18
# with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use C4::Context;
23
use Koha::CirculationRules;
24
25
use Test::More tests => 13;
26
27
use t::lib::TestBuilder;
28
use t::lib::Mocks;
29
use Koha::Holds;
30
31
use Koha::Account;
32
use Koha::Account::DebitTypes;
33
34
BEGIN {
35
    use_ok('C4::Reserves');
36
}
37
38
my $schema = Koha::Database->schema;
39
$schema->storage->txn_begin;
40
my $dbh = C4::Context->dbh;
41
42
my $builder = t::lib::TestBuilder->new;
43
44
my $library1 = $builder->build({
45
    source => 'Branch',
46
});
47
my $library2 = $builder->build({
48
    source => 'Branch',
49
});
50
51
my $bib_title = "Test Title";
52
53
my $borrower = $builder->build({
54
    source => 'Borrower',
55
    value => {
56
        branchcode => $library1->{branchcode},
57
    }
58
});
59
60
my $itemtype1 = $builder->build({
61
    source => 'Itemtype',
62
    value => {}
63
});
64
my $itemtype2 = $builder->build({
65
    source => 'Itemtype',
66
    value => {}
67
});
68
my $itemtype3 = $builder->build({
69
    source => 'Itemtype',
70
    value => {}
71
});
72
my $itemtype4 = $builder->build({
73
    source => 'Itemtype',
74
    value => {}
75
});
76
77
my $borrowernumber = $borrower->{borrowernumber};
78
79
my $library_A_code = $library1->{branchcode};
80
81
my $biblio = $builder->build_sample_biblio({itemtype => $itemtype1->{itemtype}});
82
my $biblionumber = $biblio->biblionumber;
83
my $item1 = $builder->build_sample_item({
84
    biblionumber => $biblionumber,
85
    itype => $itemtype1->{itemtype},
86
    homebranch => $library_A_code,
87
    holdingbranch => $library_A_code
88
});
89
my $item2 = $builder->build_sample_item({
90
    biblionumber => $biblionumber,
91
    itype => $itemtype2->{itemtype},
92
    homebranch => $library_A_code,
93
    holdingbranch => $library_A_code
94
});
95
my $item3 = $builder->build_sample_item({
96
    biblionumber => $biblionumber,
97
    itype => $itemtype3->{itemtype},
98
    homebranch => $library_A_code,
99
    holdingbranch => $library_A_code
100
});
101
102
my $library_B_code = $library2->{branchcode};
103
104
my $biblio2 = $builder->build_sample_biblio({itemtype => $itemtype4->{itemtype}});
105
my $biblionumber2 = $biblio2->biblionumber;
106
my $item4 = $builder->build_sample_item({
107
    biblionumber => $biblionumber2,
108
    itype => $itemtype4->{itemtype},
109
    homebranch => $library_B_code,
110
    holdingbranch => $library_B_code
111
});
112
113
$dbh->do("DELETE FROM circulation_rules");
114
Koha::CirculationRules->set_rules(
115
    {
116
        itemtype     => $itemtype1->{itemtype},
117
        categorycode => undef,
118
        branchcode   => undef,
119
        rules        => {
120
            expire_reserves_charge => '111'
121
        }
122
    }
123
);
124
Koha::CirculationRules->set_rules(
125
    {
126
        itemtype     => $itemtype2->{itemtype},
127
        categorycode => undef,
128
        branchcode   => undef,
129
        rules        => {
130
            expire_reserves_charge => undef
131
        }
132
    }
133
);
134
Koha::CirculationRules->set_rules(
135
    {
136
        itemtype     => undef,
137
        categorycode => undef,
138
        branchcode   => $library_B_code,
139
        rules        => {
140
            expire_reserves_charge => '444'
141
        }
142
    }
143
);
144
145
t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary');
146
147
my $reserve_id;
148
my $account;
149
my $status;
150
my $start_balance;
151
152
# TEST: Hold itemtype1 item
153
$reserve_id = AddReserve(
154
    {
155
        branchcode       => $library_A_code,
156
        borrowernumber   => $borrowernumber,
157
        biblionumber     => $biblionumber,
158
        priority         => 1,
159
        itemnumber       => $item1->itemnumber,
160
    }
161
);
162
163
$account = Koha::Account->new({ patron_id => $borrowernumber });
164
165
( $status ) = CheckReserves($item1->id);
166
is( $status, 'Reserved', "Hold for the itemtype1 created" );
167
168
$start_balance = $account->balance();
169
170
Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
171
172
( $status ) = CheckReserves($item1->id);
173
is( $status, '', "Hold for the itemtype1 cancelled" );
174
175
is( $account->balance() - $start_balance, 111, "Used circulation rule for itemtype1" );
176
177
# TEST: circulation rule for itemtype2 has 'expire_reserves_charge' set undef, so it should use ExpireReservesMaxPickUpDelayCharge preference
178
t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 222);
179
180
$reserve_id = AddReserve(
181
    {
182
        branchcode       => $library_A_code,
183
        borrowernumber   => $borrowernumber,
184
        biblionumber     => $biblionumber,
185
        priority         => 1,
186
        itemnumber       => $item2->itemnumber,
187
    }
188
);
189
190
$account = Koha::Account->new({ patron_id => $borrowernumber });
191
192
( $status ) = CheckReserves($item2->id);
193
is( $status, 'Reserved', "Hold for the itemtype2 created" );
194
195
$start_balance = $account->balance();
196
197
Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
198
199
( $status ) = CheckReserves($item2->id);
200
is( $status, '', "Hold for the itemtype2 cancelled" );
201
202
is( $account->balance() - $start_balance, 222, "Used ExpireReservesMaxPickUpDelayCharge preference as expire_reserves_charge set to undef" );
203
204
# TEST: no circulation rules for itemtype3, it should use ExpireReservesMaxPickUpDelayCharge preference
205
t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 333);
206
207
$reserve_id = AddReserve(
208
    {
209
        branchcode       => $library_A_code,
210
        borrowernumber   => $borrowernumber,
211
        biblionumber     => $biblionumber,
212
        priority         => 1,
213
        itemnumber       => $item3->itemnumber,
214
    }
215
);
216
217
$account = Koha::Account->new({ patron_id => $borrowernumber });
218
219
( $status ) = CheckReserves($item3->id);
220
is( $status, 'Reserved', "Hold for the itemtype3 created" );
221
222
$start_balance = $account->balance();
223
224
Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
225
226
( $status ) = CheckReserves($item3->id);
227
is( $status, '', "Hold for the itemtype3 cancelled" );
228
229
is( $account->balance() - $start_balance, 333, "Used ExpireReservesMaxPickUpDelayCharge preference as there's no circulation rules for itemtype3" );
230
231
# TEST: circulation rule for itemtype4 with library_B_code
232
t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 555);
233
234
$reserve_id = AddReserve(
235
    {
236
        branchcode       => $library_B_code,
237
        borrowernumber   => $borrowernumber,
238
        biblionumber     => $biblionumber2,
239
        priority         => 1,
240
        itemnumber       => $item4->itemnumber,
241
    }
242
);
243
244
$account = Koha::Account->new({ patron_id => $borrowernumber });
245
246
( $status ) = CheckReserves($item4->id);
247
is( $status, 'Reserved', "Hold for the itemtype4 created" );
248
249
$start_balance = $account->balance();
250
251
Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
252
253
( $status ) = CheckReserves($item4->id);
254
is( $status, '', "Hold for the itemtype4 cancelled" );
255
256
is( $account->balance() - $start_balance, 444, "Used circulation rule for itemtype4 with library_B_code" );
257
258
$schema->storage->txn_rollback;
(-)a/t/db_dependent/Koha/Holds.t (-29 / +243 lines)
Lines 23-29 use Test::More tests => 11; Link Here
23
use Test::Warn;
23
use Test::Warn;
24
24
25
use C4::Circulation qw( AddIssue );
25
use C4::Circulation qw( AddIssue );
26
use C4::Reserves qw( AddReserve ModReserve ModReserveCancelAll );
26
use C4::Reserves qw( AddReserve CheckReserves ModReserve ModReserveCancelAll );
27
use Koha::AuthorisedValueCategory;
27
use Koha::AuthorisedValueCategory;
28
use Koha::Biblio::ItemGroups;
28
use Koha::Biblio::ItemGroups;
29
use Koha::Database;
29
use Koha::Database;
Lines 133-170 subtest 'cancel' => sub { Link Here
133
    is( $third_hold->discard_changes->priority, 2, 'Third hold should now be second' );
133
    is( $third_hold->discard_changes->priority, 2, 'Third hold should now be second' );
134
134
135
    subtest 'charge_cancel_fee parameter' => sub {
135
    subtest 'charge_cancel_fee parameter' => sub {
136
        plan tests => 4;
136
        plan tests => 15;
137
        my $patron_category = $builder->build_object({ class => 'Koha::Patron::Categories', value => { reservefee => 0 } } );
137
        my $library1 = $builder->build({
138
        my $patron = $builder->build_object({ class => 'Koha::Patrons', value => { categorycode => $patron_category->categorycode } });
138
            source => 'Branch',
139
        is( $patron->account->balance, 0, 'A new patron does not have any charges' );
139
        });
140
        my $library2 = $builder->build({
141
            source => 'Branch',
142
        });
143
144
        my $bib_title = "Test Title";
145
146
        my $borrower = $builder->build({
147
            source => 'Borrower',
148
            value => {
149
                branchcode => $library1->{branchcode},
150
            }
151
        });
152
153
        my $itemtype1 = $builder->build({
154
            source => 'Itemtype',
155
            value => {}
156
        });
157
        my $itemtype2 = $builder->build({
158
            source => 'Itemtype',
159
            value => {}
160
        });
161
        my $itemtype3 = $builder->build({
162
            source => 'Itemtype',
163
            value => {}
164
        });
165
        my $itemtype4 = $builder->build({
166
            source => 'Itemtype',
167
            value => {}
168
        });
169
170
        my $borrowernumber = $borrower->{borrowernumber};
171
172
        my $library_A_code = $library1->{branchcode};
173
174
        my $biblio = $builder->build_sample_biblio({itemtype => $itemtype1->{itemtype}});
175
        my $biblionumber = $biblio->biblionumber;
176
        my $item1 = $builder->build_sample_item({
177
            biblionumber => $biblionumber,
178
            itype => $itemtype1->{itemtype},
179
            homebranch => $library_A_code,
180
            holdingbranch => $library_A_code
181
        });
182
        my $item2 = $builder->build_sample_item({
183
            biblionumber => $biblionumber,
184
            itype => $itemtype2->{itemtype},
185
            homebranch => $library_A_code,
186
            holdingbranch => $library_A_code
187
        });
188
        my $item3 = $builder->build_sample_item({
189
            biblionumber => $biblionumber,
190
            itype => $itemtype3->{itemtype},
191
            homebranch => $library_A_code,
192
            holdingbranch => $library_A_code
193
        });
194
195
        my $library_B_code = $library2->{branchcode};
196
197
        my $biblio2 = $builder->build_sample_biblio({itemtype => $itemtype4->{itemtype}});
198
        my $biblionumber2 = $biblio2->biblionumber;
199
        my $item4 = $builder->build_sample_item({
200
            biblionumber => $biblionumber2,
201
            itype => $itemtype4->{itemtype},
202
            homebranch => $library_B_code,
203
            holdingbranch => $library_B_code
204
        });
205
206
        Koha::CirculationRules->set_rules(
207
            {
208
                itemtype     => undef,
209
                categorycode => undef,
210
                branchcode   => undef,
211
                rules        => {
212
                    expire_reserves_charge => undef
213
                }
214
            }
215
        );
216
        Koha::CirculationRules->set_rules(
217
            {
218
                itemtype     => $itemtype1->{itemtype},
219
                categorycode => undef,
220
                branchcode   => undef,
221
                rules        => {
222
                    expire_reserves_charge => '111'
223
                }
224
            }
225
        );
226
        Koha::CirculationRules->set_rules(
227
            {
228
                itemtype     => $itemtype2->{itemtype},
229
                categorycode => undef,
230
                branchcode   => undef,
231
                rules        => {
232
                    expire_reserves_charge => undef
233
                }
234
            }
235
        );
236
        Koha::CirculationRules->set_rules(
237
            {
238
                itemtype     => undef,
239
                categorycode => undef,
240
                branchcode   => $library_B_code,
241
                rules        => {
242
                    expire_reserves_charge => '444'
243
                }
244
            }
245
        );
140
246
141
        my $hold_info = {
247
        t::lib::Mocks::mock_preference('ReservesControlBranch', 'ItemHomeLibrary');
142
            branchcode     => $library->branchcode,
248
143
            borrowernumber => $patron->borrowernumber,
249
        my $reserve_id;
144
            biblionumber   => $item->biblionumber,
250
        my $account;
145
            priority       => 1,
251
        my $status;
146
            title          => "title for fee",
252
        my $start_balance;
147
            itemnumber     => $item->itemnumber,
253
148
        };
254
# TEST: Hold itemtype1 item
255
        $reserve_id = AddReserve(
256
            {
257
                branchcode       => $library_A_code,
258
                borrowernumber   => $borrowernumber,
259
                biblionumber     => $biblionumber,
260
                priority         => 1,
261
                itemnumber       => $item1->itemnumber,
262
            }
263
        );
264
265
        $account = Koha::Account->new({ patron_id => $borrowernumber });
266
267
        ( $status ) = CheckReserves($item1->id);
268
        is( $status, 'Reserved', "Hold for the itemtype1 created" );
269
270
        $start_balance = $account->balance();
271
272
        Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
273
274
        ( $status ) = CheckReserves($item1->id);
275
        is( $status, '', "Hold for the itemtype1 cancelled" );
276
277
        is( $account->balance() - $start_balance, 111, "Used circulation rule for itemtype1" );
278
279
# TEST: circulation rule for itemtype2 has 'expire_reserves_charge' set undef, so it should use ExpireReservesMaxPickUpDelayCharge preference
280
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 222);
281
282
        $reserve_id = AddReserve(
283
            {
284
                branchcode       => $library_A_code,
285
                borrowernumber   => $borrowernumber,
286
                biblionumber     => $biblionumber,
287
                priority         => 1,
288
                itemnumber       => $item2->itemnumber,
289
            }
290
        );
291
292
        $account = Koha::Account->new({ patron_id => $borrowernumber });
293
294
        ( $status ) = CheckReserves($item2->id);
295
        is( $status, 'Reserved', "Hold for the itemtype2 created" );
296
297
        $start_balance = $account->balance();
298
299
        Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
300
301
        ( $status ) = CheckReserves($item2->id);
302
        is( $status, '', "Hold for the itemtype2 cancelled" );
303
304
        is( $account->balance() - $start_balance, 222, "Used ExpireReservesMaxPickUpDelayCharge preference as expire_reserves_charge set to undef" );
305
306
# TEST: no circulation rules for itemtype3, it should use ExpireReservesMaxPickUpDelayCharge preference
307
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 333);
308
309
        $reserve_id = AddReserve(
310
            {
311
                branchcode       => $library_A_code,
312
                borrowernumber   => $borrowernumber,
313
                biblionumber     => $biblionumber,
314
                priority         => 1,
315
                itemnumber       => $item3->itemnumber,
316
            }
317
        );
318
319
        $account = Koha::Account->new({ patron_id => $borrowernumber });
320
321
        ( $status ) = CheckReserves($item3->id);
322
        is( $status, 'Reserved', "Hold for the itemtype3 created" );
323
324
        $start_balance = $account->balance();
325
326
        Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
327
328
        ( $status ) = CheckReserves($item3->id);
329
        is( $status, '', "Hold for the itemtype3 cancelled" );
330
331
        is( $account->balance() - $start_balance, 333, "Used ExpireReservesMaxPickUpDelayCharge preference as there's no circulation rules for itemtype3" );
332
333
# TEST: circulation rule for itemtype4 with library_B_code
334
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 555);
335
336
        $reserve_id = AddReserve(
337
            {
338
                branchcode       => $library_B_code,
339
                borrowernumber   => $borrowernumber,
340
                biblionumber     => $biblionumber2,
341
                priority         => 1,
342
                itemnumber       => $item4->itemnumber,
343
            }
344
        );
345
346
        $account = Koha::Account->new({ patron_id => $borrowernumber });
347
348
        ( $status ) = CheckReserves($item4->id);
349
        is( $status, 'Reserved', "Hold for the itemtype4 created" );
350
351
        $start_balance = $account->balance();
352
353
        Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 });
354
355
        ( $status ) = CheckReserves($item4->id);
356
        is( $status, '', "Hold for the itemtype4 cancelled" );
357
358
        is( $account->balance() - $start_balance, 444, "Used circulation rule for itemtype4 with library_B_code" );
359
360
        $reserve_id = AddReserve(
361
            {
362
                branchcode       => $library_B_code,
363
                borrowernumber   => $borrowernumber,
364
                biblionumber     => $biblionumber2,
365
                priority         => 1,
366
                itemnumber       => $item4->itemnumber,
367
            }
368
        );
369
370
        $account = Koha::Account->new({ patron_id => $borrowernumber });
371
372
        ( $status ) = CheckReserves($item4->id);
373
        is( $status, 'Reserved', "Hold for the itemtype4 created" );
149
374
150
        # First, test cancelling a reserve when there's no charge configured.
375
        $start_balance = $account->balance();
151
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 0);
152
        my $reserve_id = C4::Reserves::AddReserve( $hold_info );
153
        Koha::Holds->find( $reserve_id )->cancel( { charge_cancel_fee => 1 } );
154
        is( $patron->account->balance, 0, 'ExpireReservesMaxPickUpDelayCharge=0 - The patron should not have been charged' );
155
376
156
        # Then, test cancelling a reserve when there's no charge desired.
377
        Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 0 });
157
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 42);
158
        $reserve_id = C4::Reserves::AddReserve( $hold_info );
159
        Koha::Holds->find( $reserve_id )->cancel(); # charge_cancel_fee => 0
160
        is( $patron->account->balance, 0, 'ExpireReservesMaxPickUpDelayCharge=42, but charge_cancel_fee => 0, The patron should not have been charged' );
161
378
379
        ( $status ) = CheckReserves($item4->id);
380
        is( $status, '', "Hold for the itemtype4 cancelled" );
162
381
163
        # Finally, test cancelling a reserve when there's a charge desired and configured.
382
        is( $account->balance() - $start_balance, 0, "Patron not charged when charge_cancel_fee is 0" );
164
        t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelayCharge', 42);
165
        $reserve_id = C4::Reserves::AddReserve( $hold_info );
166
        Koha::Holds->find( $reserve_id )->cancel( { charge_cancel_fee => 1 } );
167
        is( int($patron->account->balance), 42, 'ExpireReservesMaxPickUpDelayCharge=42 and charge_cancel_fee => 1, The patron should have been charged!' );
168
    };
383
    };
169
384
170
    subtest 'waiting hold' => sub {
385
    subtest 'waiting hold' => sub {
171
- 

Return to bug 25711