Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 7791: (follow-up) tidy up some cruft in the main patch

Browse source 
This patch
- delete warns
- add a missing }
- add a condition in template of avoiding asking to delete orders or
  records if the basket is empty

To test :
1. Make the same tests as defined in test plan of main patch. It should
   behave the same way
2. Try to delete a basket with no records inside. You will only have a
   "Delete basket" button, with fewer warnings

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Mathieu Saby 2013-09-19 10:57:44 +02:00 committed by Galen Charlton
parent 09953f836d
commit 2c307f3e92
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
acqui/basket.pl
View file

@ -115,7 +115,6 @@ if ( $op eq 'delete_confirm' ) {
#Delete all orders included in that basket, and all items received. #Delete all orders included in that basket, and all items received.
foreach my $myorder (@orders){ foreach my $myorder (@orders){
DelOrder($myorder->{biblionumber},$myorder->{ordernumber}); DelOrder($myorder->{biblionumber},$myorder->{ordernumber});
warn "suppression de ".$myorder->{biblionumber}.' '.$myorder->{ordernumber};
} }
# if $delbiblio = 1, delete the records if possible # if $delbiblio = 1, delete the records if possible
if ((defined $delbiblio)and ($delbiblio ==1)){ if ((defined $delbiblio)and ($delbiblio ==1)){
@ -126,9 +125,8 @@ if ( $op eq 'delete_confirm' ) {
my @subscriptions = GetSubscriptionsId ($biblionumber); my @subscriptions = GetSubscriptionsId ($biblionumber);
my $itemcount = GetItemsCount($biblionumber); my $itemcount = GetItemsCount($biblionumber);
DelBiblio($myorder->{biblionumber}) if ($countbiblio == 0 && $itemcount == 0 && !(@subscriptions)); DelBiblio($myorder->{biblionumber}) if ($countbiblio == 0 && $itemcount == 0 && !(@subscriptions));
warn "suppression de la notice ".$myorder->{biblionumber}}; }
} }
# delete the basket # delete the basket
DelBasket($basketno,); DelBasket($basketno,);
$template->param( delete_confirmed => 1 ); $template->param( delete_confirmed => 1 );

38
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View file

@ -191,26 +191,36 @@
[% END %] [% END %]
<div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div> <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
</div> </div>
<!-- Modal for confirm deletion box--> <!-- Modal for confirm deletion box-->
<div class="modal hide" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true"> <div class="modal hide" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Confirm deletion</h3> <h3>Confirm deletion</h3>
</div> </div>
<div class="modal-body"> [% UNLESS book_foot_loop.size > 0 %]
<p>Are you sure you want to delete this basket?</p> <div class="modal-body">
<p>Warning:</p> <p>Are you sure you want to delete this basket?</p>
<p>All orders of this basket will be cancelled and used funds will be refunded.</p> </div>
<p>If items have been created at ordering or receipt stage, they will be deleted.</p> <div class="modal-footer">
<p>You can choose to delete records if possible (if they don't have any item attached, any subscription and any other order).</p> <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
</div> <button type="submit" class="btn btn-default" onclick="delete_basket([% basketno %],[% booksellerid %],0); return false;" >Delete basket</button>
<div class="modal-footer"> </div>
<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button> [% ELSE %]
<button type="submit" class="btn btn-default" onclick="delete_basket([% basketno %],[% booksellerid %],0); return false;" >Delete basket and orders</button> <div class="modal-body">
<button type="submit" class="btn btn-default" onclick="delete_basket([% basketno %],[% booksellerid %],1); return false;">Delete basket, orders and records</button> <p>Are you sure you want to delete this basket?</p>
</div> <p>Warning:</p>
<p>All orders of this basket will be cancelled and used funds will be refunded.</p>
<p>If items have been created when ordering or receiving, they will be deleted.</p>
<p>You can choose to delete records if possible (if they don't have any item attached, any subscription and are not used in any other order).</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-default" onclick="delete_basket([% basketno %],[% booksellerid %],0); return false;" >Delete basket and orders</button>
<button type="submit" class="btn btn-default" onclick="delete_basket([% basketno %],[% booksellerid %],1); return false;">Delete basket, orders and records</button>
</div>
[% END %]
</div> </div>
<!-- End of Modal--> <!-- End of Modal-->
[% ELSE %] [% ELSE %]
[% UNLESS ( grouped ) %] [% UNLESS ( grouped ) %]
<div id="toolbar" class="btn-toolbar"> <div id="toolbar" class="btn-toolbar">