Bugzilla – Attachment 137305 Details for
Bug 30650
Add a curbside pickup module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30650: Don't display slots that have are before now
Bug-30650-Dont-display-slots-that-have-are-before-.patch (text/plain), 4.09 KB, created by
Jonathan Druart
on 2022-07-07 13:03:28 UTC
(
hide
)
Description:
Bug 30650: Don't display slots that have are before now
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-07-07 13:03:28 UTC
Size:
4.09 KB
patch
obsolete
>From b8270a1f8fee1148d1b43dc9002a0ae284d5d610 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 6 Jul 2022 09:48:39 +0200 >Subject: [PATCH] Bug 30650: Don't display slots that have are before now > >Signed-off-by: Koha Team University Lyon 3 <koha@univ-lyon3.fr> >--- > .../prog/en/modules/circ/curbside_pickups.tt | 18 +++++++++++------- > .../en/modules/opac-curbside-pickups.tt | 18 +++++++++++------- > 2 files changed, 22 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >index 575534c4f43..1e24390bd64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >@@ -566,10 +566,12 @@ > let pickupIntervalEndMoment = listStartMoment.add(pickup_interval, 'minutes'); > while (keep_going) { > let available = true; >+ let display_slot = true > > if (pickupIntervalStartMoment.isBefore(now)) { > // Slots in the past are unavailable > available = false; >+ display_slot = false; > } > > if (pickupIntervalEndMoment.isAfter(listEndMoment)) { >@@ -590,13 +592,15 @@ > available = false; > } > >- pickupSlots.push( >- { >- "available": available, >- "moment": pickupIntervalStartMoment, >- "pickups_scheduled": pickups_scheduled >- } >- ); >+ if ( display_slot ) { >+ pickupSlots.push( >+ { >+ "available": available, >+ "moment": pickupIntervalStartMoment, >+ "pickups_scheduled": pickups_scheduled >+ } >+ ); >+ } > > if ( available ) { > available_count++; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >index 55852ccdc0d..f3472651d6f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >@@ -326,10 +326,12 @@ > let pickupIntervalEndMoment = listStartMoment.add(pickup_interval, 'minutes'); > while (keep_going) { > let available = true; >+ let display_slot = true; > > if (pickupIntervalStartMoment.isBefore(now)) { > // Slots in the past are unavailable > available = false; >+ display_slot = false; > } > > if (pickupIntervalEndMoment.isAfter(listEndMoment)) { >@@ -353,13 +355,15 @@ > available = false; > } > >- pickupSlots.push( >- { >- "available": available, >- "moment": pickupIntervalStartMoment, >- "pickups_scheduled": pickups_scheduled >- } >- ); >+ if ( display_slot ) { >+ pickupSlots.push( >+ { >+ "available": available, >+ "moment": pickupIntervalStartMoment, >+ "pickups_scheduled": pickups_scheduled >+ } >+ ); >+ } > > if ( available ) { > available_count++; >-- >2.25.1
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 30650
:
136584
|
136585
|
136586
|
136587
|
136588
|
136589
|
136590
|
136591
|
136592
|
136593
|
136594
|
136595
|
136596
|
136597
|
136598
|
136599
|
136600
|
136601
|
136602
|
136603
|
136604
|
136605
|
136606
|
136607
|
136608
|
136609
|
136610
|
137095
|
137100
|
137199
|
137211
|
137212
|
137277
|
137278
|
137279
|
137280
|
137281
|
137282
|
137283
|
137284
|
137285
|
137286
|
137287
|
137288
|
137289
|
137290
|
137291
|
137292
|
137293
|
137294
|
137295
|
137296
|
137297
|
137298
|
137299
|
137300
|
137301
|
137302
|
137303
|
137304
|
137305
|
137306
|
137307
|
138261
|
138262
|
138263
|
138264
|
138265
|
138266
|
138267
|
138268
|
138269
|
138270
|
138271
|
138272
|
138273
|
138274
|
138275
|
138276
|
138277
|
138278
|
138279
|
138280
|
138281
|
138282
|
138283
|
138284
|
138285
|
138286
|
138287
|
138288
|
138289
|
138290
|
138291
|
138292
|
138319
|
138320
|
138321
|
138322
|
138323
|
138324
|
138325
|
138330
|
138331
|
138332
|
138333
|
138334
|
138335
|
138336
|
138337
|
138338
|
138339
|
138340
|
138341
|
138342
|
138343
|
138344
|
138345
|
138346
|
138347
|
138348
|
138349
|
138350
|
138351
|
138352
|
138353
|
138354
|
138355
|
138356
|
138357
|
138358
|
138359
|
138360
|
138361
|
138362
|
138363
|
138364
|
138365
|
138366
|
138367
|
138368
|
138369
|
138375
|
138401
|
138610