From 8b30bb046cd275d8c0aefdb414a0212136427beb Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 28 Jun 2017 01:24:00 +0000 Subject: [PATCH] [SIGNED OFF] Bug 13208: Improving breadcrumbs for when cancelling an order To test: 1) Go to Acquisitions -> Find a vendor -> View a basket with orders in it (or make a new basket and add an order) 2) Click Cancel order 3) Notice incomplete breadcrumbs, and 'Acquisition' typo 4) Apply patch and refresh page 5) Breadcrumbs should be fixed. Confirm links to vendor and basket work as expected Sponsored-by: Catalyst IT Signed-off-by: severine.queune Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer --- acqui/cancelorder.pl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/acqui/cancelorder.pl b/acqui/cancelorder.pl index a0b7597..61d63c5 100755 --- a/acqui/cancelorder.pl +++ b/acqui/cancelorder.pl @@ -49,6 +49,8 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { my $action = $input->param('action'); my $ordernumber = $input->param('ordernumber'); my $biblionumber = $input->param('biblionumber'); +my $basketno = $input->param('basketno'); +my $basket = Koha::Database->new()->schema()->resultset('Aqbasket')->find($basketno); my $referrer = $input->param('referrer') || $input->referer; my $del_biblio = $input->param('del_biblio') ? 1 : 0; @@ -68,6 +70,7 @@ if($action and $action eq "confirmcancel") { $template->param( ordernumber => $ordernumber, biblionumber => $biblionumber, + basket => $basket, referrer => $referrer, del_biblio => $del_biblio, ); 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 94c312c..403082b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -647,10 +647,10 @@ [% IF ( books_loo.left_holds_on_order ) %] Can't cancel order
[% ELSE %] - Cancel order
+ Cancel order
[% END %] [% IF ( books_loo.can_del_bib ) %] - Cancel order and delete catalog record
+ Cancel order and delete catalog record
[% ELSE %] Can't cancel order and delete catalog record
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index eec4370..c14748d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -6,7 +6,13 @@ [% INCLUDE 'header.inc' %] - +
-- 2.7.4