Attachment 111996 Details for Bug 6819 – Bug 6819: Hide individual cancel order links when order line has been received

[patch] Bug 6819: Hide individual cancel order links when order line has been received

Bug-6819-Hide-individual-cancel-order-links-when-o.patch (text/plain), 6.26 KB, created by Séverine Queune on 2020-10-19 14:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Séverine Queune

Created: 2020-10-19 14:40:21 UTC

Size: 6.26 KB

patch

obsolete

>From ed98f59c757c2ab34c434121afb951752f7e93f3 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 18 Oct 2020 22:53:53 +0000
>Subject: [PATCH] Bug 6819: Hide individual cancel order links when order line
> has been received
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This is to prevent mistakes - a received order should not be
>cancelled, but 'undo receive' needs to be done first for things
>to turn out correctly.
>
>To test:
>- Create a basket with at least 2 orders
>- Close basket
>- Receive one of your orders at least
>- Go back to the basket
>- Reopen basket
>- The cancel links should only show on the "not received" orders
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>---
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 44 +++++++++++-----------
> 1 file changed, 23 insertions(+), 21 deletions(-)
>
>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 651a232..3eb48e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -558,27 +558,29 @@
> [% END %]
> </td>
> <td>
>- [% IF ( books_loo.left_holds_on_order ) %]
>- Can't cancel order 
>- [% ELSE %]
>- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a> 
>- [% END %]
>- [% IF ( books_loo.can_del_bib ) %]
>- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a> 
>- [% ELSE %]
>- Can't cancel order and delete catalog record 
>- [% END %]
>- [% IF ( books_loo.left_item ) %]
>- [% books_loo.items | html %] item(s) left 
>- [% END %]
>- [% IF ( books_loo.left_biblio ) %]
>- [% books_loo.biblios | html %] order(s) left 
>- [% END %]
>- [% IF ( books_loo.left_subscription ) %]
>- [% books_loo.subscriptions | html %] subscription(s) left 
>- [% END %]
>- [% IF ( books_loo.left_holds ) %]
>- [% books_loo.holds | html %] hold(s) left
>+ [% IF ( books_loo.orderstatus != "complete") %]
>+ [% IF ( books_loo.left_holds_on_order ) %]
>+ Can't cancel order 
>+ [% ELSE %]
>+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a> 
>+ [% END %]
>+ [% IF ( books_loo.can_del_bib ) %]
>+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a> 
>+ [% ELSE %]
>+ Can't cancel order and delete catalog record 
>+ [% END %]
>+ [% IF ( books_loo.left_item ) %]
>+ [% books_loo.items | html %] item(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_biblio ) %]
>+ [% books_loo.biblios | html %] order(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_subscription ) %]
>+ [% books_loo.subscriptions | html %] subscription(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_holds ) %]
>+ [% books_loo.holds | html %] hold(s) left
>+ [% END %]
> [% END %]
> </td>
> [% END %]
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 6819: 5226 | 111951 | 111994 | 111996 | 112106