gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22375: (follow-up) Format even more due dates consistently 

To test:
Create some checkouts in future and past, make sure to include
some with a time != 23:59.CirculateILL

Verify that the due date is displayed correctly on:
* Catalog detail page > Items tab > Checkout status
* Circulation start page > Renew > Renew one of your checkouts > dialog message
* ILL request page: requires ILL setup and CirculateILL system preference
* Patron acccount in staff > Print > Print summary
* Catalog detail page > Holds > search for patron > due date on checked out items
* Recalls:
  * Activate UseRecalls system preference, set up circulation rules to allow recalls
  * Checkout an item to another user
  * In the OPAC, place a recall on that record with yor use
  * Check "Recall a specific item"
  * Verify due date in item list
  * Place recall on checked out item
  * Patron account in OPAC > Recalls history (due date might have been changed through recall)
* OPAC patron account > Summary > Overdue tab
* Self checkout:
  * Activate WebBasedSelfCheck
  * Go to <opacbaseurl>/cgi-bin/koha/sco/sco-main.pl
  * Log in > Tab checkouts

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

JD amended patch - removed 'fda'
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0d888fc419)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
Katrin Fischer 2023-04-16 01:06:53 +00:00 committed by Matt Blenkinsop
parent 9be4dc1a87
commit aadd0687ff
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
View File

@ -174,7 +174,7 @@
<span>Last renewed [% checkout.lastreneweddate | $KohaDates %]</span>,
[% END %]
[% IF ( checkout.date_due ) %]
<span>Due back on [% checkout.date_due | $KohaDates %]</span>
<span>Due back on [% checkout.date_due | $KohaDates as_due_date => 1 %]</span>
[% ELSE %]
<span>Not checked out</span>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
View File

@ -184,7 +184,7 @@
( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
renewed for
[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )
now due on [% date_due | $KohaDates %]
now due on [% date_due | $KohaDates as_due_date => 1 %]
</p>
</div>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
View File

@ -289,7 +289,7 @@
</li>
<li>
<label>Due date:</label>
[% whole.value.check_out.date_due | $KohaDates with_hours => 1 %]
[% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %]
</li>
</ol>
</fieldset>

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
View File

@ -57,7 +57,7 @@
<td>[% issue.author | html %]</td>
<td>[% issue.itemcallnumber | html %]</td>
<td>[% ItemTypes.GetDescription( issue.itype ) | html %]</td>
<td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td>
<td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td>
<td>[% issue.barcode | html %]</td>
<td>[% issue.stocknumber | html %]</td>
[% IF ( issue.charge <= 0 ) %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View File

@ -852,7 +852,7 @@
[% END %]
[% IF ( itemloo.onloan ) %]
<td data-order="[% itemloo.date_due | html %]">
<span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
<span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
[% ELSE %]
<td>
[% IF ( itemloo.transfertwhen ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
View File

@ -128,7 +128,7 @@
<td>[% item.enumchron | html %]</td>
<td>
[% IF ( item.checkout ) %]
<span class="checkedout">Due [% item.checkout.date_due | $KohaDates %]</span>
<span class="checkedout">Due [% item.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
[% ELSIF ( item.get_transfer ) %]
<span class="intransit">In transit from [% Branches.GetName( item.get_transfer.frombranch ) | html %] to [% Branches.GetName( item.get_transfer.tobranch ) | html %] since [% item.get_transfer.datesent | $KohaDates %]</span>
[% END %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
View File

@ -101,7 +101,7 @@
<td class="due_date">
<span class="tdlabel">Due date</span>
[% IF ( RECALL.requested ) %]
<span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates %]</span>
<span>Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %]</span>
[% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %]
<span>Pick up by [% RECALL.expiration_date | $KohaDates %]</span>
[% ELSE %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -789,7 +789,7 @@
</td>
<td data-order="[% OVERDUE.date_due | html %]">
<span class="tdlabel">Date due:</span>
[% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
[% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
</td>
[% IF ( OpacRenewalAllowed ) %]
<td>

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
View File

@ -334,11 +334,11 @@
<td>[% ISSUE.itemcallnumber | html %]</td>
[% IF ( ISSUE.overdue ) %]
<td class="overdue" data-order="[% ISSUE.date_due | html %]">
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
</td>
[% ELSE %]
<td data-order="[% ISSUE.date_due | html %]">
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
[% ISSUE.date_due | $KohaDates as_due_date => 1 %]
</td>
[% END %]
<td>