0247b6741e
This patch includes: - the subroutines GetContract and GetContracts has been moved from C4::Acquisition.pm to C4::Contract.pm and adapted for a general use - adaptation of acqui/basket.pl, acqui/basketheader.pl, acqui/neworderempty.pl, acqui/supplier.pl and admin/aqcontract.pl - the unit tests for the module C4::Contract.pm Test plan: 1) Apply the patch 2) Execute the unit tests by launching: prove t/db_dependent/Contract.t t/Acquisition/ t/db_dependent/Acquisition/ t/db_dependent/Acquisition.t 3) The command has to be a success : t/db_dependent/Contract.t ................................. ok t/Acquisition/CanUserManageBasket.t ....................... ok t/Acquisition/Invoice.t ................................... ok t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t .. ok t/db_dependent/Acquisition/GetOrdersByBiblionumber.t ...... ok t/db_dependent/Acquisition/Invoices.t ..................... ok t/db_dependent/Acquisition/OrderFromSubscription.t ........ ok t/db_dependent/Acquisition/TransferOrder.t ................ 1/11 # Transfering order to basket2 t/db_dependent/Acquisition/TransferOrder.t ................ ok t/db_dependent/Acquisition/close_reopen_basket.t .......... ok t/db_dependent/Acquisition.t .............................. ok All tests successful. Files=10, Tests=284, 15 wallclock secs ( 0.11 usr 0.02 sys + 12.88 cusr 0.77 csys = 13.78 CPU) Result: PASS 4) Log on with a superlibrarian permission 5) Go on the page acqui/supplier.pl (Acquisitions > Button "New vendor") 6) Record a vendor with a nonzero "name" 7) Go on the page admin/aqcontract.pl (click on the "Contracts" item in the menu) 8) Click on the button "New" > "Contract" and record a new one 9) Verify the displayed data are correct about the contract 10) "Edit" the contract with different values and verify the data are updated 11) Click on "Delete" in order to delete the contract, verify the displayed data are correct but cancel the operation 12) Click on "New" > "Basket" and verify there is the created contract in field "Contract", then record a basket by selectioning the created contract 13) Verify the contract name displayed is correct 14) Record an active budget and a fund linked to this budget 15) Go on the new basket (Home > Acquisitions > Search the created vendor) 16) Click on "Add to basket" then "From a new (empty) record" and verify the displayed contract name is correct Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Tested with both patches applied. Works as described following test plan, all points (I did 14 first) All test pass No koha-qa errors Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
144 lines
3.2 KiB
Perl
144 lines
3.2 KiB
Perl
package C4::Contract;
|
||
|
||
# Copyright 2009-2010 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 2 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, write to the Free Software Foundation, Inc.,
|
||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||
|
||
use Modern::Perl;
|
||
use strict;
|
||
#use warnings; FIXME - Bug 2505
|
||
use C4::Context;
|
||
use C4::SQLHelper qw(:all);
|
||
|
||
use vars qw($VERSION @ISA @EXPORT);
|
||
|
||
BEGIN {
|
||
# set the version for version checking
|
||
$VERSION = 3.07.00.049;
|
||
require Exporter;
|
||
@ISA = qw(Exporter);
|
||
@EXPORT = qw(
|
||
&GetContracts
|
||
&GetContract
|
||
&AddContract
|
||
&ModContract
|
||
&DelContract
|
||
);
|
||
}
|
||
|
||
=head1 NAME
|
||
|
||
C4::Contract - Koha functions for dealing with bookseller contracts.
|
||
|
||
=head1 SYNOPSIS
|
||
|
||
use C4::Contract;
|
||
|
||
=head1 DESCRIPTION
|
||
|
||
The functions in this module deal with contracts. They allow to
|
||
add a new contract, to modify it or to get some informations around
|
||
a contract.
|
||
|
||
=cut
|
||
|
||
|
||
=head2 GetContracts
|
||
|
||
$contractlist = GetContracts({
|
||
booksellerid => $booksellerid,
|
||
activeonly => $activeonly
|
||
});
|
||
|
||
Looks up the contracts that belong to a bookseller
|
||
|
||
Returns a list of contracts
|
||
|
||
=over
|
||
|
||
=item C<$booksellerid> is the "id" field in the "aqbooksellers" table.
|
||
|
||
=item C<$activeonly> if exists get only contracts that are still active.
|
||
|
||
=back
|
||
|
||
=cut
|
||
|
||
sub GetContracts {
|
||
my ($params) = @_;
|
||
my $booksellerid = $params->{booksellerid};
|
||
my $activeonly = $params->{activeonly};
|
||
|
||
my $dbh = C4::Context->dbh;
|
||
my $query = "SELECT * FROM aqcontract";
|
||
my $result_set;
|
||
if($booksellerid) {
|
||
$query .= " WHERE booksellerid=?";
|
||
|
||
if($activeonly) {
|
||
$query .= " AND contractenddate >= CURDATE( )";
|
||
}
|
||
|
||
$result_set = $dbh->selectall_arrayref( $query, { Slice => {} }, $booksellerid );
|
||
}
|
||
else {
|
||
$result_set = $dbh->selectall_arrayref( $query, { Slice => {} } );
|
||
}
|
||
|
||
return $result_set;
|
||
}
|
||
|
||
=head2 GetContract
|
||
|
||
$contract = GetContract( { contractnumber => $contractnumber } );
|
||
|
||
Looks up the contract that has PRIMKEY (contractnumber) value $contractID
|
||
|
||
Returns a contract
|
||
|
||
=cut
|
||
|
||
sub GetContract {
|
||
my ($params) = @_;
|
||
my $contractno = $params->{contractnumber};
|
||
|
||
my $dbh = C4::Context->dbh;
|
||
my $query = "SELECT * FROM aqcontract WHERE contractnumber=?";
|
||
|
||
my $sth = $dbh->prepare($query);
|
||
$sth->execute($contractno);
|
||
my $result = $sth->fetchrow_hashref;
|
||
return $result;
|
||
}
|
||
|
||
|
||
#sub GetContract { SearchInTable("aqcontract", shift); }
|
||
|
||
sub AddContract { InsertInTable("aqcontract", shift); }
|
||
|
||
sub ModContract { UpdateInTable("aqcontract", shift); }
|
||
|
||
sub DelContract { DeleteInTable("aqcontract", shift); }
|
||
|
||
1;
|
||
|
||
__END__
|
||
|
||
=head1 AUTHOR
|
||
|
||
Koha Development Team <http://koha-community.org/>
|
||
|
||
=cut
|