Attachment 65176 Details for Bug 13208 – Bug 13208: Improving breadcrumbs for when cancelling an order

[patch] Bug 13208: Improving breadcrumbs for when cancelling an order

Bug-13208-Improving-breadcrumbs-for-when-cancellin.patch (text/plain), 4.94 KB, created by Nick Clemens (kidclamp) on 2017-07-21 12:01:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2017-07-21 12:01:50 UTC

Size: 4.94 KB

patch

obsolete

>From 6f5630218e92b313de0c5f96a5510f7613dc7739 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Wed, 28 Jun 2017 01:24:00 +0000
>Subject: [PATCH] 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 <severine.queune@bulac.fr>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> 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 ) %]
>                             <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
>                             [% ELSE %]
>-                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
>+                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
>                             [% END %]
>                             [% IF ( books_loo.can_del_bib ) %]
>-                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order and delete catalog record</a><br>
>+                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order and delete catalog record</a><br>
>                             [% ELSE %]
>                             <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
>                             [% 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 @@
> <body id="acq_cancelorder" class="acq">
> [% INCLUDE 'header.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; Cancel order</div>
>+<div id="breadcrumbs">
>+    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>+    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
>+    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.booksellerid.id %]">[% basket.booksellerid.name | html %]</a> &rsaquo;
>+    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">Basket [% basket.basketname | html %] ([% basket.basketno %]) for [% basket.booksellerid.name | html %]</a> &rsaquo;
>+    Cancel order
>+</div>
> 
> <div id="doc" class="yui-t7">
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 13208: 64686 | 64697 | 65176 | 65291 | 65954 | 66161 | 66499 | 66500 | 66501 | 66738 | 66739 | 66740 | 66741 | 66831 | 67167 | 67168 | 67169 | 67170 | 67171 | 67768 | 67769 | 67770 | 67771 | 67772