Bugzilla – Attachment 138284 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: Select 'schedule a pickup' if no pickups yet
Bug-30650-Select-schedule-a-pickup-if-no-pickups-y.patch (text/plain), 5.28 KB, created by
Jonathan Druart
on 2022-07-29 09:33:31 UTC
(
hide
)
Description:
Bug 30650: Select 'schedule a pickup' if no pickups yet
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-07-29 09:33:31 UTC
Size:
5.28 KB
patch
obsolete
>From bc031e052a716b9950c21d2eb3dd1758de8a785d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 15 Jun 2022 10:58:07 +0200 >Subject: [PATCH] Bug 30650: Select 'schedule a pickup' if no pickups yet > >Signed-off-by: Koha Team University Lyon 3 <koha@univ-lyon3.fr> >--- > .../en/modules/opac-curbside-pickups.tt | 31 ++++++++++++++----- > 1 file changed, 24 insertions(+), 7 deletions(-) > >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 9dae1b16b23..5b6fe81aea2 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 >@@ -89,14 +89,31 @@ > > <div id="opac-pickups-views" class="toptabs"> > <ul class="nav nav-tabs" role="tablist"> >- <li class="nav-item" role="presentation" id="tab-user-pickups"><a href="#user-pickups" class="nav-link" aria-controls="user-pickups" aria-selected="true" role="tab" data-toggle="tab">Your pickups</a></li> >+ <li class="nav-item" role="presentation" id="tab-user-pickups"> >+ [% IF patron_curbside_pickups.count %] >+ <a href="#user-pickups" class="nav-link active" aria-controls="user-pickups" aria-selected="true" role="tab" data-toggle="tab">Your pickups</a> >+ [% ELSE %] >+ <a href="#user-pickups" class="nav-link" aria-controls="user-pickups" role="tab" data-toggle="tab">Your pickups</a> >+ [% END %] >+ </li> >+ > [% IF policies.count %] >- <li class="nav-item" role="presentation" id="tab-user-schedule-pickup"><a href="#user-schedule-pickup" class="nav-link" aria-controls="user-schedule-pickup" aria-selected="false" role="tab" data-toggle="tab">Schedule a pickup</a></li> >+ <li class="nav-item" role="presentation" id="tab-user-schedule-pickup"> >+ [% IF patron_curbside_pickups.count %] >+ <a href="#user-schedule-pickup" class="nav-link" aria-controls="user-schedule-pickup" role="tab" data-toggle="tab">Schedule a pickup</a> >+ [% ELSE %] >+ <a href="#user-schedule-pickup" class="nav-link active" aria-controls="user-schedule-pickup" aria-selected="true" role="tab" data-toggle="tab">Schedule a pickup</a> >+ [% END %] >+ </li> > [% END %] > </ul> > > <div class="tab-content"> >+ [% IF patron_curbside_pickups.count %] >+ <div role="tabpanel" class="tab-pane active" id="user-pickups" aria-labelledby="tab-user-pickups"> >+ [% ELSE %] > <div role="tabpanel" class="tab-pane" id="user-pickups" aria-labelledby="tab-user-pickups"> >+ [% END %] > [% IF patron_curbside_pickups.count %] > <table id="pickups-table" class="table table-striped"> > <thead> >@@ -147,7 +164,11 @@ > </div> > > [% IF policies.count %] >+ [% IF patron_curbside_pickups.count %] > <div role="tabpanel" class="tab-pane" id="user-schedule-pickup" aria-labelledby="tab-user-schedule-pickup"> >+ [% ELSE %] >+ <div role="tabpanel" class="tab-pane active" id="user-schedule-pickup" aria-labelledby="tab-user-schedule-pickup"> >+ [% END %] > <form id="create-pickup" method="post"> > <fieldset class="rows"> > <ol> >@@ -160,7 +181,7 @@ > > [% END %] > </select> >- <span id="existing-pickup-warning" class="required">You already have a pickup scheduled for this library.</span> >+ <span id="existing-pickup-warning" class="required" style="display: none;">You already have a pickup scheduled for this library.</span> > </li> > <li> > <label for="pickup_date">Pickup date:</label> >@@ -365,11 +386,7 @@ > > > $(document).ready(function() { >- $("#existing-pickup-warning").hide(); > $("#pickup-times").hide(); >- if( $("#opac-pickups-views .tab-pane.active").length < 1 ){ >- $("#opac-pickups-views a:first").tab("show"); >- } > > $("#create-pickup").on('submit', function(){ > if ( ! $("input[type='radio']:checked").length ) { >-- >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