From 708be5551f632481cb17ab6121147ee27b3508c3 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Sun, 16 Sep 2018 03:05:59 +0000
Subject: [PATCH] Bug 21364: Allow closing basket from vendor view/search

To test:
1 - Have a vendor
2 - Add some empty baskets
3 - Add some non-empty baskets
4 - Search for vendor and note you now
    a - Can only 'View' empty or closed baskets
    b - Have a dropup menu to 'Add to ' or 'Close' open baskets
5 - Confirm things look correct and buttons work
6 - Confirm that basket name is now a link to view basket

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 .../prog/en/modules/acqui/booksellers.tt           | 45 +++++++++++++---------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index f8d5d8b..5e6359e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -103,7 +103,7 @@
                                         <tr>
                                     [% END %]
                                         <td>[% basket.basketno | html %]</td>
-                                        <td>[% basket.basketname | html %]</td>
+                                        <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]">[% basket.basketname | html %]<a></td>
                                         <td>
                                             <span title="[% basket.total_items | html %]">[% basket.total_items | html %]
                                                 [% IF basket.total_items_cancelled %]
@@ -144,24 +144,33 @@
                                             [% END %]
                                         </td>
                                         <td class="actions">
-                                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-eye"></i> View</a>
-
-                                            [% IF not basket.closedate and supplier.active %]
-                                                <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
-                                                <!-- Modal -->
-                                                <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
-                                                    <div class="modal-dialog">
-                                                    <div class="modal-content">
-                                                    <div class="modal-body">
-                                                        [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
-                                                    </div>
-                                                    <div class="modal-footer">
-                                                        <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
-                                                    </div>
+                                        [% IF not basket.closedate and supplier.active %]
+                                            <div class="dropup">
+                                                <div class="btn-group">
+                                                [%# There should be no space between these two buttons, it would render badly %]
+                                                    <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-eye"></i> View</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
+                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]">
+                                                        <li><a id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></li>
+                                                        [% IF basket.total_items %]
+                                                        <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | html %]&booksellerid=[% supplier.id | html %]"><i class="fa fa-times-circle"></i> Close this basket</a></li>
+                                                        [% END %]
+                                                    </ul>
+                                                    <!-- Modal -->
+                                                    <div id="addtoBasket[% basket.basketno | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno | html %]" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
+                                                        <div class="modal-dialog">
+                                                            <div class="modal-content">
+                                                                <div class="modal-body">
+                                                                    [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
+                                                                </div>
+                                                                <div class="modal-footer">
+                                                                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+                                                                </div>
+                                                            </div>
+                                                        </div>
                                                     </div>
-                                                    </div>
-                                                </div>
-                                            [% END %]
+                                        [% ELSE %]
+                                            <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-eye"></i> View</a>
+                                        [% END %]
                                         </td>
                                     </tr>
                                 [% END %][%# FOREACH basket IN supplier.loop_basket %]
-- 
2.1.4