From e9c50bbaeb33a34b0867c725b3e7c37431359223 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 26 Jan 2023 11:38:53 +0000 Subject: [PATCH] Bug 32733: Add page-section cards to basket summary This patch adds two new page-section divs to the basket summary page. One for each column of details in the top area of the summary page. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 89db73cbcef39d65f5bc838029eb8f4f4be4f62c) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/acqui/basket.tt | 354 +++++++++--------- 1 file changed, 180 insertions(+), 174 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 4154ba2fbb..14db18a298 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -240,199 +240,205 @@
-
    - [% IF ( basketnote ) %] -
  1. Internal note: [% basketnote | html %]
    2. - [% END %] - [% IF ( basketbooksellernote ) %] -
  2. Vendor note: [% basketbooksellernote | html %]
    3. - [% END %] - [% IF ( basketcontractno ) %] -
  3. Contract name: [% basketcontractname | html %]
    4. - [% END %] - [% IF deliveryplace %] -
  4. Delivery place: [% Branches.GetName( deliveryplace ) | html %]
    5. - [% END %] - [% IF billingplace %] -
  5. Billing place: [% Branches.GetName( billingplace ) | html %]
    6. - [% END %] - [% IF ( authorisedbyname ) %] -
  6. [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
    7. - [% END %] -
  7. -
    - Managed by: -
    -
      - [% FOREACH user IN users %] -
    • - [% user.firstname | html %] [% user.surname | html %] - Delete user +
      +

      General information

      +
        + [% IF ( basketnote ) %] +
      1. Internal note: [% basketnote | html %]
        2. + [% END %] + [% IF ( basketbooksellernote ) %] +
      2. Vendor note: [% basketbooksellernote | html %]
        3. + [% END %] + [% IF ( basketcontractno ) %] +
      3. Contract name: [% basketcontractname | html %]
        4. + [% END %] + [% IF deliveryplace %] +
      4. Delivery place: [% Branches.GetName( deliveryplace ) | html %]
        5. + [% END %] + [% IF billingplace %] +
      5. Billing place: [% Branches.GetName( billingplace ) | html %]
        6. + [% END %] + [% IF ( authorisedbyname ) %] +
      6. [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
        7. + [% END %] +
      7. + + Managed by: +
        +
          + [% FOREACH user IN users %] +
        • + [% user.firstname | html %] [% user.surname | html %] + Delete user +
          • + [% END %] +
        • + Add user
          • - [% END %] -
        • - Add user -
          • - -
        -
        - - - -
        8. + +
    +
    + + + + -
    8. -
  8. - Managing library: - [% IF basketbranchcode %] - [% Branches.GetName( basketbranchcode ) | html %] - Change library - [% ELSE %] - No library - Set library - [% END %] -
    9. - [% IF branches_loop.size %] - - [% END # /IF branches_loop.size %] + + Cancel + + + +
+ + [% END # /IF branches_loop.size %] - [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] + [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] - + +
-
    - [% IF ( creationdate ) %] -
  1. Opened on: [% creationdate | $KohaDates %]
    2. - [% END %] - [% IF ( closedate ) %] -
  2. Closed on: [% closedate | $KohaDates %]
    3. - [% END %] - [% IF ( ediaccount ) %] - [%- BLOCK edi_status -%] - [%- SWITCH edi_order.status -%] - [%- CASE 'Pending' -%]Pending - [%- CASE 'Sent' -%]Sent - [%- CASE 'Processed' -%]Processed - [%- END -%] - [%- END -%] - [% IF ( edi_order ) %] -
  3. EDI status: [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])
    4. - [% ELSE %] -
  4. EDI status: Not ordered
    5. +
    +

    Settings

    +
      + [% IF ( creationdate ) %] +
    1. Opened on: [% creationdate | $KohaDates %]
      2. [% END %] - [% END %] - [% IF ( estimateddeliverydate ) %] -
    2. Estimated delivery date: [% estimateddeliverydate | $KohaDates %]
      3. - [% END %] -
    3. Orders are standing: [% IF is_standing %]Yes[% ELSE %]No[% END %]
      4. - - [% IF basket.create_items %] -
    4. - Create items when: - [% SWITCH basket.create_items %] - [% CASE 'receiving' %]Receiving items - [% CASE 'cataloguing' %]Cataloguing items - [% CASE %]Placing orders + [% IF ( closedate ) %] +
    5. Closed on: [% closedate | $KohaDates %]
      6. + [% END %] + [% IF ( ediaccount ) %] + [%- BLOCK edi_status -%] + [%- SWITCH edi_order.status -%] + [%- CASE 'Pending' -%]Pending + [%- CASE 'Sent' -%]Sent + [%- CASE 'Processed' -%]Processed + [%- END -%] + [%- END -%] + [% IF ( edi_order ) %] +
    6. EDI status: [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])
      7. + [% ELSE %] +
    7. EDI status: Not ordered
      8. [% END %] - - [% END %] -
    + [% END %] + [% IF ( estimateddeliverydate ) %] +
  5. Estimated delivery date: [% estimateddeliverydate | $KohaDates %]
    6. + [% END %] +
  6. Orders are standing: [% IF is_standing %]Yes[% ELSE %]No[% END %]
    7. - [% IF ( closedate ) %] -
      -
    1. - Basket group: - [% IF basketgroup.id and not basketgroup.name %] - [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] - [% END %] + [% IF basket.create_items %] +
    2. + Create items when: + [% SWITCH basket.create_items %] + [% CASE 'receiving' %]Receiving items + [% CASE 'cataloguing' %]Cataloguing items + [% CASE %]Placing orders + [% END %] +
      3. + [% END %] +
    - [% IF basketgroup.closed %] - [% IF ( CAN_user_acquisition_group_manage ) %] - [% basketgroup.name | html %] (closed) - [% ELSE %] - [% basketgroup.name | html %] (closed) + [% IF ( closedate ) %] +
      +
    1. + Basket group: + [% IF basketgroup.id and not basketgroup.name %] + [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] [% END %] - [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] - [%- IF basketgroup.id -%] - [% basketgroup.name | html %] - [%- ELSE -%] - No group - [%- END -%] - [% ELSE %] - [% IF ( CAN_user_acquisition_group_manage ) %] - [% IF ( basketgroup.id ) %] - [% basketgroup.name | html %] - Change basket group + + [% IF basketgroup.closed %] + [% IF ( CAN_user_acquisition_group_manage ) %] + [% basketgroup.name | html %] (closed) [% ELSE %] - No group - Set basket group + [% basketgroup.name | html %] (closed) + [% END %] + [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] + [%- IF basketgroup.id -%] + [% basketgroup.name | html %] + [%- ELSE -%] + No group + [%- END -%] + [% ELSE %] + [% IF ( CAN_user_acquisition_group_manage ) %] + [% IF ( basketgroup.id ) %] + [% basketgroup.name | html %] + Change basket group + [% ELSE %] + No group + Set basket group + [% END %] [% END %] [% END %] - [% END %] -
      2. - [% IF ( CAN_user_acquisition_group_manage ) %] - - [% END # /IF ( CAN_user_acquisition_group_manage ) %] - [% IF basketgroup.deliveryplace %] -
    2. - Basket group delivery placename: [% Branches.GetName( basketgroup.deliveryplace ) | html %] -
      3. - [% END %] - [% IF basketgroup.billingplace %] -
    3. - Basket group billing place: [% Branches.GetName( basketgroup.billingplace ) | html %] -
      4. - [% END %] -
    - [% END # /IF closeddate %] + + + Cancel + + + + +
    + + [% END # /IF ( CAN_user_acquisition_group_manage ) %] + [% IF basketgroup.deliveryplace %] +
  7. + Basket group delivery placename: [% Branches.GetName( basketgroup.deliveryplace ) | html %] +
    8. + [% END %] + [% IF basketgroup.billingplace %] +
  8. + Basket group billing place: [% Branches.GetName( basketgroup.billingplace ) | html %] +
    9. + [% END %] +
+ [% END # /IF closeddate %] +
-- 2.39.5