From fbdd1f2927be5350700bb1d678403f9a0019d69f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 28 Mar 2022 17:28:50 +0000 Subject: [PATCH] Bug 30388: Fix some errors in the template for ordering from a MARC file This patch fixes a few markup errors in the addorder2709 template. The modal dialog markup is corrected and moved out of the loop of records so that it doesn't create repeating id attributes. Obsolete CSS is removed, fixing the width of the MARC preview modal. The calendar include is added, fixing a Flatpickr error in the console. Double ID attributes are removed from the Statistics 1 and Statistics 2 fields. To test, apply the patch and test the process of adding an order to a basket from a staged MARC file. Test in particular: - The MARC and Card previews - The "Date acquired" field under the "Item information" tab should trigger a Flatpickr widget. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/addorderiso2709.tt | 100 +++++++++--------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 4baf5ff52e..44eb33ae7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -10,7 +10,7 @@ Batch list [% END %] › Order staged MARC records › Acquisitions › Koha - + [% INCLUDE 'doc-head-close.inc' %] [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %] [% Asset.js("js/acquisitions-menu.js") | $raw %] @@ -18,6 +18,7 @@ [% Asset.js("js/acq.js") | $raw %] [% Asset.js("js/funds_sorts.js") | $raw %] [% Asset.js("js/addorderiso2709.js") | $raw %] +[% INCLUDE 'calendar.inc' %] @@ -180,11 +181,11 @@
  • - +
  • - +
    • @@ -319,23 +320,24 @@ - [% END # /FOREACH biblio %] +
    @@ -402,40 +404,40 @@ -
  • - [% IF ( close ) %] + [% IF ( close ) %] +
  • Fund: [% Budget_name | html %] - [% ELSE %] -
  • - - + [% FOREACH currency IN currencies %] + [% IF currency.currency == bookseller.listprice %] + + [% ELSIF not currency.archived %] + [% END %] - -
    • -
  • - - +
    • +
  • + + - - -
    • - [% END #/IF close %] - + [% END %] + + + + + [% END #/IF close %]
  • -- 2.30.2