Bugzilla – Attachment 176421 Details for
Bug 25711
Move ExpireReservesMaxPickUpDelayCharge to the circulation rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25711: (QA follow-up) Re-base fixes
Bug-25711-QA-follow-up-Re-base-fixes.patch (text/plain), 4.75 KB, created by
Martin Renvoize (ashimema)
on 2025-01-12 17:46:16 UTC
(
hide
)
Description:
Bug 25711: (QA follow-up) Re-base fixes
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-01-12 17:46:16 UTC
Size:
4.75 KB
patch
obsolete
>From 5413b15b7eb6cb4a597ba989de2cb2b972ad3e82 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Sun, 12 Jan 2025 17:38:26 +0000 >Subject: [PATCH] Bug 25711: (QA follow-up) Re-base fixes > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > t/db_dependent/Koha/Holds.t | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > >diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t >index d0bf9f7067e..4310370f289 100755 >--- a/t/db_dependent/Koha/Holds.t >+++ b/t/db_dependent/Koha/Holds.t >@@ -266,14 +266,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item1->id); >+ ( $status ) = CheckReserves($item1); > is( $status, 'Reserved', "Hold for the itemtype1 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 }); > >- ( $status ) = CheckReserves($item1->id); >+ ( $status ) = CheckReserves($item1); > is( $status, '', "Hold for the itemtype1 cancelled" ); > > is( $account->balance() - $start_balance, 111, "Used circulation rule for itemtype1" ); >@@ -293,14 +293,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item2->id); >+ ( $status ) = CheckReserves($item2); > is( $status, 'Reserved', "Hold for the itemtype2 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 }); > >- ( $status ) = CheckReserves($item2->id); >+ ( $status ) = CheckReserves($item2); > is( $status, '', "Hold for the itemtype2 cancelled" ); > > is( $account->balance() - $start_balance, 222, "Used ExpireReservesMaxPickUpDelayCharge preference as expire_reserves_charge set to undef" ); >@@ -320,14 +320,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item3->id); >+ ( $status ) = CheckReserves($item3); > is( $status, 'Reserved', "Hold for the itemtype3 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 }); > >- ( $status ) = CheckReserves($item3->id); >+ ( $status ) = CheckReserves($item3); > is( $status, '', "Hold for the itemtype3 cancelled" ); > > is( $account->balance() - $start_balance, 333, "Used ExpireReservesMaxPickUpDelayCharge preference as there's no circulation rules for itemtype3" ); >@@ -347,14 +347,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item4->id); >+ ( $status ) = CheckReserves($item4); > is( $status, 'Reserved', "Hold for the itemtype4 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 }); > >- ( $status ) = CheckReserves($item4->id); >+ ( $status ) = CheckReserves($item4); > is( $status, '', "Hold for the itemtype4 cancelled" ); > > is( $account->balance() - $start_balance, 444, "Used circulation rule for itemtype4 with library_B_code" ); >@@ -374,14 +374,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item5->id); >+ ( $status ) = CheckReserves($item5); > is( $status, 'Reserved', "Hold for the itemtype5 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 1 }); > >- ( $status ) = CheckReserves($item5->id); >+ ( $status ) = CheckReserves($item5); > is( $status, '', "Hold for the itemtype5 cancelled" ); > > is( $account->balance() - $start_balance, 0, "Used circulation rule for itemtype4 with library_C_code even though it's 0" ); >@@ -399,14 +399,14 @@ subtest 'cancel' => sub { > > $account = Koha::Account->new({ patron_id => $borrowernumber }); > >- ( $status ) = CheckReserves($item4->id); >+ ( $status ) = CheckReserves($item4); > is( $status, 'Reserved', "Hold for the itemtype4 created" ); > > $start_balance = $account->balance(); > > Koha::Holds->find( $reserve_id )->cancel({ charge_cancel_fee => 0 }); > >- ( $status ) = CheckReserves($item4->id); >+ ( $status ) = CheckReserves($item4); > is( $status, '', "Hold for the itemtype4 cancelled" ); > > is( $account->balance() - $start_balance, 0, "Patron not charged when charge_cancel_fee is 0" ); >-- >2.47.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25711
:
107144
|
107407
|
107683
|
107844
|
108689
|
119851
|
119911
|
119912
|
120164
|
123309
|
123310
|
123326
|
123327
|
123328
|
123452
|
123456
|
123498
|
123568
|
123610
|
123653
|
123661
|
135060
|
135061
|
135062
|
135063
|
135064
|
135065
|
135156
|
135157
|
135158
|
135159
|
135160
|
135161
|
135950
|
135951
|
135952
|
135953
|
135954
|
135955
|
136769
|
140377
|
140378
|
140379
|
140380
|
140381
|
140382
|
140383
|
141270
|
157632
|
157633
|
157634
|
157635
|
157636
|
157637
|
157638
|
157639
|
171054
|
171055
|
171056
|
171057
|
171058
|
171059
|
176243
|
176244
|
176245
|
176246
|
176247
|
176248
|
176408
|
176409
|
176410
|
176411
|
176412
|
176413
|
176414
|
176415
|
176416
|
176417
|
176418
|
176419
|
176420
| 176421