From 4b0157e48ab3d2ae2a24b97fa075ee3b662cf47c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 11 Sep 2025 07:27:11 +0100 Subject: [PATCH] Bug 3492: (follow-up) Remove last reservefee references Sponsored-by: OpenFifth Signed-off-by: Jackie Usher --- .../data/mysql/en/optional/patron_categories.yml | 12 ------------ t/db_dependent/Circulation/GetHardDueDate.t | 7 +++---- t/db_dependent/Koha/Holds.t | 1 - t/lib/TestBuilder.pm | 1 - 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/installer/data/mysql/en/optional/patron_categories.yml b/installer/data/mysql/en/optional/patron_categories.yml index 2d4038c6893..505da8de4fe 100644 --- a/installer/data/mysql/en/optional/patron_categories.yml +++ b/installer/data/mysql/en/optional/patron_categories.yml @@ -54,7 +54,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'A' can_be_guarantee: 0 @@ -65,7 +64,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'A' can_be_guarantee: 0 @@ -76,7 +74,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'A' can_be_guarantee: 0 @@ -88,7 +85,6 @@ tables: dateofbirthrequired: 5 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'C' can_be_guarantee: 1 @@ -99,7 +95,6 @@ tables: dateofbirthrequired: 5 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'C' can_be_guarantee: 1 @@ -110,7 +105,6 @@ tables: dateofbirthrequired: 5 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'C' can_be_guarantee: 1 @@ -122,7 +116,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 0 - reservefee: '0.000000' category_type: 'P' can_be_guarantee: 1 @@ -133,7 +126,6 @@ tables: dateofbirthrequired: 5 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'P' can_be_guarantee: 1 @@ -145,7 +137,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'I' can_be_guarantee: 0 @@ -156,7 +147,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'I' can_be_guarantee: 0 @@ -167,7 +157,6 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 1 - reservefee: '0.000000' category_type: 'I' can_be_guarantee: 0 @@ -179,6 +168,5 @@ tables: dateofbirthrequired: 18 enrolmentfee: '0.000000' overduenoticerequired: 0 - reservefee: '0.000000' category_type: 'S' can_be_guarantee: 0 diff --git a/t/db_dependent/Circulation/GetHardDueDate.t b/t/db_dependent/Circulation/GetHardDueDate.t index 598c04c1db3..122844f8256 100755 --- a/t/db_dependent/Circulation/GetHardDueDate.t +++ b/t/db_dependent/Circulation/GetHardDueDate.t @@ -82,19 +82,18 @@ my $samplecat = { dateofbirthrequired => undef, enrolmentfee => undef, overduenoticerequired => undef, - reservefee => undef, hidelostitems => 0, category_type => 'A', }; my $query = - "INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired,enrolmentfee,overduenoticerequired ,reservefee ,hidelostitems ,category_type) VALUES( ?,?,?,?,?,?,?,?,?,?)"; + "INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,dateofbirthrequired,enrolmentfee,overduenoticerequired,hidelostitems,category_type) VALUES(?,?,?,?,?,?,?,?,?)"; $dbh->do( $query, {}, $samplecat->{categorycode}, $samplecat->{description}, $samplecat->{enrolmentperiod}, $samplecat->{enrolmentperioddate}, $samplecat->{dateofbirthrequired}, $samplecat->{enrolmentfee}, - $samplecat->{overduenoticerequired}, $samplecat->{reservefee}, - $samplecat->{hidelostitems}, $samplecat->{category_type} + $samplecat->{overduenoticerequired}, $samplecat->{hidelostitems}, + $samplecat->{category_type} ); my $builder = t::lib::TestBuilder->new; diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t index 1746d100b83..1cebe2fc3a3 100755 --- a/t/db_dependent/Koha/Holds.t +++ b/t/db_dependent/Koha/Holds.t @@ -484,7 +484,6 @@ subtest 'cancel' => sub { my $patron_category = $builder->build_object( { class => 'Koha::Patron::Categories', - value => { reservefee => 0 } } ); my $patron = $builder->build_object( diff --git a/t/lib/TestBuilder.pm b/t/lib/TestBuilder.pm index e5bdfde6b49..f4cd8f02cdb 100644 --- a/t/lib/TestBuilder.pm +++ b/t/lib/TestBuilder.pm @@ -655,7 +655,6 @@ sub _gen_default_values { }, Category => { enrolmentfee => 0, - reservefee => 0, # Not X, used for statistics category_type => sub { return [qw( A C S I P )]->[ int( rand(5) ) ] }, -- 2.51.0