Bugzilla – Attachment 75422 Details for
Bug 17561
ReserveSlip needs itemnumber for item level holds on same biblio
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17561 [QA Followup]: Simplify new ReserveSlip code
Bug-17561-QA-Followup-Simplify-new-ReserveSlip-cod.patch (text/plain), 3.07 KB, created by
Kyle M Hall
on 2018-05-18 12:12:32 UTC
(
hide
)
Description:
Bug 17561 [QA Followup]: Simplify new ReserveSlip code
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2018-05-18 12:12:32 UTC
Size:
3.07 KB
patch
obsolete
>From 38e93fe5c497768f7e41e2839847ddec441af445 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatetsolutions.com> >Date: Fri, 18 May 2018 07:20:06 -0400 >Subject: [PATCH] Bug 17561 [QA Followup]: Simplify new ReserveSlip code > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Reserves.pm | 54 ++++++++++++++++++++++++++++++++++++------------------ > 1 file changed, 36 insertions(+), 18 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index e7fc3c1eb5..706e3c7626 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -1868,13 +1868,15 @@ sub RevertWaitingStatus { > > =head2 ReserveSlip > >- ReserveSlip($args => { >- branchcode, >- borrowernumber, >- biblionumber, >- [itemnumber], >- [barcode], >- }) >+ReserveSlip( >+ { >+ branchcode => $branchcode, >+ borrowernumber => $borrowernumber, >+ biblionumber => $biblionumber, >+ [ itemnumber => $itemnumber, ] >+ [ barcode => $barcode, ] >+ } >+ ) > > Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef > >@@ -1892,18 +1894,34 @@ available within the slip: > > sub ReserveSlip { > my ($args) = @_; >- my $patron = Koha::Patrons->find( $args->{borrowernumber} ); >+ my $branchcode = $args->{branchcode}; >+ my $borrowernumber = $args->{borrowernumber}; >+ my $biblionumber = $args->{biblionumber}; >+ my $itemnumber = $args->{itemnumber}; >+ my $barcode = $args->{barcode}; >+ >+ >+ my $patron = Koha::Patrons->find($borrowernumber); > > my $hold; >- if ($args->{itemnumber}) { >- $hold = Koha::Holds->search({biblionumber => $args->{biblionumber}, borrowernumber => $args->{borrowernumber}, itemnumber => $args->{itemnumber} })->next; >- } elsif ($args->{barcode}) { >- my $itemnumber = Koha::Items->find({ barcode => $args->{barcode} }); >- if ($args->{itemnumber}) { >- $hold = Koha::Holds->search({biblionumber => $args->{biblionumber}, borrowernumber => $args->{borrowernumber}, itemnumber => $args->{itemnumber} })->next; >- } >- } else { >- $hold = Koha::Holds->search({biblionumber => $args->{biblionumber}, borrowernumber => $args->{borrowernumber} })->next; >+ if ($itemnumber || $barcode ) { >+ $itemnumber ||= Koha::Items->find( { barcode => $barcode } ); >+ >+ $hold = Koha::Holds->search( >+ { >+ biblionumber => $biblionumber, >+ borrowernumber => $borrowernumber, >+ itemnumber => $itemnumber >+ } >+ )->next; >+ } >+ else { >+ $hold = Koha::Holds->search( >+ { >+ biblionumber => $biblionumber, >+ borrowernumber => $borrowernumber >+ } >+ )->next; > } > > return unless $hold; >@@ -1912,7 +1930,7 @@ sub ReserveSlip { > return C4::Letters::GetPreparedLetter ( > module => 'circulation', > letter_code => 'HOLD_SLIP', >- branchcode => $args->{branchcode}, >+ branchcode => $branchcode, > lang => $patron->lang, > tables => { > 'reserves' => $reserve, >-- >2.15.1 (Apple Git-101)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17561
:
57239
|
57293
|
72678
|
72939
|
72967
|
73064
|
75421
|
75422
|
75423
|
75424
|
75425
|
75426
|
75659
|
75675
|
75676
|
75677
|
75678