From 8ab68a03f218cacab976d8d1dbdc93a526fb2c1d Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Thu, 23 Feb 2012 15:18:48 +0100 Subject: [PATCH] Bug 4969: deletion of booksellers Is a vendor has no basket/subscription link, it can now be deleted (after a JS confirmation). --- C4/Bookseller.pm | 5 +++++ acqui/supplier.pl | 7 ++++++- .../prog/en/includes/acquisitions-toolbar.inc | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index 6a91f99..a36c909 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -85,6 +85,11 @@ sub GetBookSellerFromId { 'SELECT count(*) FROM aqbasket where booksellerid = ?', {}, $id ); } + if ($vendor) { + ( $vendor->{subscriptioncount} ) = $dbh->selectrow_array( + 'SELECT count(*) FROM subscription WHERE aqbooksellerid = ?', + {}, $id ); + } return $vendor; } diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 3faa560..ef6eedd 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -114,10 +114,15 @@ if ( $op eq 'display' ) { GST => $tax_rate, default_tax => defined($seller_gstrate), basketcount => $supplier->{'basketcount'}, + subscriptioncount => $supplier->{'subscriptioncount'}, contracts => $contracts, ); } elsif ( $op eq 'delete' ) { - DelBookseller($id); + # no further message needed for the user + # the DELETE button only appears in the template if basketcount == 0 + if ( $supplier->{'basketcount'} == 0 ) { + DelBookseller($id); + } print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl'); exit; } else { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index f81b303..baa1909 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,6 +1,13 @@