Attachment 141211 Details for Bug 30407 – Bug 30407: Add ability to syspref UpdateNotForLoanStatusOnCheckin to show only the notforloan values description

[patch] Bug 30407: Add ability to syspref UpdateNotForLoanStatusOnCheckin to show only the notforloan values description

Bug-30407-Add-ability-to-syspref-UpdateNotForLoanS.patch (text/plain), 9.98 KB, created by Katrin Fischer on 2022-10-02 20:35:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-10-02 20:35:59 UTC

Size: 9.98 KB

patch

obsolete

>From e447c420d0dc409cfddd81e6f321000144363828 Mon Sep 17 00:00:00 2001
>From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>
>Date: Wed, 30 Mar 2022 11:58:46 +0300
>Subject: [PATCH] Bug 30407: Add ability to syspref
> UpdateNotForLoanStatusOnCheckin to show only the notforloan values
> description
>
>This can be used to instruct staff how the item should handled when
>it's checked in. For example items notforloan status has been
>changed as "Invoiced item" while item has been on loan. When it's
>checked in staff sees that they should put item aside for further
>processing.
>
>To test:
>1. Apply patch and update database if needed
>2. Set items notforloan status as -1 (or create new one)
>3. Add line "-1: ONLYMESSAGE" to UpdateNotForLoanStatusOnCheckin
>4. Check item out for patron.
>5. Check item in.
>=> Description of notforloan status should be displayed.
>=> Confirm notforloan status hasn't changed.
>
>Also prove t/db_dependent/Circulation/issue.t
>
>Sponsored-by: Koha-Suomi Oy
>
>Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Circulation.pm                                   |  2 +-
> installer/data/mysql/atomicupdate/bug_30407.pl      | 13 +++++++++++++
> installer/data/mysql/mandatory/sysprefs.sql         |  2 +-
> .../en/modules/admin/preferences/circulation.pref   |  1 +
> .../intranet-tmpl/prog/en/modules/circ/returns.tt   |  4 ++++
> t/db_dependent/Circulation/issue.t                  |  8 +++++++-
> 6 files changed, 27 insertions(+), 3 deletions(-)
> create mode 100755 installer/data/mysql/atomicupdate/bug_30407.pl
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 6faf53add9..7865178662 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -2142,7 +2142,7 @@ sub AddReturn {
>             foreach my $key ( keys %$rules ) {
>                 if ( $item->notforloan eq $key ) {
>                     $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
>-                    $item->notforloan($rules->{$key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 });
>+                    $item->notforloan($rules->{$key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1 }) unless $rules->{$key} eq 'ONLYMESSAGE';
>                     last;
>                 }
>             }
>diff --git a/installer/data/mysql/atomicupdate/bug_30407.pl b/installer/data/mysql/atomicupdate/bug_30407.pl
>new file mode 100755
>index 0000000000..c8b875d24b
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_30407.pl
>@@ -0,0 +1,13 @@
>+use Modern::Perl;
>+
>+return {
>+    bug_number => "30407",
>+    description => "Add ability to syspref UpdateNotForLoanStatusOnCheckin to show only the notforloan values message",
>+    up => sub {
>+        my ($args) = @_;
>+        my ($dbh, $out) = @$args{qw(dbh out)};
>+        # Do you stuffs here
>+        $dbh->do(q{UPDATE IGNORE systempreferences SET explanation = "This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan. Can be used for showing only the not for loan message E.g. '-1: ONLYMESSAGE'. Each pair of values should be on a separate line." WHERE variable = "UpdateNotForLoanStatusOnCheckin"});
>+        say $out "Update is going well so far";
>+    },
>+};
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index db99d68f81..a9dbc85dfd 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -734,7 +734,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the patrons unseen renewals limit.','YesNo'),
> ('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),
> ('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),
>-('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'),
>+('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan. Can be used for showing only the not for loan message E.g. '-1: ONLYMESSAGE'. Each pair of values should be on a separate line.', 'Free'),
> ('UpdateTotalIssuesOnCirc','0',NULL,'Whether to update the totalissues field in the biblio on each circ.','YesNo'),
> ('UploadPurgeTemporaryFilesDays','',NULL,'If not empty, number of days used when automatically deleting temporary uploads','integer'),
> ('uppercasesurnames','0',NULL,'If ON, surnames are converted to upper case in patron entry form','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>index bcdb4b2b88..5f1dd62d43 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>@@ -634,6 +634,7 @@ Circulation:
>               class: code
>             - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value
>             - "it will be updated to the right-hand value. For example, '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
>+            - "Can be used for showing only the not for loan message E.g. '-1: ONLYMESSAGE'."
>             - Each pair of values should be on a separate line.
>         -
>             - pref: HidePersonalPatronDetailOnCirculation
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index 023a1af80a..2bc73147a3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -261,6 +261,9 @@
>                                     [% FOREACH errmsgloo IN errmsgloop %]
>                                         [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
>                                             <p class="problem ret_nflupdate">
>+                                            [% IF errmsgloo.NotForLoanStatusUpdated.to == 'ONLYMESSAGE' %]
>+                                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]
>+                                            [% ELSE %]
>                                                 Not for loan status updated.
>                                                 <br />Old value:
>                                                 [% IF errmsgloo.NotForLoanStatusUpdated.from %]
>@@ -278,6 +281,7 @@
>                                                 [% ELSE %]
>                                                     Available for loan.
>                                                 [% END %]
>+                                            [% END %]
>                                             </p>
>                                         [% END %]
>                                         [% IF ( errmsgloo.ItemLocationUpdated ) %]
>diff --git a/t/db_dependent/Circulation/issue.t b/t/db_dependent/Circulation/issue.t
>index 5fc658b57f..f388dab007 100755
>--- a/t/db_dependent/Circulation/issue.t
>+++ b/t/db_dependent/Circulation/issue.t
>@@ -17,7 +17,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 48;
>+use Test::More tests => 49;
> use DateTime::Duration;
> 
> use t::lib::Mocks;
>@@ -408,6 +408,12 @@ AddReturn( 'barcode_3', $branchcode_1 );
> $item = Koha::Items->find( $itemnumber );
> ok( $item->notforloan eq 9, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 9 with setting "1: 9"} );
> 
>+t::lib::Mocks::mock_preference( 'UpdateNotForLoanStatusOnCheckin', '1: ONLYMESSAGE' );
>+$item->notforloan(1)->store;
>+AddReturn( 'barcode_3', $branchcode_1 );
>+$item = Koha::Items->find( $itemnumber );
>+ok( $item->notforloan eq 1, q{UpdateNotForLoanStatusOnCheckin does not update notforloan value from 1 with setting "1: ONLYMESSAGE"} );
>+
> my $itemnumber2 = Koha::Item->new(
>     {
>         biblionumber   => $biblionumber,
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30407: 132554 | 138168 | 138171 | 141211 | 141212 | 141213 | 142724