Bugzilla – Attachment 146208 Details for
Bug 32698
Use template wrapper for serials pages tabs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32698: Use template wrapper for serials pages tabs
Bug-32698-Use-template-wrapper-for-serials-pages-t.patch (text/plain), 37.35 KB, created by
Katrin Fischer
on 2023-02-05 12:51:28 UTC
(
hide
)
Description:
Bug 32698: Use template wrapper for serials pages tabs
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-02-05 12:51:28 UTC
Size:
37.35 KB
patch
obsolete
>From 03aa76a94fd5d3030cd79265ceb775efe8ca1b69 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 20 Jan 2023 18:47:11 +0000 >Subject: [PATCH] Bug 32698: Use template wrapper for serials pages tabs > >This patch updates three serials templates to replace tab markup with >the use of WRAPPERs. > >To test requires more data than will be found in the sample data. You >need at least one subscription with issues spanning more than one year. >I suggest creating a new subscription which starts in December, then >receive one issue from December and one in January. > >Apply the patch and go to Serials. > >- Perform a subscription search. > - On the search results page there should be two tabs: "Open" and > "Closed." These tabs should work correctly. >- Open the detail view of one of your subscriptions. > - You should see at least four tabs: "Information," "Planning," > "Issues," and "Summary." > - In some cases an "Acquisition details" tab will also appear. To test > this you must go to Acquisitions and add an order to a basket by > choosing "From a subscription" option. >- Click "Serial collection" in the left-hand sidebar. > - There should be tabs for each year of subscription issues in your > collection. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../en/modules/serials/serials-collection.tt | 33 +- > .../prog/en/modules/serials/serials-search.tt | 36 ++- > .../en/modules/serials/subscription-detail.tt | 305 +++++++----------- > 3 files changed, 159 insertions(+), 215 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 48e104971c..19cc576664 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -146,22 +146,35 @@ > > [% IF ( years ) %] > <form name="edition" action="/cgi-bin/koha/serials/serials-edit.pl" method="post"> >- <div id="subscription_years" class="toptabs numbered"> >- <ul class="nav nav-tabs" role="tablist"> >+ [% WRAPPER tabs id= "subscription_years" %] >+ [% WRAPPER tabs_nav %] > [% FOREACH year IN years %] >+ [% IF ( loop.first ) %] >+ [% bt_active = 1 %] >+ [% ELSE %] >+ [% bt_active = 0 %] >+ [% END %] > [% IF ( year.year ) %] > [% IF year.year == 'manage' %] >- <li role="presentation"><a href="#subscription-year-manage" aria-controls="subscription-year-manage" role="tab" data-toggle="tab">Manage</a></li> >+ [% SET tabname = "subscription-year-manage" %] >+ [% SET tab_text = "Manage" %] > [% ELSE %] >- <li role="presentation"><a href="#subscription-year-[% year.year | uri %]" aria-controls="subscription-year-[% year.year | uri %]" role="tab" data-toggle="tab">[% year.year | html %]</a></li> >+ [% SET tabname = "subscription-year-${year.year}" %] >+ [% SET tab_text = year.year %] > [% END %] >+ [% WRAPPER tab_item tabname= tabname bt_active= bt_active %] [% tab_text | html %] [% END %] > [% END %] > [% END %] >- </ul> >+ [% END # /WRAPPER tabs_nav %] > >- <div class="tab-content"> >+ [% WRAPPER tab_panels %] > [% FOREACH year IN years %] >- <div id="subscription-year-[% year.year | html %]" role="tabpanel" class="tab-pane"> >+ [% IF ( loop.first ) %] >+ [% SET bt_active = 1 %] >+ [% ELSE %] >+ [% SET bt_active = 0 %] >+ [% END %] >+ [% WRAPPER tab_panel tabname="subscription-year-${year.year}" bt_active= bt_active %] > [% IF ( CAN_user_serials_receive_serials ) %] > <p> > <div class="btn-group"><input type="submit" value="Edit serials" class="btn btn-primary btn-sm" /></div> >@@ -305,11 +318,11 @@ > [% END %] > </tbody> > </table> <!-- /.subscription-year-table --> >- </div> <!-- /#subscription-year-year --> >+ [% END # /WRAPPER tab_panel#subscription-year %] > [% END # /FOREACH year %] >- </div> <!-- /.tab-content --> >+ [% END # /WRAPPER tab_panels %] > <input type="hidden" name="subscriptionid" value="[% subscriptionidlist | html %]" /> >- </div> <!-- /#subscription_years --> >+ [% END # /WRAPPER tabs#subscription_years %] > </form> > [% END # /IF years %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index dc43ca6544..603e897da7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -310,22 +310,23 @@ > > [% IF ( done_searched ) %] > [% IF ( total ) %] >- <div id="serialstabs" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >+ >+ [% WRAPPER tabs id= "serialstabs" %] >+ [% WRAPPER tabs_nav %] > [% IF mana %] >- <li role="presentation" class="active"><a href="#mana" aria-controls="mana" role="tab" data-toggle="tab">Mana ([% total || 0 | html %])</a></li> >+ [% WRAPPER tab_item tabname= "mana" bt_active= 1 %] Mana ([% total || 0 | html %]) [% END %] > [% ELSE %] >- <li role="presentation" class="active"><a href="#opened" aria-controls="opened" role="tab" data-toggle="tab">Open ([% openedsubscriptions.size || 0 | html %])</a></li> >- <li role="presentation"><a href="#closed" aria-controls="closed" role="tab" data-toggle="tab">Closed ([% closedsubscriptions.size || 0 | html %])</a></li> >+ [% WRAPPER tab_item tabname= "opened" bt_active= 1 %] Open ([% openedsubscriptions.size || 0 | html %]) [% END %] >+ [% WRAPPER tab_item tabname= "closed" %] Closed ([% closedsubscriptions.size || 0 | html %]) [% END %] > [% END %] >- </ul> >- <div class="tab-content"> >+ [% END # /WRAPPER tabs_nav %] >+ [% WRAPPER tab_panels %] > [% IF mana %] >- <div id="mana" role="tabpanel" class="tab-pane active" > >+ [% WRAPPER tab_panel tabname="mana" bt_active= 1 %] > [% INCLUDE 'mana/mana-subscription-search-result.inc' %] >- </div> >+ [% END # /WRAPPER tab_panel#mana %] > [% ELSE %] >- <div id="opened" role="tabpanel" class="tab-pane active" > >+ [% WRAPPER tab_panel tabname="opened" bt_active= 1 %] > [% IF openedsubscriptions %] > [% INCLUDE subscriptions_table subscriptions = openedsubscriptions %] > [% ELSE %] >@@ -333,8 +334,8 @@ > <p>Your search returned no open subscriptions.</p> > </div> > [% END %] >- </div> >- <div id="closed" role="tabpanel" class="tab-pane" > >+ [% END # /WRAPPER tab_panel#opened %] >+ [% WRAPPER tab_panel tabname="closed" %] > [% IF closedsubscriptions %] > [% INCLUDE subscriptions_table subscriptions = closedsubscriptions closed = 1 %] > [% ELSE %] >@@ -342,10 +343,11 @@ > <p>Your search returned no closed subscriptions.</p> > </div> > [% END %] >- </div> >+ [% END # /WRAPPER tab_panel#closed %] > [% END # /IF mana %] >- </div> <!-- /.tab-content --> >- </div> <!-- /#serialstabs --> >+ [% END # /WRAPPER tab_panels %] >+ [% END # /WRAPPER tabs#serialstabs %] >+ > [% ELSE %] > <div class="dialog message"> > <p>Your search returned no results.</p> >@@ -479,7 +481,7 @@ > } > > $(document).ready(function() { >- var osrlt = $("#opened table").dataTable($.extend(true, {}, dataTablesDefaults, { >+ var osrlt = $("#opened_panel table").dataTable($.extend(true, {}, dataTablesDefaults, { > "sPaginationType": "full", > "order": [[ 2, "asc" ]], > "aoColumnDefs": [ >@@ -488,7 +490,7 @@ > ] > })); > >- var csrlt = $("#closed table").dataTable($.extend(true, {}, dataTablesDefaults, { >+ var csrlt = $("#closed_panel table").dataTable($.extend(true, {}, dataTablesDefaults, { > // FIXME sort function of additional_fields! > "order": [[ 2, "asc" ]], > "sPaginationType": "full", >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 8ddfa5a4a5..8fac9a8cfc 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 >@@ -93,28 +93,19 @@ > </div> > [% END %] > >- <div id="subscription_description" class="toptabs"> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a href="#subscription_info" aria-controls="subscription_info" role="tab" data-toggle="tab">Information</a> >- </li> >- <li role="presentation"> >- <a href="#subscription_planning" aria-controls="subscription_planning" role="tab" data-toggle="tab">Planning</a> >- </li> >- <li role="presentation"> >- <a href="#subscription_issues" aria-controls="subscription_issues" role="tab" data-toggle="tab">Issues</a> >- </li> >- <li role="presentation"> >- <a href="#subscription_summary" aria-controls="subscription_summary" role="tab" data-toggle="tab">Summary</a> >- </li> >+ [% WRAPPER tabs id= "subscription_description" %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "subscription_info" bt_active= 1 %] Information [% END %] >+ [% WRAPPER tab_item tabname= "subscription_planning" %] Planning [% END %] >+ [% WRAPPER tab_item tabname= "subscription_issues" %] Issues [% END %] >+ [% WRAPPER tab_item tabname= "subscription_summary" %] Summary [% END %] > [% IF orders_grouped.size %] >- <li role="presentation"> >- <a href="#acquisition_details" aria-controls=" aria-controls="profile" role="tab" data-toggle="tab"" role="tab" data-toggle="tab">Acquisition details</a> >- </li> >+ [% WRAPPER tab_item tabname= "acquisition_details" %] Acquisition details [% END %] > [% END %] >- </ul> >- <div class="tab-content"> >- <div id="subscription_info" role="tabpanel" class="tab-pane active"> >+ [% END # /WRAPPER tabs_nav %] >+ >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="subscription_info" bt_active= 1 %] > <div class="row"> > <div class="col-sm-6"> > <div class="rows"> >@@ -182,9 +173,9 @@ > </div> <!-- /.col-sm-6 --> > </div> <!-- /.row --> > [% END %] >- </div> <!-- /#subscription_info --> >+ [% END # /WRAPPER#subscription_info %] > >- <div id="subscription_planning" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="subscription_planning" %] > <div class="row"> > <div class="col-sm-12"> > <div class="rows"> >@@ -263,71 +254,9 @@ > </div> <!-- /.rows --> > </div> <!-- /.col-sd-12 --> > </div> <!-- /.row --> >- </div> <!-- /#subscription_planning --> >+ [% END # /WRAPPER#subscription_planning %] > >- <div id="subscription_numbering" role="tabpanel" class="tab-pane" style="display:none"> >- <h3>Numbering calculation</h3> >- <p><label>Numbering formula:</label> [% numberingmethod | html %]</p> >- <table> >- <tr> >- <th> </th> >- <th>X</th> >- <th>Y</th> >- <th>Z</th> >- </tr> >- <tr> >- <td>Add</td> >- <td> >- [% add1 | html %] >- </td> >- <td> >- [% add2 | html %] >- </td> >- <td> >- [% add3 | html %] >- </td> >- </tr> >- <tr> >- <td>once every</td> >- <td>[% every1 | html %]</td> >- <td>[% every2 | html %]</td> >- <td>[% every3 | html %]</td> >- </tr> >- <tr> >- <td>When more than</td> >- <td>[% whenmorethan1 | html %] [% IF ( innerloop1 ) %]<br /> >- <em>(is [% innerloop1 | html %])</em>[% END %]</td> >- <td>[% whenmorethan2 | html %] [% IF ( innerloop2 ) %]<br /> >- <em>(is [% innerloop2 | html %])</em>[% END %]</td> >- <td>[% whenmorethan3 | html %] [% IF ( innerloop3 ) %]<br /> >- <em>(is [% innerloop3 | html %])</em>[% END %]</td> >- </tr> >- <tr> >- <td>Set back to</td> >- <td>[% setto1 | html %]</td> >- <td>[% setto2 | html %]</td> >- <td>[% setto3 | html %]</td> >- </tr> >- <tr> >- <td> >- Inner counter >- </td> >- <td>[% innerloop1 | html %]</td> >- <td>[% innerloop2 | html %]</td> >- <td>[% innerloop3 | html %]</td> >- </tr> >- <tr> >- <td> >- Last value >- </td> >- <td>[% lastvalue1 | html %]</td> >- <td>[% lastvalue2 | html %]</td> >- <td>[% lastvalue3 | html %]</td> >- </tr> >- </table> >- </div> <!-- /#subscription_numbering --> >- >- <div id="subscription_issues" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="subscription_issues" %] > <table> > <tr> > <th>Issue number</th> >@@ -345,44 +274,44 @@ > [% IF serialslis.planneddate %] > [% serialslis.planneddate | html %] > [% ELSE %] >- <span>Unknown</span> >- [% END %] >- </td> >- <td> >- [% IF serialslis.publisheddate %] >- [% serialslis.publisheddate | html %] >- [% ELSE %] >- <span>Unknown</span> >- [% END %] >- </td> >- <td> >- [% serialslis.publisheddatetext | html %] >- </td> >- <td> >- [% IF ( serialslis.status1 ) %]<span>Expected</span>[% END %] >- [% IF ( serialslis.status2 ) %]<span>Arrived</span>[% END %] >- [% IF ( serialslis.status3 ) %]<span>Late</span>[% END %] >- [% IF ( serialslis.status4 ) %]<span>Missing</span>[% END %] >- [% IF ( serialslis.status41 ) %]<span>Missing (never received)</span>[% END %] >- [% IF ( serialslis.status42 ) %]<span>Missing (sold out)</span>[% END %] >- [% IF ( serialslis.status43 ) %]<span>Missing (damaged)</span>[% END %] >- [% IF ( serialslis.status44 ) %]<span>Missing (lost)</span>[% END %] >- [% IF ( serialslis.status5 ) %]<span>Not issued</span>[% END %] >- [% IF ( serialslis.status6 ) %]<span>Delete</span>[% END %] >- [% IF ( serialslis.status7 ) %] >- <span>Claimed</span> >- [% IF ( serialslis.claimdate ) %] >- [% serialslis.claimdate | html %] >+ <span>Unknown</span> > [% END %] >- [% END %] >- [% IF ( serialslis.status8 ) %]<span>Stopped</span>[% END %] >- </td> >- </tr> >- [% END # /FOREACH serialslist %] >- </table> >- </div> <!-- /#subscription_issues --> >+ </td> >+ <td> >+ [% IF serialslis.publisheddate %] >+ [% serialslis.publisheddate | html %] >+ [% ELSE %] >+ <span>Unknown</span> >+ [% END %] >+ </td> >+ <td> >+ [% serialslis.publisheddatetext | html %] >+ </td> >+ <td> >+ [% IF ( serialslis.status1 ) %]<span>Expected</span>[% END %] >+ [% IF ( serialslis.status2 ) %]<span>Arrived</span>[% END %] >+ [% IF ( serialslis.status3 ) %]<span>Late</span>[% END %] >+ [% IF ( serialslis.status4 ) %]<span>Missing</span>[% END %] >+ [% IF ( serialslis.status41 ) %]<span>Missing (never received)</span>[% END %] >+ [% IF ( serialslis.status42 ) %]<span>Missing (sold out)</span>[% END %] >+ [% IF ( serialslis.status43 ) %]<span>Missing (damaged)</span>[% END %] >+ [% IF ( serialslis.status44 ) %]<span>Missing (lost)</span>[% END %] >+ [% IF ( serialslis.status5 ) %]<span>Not issued</span>[% END %] >+ [% IF ( serialslis.status6 ) %]<span>Delete</span>[% END %] >+ [% IF ( serialslis.status7 ) %] >+ <span>Claimed</span> >+ [% IF ( serialslis.claimdate ) %] >+ [% serialslis.claimdate | html %] >+ [% END %] >+ [% END %] >+ [% IF ( serialslis.status8 ) %]<span>Stopped</span>[% END %] >+ </td> >+ </tr> >+ [% END # /FOREACH serialslist %] >+ </table> >+ [% END # /WRAPPER#subscription_issues %] > >- <div id="subscription_summary" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="subscription_summary" %] > <div class="row"> > <div class="col-sm-12"> > <div class="rows"> >@@ -401,10 +330,10 @@ > </div> <!-- /.rows --> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >- </div> <!-- /#subscription_summary --> >+ [% END # /WRAPPER#subscription_summary %] > > [% IF orders_grouped.size %] >- <div id="acquisition_details" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="acquisition_details" %] > <h2>Acquisition details</h2> > <table id="orders"> > <caption> >@@ -441,76 +370,76 @@ > [% IF CAN_user_acquisition_order_manage %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% parent_order.basket.basketno | uri %]">[% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %])</a> > [% ELSE %] >- [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) >- [% END %] >- </td> >- <td></td> [%# ordernumber %] >- <td>[% parent_order.basket.creationdate | $KohaDates %]</td> >- <td>[% parent_order.datereceived | $KohaDates %]</td> >- <td> >- [% SWITCH parent_order.orderstatus %] >- [% CASE 'new' %]<span title="status_1">New</span> >- [% CASE 'ordered' %]<span title="status_2">Ordered</span> >- [% CASE 'partial' %]<span title="status_3">Partial</span> >- [% CASE 'complete' %]<span title="status_4">Complete</span> >- [% CASE 'cancelled' %]<span title="status_5">Cancelled</span> >- [% END %] >- </td> >- <td></td> [%# internalnote %] >- <td></td> [%# vendornote %] >- <td></td> [%# fund %] >- <td>[% parent_order.quantity | html %]</td> >- <td>[% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %]</td> >- <td>[% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %]</td> >- </tr> >- [% FOR order IN parent_order.orders %] >- <tr data-tt-id="0" data-tt-parent-id="[% parent_tree_id | html %]"> >- <td> >- [% IF order.invoice %] >- [% IF CAN_user_acquisition %] >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page"> >- [% order.invoice.invoicenumber | html %]</a> >- [% ELSE %] >- [% order.invoice.invoicenumber | html %] >- [% END %] >- [% END %] >- </td> >- <td></td> [%# basket %] >- <td>[% order.ordernumber | html %]</td> >- <td data-order="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</td> >- <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</td> >- [% SWITCH order.orderstatus %] >- [% CASE 'new' %]<td data-order="status_1"><span>New</span> >- [% CASE 'ordered' %]<td data-order="status_2"><span>Ordered</span> >- [% CASE 'partial' %]<td data-order="status_3"><span>Partial</span> >- [% CASE 'complete' %]<td data-order="status_4"><span>Complete</span> >- [% CASE 'cancelled' %]<td data-order="status_5"><span>Cancelled</span> >- [% END %] >- </td> >- <td>[% order.order_internalnote | html %]</td> >- <td>[% order.order_vendornote | html %]</td> >- <td>[% order.fund.budget_name | html %]</td> >- <td>[% order.quantity | html %]</td> >- <td> >- [% UNLESS order.datereceived %] >- [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] >+ [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) > [% END %] > </td> >+ <td></td> [%# ordernumber %] >+ <td>[% parent_order.basket.creationdate | $KohaDates %]</td> >+ <td>[% parent_order.datereceived | $KohaDates %]</td> > <td> >- [% 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 %] >+ [% SWITCH parent_order.orderstatus %] >+ [% CASE 'new' %]<span title="status_1">New</span> >+ [% CASE 'ordered' %]<span title="status_2">Ordered</span> >+ [% CASE 'partial' %]<span title="status_3">Partial</span> >+ [% CASE 'complete' %]<span title="status_4">Complete</span> >+ [% CASE 'cancelled' %]<span title="status_5">Cancelled</span> > [% END %] > </td> >+ <td></td> [%# internalnote %] >+ <td></td> [%# vendornote %] >+ <td></td> [%# fund %] >+ <td>[% parent_order.quantity | html %]</td> >+ <td>[% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %]</td> >+ <td>[% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %]</td> > </tr> >- [% END # /FOR order %] >- [% END # /FOR ordernumber %] >- </tbody> >- </table> <!-- /#orders --> >- </div> <!-- /#acquisition_details --> >- [% END # IF orders_grouped.size %] >- </div> <!-- /.tab-content --> >- </div> <!-- /#subscription_description --> >+ [% FOR order IN parent_order.orders %] >+ <tr data-tt-id="0" data-tt-parent-id="[% parent_tree_id | html %]"> >+ <td> >+ [% IF order.invoice %] >+ [% IF CAN_user_acquisition %] >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page"> >+ [% order.invoice.invoicenumber | html %]</a> >+ [% ELSE %] >+ [% order.invoice.invoicenumber | html %] >+ [% END %] >+ [% END %] >+ </td> >+ <td></td> [%# basket %] >+ <td>[% order.ordernumber | html %]</td> >+ <td data-order="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</td> >+ <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</td> >+ [% SWITCH order.orderstatus %] >+ [% CASE 'new' %]<td data-order="status_1"><span>New</span> >+ [% CASE 'ordered' %]<td data-order="status_2"><span>Ordered</span> >+ [% CASE 'partial' %]<td data-order="status_3"><span>Partial</span> >+ [% CASE 'complete' %]<td data-order="status_4"><span>Complete</span> >+ [% CASE 'cancelled' %]<td data-order="status_5"><span>Cancelled</span> >+ [% END %] >+ </td> >+ <td>[% order.order_internalnote | html %]</td> >+ <td>[% order.order_vendornote | html %]</td> >+ <td>[% order.fund.budget_name | html %]</td> >+ <td>[% order.quantity | html %]</td> >+ <td> >+ [% UNLESS order.datereceived %] >+ [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %] >+ [% END %] >+ </td> >+ <td> >+ [% 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 %] >+ </td> >+ </tr> >+ [% END # /FOR order %] >+ [% END # /FOR ordernumber %] >+ </tbody> >+ </table> <!-- /#orders --> >+ [% END # /WRAPPER tab_panel#acquisition_details %] >+ [% END # IF orders_grouped.size %] >+ [% END # /WRAPPER tab_panels %] >+ [% END # /WRAPPER tabs#subscription_description %] > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32698
:
145576
|
145881
|
146040
| 146208