From 45b7506e81892b197f0f5c2879ef739a4e961f9e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Apr 2015 10:10:56 +0200 Subject: [PATCH] [PASSED QA] Bug 12054: Inactive vendors should be inactive This patch make inactive vendors really inactive. That means an inactive vendor would not be able to add a basket / add an order. Revised test plan ================= 1/ In the acquisition module create 2 vendors: 1 active and 1 inactive. 2/ On the acqui/booksellers.pl, acqui/uncertainprice.pl, admin/aqcontract.pl and acqui/supplier.pl (pages which include the acq toolbar), you should be able to, for both the 'active' as well as the inactive vendor : (a) add new basket (b) add order items to the basket Remark: This is *wrong*. You should be able to do so only for active vendor. 3/ Apply the patch 4/ Go to the links in step #2 above and select the inactive vendor you should no longer be able to: (a) add new basket (b) add order items to the basket Remark: This is the *correct* behaviour 5/ No change should be noted for vendor marked "active", and should be able to undertake operations 4 (a), 4 (b) and 4 (c). Remark: This is the *correct* behaviour. 6/ run koha qa tests tool Bug 12054: (follow-up) Inactive vendors should be inactive Don't display "add order""block and buttons if the vendor is inactive. Signed-off-by: Indranil Das Gupta (L2C2 Technologies) Signed-off-by: Kyle M Hall --- acqui/booksellers.pl | 3 ++- acqui/uncertainprice.pl | 1 + admin/aqcontract.pl | 1 + .../prog/en/includes/acquisitions-toolbar.inc | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 7 ++++++- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 7 ++++++- 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 43dc024..b56f73e 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -93,7 +93,8 @@ if ( $supplier_count == 1 ) { $template->param( supplier_name => $suppliers[0]->{'name'}, booksellerid => $suppliers[0]->{'id'}, - basketcount => $suppliers[0]->{'basketcount'} + basketcount => $suppliers[0]->{'basketcount'}, + active => $suppliers[0]->{active}, ); } diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl index f3848c1..a90c75f 100755 --- a/acqui/uncertainprice.pl +++ b/acqui/uncertainprice.pl @@ -128,6 +128,7 @@ $template->param( uncertainpriceorders => \@orders, booksellernotes => $bookseller->{'notes'}, basketcount => $bookseller->{'basketcount'}, subscriptioncount => $bookseller->{'subscriptioncount'}, + active => $bookseller->{active}, owner => $owner, scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl"); $template->{'VARS'}->{'contacts'} = $bookseller->{'contacts'}; diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl index 095d70c..daf8fb4 100755 --- a/admin/aqcontract.pl +++ b/admin/aqcontract.pl @@ -53,6 +53,7 @@ $template->param( booksellerid => $booksellerid, booksellername => $bookseller->{name}, basketcount => $bookseller->{'basketcount'}, + active => $bookseller->{active}, subscriptioncount => $bookseller->{'subscriptioncount'}, ); 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 5308b5a..c0007d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -14,10 +14,10 @@ function confirm_deletion() {
    - [% IF ( CAN_user_acquisition_order_manage ) %] + [% IF CAN_user_acquisition_order_manage && active %]
  • Basket
    • [% END %] - [% IF ( CAN_user_acquisition_contracts_manage ) %] + [% IF CAN_user_acquisition_contracts_manage && active %]
  • Contract
    • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %] @@ -31,7 +31,7 @@ function confirm_deletion() {
    Delete vendor
    [% END %] [% END %] - [% IF ( CAN_user_acquisition_order_receive && basketcount ) %] + [% IF CAN_user_acquisition_order_receive && basketcount %]
    Receive shipments
    [% END %] [% ELSE %] 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 7e02e80..de16aa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -161,7 +161,9 @@ [% UNLESS ( selectbasketg ) %] [% UNLESS ( closedate ) %]
    -
    Add to basket
    + [% IF active %] +
    Add to basket
    + [% END %]
    Edit basket
    [%# FIXME This action should not be available for everyone %]
    Delete this basket
    @@ -627,7 +629,10 @@
    + [% IF active %] [% INCLUDE 'acquisitions-add-to-basket.inc' %] + [% END %] + [% END %] [% END %] [% END %] [% ELSE %] 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 31918fd..8312cb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -157,7 +157,7 @@ $(document).ready(function() { View - [% UNLESS ( basket.closedate ) %] + [% IF not basket.closedate and supplier.active %] | Add to basket -- 1.7.2.5