From f1f66d73006e0de49dad36ff969ad974d4bd0fce Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 12 Aug 2019 18:08:37 +0000 Subject: [PATCH] Bug 23448: (follow-up) Add comments on markup structure This patch adds comments to the markup in order to highlight the structure of the page. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../en/modules/serials/subscription-detail.tt | 131 +++++++++--------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 55684b2860..03a7bc9592 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -61,7 +61,7 @@ - [% END %] + [% END # /IF NEEDSCONFIRMATION %] [% IF mana_code.defined %]
@@ -117,8 +117,8 @@
  • Grace period: [% graceperiod | html %]
    • -
    - + +
      @@ -134,9 +134,9 @@ [% END %] [% IF ( hasRouting ) %]
    1. Routing: yes
      2. [% END %]
    -
    -
    - + + + [% IF available_additional_fields %]
    @@ -147,11 +147,11 @@
      [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
    - - - + + + [% END %] - +
    @@ -229,10 +229,10 @@ [% monthlength | html %] [% END %] -
    -
    - - + + + + + +
    @@ -346,9 +347,9 @@ [% IF ( serialslis.status8 ) %]Stopped[% END %] - [% END %] + [% END # /FOREACH serialslist %]
    -
    +
    @@ -366,10 +367,10 @@
  • History staff note:[% librariannote | html | html_line_break %]
  • History OPAC note:[% opacnote | html | html_line_break %]
    • -
    -
    - - + + + + [% IF orders_grouped.size %]
    @@ -433,52 +434,52 @@ [% FOR order IN parent_order.orders %] - - [% IF order.invoice %] - [% IF CAN_user_acquisition %] - - [% order.invoice.invoicenumber | html %] - [% ELSE %] - [% order.invoice.invoicenumber | html %] - [% END %] - [% END %] - - [%# basket %] - [% order.ordernumber | html %] - [% order.basket.creationdate | $KohaDates%] - [% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] - - [% SWITCH order.orderstatus %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled - [% END %] - - [% order.order_internalnote | html %] - [% order.order_vendornote | html %] - [% order.fund.budget_name | html %] - [% order.quantity | html %] - - [% UNLESS order.datereceived %] - [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] - [% END %] - - - [% IF order.datereceived %] - [%# FIXME What if unitprice has not been filled? %] - [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] + + [% IF order.invoice %] + [% IF CAN_user_acquisition %] + + [% order.invoice.invoicenumber | html %] + [% ELSE %] + [% order.invoice.invoicenumber | html %] + [% END %] [% END %] - - - [% END %] - [% END %] + + [%# basket %] + [% order.ordernumber | html %] + [% order.basket.creationdate | $KohaDates%] + [% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] + + [% SWITCH order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled + [% END %] + + [% order.order_internalnote | html %] + [% order.order_vendornote | html %] + [% order.fund.budget_name | html %] + [% order.quantity | html %] + + [% UNLESS order.datereceived %] + [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] + [% END %] + + + [% IF order.datereceived %] + [%# FIXME What if unitprice has not been filled? %] + [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %] + [% END %] + + + [% END # /FOR order %] + [% END # /FOR ordernumber %] - -
    - [% END %] - + + + [% END # IF orders_grouped.size %] + -- 2.39.5