From dfc331dd4c9491da4d9adf9e88d245d089ffbc70 Mon Sep 17 00:00:00 2001 From: David Nind Date: Mon, 26 Aug 2024 11:18:43 +0000 Subject: [PATCH] Bug 14250: (follow-up) Update messages Update the text for the reasons the patron cannot be discharged. --- .../prog/en/modules/members/discharge.tt | 12 ++++++++---- .../opac-tmpl/bootstrap/en/modules/opac-discharge.tt | 12 ++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index 63bfb6a1..88f85ead 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -53,19 +53,23 @@ [% END %] [% UNLESS can_be_discharged %] -

Cannot edit discharge for following reasons:

+

A discharge cannot be generated for this patron because:

[% ELSE %] [% IF patron.holds.count %] -

Patron has holds. They will be cancelled if the discharge is generated.

+

The patron has holds. The holds will be cancelled if the discharge is generated.

+ [% END %] + + [% IF discharge_problems.debt %] +
  • The patron has unpaid charges of [% discharge_problems.debt | $Price %]
  • [% END %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt index c28ab0e0..6dfcbf6b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt @@ -43,16 +43,16 @@ [% ELSIF pending %]

    Your discharge will be available on this page within a few days.

    [% ELSIF failure %] -

    You cannot be discharged, you have checked out items. Please return items before asking for a discharge.

    +

    You cannot be discharged because you have checked out items. Please return your checked out items before asking for a discharge.

      [% IF has_debt %] -
    • You have unpaid fines. Please pay your fines before reapplying.
    • +
    • You have unpaid charges. Please pay your charges before reapplying.
    • [% END %] [% IF has_issues %] -
    • You have checked out items. Please return them before reapplying.
    • +
    • You have checked out items. Please return your checked out items before reapplying.
    • [% END %] [% IF !has_issue and !has_debt %] -
    • Patron cannot be discharged for an unknown reason, please contact a librarian for more information
    • +
    • You cannot be discharged for an unknown reason. Please contact library staff for more information.
    • [% END %]
    [% ELSIF not messages %] @@ -67,11 +67,11 @@ >You cannot be discharged for following reasons:
      [% IF discharge_problems.checkouts %] -
    • You have [% discharge_problems.checkouts | html %] item(s) checked out. Please return them before reapplying.
    • +
    • You have [% discharge_problems.checkouts | html %] item(s) checked out. Please return your checked out items before reapplying.
    • [% END %] [% IF discharge_problems.debt %] -
    • They have unpaid fines totaling [% discharge_problems.debt | $Price %]. Please pay your fines before reapplying.
    • +
    • You have unpaid charges of [% discharge_problems.debt | $Price %]. Please pay your charges before reapplying.
    • [% END %]
    -- 2.30.2