Bugzilla – Attachment 79470 Details for
Bug 21364
Allow closing basket from vendor search/view
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21364: Allow closing basket from vendor view/search
Bug-21364-Allow-closing-basket-from-vendor-viewsea.patch (text/plain), 7.08 KB, created by
Martin Renvoize (ashimema)
on 2018-09-27 08:20:09 UTC
(
hide
)
Description:
Bug 21364: Allow closing basket from vendor view/search
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-09-27 08:20:09 UTC
Size:
7.08 KB
patch
obsolete
>From 368572b0758d1bd38546ca28c5277ac7ee9b57ea 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> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../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 f8d5d8b63b..5e6359e43f 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.18.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21364
:
79015
|
79019
|
79069
|
79106
|
79121
|
79470
|
88393
|
88787
|
88788
|
88847
|
88848
|
88982
|
88983