@@ -, +, @@ - 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. --- .../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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -146,22 +146,35 @@ [% IF ( years ) %]
[% END # /IF years %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -310,22 +310,23 @@ [% IF ( done_searched ) %] [% IF ( total ) %] -Your search returned no open subscriptions.
Your search returned no closed subscriptions.
Issue number | @@ -345,44 +274,44 @@ [% IF serialslis.planneddate %] [% serialslis.planneddate | html %] [% ELSE %] - Unknown - [% END %] - -- [% IF serialslis.publisheddate %] - [% serialslis.publisheddate | html %] - [% ELSE %] - Unknown - [% END %] - | -- [% serialslis.publisheddatetext | html %] - | -- [% IF ( serialslis.status1 ) %]Expected[% END %] - [% IF ( serialslis.status2 ) %]Arrived[% END %] - [% IF ( serialslis.status3 ) %]Late[% END %] - [% IF ( serialslis.status4 ) %]Missing[% END %] - [% IF ( serialslis.status41 ) %]Missing (never received)[% END %] - [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %] - [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %] - [% IF ( serialslis.status44 ) %]Missing (lost)[% END %] - [% IF ( serialslis.status5 ) %]Not issued[% END %] - [% IF ( serialslis.status6 ) %]Delete[% END %] - [% IF ( serialslis.status7 ) %] - Claimed - [% IF ( serialslis.claimdate ) %] - [% serialslis.claimdate | html %] + Unknown [% END %] - [% END %] - [% IF ( serialslis.status8 ) %]Stopped[% END %] - | -
---|
[%# ordernumber %] - | [% parent_order.basket.creationdate | $KohaDates %] | -[% parent_order.datereceived | $KohaDates %] | -- [% SWITCH parent_order.orderstatus %] - [% CASE 'new' %]New - [% CASE 'ordered' %]Ordered - [% CASE 'partial' %]Partial - [% CASE 'complete' %]Complete - [% CASE 'cancelled' %]Cancelled - [% END %] - | -[%# internalnote %] - | [%# vendornote %] - | [%# fund %] - | [% parent_order.quantity | html %] | -[% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %] | -[% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %] | - - [% 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%] | -[% order.datereceived | $KohaDates %] | - [% 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 %] + [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %]) [% END %] | +[%# ordernumber %] + | [% parent_order.basket.creationdate | $KohaDates %] | +[% parent_order.datereceived | $KohaDates %] | - [% 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' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled [% END %] | +[%# internalnote %] + | [%# vendornote %] + | [%# fund %] + | [% parent_order.quantity | html %] | +[% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %] | +[% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %] |