From 1b289f74cc5b08a87e8d5b612f946a930c5e7e24 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 19 Feb 2021 12:06:10 +0000 Subject: [PATCH] Bug 25690: (QA follow-up) PROCESSED -> PROCESSING for consistency PROCESSED gave the apearance that the item processing had been completed whereas in reading the code it appears to actually signify that the item is awaiting/in proessing state. This patch updates the variable to be PROCESSING consistently throughout the codebase. Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- C4/Circulation.pm | 2 +- C4/SIP/ILS/Transaction/Checkout.pm | 2 +- circ/branchtransfers.pl | 2 +- .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 9ca5e5a9a0..03fe5c78f2 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1149,7 +1149,7 @@ sub CanBookBeIssued { } elsif ( $restype eq "Processing" ) { # The item is determined hold being processed for someone else. - $needsconfirmation{PROCESSED} = 1; + $needsconfirmation{PROCESSING} = 1; $needsconfirmation{'resfirstname'} = $patron->firstname; $needsconfirmation{'ressurname'} = $patron->surname; $needsconfirmation{'rescardnumber'} = $patron->cardnumber; diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm index fbd3816df8..2386d90fa1 100644 --- a/C4/SIP/ILS/Transaction/Checkout.pm +++ b/C4/SIP/ILS/Transaction/Checkout.pm @@ -76,7 +76,7 @@ sub do_checkout { next; } elsif ($confirmation eq 'RESERVE_WAITING' or $confirmation eq 'TRANSFERRED' - or $confirmation eq 'PROCESSED') { + or $confirmation eq 'PROCESSING') { $debug and warn "Item is on hold for another patron."; $self->screen_msg("Item is on hold for another patron."); $noerror = 0; diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index c795236f69..95ec789926 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -224,7 +224,7 @@ $template->param( reserved => $reserved, waiting => $waiting, transferred => $hold_transferred, - processed => $hold_processed, + processing => $hold_processed, borrowernumber => $borrowernumber, itemnumber => $itemnumber, barcode => $barcode, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 89a7f6d496..a1c0e5f496 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -50,7 +50,7 @@ - [% IF ( waiting or transferred or processed ) %] + [% IF ( waiting or transferred or processing ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index a71fb2873c..e0ea618df2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -126,7 +126,7 @@
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]
    • [% END %] - [% IF ( PROCESSED ) %] + [% IF ( PROCESSING ) %]
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is being processed for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]
    • [% END %] @@ -254,7 +254,7 @@

    [% END %] - [% IF ( PROCESSED ) %] + [% IF ( PROCESSING ) %]


    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 6afb301479..4fe30d73ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -150,7 +150,7 @@ [% IF checkout_info.TRANSFERRED %]

  • This item is on hold and being transferred to another patron.
    • [% END %] - [% IF checkout_info.PROCESSED %] + [% IF checkout_info.PROCESSING %]
  • This item is on hold and being processed for another patron.
    • [% END %] [% IF checkout_info.ISSUED_TO_ANOTHER %] @@ -193,7 +193,7 @@ [% END %] - [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSED ) %] + [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %]
  • This item is on hold for another patron. The hold will be overridden, but not cancelled.
    • [% ELSIF checkout_info.RESERVED %]
  • This item is on hold for another patron.
    • -- 2.39.5