58c652a0fc
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) <indradg@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
169 lines
5.8 KiB
Perl
Executable file
169 lines
5.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to administer the contract table
|
|
#written 02/09/2008 by john.soros@biblibre.com
|
|
|
|
# Copyright 2008-2009 BibLibre SARL
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Dates qw/format_date format_date_in_iso/;
|
|
use C4::Contract;
|
|
|
|
use Koha::Acquisition::Bookseller;
|
|
|
|
my $input = new CGI;
|
|
my $contractnumber = $input->param('contractnumber');
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $op = $input->param('op') || 'list';
|
|
|
|
my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "admin/aqcontract.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => 'contracts_manage' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
$template->param(
|
|
contractnumber => $contractnumber,
|
|
booksellerid => $booksellerid,
|
|
booksellername => $bookseller->{name},
|
|
basketcount => $bookseller->{'basketcount'},
|
|
active => $bookseller->{active},
|
|
subscriptioncount => $bookseller->{'subscriptioncount'},
|
|
);
|
|
|
|
#ADD_FORM: called if $op is 'add_form'. Used to create form to add or modify a record
|
|
if ( $op eq 'add_form' ) {
|
|
$template->param( add_form => 1 );
|
|
|
|
# if contractnumber exists, it's a modify action, so read values to modify...
|
|
if ($contractnumber) {
|
|
my $contract = GetContract({
|
|
contractnumber => $contractnumber
|
|
});
|
|
|
|
$template->param(
|
|
contractnumber => $contract->{contractnumber},
|
|
contractname => $contract->{contractname},
|
|
contractdescription => $contract->{contractdescription},
|
|
contractstartdate => format_date( $contract->{contractstartdate} ),
|
|
contractenddate => format_date( $contract->{contractenddate} ),
|
|
);
|
|
} else {
|
|
$template->param(
|
|
contractnumber => undef,
|
|
contractname => undef,
|
|
contractdescription => undef,
|
|
contractstartdate => undef,
|
|
contractenddate => undef,
|
|
);
|
|
}
|
|
|
|
# END $OP eq ADD_FORM
|
|
}
|
|
#ADD_VALIDATE: called by add_form, used to insert/modify data in DB
|
|
elsif ( $op eq 'add_validate' ) {
|
|
## Please see file perltidy.ERR
|
|
$template->param( add_validate => 1 );
|
|
|
|
my $is_a_modif = $input->param("is_a_modif");
|
|
|
|
if ( $is_a_modif ) {
|
|
ModContract({
|
|
contractstartdate => format_date_in_iso( $input->param('contractstartdate') ),
|
|
contractenddate => format_date_in_iso( $input->param('contractenddate') ),
|
|
contractname => $input->param('contractname'),
|
|
contractdescription => $input->param('contractdescription'),
|
|
booksellerid => $input->param('booksellerid'),
|
|
contractnumber => $input->param('contractnumber'),
|
|
});
|
|
} else {
|
|
AddContract({
|
|
contractname => $input->param('contractname'),
|
|
contractdescription => $input->param('contractdescription'),
|
|
booksellerid => $input->param('booksellerid'),
|
|
contractstartdate => format_date_in_iso( $input->param('contractstartdate') ),
|
|
contractenddate => format_date_in_iso( $input->param('contractenddate') ),
|
|
});
|
|
}
|
|
|
|
print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
|
|
exit;
|
|
|
|
# END $OP eq ADD_VALIDATE
|
|
}
|
|
#DELETE_CONFIRM: called by default form, used to confirm deletion of data in DB
|
|
elsif ( $op eq 'delete_confirm' ) {
|
|
$template->param( delete_confirm => 1 );
|
|
|
|
my $contract = GetContract( { contractnumber => $contractnumber } );
|
|
|
|
$template->param(
|
|
contractnumber => $$contract{contractnumber},
|
|
contractname => $$contract{contractname},
|
|
contractdescription => $$contract{contractdescription},
|
|
contractstartdate => format_date( $$contract{contractstartdate} ),
|
|
contractenddate => format_date( $$contract{contractenddate} ),
|
|
);
|
|
|
|
# END $OP eq DELETE_CONFIRM
|
|
}
|
|
#DELETE_CONFIRMED: called by delete_confirm, used to effectively confirm deletion of data in DB
|
|
elsif ( $op eq 'delete_confirmed' ) {
|
|
my $deleted = DelContract( { contractnumber => $contractnumber } );
|
|
|
|
if ( $deleted ) {
|
|
print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
|
|
exit;
|
|
} else {
|
|
$template->param( error => 'not_deleted' );
|
|
$op = 'list';
|
|
}
|
|
|
|
# END $OP eq LIST
|
|
}
|
|
# DEFAULT: Builds a list of contracts and displays them
|
|
if ( $op eq 'list' ) {
|
|
$template->param(else => 1);
|
|
|
|
# get contracts
|
|
my @contracts = @{GetContracts( { booksellerid => $booksellerid } )};
|
|
|
|
# format dates
|
|
for ( @contracts ) {
|
|
$$_{contractstartdate} = format_date($$_{contractstartdate});
|
|
$$_{contractenddate} = format_date($$_{contractenddate});
|
|
}
|
|
|
|
$template->param(loop => \@contracts);
|
|
|
|
#---- END $OP eq DEFAULT
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|