Bugzilla – Attachment 15659 Details for
Bug 8367
How long is a hold waiting for pickup at a more granular level
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8367: Skip to next open day if max pickup date is a holiday
Bug-8367-Skip-to-next-open-day-if-max-pickup-date-.patch (text/plain), 2.66 KB, created by
Kyle M Hall (khall)
on 2013-02-25 18:19:04 UTC
(
hide
)
Description:
Bug 8367: Skip to next open day if max pickup date is a holiday
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-02-25 18:19:04 UTC
Size:
2.66 KB
patch
obsolete
>From 192d449cd2d51d9a72962312512a3286f2e0f496 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 25 Feb 2013 13:18:07 -0500 >Subject: [PATCH] Bug 8367: Skip to next open day if max pickup date is a holiday > >--- > C4/Reserves.pm | 25 +++++++++++++++++++------ > 1 files changed, 19 insertions(+), 6 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 6cdd9ee..61347f6 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -30,6 +30,7 @@ use C4::Members; > use C4::Items; > use C4::Circulation; > use C4::Accounts; >+use C4::Calendar; > > # for _koha_notify_reserve > use C4::Members::Messaging; >@@ -174,7 +175,8 @@ sub AddReserve { > my $maxpickupdate = GetMaxPickupDate({ > waitingdate => $waitingdate, > itemnumber => $checkitem, >- borrowernumber => $borrowernumber >+ borrowernumber => $borrowernumber. >+ branchcode => $branch, > }); > > #eval { >@@ -346,7 +348,7 @@ sub GetReservesFromItemnumber { > my ( $itemnumber, $all_dates ) = @_; > my $dbh = C4::Context->dbh; > my $query = " >- SELECT reservedate,borrowernumber,branchcode >+ SELECT * > FROM reserves > WHERE itemnumber=? > "; >@@ -355,8 +357,10 @@ sub GetReservesFromItemnumber { > } > my $sth_res = $dbh->prepare($query); > $sth_res->execute($itemnumber); >- my ( $reservedate, $borrowernumber,$branchcode ) = $sth_res->fetchrow_array; >- return ( $reservedate, $borrowernumber, $branchcode ); >+ >+ my $reserve = $sth_res->fetchrow_hashref(); >+ >+ return ( $reserve->{'reservedate'}, $reserve->{'borrowernumber'}, $reserve->{'branchcode'}, $reserve ); > } > > =head2 GetReservesFromBorrowernumber >@@ -528,9 +532,10 @@ sub GetMaxPickupDate { > $item = C4::Items::GetItem( $reserve->{itemnumber} ); > } > >- unless ( defined $reserve ) { >- my $reserve = GetReservesFromItemnumber( $item->{itemnumber} ); >+ unless ( defined $reserve && defined $reserve->{'branchcode'} ) { >+ ( undef, undef, undef, $reserve ) = GetReservesFromItemnumber( $item->{itemnumber} ); > } >+ > return unless $reserve->{waitingdate}; > > my $borrower = C4::Members::GetMember( 'borrowernumber' => $reserve->{borrowernumber} ); >@@ -551,6 +556,14 @@ sub GetMaxPickupDate { > > $date->add( days => $holdspickupdelay ); > >+ my $calendar = C4::Calendar->new( branchcode => $reserve->{'branchcode'} ); >+ my $is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() ); >+ >+ while ( $is_holiday ) { >+ $date->add( days => 1 ); >+ $is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() ); >+ } >+ > return $date; > } > >-- >1.7.2.5
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 8367
:
12130
|
13139
|
13602
|
13603
|
13604
|
13624
|
15334
|
15335
|
15369
|
15498
|
15613
|
15658
|
15659
|
19093
|
19094
|
19095
|
19096
|
19104
|
19105
|
19107
|
19108
|
19116
|
19180
|
19181
|
19182
|
19360
|
19361
|
19362
|
20300
|
20301
|
20302
|
20303
|
20304
|
32786
|
32826
|
32884
|
32885
|
32916
|
32930
|
42706
|
42754
|
79790
|
79791
|
79798
|
79799
|
79800
|
79853
|
79854
|
79855
|
79859
|
92412
|
92413
|
92414
|
92415
|
92416
|
92417
|
92418
|
92419
|
92420
|
92421
|
92422
|
92423
|
92424
|
92425
|
92426
|
92427
|
92428
|
92958
|
92959
|
92960
|
92961
|
103425
|
113211
|
117284
|
118017
|
118021
|
124568
|
125087
|
131299
|
131300
|
131301
|
131302
|
131646
|
131647
|
131718
|
131719
|
131720
|
131722
|
131723
|
131724
|
133089
|
133090
|
133091
|
133092
|
133093
|
133094
|
142897
|
142898
|
142899
|
142900
|
142901
|
142902
|
142903
|
144097
|
144098
|
144099
|
144100
|
144101
|
144102
|
144103
|
144146
|
145644
|
145657
|
147798
|
147799
|
147800
|
147801
|
147802
|
147803
|
147804
|
147805
|
147806
|
147807
|
148536
|
148537
|
148538
|
148539
|
148540
|
148541
|
148542
|
148543
|
148544
|
148545
|
150437
|
150438
|
150439
|
153235
|
153237
|
153238
|
153239
|
153240
|
153241
|
153242
|
153243
|
153244
|
153245
|
153246
|
157138
|
157139
|
157140
|
157141
|
157142
|
157143
|
157144
|
157145
|
157146
|
157147
|
157148
|
157149
|
157150
|
157298
|
157343
|
157344
|
157345
|
157346
|
157347
|
157348
|
157349
|
157350
|
157351
|
157352
|
157354
|
157355
|
157356
|
157697
|
157698
|
157699
|
157700
|
157701
|
157702
|
157703
|
157704
|
157705
|
157706
|
157707
|
157708
|
157709
|
157715
|
158023
|
158024
|
158025
|
158026
|
158027
|
158028
|
158029
|
158030
|
158031
|
158032
|
158033
|
158034
|
158035
|
158254
|
158255