Bugzilla – Attachment 67117 Details for
Bug 19299
Replace C4::Reserves::GetReservesForBranch with Koha::Holds->waiting
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19299: Replace C4::Reserves::GetReservesForBranch with Koha::Holds->waiting
Bug-19299-Replace-C4ReservesGetReservesForBranch-w.patch (text/plain), 6.29 KB, created by
Jonathan Druart
on 2017-09-13 18:56:16 UTC
(
hide
)
Description:
Bug 19299: Replace C4::Reserves::GetReservesForBranch with Koha::Holds->waiting
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-09-13 18:56:16 UTC
Size:
6.29 KB
patch
obsolete
>From 5e5c4e478f2ff918daacd09daea35760e4c80145 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 11 Sep 2017 12:49:33 -0300 >Subject: [PATCH] Bug 19299: Replace C4::Reserves::GetReservesForBranch with > Koha::Holds->waiting > >GetReservesForBranch simply returns the waiting holds, for a specific >branch of not. This can easily be replaced with a call to >Koha::Holds->waiting > >To avoid any regressions, I reuse the exact conditions (priority = 0), >but I do not think it is useful. > >Test plan: >Make sure the holds information are correctly displayed on the waiting >holds screen. >--- > C4/Reserves.pm | 36 ------------------------------------ > circ/waitingreserves.pl | 47 +++++++++++++++++++++++------------------------ > 2 files changed, 23 insertions(+), 60 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 521b072368..5da7212819 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -104,7 +104,6 @@ BEGIN { > @EXPORT = qw( > &AddReserve > >- &GetReservesForBranch > &GetReserveStatus > > &GetOtherReserves >@@ -562,41 +561,6 @@ SELECT COUNT(*) FROM reserves WHERE biblionumber=? AND borrowernumber<>? > return $fee; > } > >-=head2 GetReservesForBranch >- >- @transreserv = GetReservesForBranch($frombranch); >- >-=cut >- >-sub GetReservesForBranch { >- my ($frombranch) = @_; >- my $dbh = C4::Context->dbh; >- >- my $query = " >- SELECT reserve_id,borrowernumber,reservedate,itemnumber,waitingdate, expirationdate >- FROM reserves >- WHERE priority='0' >- AND found='W' >- "; >- $query .= " AND branchcode=? " if ( $frombranch ); >- $query .= "ORDER BY waitingdate" ; >- >- my $sth = $dbh->prepare($query); >- if ($frombranch){ >- $sth->execute($frombranch); >- } else { >- $sth->execute(); >- } >- >- my @transreserv; >- my $i = 0; >- while ( my $data = $sth->fetchrow_hashref ) { >- $transreserv[$i] = $data; >- $i++; >- } >- return (@transreserv); >-} >- > =head2 GetReserveStatus > > $reservestatus = GetReserveStatus($itemnumber); >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 8527f2df9f..66fe438490 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -84,54 +84,53 @@ $template->param( all_branches => 1 ) if $all_branches; > > my (@reservloop, @overloop); > my ($reservcount, $overcount); >-my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch($default); >+# FIXME - Is priority => 0 useful? If yes it must be moved to waiting, otherwise we need to remove it from here. >+my $holds = Koha::Holds->waiting->search({ priority => 0, ( $all_branches ? () : ( branchcode => $default ) ) }, { order_by => ['waitingdate'] }); > # get reserves for the branch we are logged into, or for all branches > > my $today = Date_to_Days(&Today); > my $max_pickup_delay = C4::Context->preference('ReservesMaxPickUpDelay'); > >-foreach my $num (@getreserves) { >- next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00'); >+while ( my $hold = $holds->next ) { >+ next unless ($hold->waitingdate && $hold->waitingdate ne '0000-00-00'); > >- my $itemnumber = $num->{'itemnumber'}; >- my $item = Koha::Items->find( $itemnumber ); >+ my $item = $hold->item; >+ my $patron = $hold->borrower; > my $biblio = $item->biblio; >- my $borrowernum = $num->{'borrowernumber'}; > my $holdingbranch = $item->holdingbranch; > my $homebranch = $item->homebranch; > > my %getreserv = ( >- itemnumber => $itemnumber, >- borrowernum => $borrowernum, >+ title => $biblio->title, >+ itemnumber => $item->itemnumber, >+ waitingdate => $hold->waitingdate, >+ borrowernum => $patron->borrowernumber, >+ biblionumber => $biblio->biblionumber, >+ barcode => $item->barcode, >+ homebranch => $homebranch, >+ holdingbranch => $item->holdingbranch, >+ itemcallnumber => $item->itemcallnumber, >+ enumchron => $item->enumchron, >+ copynumber => $item->copynumber, >+ borrowername => $patron->surname, # FIXME Let's send $patron to the template >+ borrowerfirstname => $patron->firstname, >+ borrowerphone => $patron->phone, > ); > >- my $patron = Koha::Patrons->find( $num->{borrowernumber} ); > my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype ); >- $getreserv{'waitingdate'} = $num->{'waitingdate'}; >- my ( $expire_year, $expire_month, $expire_day ) = split (/-/, $num->{'expirationdate'}); >+ my ( $expire_year, $expire_month, $expire_day ) = split (/-/, $hold->expirationdate); > my $calcDate = Date_to_Days( $expire_year, $expire_month, $expire_day ); > > $getreserv{'itemtype'} = $itemtype->description; # FIXME Should not it be translated_description? >- $getreserv{'title'} = $biblio->title; > $getreserv{'subtitle'} = GetRecordValue( > 'subtitle', > GetMarcBiblio({ biblionumber => $biblio->biblionumber }), > $biblio->frameworkcode); >- $getreserv{'biblionumber'} = $biblio->biblionumber; >- $getreserv{'barcode'} = $item->barcode; >- $getreserv{'homebranch'} = $homebranch; >- $getreserv{'holdingbranch'} = $item->holdingbranch; >- $getreserv{'itemcallnumber'} = $item->itemcallnumber; >- $getreserv{'enumchron'} = $item->enumchron; >- $getreserv{'copynumber'} = $item->copynumber; > if ( $homebranch ne $holdingbranch ) { > $getreserv{'dotransfer'} = 1; > } >- $getreserv{'borrowername'} = $patron->surname; >- $getreserv{'borrowerfirstname'} = $patron->firstname; >- $getreserv{'borrowerphone'} = $patron->phone; > >- my $borEmail = GetFirstValidEmailAddress( $borrowernum ); >+ my $borEmail = $patron->first_valid_email_address; > > if ( $borEmail ) { > $getreserv{'borrowermail'} = $borEmail; >@@ -139,7 +138,7 @@ foreach my $num (@getreserves) { > > if ($today > $calcDate) { > if ($cancelall) { >- my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all ); >+ my $res = cancel( $item->itemnumber, $patron->borrowernumber, $holdingbranch, $homebranch, !$transfer_when_cancel_all ); > push @cancel_result, $res if $res; > next; > } else { >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=67117">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19299
:
67117
|
67118
|
68815
|
68908