From 7045e982f920f048e822d8f896099a9a0791e5ed Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 8 May 2018 13:31:55 -0300 Subject: [PATCH] Bug 20366: Add subscription info to the acq tab on the biblio detail page On the "Acquisition details" tab of the bibliographic detail page, the subscription information are missing. This patch replace the call to GetHistory with Koha::Acquisition::Orders in order to simplify the code and make use of new Koha:: packages/methods. TODO: Add column settings (show/hide columns) to this table (?) --- catalogue/detail.pl | 10 ++++-- .../prog/en/modules/catalogue/detail.tt | 37 +++++++++++++++------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 86a0698c2f..51d4ff29b3 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -20,7 +20,6 @@ use Modern::Perl; use CGI qw ( -utf8 ); use HTML::Entities; -use C4::Acquisition qw( GetHistory ); use C4::Auth; use C4::Koha; use C4::Serials; #uses getsubscriptionfrom biblionumber @@ -180,7 +179,14 @@ foreach my $subscription (@subscriptions) { # Get acquisition details if ( C4::Context->preference('AcquisitionDetails') ) { - my $orders = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 ); + my $orders = Koha::Acquisition::Orders->search( + { biblionumber => $biblionumber }, + { + join => 'basketno', + order_by => 'basketno.booksellerid' + } + ); # GetHistory sorted by aqbooksellerid, but does it make sense? + $template->param( orders => $orders, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index ec6695c2ce..fd579e539d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -693,43 +693,46 @@ Receive date Status Quantity + Subscription + Subscription callnumber [% FOR order IN orders %] + [% SET basket = order.basket %] + [% SET vendor = basket.bookseller %] - [% IF (order.id) %] - [% order.name %] - [% END %] + [% vendor.name %] - [% IF (order.invoiceid) %] + [% IF order.invoiceid %] [% IF CAN_user_acquisition %] - [% order.invoicenumber %] + [% order.invoice.invoicenumber %] [% ELSE %] - [% order.invoicenumber %] + [% order.invoice.invoicenumber %] [% END %] [% END %] - [% IF (order.basketgroupid) %] + [% IF basket.basketgroupid %] + [% SET basket_group = basket.basket_group %] [% IF CAN_user_acquisition_group_manage %] - [% order.groupname %] ([% order.basketgroupid %]) + [% basket_group.name %] ([% basket_group.id %]) [% ELSE %] - [% order.groupname %] ([% order.basketgroupid %]) + [% basket_group.name %] ([% basket_group.id %]) [% END %] [% END %] [% IF CAN_user_acquisition_order_manage %] - [% order.basketname %] ([% order.basketno %]) + [% basket.basketname %] ([% basket.basketno %]) [% ELSE %] - [% order.basketname %] ([% order.basketno %]) + [% basket.basketname %] ([% basket.basketno %]) [% END %] [% order.ordernumber %] - [% order.creationdate | $KohaDates%] + [% basket.creationdate | $KohaDates%] [% order.datereceived | $KohaDates%] [% SWITCH order.orderstatus %] @@ -741,6 +744,16 @@ [% END %] [% order.quantity %] + + [% IF order.subscriptionid %] + [% order.subscriptionid %] + [% END %] + + + [% IF order.subscriptionid %] + [% order.subscription.callnumber %] + [% END %] + [% END %] -- 2.11.0