From 662dcc200a0070182e334a426d67205fd2107e42 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Thu, 19 Sep 2013 09:59:31 +0200 Subject: [PATCH] Bug 7791 : Give the ability to delete records when deleting a basket Content-Type: text/plain; charset="utf-8" Currently, when a basket is deleted, all the orders are deleted (there is a foreign key in aqorders table on basketno). This could be dangerous, and there is no warn. After the deletion, unused biblios are left in the catalogue. This patch - adds a more detailed message describing the consequences of deletion - give the choice of also deleting biblio records if possible To test : Test A : 1. create a basket with 4 orders: - an order from a new record A - an order from a record B which has already an item - an order from a record C used in a subscription - an order from a record D used in an other order 2. note the biblionumbers of the records used (or open them in other tabs in yout browser) 3. click on "Delete basket" 4. choose button "Delete basket and orders" 5. check the catalogue : records A,B,C,D must still be there Test B: 1. create a basket with 4 orders: - an order from a new record A - an order from a record B which has already an item - an order from a record C used in a subscription - an order from a record D used in an other order 2. note the biblionumbers of the records used (or open them in other tabs in yout browser) 3. click on "Delete basket" 4. choose button "Delete basket, orders and records" 5. check the catalogue : records B,C,D must still be there. Record A must be deleted --- acqui/basket.pl | 24 +++++++++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 40 +++++++++++++------- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 681cd60..313cef8 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -97,7 +97,27 @@ $template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2'; if ( $op eq 'delete_confirm' ) { my $basketno = $query->param('basketno'); - DelBasket($basketno); + my $delbiblio = $query->param('delbiblio'); + my @orders = GetOrders($basketno); +#Delete all orders included in that basket, and all items received. + foreach my $myorder (@orders){ + DelOrder($myorder->{biblionumber},$myorder->{ordernumber}); + warn "suppression de ".$myorder->{biblionumber}.' '.$myorder->{ordernumber}; + } +# if $delbiblio = 1, delete the records if possible + if ((defined $delbiblio)and ($delbiblio ==1)){ + foreach my $myorder (@orders){ + my $biblionumber = $myorder->{'biblionumber'}; + my $countbiblio = CountBiblioInOrders($biblionumber); + my $ordernumber = $myorder->{'ordernumber'}; + my @subscriptions = GetSubscriptionsId ($biblionumber); + my $itemcount = GetItemsCount($biblionumber); + DelBiblio($myorder->{biblionumber}) if ($countbiblio == 0 && $itemcount == 0 && !(@subscriptions)); + warn "suppression de la notice ".$myorder->{biblionumber}}; + } + + # delete the basket + DelBasket($basketno,); $template->param( delete_confirmed => 1 ); } elsif ( !$bookseller ) { $template->param( NO_BOOKSELLER => 1 ); @@ -399,7 +419,7 @@ sub get_order_infos { if ($nb){ $itemholds += $nb; } - } + } # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680 $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds); $line{items} = ($itemcount) - (scalar @items); 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 67e299d..e7c6bbb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -43,12 +43,11 @@ window.location = "[% script_name %]?op=close&basketno=[% basketno %]"; } } - function confirm_deletion() { - var is_confirmed = confirm(_("Are you sure you want to delete this basket?")); - if (is_confirmed) { - window.location = "[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]"; - } + + function delete_basket(basketno,booksellerid,delbiblio) { + window.location = "[% script_name %]?op=delete_confirm&delbiblio="+delbiblio+"&basketno="+basketno+"&booksellerid="+booksellerid; } + function confirm_delete_item(ordernumber, biblionumber) { var is_confirmed = confirm(_("Are you sure you want to delete this order ?")); if (is_confirmed) { @@ -112,11 +111,7 @@ } ) ); var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, { "sPaginationType": "four_button" - } ) ); - $("#delbasketbutton").on("click",function(e){ - e.preventDefault(); - confirm_deletion(); - }); + } ) ); $("#reopenbutton").on("click",function(e){ e.preventDefault(); confirm_reopen(); @@ -147,8 +142,8 @@
- - [% IF ( unclosable ) %] + + [% IF ( unclosable ) %] [% ELSIF ( uncertainprices ) %] [% ELSE %] @@ -157,8 +152,27 @@
[% END %]
Export this basket as CSV
- + + + [% ELSE %] [% UNLESS ( grouped ) %]
-- 1.7.9.5