Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 37761: Fix redirection on the tabs and buttons

Browse source 
To test:
- Apply the patch and enable the CurbsidePickup system preference if
  necessary.
- Properly testing requires testing data. You can run this command to
  REPLACE your curbside pickup data with sample data:

  bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh)

- Go to Circulation -> Curbside pickups.
- Confirm that the tabs look correct. The first tab should be active
  by default.
- Confirm that the right content is displayed when you click each tab.
- Under the "Schedule pickup" tab, search for a patron.
- After you submit the search the page should reload and the "Schedule
  pickup" tab should be open.
- Go on each tab and try each button to verify you're staying on the
  same tab.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Sukhmandeep Benipal 2024-09-12 11:56:34 -04:00 committed by Katrin Fischer
parent 1311b8c01c
commit ffb344c580
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
circ/curbside_pickups.pl
View file

@ -59,7 +59,7 @@ if ( $op eq 'find-patron' ) {
}
)->filter_by_scheduled_today;
$tab = 'schedule-pickup';
$tab = 'schedule-pickup_panel';
$template->param(
patron => $patron,
existing_curbside_pickups => $existing_curbside_pickups,

18
koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
View file

@ -216,7 +216,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-staged"/>
<input type="hidden" name="tab" value="to-be-staged"/>
<input type="hidden" name="tab" value="to-be-staged_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-staged-and-ready-btn"><i class="fa fa-check" aria-hidden="true"></i> Mark as <i>staged & ready</i></button>
@ -226,7 +226,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-cancel"/>
<input type="hidden" name="tab" value="to-be-staged"/>
<input type="hidden" name="tab" value="to-be-staged_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default cancel-btn"><i class="fa fa-ban" aria-hidden="true"></i> Cancel</button>
@ -272,7 +272,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-patron-has-arrived"/>
<input type="hidden" name="tab" value="staged-and-ready"/>
<input type="hidden" name="tab" value="staged-and-ready_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default patron-has-arrived-btn"><i class="fa-solid fa-location-dot" aria-hidden="true"></i> Patron has arrived</button>
@ -282,7 +282,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-delivered"/>
<input type="hidden" name="tab" value="staged-and-ready"/>
<input type="hidden" name="tab" value="staged-and-ready_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-delivered-btn"><i class="fa-solid fa-envelope" aria-hidden="true"></i> Mark as <i>delivered</i></button>
@ -292,7 +292,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-unstaged"/>
<input type="hidden" name="tab" value="staged-and-ready"/>
<input type="hidden" name="tab" value="staged-and-ready_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-to-be-staged-btn"><i class="fa fa-undo" aria-hidden="true"></i> Mark as <i>to be staged</i></button>
@ -338,7 +338,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-delivered"/>
<input type="hidden" name="tab" value="patron-is-outside"/>
<input type="hidden" name="tab" value="patron-is-outside_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-delivered-btn"><i class="fa-solid fa-envelope" aria-hidden="true"></i> Mark as delivered</button>
@ -348,7 +348,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-staged"/>
<input type="hidden" name="tab" value="patron-is-outside"/>
<input type="hidden" name="tab" value="patron-is-outside_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-staged-and-ready-btn"><i class="fa fa-undo" aria-hidden="true"></i> Mark as <i>staged & ready</i></button>
@ -358,7 +358,7 @@
<form method="post" class="form">
[% INCLUDE 'csrf-token.inc' %]
<input type="hidden" name="op" value="cud-mark-as-unstaged"/>
<input type="hidden" name="tab" value="patron-is-outside"/>
<input type="hidden" name="tab" value="patron-is-outside_panel"/>
<input type="hidden" name="id" value="[% cp.id | html %]"/>
<p>
<button type="submit" class="btn btn-default mark-as-to-be-staged-btn"><i class="fa fa-undo" aria-hidden="true"></i> Mark as <i>to be staged</i></button>
@ -431,7 +431,7 @@
<fieldset class="rows" style="float: none;">
<input type="hidden" name="borrowernumber" value="[% patron.id | html %]"/>
<input type="hidden" name="op" value="cud-create-pickup"/>
<input type="hidden" name="tab" value="schedule-pickup"/>
<input type="hidden" name="tab" value="schedule-pickup_panel"/>
<ol>
<li>
<label>Patron: </label>