From 780323c86948fbc28dda066fd8d89d32ff861e06 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Jan 2023 19:28:04 +0000 Subject: [PATCH] Bug 32658: Use template wrapper in order from staged file template This patch implements the template WRAPPER system (see Bug 32571) for building tabs on the page for adding to a basket from a staged file. To test you need an active vendor, at least one basket for that vendor, and a staged MARC file. Apply the patch and go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a staged file. - Click "Add to orders" on one of your staged files. - On the "Add orders from..." page you should see three tabs, the first one active. - Tabs should look correct and work correctly. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 09717bb20d83fee1b3fee2f3fcd1605a9e5c5489) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/acqui/addorderiso2709.tt | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 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 87add6951c..c79bd0dc13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -64,17 +64,17 @@ ([% file_name | html %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
-
-
    - + [% WRAPPER tabs id= "tabs" %] + [% WRAPPER tabs_nav %] + [% WRAPPER tab_item tabname= "records_to_import" active= 1 %] Select to import [% END %] [% IF items %] -
  • Item information
    • + [% WRAPPER tab_item tabname= "items_info" %] Item information [% END %] [% END %] -
  • Default accounting details
    • -
+ [% WRAPPER tab_item tabname= "accounting_details" %] Default accounting details [% END %] + [% END %] -
-
+ [% WRAPPER tab_panels %] + [% WRAPPER tab_panel tabname= "records_to_import" active= 1 %]
Select all @@ -363,66 +363,66 @@
-
+ [% END # /#records_to_import %] [% IF ( items ) %] -
+ [% WRAPPER tab_panel tabname= "items_info" %]

Item information

Import all the checked items in the basket with the following parameters:

-
- Item - [% IF ( NoACQframework ) %] -
No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
- [% END %] -
- [% FOREACH item IN items %] -
-
-
    - [% FOREACH iteminformatio IN item.iteminformation %] -
  1. -
    - [% IF (iteminformatio.mandatory) %] - - [% ELSE %] - - [% END %] +
    + Item + [% IF ( NoACQframework ) %] +
    No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used
    + [% END %] +
    + [% FOREACH item IN items %] +
    +
    +
      + [% FOREACH iteminformatio IN item.iteminformation %] +
    1. +
      + [% IF (iteminformatio.mandatory) %] + + [% ELSE %] + + [% END %] - [% IF ( iteminformatio.marc_value.type == 'select' ) %] - - [% ELSE %] - [% iteminformatio.marc_value | $raw %] - [% END %] - - - - - - [% IF ( iteminformatio.mandatory ) %] - Required + [% IF ( iteminformatio.marc_value.type == 'select' ) %] + + [% ELSE %] + [% iteminformatio.marc_value | $raw %] + [% END %] + + + + + + [% IF ( iteminformatio.mandatory ) %] + Required + [% END %] +
      +
      2. + [% END %] +
    +
    +
    + [% END #/FOREACH item %] +
    +
    + [% END # /#items_info %] [% END # /IF items %] -
    + [% WRAPPER tab_panel tabname= "accounting_details" %]

    Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):

    Accounting details @@ -486,9 +486,9 @@
-
-
- + [% END # /#accounting_details %] + [% END #/WRAPPER tab_panels %] + [% END # /WRAPPER tabs %]
Cancel
-- 2.39.5