Attachment 141499 Details for Bug 14783 – Bug 14783: Change pickup location from opac.

[patch] Bug 14783: Change pickup location from opac.

0001-Bug-14783-Change-pickup-location-from-opac.patch (text/plain), 17.57 KB, created by Björn Nylén on 2022-10-07 13:35:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Nylén

Created: 2022-10-07 13:35:53 UTC

Size: 17.57 KB

patch

obsolete

>From 7c05710048901c651460395d7395e22863b0e9ad Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Nyl=C3=A9n?= <bjorn.nylen@ub.lu.se>
>Date: Fri, 7 Oct 2022 11:22:19 +0000
>Subject: [PATCH 1/4] Bug 14783: Change pickup location from opac.
>
>This patch allows users to change the pickup location for their holds
>from the opac. A syspref (OPACAllowUserToChangeBranch) controls at what
>stage a hold can be changed.
>
>To test:
>1. Set up holds with diffrent statuses for a patron (pending, waiting,
> in transit, suspended)
>2. No pickup locations for any hold should be able to be changed.
>3. Turn on and off the different options under
> OPACAllowUserToChangeBranch. Make sure that only the corresponding
> holds can be changed from the opac. Check eg in the staff client that
> pickup location has changed.
>4. The available pickup locations should respect any transfer
> restrictions. (Same as the
> holds list for a biblio in staff client)
>5. For an in-transit hold: Check in the item at the original pickup
> location.
>6. Note that it will be redirected to the new location.
>
>Sponsored-by: Lunds Universitetsbibliotek
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>---
> Koha/Hold.pm | 20 +++++++++++++++++++
> ...OpacAllowPickupLocationChange_syspref.perl | 10 ++++++++++
> installer/data/mysql/mandatory/sysprefs.sql | 2 +-
> .../admin/preferences/circulation.pref | 13 ++++++------
> .../bootstrap/en/includes/holds-table.inc | 15 +++++++-------
> opac/opac-modrequest.pl | 2 +-
> 6 files changed, 47 insertions(+), 15 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_14783-add_OpacAllowPickupLocationChange_syspref.perl
>
>diff --git a/Koha/Hold.pm b/Koha/Hold.pm
>index ca261086c7..232012976a 100644
>--- a/Koha/Hold.pm
>+++ b/Koha/Hold.pm
>@@ -906,6 +906,26 @@ sub to_api_mapping {
> };
> }
> 
>+=head3 can_change_branch_opac
>+
>+returns if a hold can change pickup location from opac
>+
>+my $can_change_branch_opac = $hold->can_change_branch_opac;
>+
>+=cut
>+
>+sub can_change_branch_opac {
>+ my ($self) = @_;
>+
>+ my @statuses = split /,/, C4::Context->preference("OPACAllowUserToChangeBranch");
>+ foreach my $status ( @statuses ){
>+ return 1 if ($status eq 'pending' && !$self->is_found && !$self->is_suspended );
>+ return 1 if ($status eq 'intransit' && $self->is_in_transit);
>+ return 1 if ($status eq 'suspended' && $self->is_suspended);
>+ }
>+ return 0;
>+}
>+
> =head2 Internal methods
> 
> =head3 _type
>diff --git a/installer/data/mysql/atomicupdate/bug_14783-add_OpacAllowPickupLocationChange_syspref.perl b/installer/data/mysql/atomicupdate/bug_14783-add_OpacAllowPickupLocationChange_syspref.perl
>new file mode 100644
>index 0000000000..75d91c6533
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_14783-add_OpacAllowPickupLocationChange_syspref.perl
>@@ -0,0 +1,10 @@
>+
>+
>+$DBversion = 'XXX'; # will be replaced by the RM
>+if( CheckVersion( $DBversion ) ) {
>+ $dbh->do( "INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACAllowUserToChangeBranch','','Pending, In-Transit, Suspended','Allow users to change the library to pick up a hold for these statuses:','multiple');" );
>+ $dbh->do( "UPDATE systempreferences set value = (SELECT CASE WHEN value = 1 THEN 'intransit' ELSE '' END FROM systempreferences WHERE variable = 'OPACInTransitHoldPickupLocationChange')");
>+ $dbh->do( "DELETE FROM systempreferences WHERE variable = 'OPACInTransitHoldPickupLocationChange' ");
>+ # Always end with this (adjust the bug info)
>+ NewVersion( $DBversion, 14783, "Allow patrons to change pickup location for non-waiting holds");
>+}
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index 9f6d066976..ae3d9e718f 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -416,6 +416,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OpacAllowPublicListCreation','1',NULL,'If set, allows opac users to create public lists','YesNo'),
> ('OpacAllowSharingPrivateLists','0',NULL,'If set, allows opac users to share private lists with other patrons','YesNo'),
> ('OPACAllowUserToChooseBranch','1','1','Allow the user to choose the branch they want to pickup their hold from','YesNo'),
>+('OPACAllowUserToChangeBranch','','Pending, In-Transit, Suspended','Allow users to change the library to pick up a hold for these statuses:','multiple'),
> ('OPACAmazonCoverImages','0','','Display cover images on OPAC from Amazon Web Services','YesNo'),
> ('OPACAuthorIdentifiers','0','','Display author identifiers on the OPAC detail page','YesNo'),
> ('OpacAuthorities','1',NULL,'If ON, enables the search authorities link on OPAC','YesNo'),
>@@ -448,7 +449,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OPACHoldsIfAvailableAtPickupExceptions','','','List the patron categories not affected by OPACHoldsIfAvailableAtPickup if off','Free'),
> ('OpacHoldNotes','0','','Show hold notes on OPAC','YesNo'),
> ('OPACHoldRequests','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
>-('OPACInTransitHoldPickupLocationChange','0',NULL,'Allow user to change the pickup location while a hold is in transit','YesNo'),
> ('OPACISBD','#100||{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }| \r\n#245||{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }|\r\n#246||{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }|\r\n#242||{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }|\r\n#245||{ 245c }|\r\n#242||{ = 242c }|\r\n#250| - |{ 250a }{ 250b }|\r\n#254|, |{ 254a }|\r\n#255|, |{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }|\r\n#256|, |{ 256a }|\r\n#257|, |{ 257a }|\r\n#258|, |{ 258a }{ 258b }|\r\n#260| - |{ 260a }{ 260b }{ 260c }|\r\n#300| - |{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }|\r\n#306| - |{ 306a }|\r\n#307| - |{ 307a }{ 307b }|\r\n#310| - |{ 310a }{ 310b }|\r\n#321| - |{ 321a }{ 321b }|\r\n#340| - |{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }|\r\n#342| - |{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }|\r\n#343| - |{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }|\r\n#351| - |{ 3513 }{ 351a }{ 351b }{ 351c }|\r\n#352| - |{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }|\r\n#362| - |{ 362a }{ 351z }|\r\n#440| - |{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }|.\r\n#490| - |{ 490a }{ 490v }{ 490x }|.\r\n#800| - |{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }|.\r\n#810| - |{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }|.\r\n#811| - |{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }|.\r\n#830| - |{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }|.\r\n#500| |{ 5003 }{ 500a }|\r\n#501| |{ 501a }|\r\n#502| |{ 502a }|\r\n#504| |{ 504a }|\r\n#505| |{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }|\r\n#506| |{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }|\r\n#507| |{ 507a }{ 507b }|\r\n#508| |{ 508a }{ 508a }|\r\n#510| |{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }|\r\n#511| |{ 511a }|\r\n#513| |{ 513a }{513b }|\r\n#514| |{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }|\r\n#515| |{ 515a }|\r\n#516| |{ 516a }|\r\n#518| |{ 5183 }{ 518a }|\r\n#520| |{ 5203 }{ 520a }{ 520b }{ 520u }|\r\n#521| |{ 5213 }{ 521a }{ 521b }|\r\n#522| |{ 522a }|\r\n#524| |{ 524a }|\r\n#525| |{ 525a }|\r\n#526| |{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }|\r\n#530| |{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }|\r\n#533| |{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }|\r\n#534| |{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }|\r\n#535| |{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }|\r\n#538| |{\\n5383 }{\\n538a }{\\n538i }{\\n538u }|\r\n#540| |{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }|\r\n#544| |{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }|\r\n#545| |{\\n545a }{ 545b }{\\n545u }|\r\n#546| |{\\n5463 }{\\n546a }{ 546b }|\r\n#547| |{\\n547a }|\r\n#550| |{ 550a }|\r\n#552| |{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }|\r\n#555| |{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }|\r\n#556| |{ 556a }{ 506z }|\r\n#563| |{ 5633 }{ 563a }{ 563u }|\r\n#565| |{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }|\r\n#567| |{ 567a }|\r\n#580| |{ 580a }|\r\n#581| |{ 5633 }{ 581a }{ 581z }|\r\n#584| |{ 5843 }{ 584a }{ 584b }|\r\n#585| |{ 5853 }{ 585a }|\r\n#586| |{ 5863 }{ 586a }|\r\n#020| <label>ISBN: </label>|{ 020a }{ 020c }|\r\n#022| <label>ISSN: </label>|{ 022a }|\r\n#222| = |{ 222a }{ 222b }|\r\n#210| = |{ 210a }{ 210b }|\r\n#024| <label>Standard No.: </label>|{ 024a }{ 024c }{ 024d }{ 0242 }|\r\n#027| <label>Standard Tech. Report. No.: </label>|{ 027a }|\r\n#028| <label>Publisher. No.: </label>|{ 028a }{ 028b }|\r\n#013| <label>Patent No.: </label>|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }|\r\n#030| <label>CODEN: </label>|{ 030a }|\r\n#037| <label>Source: </label>|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }|\r\n#010| <label>LCCN: </label>|{ 010a }|\r\n#015| <label>Nat. Bib. No.: </label>|{ 015a }{ 0152 }|\r\n#016| <label>Nat. Bib. Agency Control No.: </label>|{ 016a }{ 0162 }|\r\n#600| <label>Subjects--Personal Names: </label>|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}|\r\n#610| <label>Subjects--Corporate Names: </label>|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}|\r\n#611| <label>Subjects--Meeting Names: </label>|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}|\r\n#630| <label>Subjects--Uniform Titles: </label>|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}|\r\n#648| <label>Subjects--Chronological Terms: </label>|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}|\r\n#650| <label>Subjects--Topical Terms: </label>|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}|\r\n#651| <label>Subjects--Geographic Terms: </label>|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}|\r\n#653| <label>Subjects--Index Terms: </label>|{ 653a }|\r\n#654| <label>Subjects--Facted Index Terms: </label>|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}|\r\n#655| <label>Index Terms--Genre/Form: </label>|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}|\r\n#656| <label>Index Terms--Occupation: </label>|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}|\r\n#657| <label>Index Terms--Function: </label>|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}|\r\n#658| <label>Index Terms--Curriculum Objective: </label>|{\\n658a}{--658b}{--658c}{--658d}{--658v}|\r\n#050| <label>LC Class. No.: </label>|{ 050a }{ / 050b }|\r\n#082| <label>Dewey Class. No.: </label>|{ 082a }{ / 082b }|\r\n#080| <label>Universal Decimal Class. No.: </label>|{ 080a }{ 080x }{ / 080b }|\r\n#070| <label>National Agricultural Library Call No.: </label>|{ 070a }{ / 070b }|\r\n#060| <label>National Library of Medicine Call No.: </label>|{ 060a }{ / 060b }|\r\n#074| <label>GPO Item No.: </label>|{ 074a }|\r\n#086| <label>Gov. Doc. Class. No.: </label>|{ 086a }|\r\n#088| <label>Report. No.: </label>|{ 088a }|','70|10','OPAC ISBD','Textarea'),
> ('OpacItemLocation','callnum','callnum|ccode|location|library','Show the shelving location of items in the opac','Choice'),
> ('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL),
>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..dd3267b19b 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
>@@ -695,12 +695,6 @@ Circulation:
> 1: Allow
> 0: "Don't allow"
> - a patron to renew an item with unfilled holds if other available items can fill that hold.
>- -
>- - pref: OPACInTransitHoldPickupLocationChange
>- choices:
>- 1: Allow
>- 0: "Don't allow"
>- - patrons to change their in transit holds pickup location.
> -
> - pref: AllowHoldPolicyOverride
> choices:
>@@ -801,6 +795,13 @@ Circulation:
> 1: Allow
> 0: "Don't allow"
> - a user to choose the library to pick up a hold from.
>+ -
>+ - 'Allow users to change the library to pick up a hold for these statuses:'
>+ - pref: OPACAllowUserToChangeBranch
>+ multiple:
>+ pending: Pending
>+ intransit: In transit
>+ suspended: Suspended
> -
> - pref: ReservesNeedReturns
> choices:
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>index 5daded0745..4e446acbff 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
>@@ -82,16 +82,17 @@
> [% UNLESS( singleBranchMode) %]
> <td class="branch">
> Pick up location:
>- [% IF Koha.Preference('OPACInTransitHoldPickupLocationChange') && HOLD.is_in_transit %]
>- <form class="form-inline" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
>- <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
>- <select name="new_pickup_location" class="new_pickup_location" onchange="this.form.submit()">
>- [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { item => HOLD.itemnumber, patron => logged_in_user }, selected => HOLD.branchcode }) %]
>- </select>
>+ [% IF ( HOLD.can_change_branch_opac ) %]
>+ <form class="change_branch" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
>+ <select name="new_branch" >
>+ [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
>+ </select>
>+ <input type="hidden" name="new_branch_reserveid" value="[% HOLD.reserve_id | html %]" />
>+ <button class="btn btn-primary" type="submit" name="change_branch" value="1">Change</button>
> </form>
> [% ELSE %]
> [% HOLD.branch.branchname | html %]
>- [% END %]
>+ [% END %]
> </td>
> [% END %]
> [% IF ( showpriority ) %]
>diff --git a/opac/opac-modrequest.pl b/opac/opac-modrequest.pl
>index 4eb805b359..d296591001 100755
>--- a/opac/opac-modrequest.pl
>+++ b/opac/opac-modrequest.pl
>@@ -60,7 +60,7 @@ if ( $reserve_id && $borrowernumber ) {
> }
> elsif ( $new_pickup_location ) {
> 
>- if ( C4::Context->preference('OPACInTransitHoldPickupLocationChange') ) {
>+ if ($hold->can_change_branch_opac){
> $hold->set_pickup_location({ library_id => $new_pickup_location });
> }
> else {
>-- 
>2.20.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 14783: 118189 | 118241 | 123199 | 123271 | 123708 | 123709 | 127488 | 127490 | 127492 | 130344 | 130345 | 130346 | 130347 | 141499 | 141500 | 141501 | 141502 | 141727 | 141728 | 141729 | 141730 | 142009 | 142010 | 142011 | 142012 | 142013 | 142014 | 142015 | 143025