From a158c041c013fa5757a96c00b77abb79eea49a6a Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Fri, 18 Oct 2013 11:44:39 +0200 Subject: [PATCH] Bug 7791: (follow-up) add warning after deletion if some records were not deleted This followup add some warnings after deletion if some items were not deleted. 4 types of messages are possible : - x item(s) attached. - x subscription(s) attached. - x order(s) attached. - Unknown error. To test : test a 1. create a basket with - an order using a record A which has already an item, which is used in a subscription, and in other order (in an other basket) - an order using a record B used nowhere elese 2. click on "Delete basket" 3. choose button "Delete basket, orders and records" 4. you should see a page anouncing basket deletion, and that record A was not deleted because of its item, subscription and order. 5. check the link around the title of record B takes you to the record 6. check the link under the warning box ("Click here to go back to booksellers page") takes you to booksellers page 5. check record B is deleted test b 1. suppress the subscription linked with record A 2. create an other basket using record A 3. delete the basket on the same way as for test a 4. you should see a page anouncing basket deletion, and that record A was not deleted because of its item and order test c 1. suppress the item attached under record A 2. create an other basket using record A 3. delete the basket on the same way as for test a 4. you should see a page anouncing basket deletion, and that record A was not deleted because of its orderBug 7791 Followup: add warning after deletion if some records were not deleted Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit de2bfb6799f718a75eb338490b1cee8f8145b6a8) Signed-off-by: Fridolin SOMERS --- acqui/basket.pl | 22 +++++++++++++++-- .../prog/en/modules/acqui/basket.tt | 24 +++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 03e5d0667e..6833eb6512 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -118,14 +118,32 @@ if ( $op eq 'delete_confirm' ) { } # if $delbiblio = 1, delete the records if possible if ((defined $delbiblio)and ($delbiblio ==1)){ + my @cannotdelbiblios ; foreach my $myorder (@orders){ my $biblionumber = $myorder->{'biblionumber'}; my $countbiblio = CountBiblioInOrders($biblionumber); my $ordernumber = $myorder->{'ordernumber'}; - my @subscriptions = GetSubscriptionsId ($biblionumber); + my $subscriptions = scalar GetSubscriptionsId ($biblionumber); my $itemcount = GetItemsCount($biblionumber); - DelBiblio($myorder->{biblionumber}) if ($countbiblio == 0 && $itemcount == 0 && !(@subscriptions)); + my $error; + if ($countbiblio == 0 && $itemcount == 0 && $subscriptions == 0) { + $error = DelBiblio($myorder->{biblionumber}) } + else { + push @cannotdelbiblios, {biblionumber=> ($myorder->{biblionumber}), + title=> $myorder->{'title'}, + author=> $myorder->{'author'}, + countbiblio=> $countbiblio, + itemcount=>$itemcount, + subscriptions=>$subscriptions}; + } + if ($error) { + push @cannotdelbiblios, {biblionumber=> ($myorder->{biblionumber}), + title=> $myorder->{'title'}, + author=> $myorder->{'author'}, + othererror=> $error}; + } } + $template->param( cannotdelbiblios => \@cannotdelbiblios ); } # delete the basket DelBasket($basketno,); 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 23b94d9919..3e1975362a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -211,11 +211,11 @@

Warning:

All orders of this basket will be cancelled and used funds will be refunded.

If items have been created when ordering or receiving, they will be deleted.

-

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).

+

You can choose to delete records if possible (records with some items, used in a subscription, or an other order will not be deleted).

[% END %] @@ -236,7 +236,27 @@ [% ELSE %] [% IF ( delete_confirmed ) %]

Basket deleted

+ [% IF (cannotdelbiblios) %] +
+

Warning:

+

The following records could not be deleted:

+
    + [% FOREACH cannotdelbiblio IN cannotdelbiblios %] +
  • [% cannotdelbiblio.title |html %] by [% cannotdelbiblio.author %]: +
      + [% IF (cannotdelbiblio.itemcount) %]
    • [% cannotdelbiblio.itemcount %] item(s) attached.
    • [% END %] + [% IF (cannotdelbiblio.subscriptions) %]
    • [% cannotdelbiblio.subscriptions %] subscription(s) attached.
    • [% END %] + [% IF (cannotdelbiblio.countbiblio) %]
    • [% cannotdelbiblio.countbiblio %] order(s) attached.
    • [% END %] + [% IF (cannotdelbiblio.othererror) %]
    • Unknown error.
    • [% END %] +
    +
  • + [% END %] +
+
+ Click here to go back to booksellers page + [% ELSE %] + [% END %] [% ELSE %]

[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]

[% IF ( delete_confirm ) %] -- 2.39.5