package C4::Bookseller;
# Copyright 2000-2002 Katipo Communications
+# Copyright 2010 PTFS Europe
#
# This file is part of Koha.
#
# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# 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 strict;
+use warnings;
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
- # set the version for version checking
- $VERSION = 3.01;
- require Exporter;
- @ISA = qw(Exporter);
- @EXPORT = qw(
- &GetBookSeller &GetBooksellersWithLateOrders &GetBookSellerFromId
- &ModBookseller
- &DelBookseller
- &AddBookseller
- );
-}
+use base qw( Exporter );
+# set the version for version checking
+our $VERSION = 3.07.00.049;
+our @EXPORT_OK = qw(
+ GetBookSeller GetBooksellersWithLateOrders GetBookSellerFromId
+ ModBookseller
+ DelBookseller
+ AddBookseller
+);
=head1 NAME
=head2 GetBookSeller
-@results = &GetBookSeller($searchstring);
+@results = GetBookSeller($searchstring);
Looks up a book seller. C<$searchstring> may be either a book seller
ID, or a string to look for in the book seller's name.
-C<@results> is an array of references-to-hash, whose keys are the fields of of the
+C<@results> is an array of hash_refs whose keys are the fields of of the
aqbooksellers table in the Koha database.
=cut
-# FIXME: This function is badly named. It should be something like
-# SearchBookSellersByName. It is NOT a singular return value.
+sub GetBookSeller {
+ my $searchstring = shift;
+ $searchstring = q{%} . $searchstring . q{%};
+ my $query = "
+ SELECT aqbooksellers.*, count(*) AS basketcount
+ FROM aqbooksellers
+ LEFT JOIN aqbasket ON aqbasket.booksellerid = aqbooksellers.id
+ WHERE name LIKE ? GROUP BY aqbooksellers.id ORDER BY name
+ ";
+
+ my $dbh = C4::Context->dbh;
+ my $sth = $dbh->prepare($query);
+ $sth->execute($searchstring);
+ my $resultset_ref = $sth->fetchall_arrayref( {} );
+ return @{$resultset_ref};
+}
-sub GetBookSeller($) {
- my ($searchstring) = @_;
+sub GetBookSellerFromId {
+ my $id = shift or return;
my $dbh = C4::Context->dbh;
- my $query = "SELECT * FROM aqbooksellers WHERE name LIKE ?";
- my $sth =$dbh->prepare($query);
- $sth->execute( "%$searchstring%" );
- my @results;
- # count how many baskets this bookseller has.
- # if it has none, the bookseller can be deleted
- my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
- while ( my $data = $sth->fetchrow_hashref ) {
- $sth2->execute($data->{id});
- $data->{basketcount} = $sth2->fetchrow();
- push( @results, $data );
+ my $vendor =
+ $dbh->selectrow_hashref( 'SELECT * FROM aqbooksellers WHERE id = ?',
+ {}, $id );
+ if ($vendor) {
+ ( $vendor->{basketcount} ) = $dbh->selectrow_array(
+ 'SELECT count(*) FROM aqbasket where booksellerid = ?',
+ {}, $id );
+ ( $vendor->{subscriptioncount} ) = $dbh->selectrow_array(
+ 'SELECT count(*) FROM subscription WHERE aqbooksellerid = ?',
+ {}, $id );
}
- $sth->finish;
- return @results ;
+ return $vendor;
}
-
-sub GetBookSellerFromId($) {
- my ($id) = shift or return undef;
- my $dbh = C4::Context->dbh();
- my $query = "SELECT * FROM aqbooksellers WHERE id = ?";
- my $sth =$dbh->prepare($query);
- $sth->execute( $id );
- if (my $data = $sth->fetchrow_hashref()){
- my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
- $sth2->execute($id);
- $data->{basketcount}=$sth2->fetchrow();
- return ($data);
- }
- return 0;
-}
#-----------------------------------------------------------------#
=head2 GetBooksellersWithLateOrders
-%results = &GetBooksellersWithLateOrders;
+%results = GetBooksellersWithLateOrders( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto );
Searches for suppliers with late orders.
=cut
sub GetBooksellersWithLateOrders {
- my ($delay,$branch) = @_; # FIXME: Branch argument unused.
- my $dbh = C4::Context->dbh;
+ my ( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto ) = @_;
+ my $dbh = C4::Context->dbh;
-# FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
-# should be tested with other DBMs
+ # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
+ # should be tested with other DBMs
- my $strsth;
+ my $query;
+ my @query_params = ();
my $dbdriver = C4::Context->config("db_scheme") || "mysql";
- if ( $dbdriver eq "mysql" ) {
- $strsth = "
- SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
- FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
- LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
- WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
- AND (datereceived = '' OR datereceived IS NULL))
- ";
+ $query = "
+ SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
+ FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
+ LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
+ WHERE
+ ( datereceived = ''
+ OR datereceived IS NULL
+ OR aqorders.quantityreceived < aqorders.quantity
+ )
+ AND aqorders.rrp <> 0
+ AND aqorders.ecost <> 0
+ AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0
+ AND aqbasket.closedate IS NOT NULL
+ ";
+ if ( defined $delay && $delay >= 0 ) {
+ $query .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? + COALESCE(aqbooksellers.deliverytime,0) DAY)) ";
+ push @query_params, $delay;
+ } elsif ( $delay < 0 ){
+ warn 'WARNING: GetBooksellerWithLateOrders is called with a negative value';
+ return;
+ }
+ if ( defined $estimateddeliverydatefrom ) {
+ $query .= '
+ AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime,0) DAY) >= ?';
+ push @query_params, $estimateddeliverydatefrom;
+ if ( defined $estimateddeliverydateto ) {
+ $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime, 0) DAY) <= ?';
+ push @query_params, $estimateddeliverydateto;
+ } else {
+ $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime, 0) DAY) <= CAST(now() AS date)';
+ }
}
- else {
- $strsth = "
- SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
- FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
- LEFT JOIN aqbooksellers ON aqbasket.aqbooksellerid = aqbooksellers.id
- WHERE (closedate < (CURDATE( )-(INTERVAL $delay DAY)))
- AND (datereceived = '' OR datereceived IS NULL))
- ";
+ if ( defined $estimateddeliverydateto ) {
+ $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime,0) DAY) <= ?';
+ push @query_params, $estimateddeliverydateto;
}
- my $sth = $dbh->prepare($strsth);
- $sth->execute;
+ my $sth = $dbh->prepare($query);
+ $sth->execute( @query_params );
my %supplierlist;
while ( my ( $id, $name ) = $sth->fetchrow ) {
$supplierlist{$id} = $name;
sub AddBookseller {
my ($data) = @_;
- my $dbh = C4::Context->dbh;
- my $query = "
+ my $dbh = C4::Context->dbh;
+ my $query = q|
INSERT INTO aqbooksellers
(
- name, address1, address2, address3, address4,
- postal, phone, fax, url, contact,
- contpos, contphone, contfax, contaltphone, contemail,
- contnotes, active, listprice, invoiceprice, gstreg,
- listincgst,invoiceincgst, discount,
- notes
+ name, address1, address2, address3, address4,
+ postal, phone, accountnumber,fax, url,
+ contact, contpos, contphone, contfax, contaltphone,
+ contemail, contnotes, active, listprice, invoiceprice,
+ gstreg, listincgst, invoiceincgst,gstrate, discount,
+ notes, deliverytime
)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
- ";
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
+ ;
my $sth = $dbh->prepare($query);
$sth->execute(
- $data->{'name'}, $data->{'address1'},
- $data->{'address2'}, $data->{'address3'},
- $data->{'address4'}, $data->{'postal'},
- $data->{'phone'}, $data->{'fax'},
- $data->{'url'}, $data->{'contact'},
- $data->{'contpos'}, $data->{'contphone'},
- $data->{'contfax'}, $data->{'contaltphone'},
- $data->{'contemail'}, $data->{'contnotes'},
- $data->{'active'}, $data->{'listprice'},
- $data->{'invoiceprice'}, $data->{'gstreg'},
- $data->{'listincgst'}, $data->{'invoiceincgst'},
- $data->{'discount'}, $data->{'notes'}
+ $data->{name} ,$data->{address1},
+ $data->{address2} ,$data->{address3},
+ $data->{address4} ,$data->{postal},
+ $data->{phone} ,$data->{accountnumber},
+ $data->{fax},
+ $data->{url} ,$data->{contact},
+ $data->{contpos} ,$data->{contphone},
+ $data->{contfax} ,$data->{contaltphone},
+ $data->{contemail} ,$data->{contnotes},
+ $data->{active} ,$data->{listprice},
+ $data->{invoiceprice} ,$data->{gstreg},
+ $data->{listincgst} ,$data->{invoiceincgst},
+ $data->{gstrate} ,$data->{discount},
+ $data->{notes} ,$data->{deliverytime},
);
# return the id of this new supplier
- # FIXME: no protection against simultaneous addition: max(id) might be wrong!
- $query = "
- SELECT max(id)
- FROM aqbooksellers
- ";
- $sth = $dbh->prepare($query);
- $sth->execute;
- return scalar($sth->fetchrow);
+ return $dbh->{'mysql_insertid'};
}
#-----------------------------------------------------------------#
=head2 ModBookseller
-&ModBookseller($bookseller);
+ModBookseller($bookseller);
Updates the information for a given bookseller. C<$bookseller> is a
reference-to-hash whose keys are the fields of the aqbooksellers table
sub ModBookseller {
my ($data) = @_;
my $dbh = C4::Context->dbh;
- my $query = "
- UPDATE aqbooksellers
+ return unless $data->{'id'};
+ my $query = 'UPDATE aqbooksellers
SET name=?,address1=?,address2=?,address3=?,address4=?,
- postal=?,phone=?,fax=?,url=?,contact=?,contpos=?,
+ postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
contphone=?,contfax=?,contaltphone=?,contemail=?,
contnotes=?,active=?,listprice=?, invoiceprice=?,
gstreg=?,listincgst=?,invoiceincgst=?,
- discount=?, notes=?, gstrate=?
- WHERE id=?
- ";
- my $sth = $dbh->prepare($query);
- $sth->execute(
+ discount=?,notes=?,gstrate=?,deliverytime=?
+ WHERE id=?';
+ my $sth = $dbh->prepare($query);
+ return $sth->execute(
$data->{'name'}, $data->{'address1'},
$data->{'address2'}, $data->{'address3'},
$data->{'address4'}, $data->{'postal'},
- $data->{'phone'}, $data->{'fax'},
+ $data->{'phone'}, $data->{'accountnumber'},
+ $data->{'fax'},
$data->{'url'}, $data->{'contact'},
$data->{'contpos'}, $data->{'contphone'},
$data->{'contfax'}, $data->{'contaltphone'},
$data->{'active'}, $data->{'listprice'},
$data->{'invoiceprice'}, $data->{'gstreg'},
$data->{'listincgst'}, $data->{'invoiceincgst'},
- $data->{'discount'},
- $data->{'notes'}, $data->{'gstrate'},
+ $data->{'discount'}, $data->{'notes'},
+ $data->{'gstrate'},
+ $data->{deliverytime},
$data->{'id'}
);
- $sth->finish;
}
=head2 DelBookseller
-&DelBookseller($booksellerid);
+DelBookseller($booksellerid);
-delete the supplier identified by $booksellerid
-This sub can be called only if the supplier has no order.
+delete the supplier record identified by $booksellerid
+This sub assumes it is called only if the supplier has no order.
=cut
+
sub DelBookseller {
- my ($id) = @_;
- my $dbh=C4::Context->dbh;
- my $sth=$dbh->prepare("DELETE FROM aqbooksellers WHERE id=?");
- $sth->execute($id);
+ my $id = shift;
+ my $dbh = C4::Context->dbh;
+ my $sth = $dbh->prepare('DELETE FROM aqbooksellers WHERE id=?');
+ return $sth->execute($id);
}
1;
=head1 AUTHOR
-Koha Developement team <info@koha.org>
+Koha Development Team <http://koha-community.org/>
=cut
projects / koha.git / blobdiff