Attachment 88158 Details for Bug 15505 – Bug 15505: Mark Hold Items 'On hold' instead of 'Available'

[patch] Bug 15505: Mark Hold Items 'On hold' instead of 'Available'

Bug-15505-Mark-Hold-Items-On-hold-instead-of-Avail.patch (text/plain), 8.25 KB, created by Martin Renvoize (ashimema) on 2019-04-17 09:55:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-04-17 09:55:08 UTC

Size: 8.25 KB

patch

obsolete

>From 7aa69de30463a1ba5221c968509df064b55981b4 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 27 Dec 2016 17:07:20 +0000
>Subject: [PATCH] Bug 15505: Mark Hold Items 'On hold' instead of 'Available'
>
>This patch adds a 'pending hold' column to C4::Items:GetItemsInfo to
>allow for displaying status of an item when it has been selected for a
>hold by the holdsqueue and AllowItemsOnHoldCheckout is set to 'Don't
>allow'
>
>To test:
>00 - Set AllowItemsOnHoldCheckout to 'Allow'
>01 - Place a hold on an item
>02 - Build the holdsqueue (kohadevbox example below)
> sudo koha-shell kohadev
> perl misc/cronjobs/holds/build_holds_queue.pl
>03 - Search for the item on the OPAC
>04 - Note item shows as 'Available' in results and details
>05 - Toggle AllowItemsOnHOldCheckout to 'Don't allow'
>06 - Repeat search, note there is no change
>06 - Apply Patch
>07 - Search for the item on the OPAC
>08 - Note that item now shows as 'Pending hold'
>09 - Toggle AllowItemsOnHoldCheckout to Allow
>10 - Note item shows as available
>11 - prove -v t/db_dependent/Items.t
>
>Signed-off-by: Liz Rea <wizzyrea@gmail.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Items.pm | 3 +++
> C4/XSLT.pm | 7 +++++--
> .../en/modules/admin/preferences/circulation.pref | 2 +-
> .../bootstrap/en/includes/item-status.inc | 5 +++++
> .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 6 ++++++
> t/db_dependent/Items.t | 15 ++++++++++++++-
> 6 files changed, 34 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Items.pm b/C4/Items.pm
>index fdf262f7ed..14fcdcfc37 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -963,6 +963,7 @@ sub GetItemsInfo {
> holding.opac_info as holding_branch_opac_info,
> home.opac_info as home_branch_opac_info
> ";
>+ $query .= ",IF(tmp_holdsqueue.itemnumber,1,0) AS pending_hold" if !C4::Context->preference('AllowItemsOnHoldCheckout');
> $query .= "
> FROM items
> LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
>@@ -975,6 +976,8 @@ sub GetItemsInfo {
> LEFT JOIN serial USING (serialid)
> LEFT JOIN itemtypes ON itemtypes.itemtype = "
> . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
>+ $query .= "
>+ LEFT JOIN tmp_holdsqueue USING (itemnumber)" if !C4::Context->preference('AllowItemsOnHoldCheckout');
> $query .= q|
> LEFT JOIN localization ON itemtypes.itemtype = localization.code
> AND localization.entity = 'itemtypes'
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index f434fa4fdc..2d499cbc9c 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -293,10 +293,10 @@ sub buildKohaItemsNamespace {
> my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
> 
> if ( ( $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} ) || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} ||
>- (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
>+ (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") || $item->{pending_hold} ){
> if ( $item->{notforloan} < 0) {
> $status = "On order";
>- } 
>+ }
> if ( $item->{itemnotforloan} && $item->{itemnotforloan} > 0 || $item->{notforloan} && $item->{notforloan} > 0 || $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} && $itemtypes->{ $item->{itype} }->{notforloan} == 1 ) {
> $status = "reference";
> }
>@@ -318,6 +318,9 @@ sub buildKohaItemsNamespace {
> if (defined $reservestatus && $reservestatus eq "Waiting") {
> $status = 'Waiting';
> }
>+ if ($item->{pending_hold}) {
>+ $status = 'Pending hold';
>+ }
> } else {
> $status = "available";
> }
>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 8e9abeb1d5..28590204a9 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
>@@ -196,7 +196,7 @@ Circulation:
> choices:
> yes: Allow
> no: "Don't allow"
>- - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
>+ - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't Allow".
> -
> - pref: AllowItemsOnHoldCheckoutSCO
> choices:
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>index 1fb9278da7..6b8dadcf4b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>@@ -89,6 +89,11 @@
> On order
> [% END %]
> 
>+[% IF item.pending_hold %]
>+ [% SET itemavailable = 0 %]
>+ Pending hold
>+[% END %]
>+
> [% IF ( itemavailable ) %]
> [% IF NOT item.isa('Koha::Item') %][% SET restrictedvalueopac = item.restrictedvalueopac %][% END %]
> Available [% IF restrictedvalueopac %]([% restrictedvalueopac | html %])[% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>index 7b858e12c3..7635c0767c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>@@ -1298,6 +1298,12 @@
> <xsl:text>On order (</xsl:text>
> <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
> <xsl:text>). </xsl:text> 
>+ </xsl:if>
>+ <xsl:if test="count(key('item-by-status', 'Pending hold'))>0">
>+ 
>+ <xsl:text>Pending hold (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status', 'Pending hold'))"/>
>+ <xsl:text>). </xsl:text> 
> </xsl:if>
> <xsl:if test="count(key('item-by-status', 'In transit'))>0">
> 
>diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t
>index 4744cff4e5..aeb968f90d 100755
>--- a/t/db_dependent/Items.t
>+++ b/t/db_dependent/Items.t
>@@ -251,7 +251,7 @@ subtest 'GetHiddenItemnumbers tests' => sub {
> 
> subtest 'GetItemsInfo tests' => sub {
> 
>- plan tests => 7;
>+ plan tests => 9;
> 
> $schema->storage->txn_begin;
> 
>@@ -313,6 +313,19 @@ subtest 'GetItemsInfo tests' => sub {
> is( $results[0]->{ restrictedvalueopac }, "Restricted Access OPAC",
> 'GetItemsInfo returns a restricted value description (OPAC)' );
> 
>+ t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 0 );
>+ #place item into holds queue
>+ my $dbh = C4::Context->dbh;
>+ $dbh->do(q{INSERT INTO tmp_holdsqueue (biblionumber, itemnumber, surname, borrowernumber ) VALUES (?, ?, "Zorro", 42)}, undef, $item_bibnum, $itemnumber);
>+ @results = GetItemsInfo( $biblio->biblionumber );
>+ is( $results[0]->{ pending_hold }, "1",
>+ 'Hold marked as pending/unavailable if not AllowItemsOnHoldCheckout' );
>+ t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 1 );
>+ @results = GetItemsInfo( $biblio->biblionumber );
>+ is( $results[0]->{ pending_hold }, undef,
>+ 'Hold not marked as pending/unavailable if AllowItemsOnHoldCheckout' );
>+
>+
> $schema->storage->txn_rollback;
> };
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 15505: 58459 | 58549 | 83643 | 85349 | 86817 | 86821 | 88158