use base qw( Exporter );
# set the version for version checking
-our $VERSION = 4.01;
+our $VERSION = 3.07.00.049;
our @EXPORT_OK = qw(
GetBookSeller GetBooksellersWithLateOrders GetBookSellerFromId
ModBookseller
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 $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);
( $vendor->{basketcount} ) = $dbh->selectrow_array(
'SELECT count(*) FROM aqbasket where booksellerid = ?',
{}, $id );
+ ( $vendor->{subscriptioncount} ) = $dbh->selectrow_array(
+ 'SELECT count(*) FROM subscription WHERE aqbooksellerid = ?',
+ {}, $id );
}
return $vendor;
}
=head2 GetBooksellersWithLateOrders
-%results = GetBooksellersWithLateOrders($delay);
+%results = GetBooksellersWithLateOrders( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto );
Searches for suppliers with late orders.
=cut
sub GetBooksellersWithLateOrders {
- my $delay = shift;
- my $dbh = C4::Context->dbh;
-
- # TODO delay should be verified
- my $query_string =
- "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))";
-
- my $sth = $dbh->prepare($query_string);
- $sth->execute;
+ 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
+
+ my $query;
+ my @query_params = ();
+ my $dbdriver = C4::Context->config("db_scheme") || "mysql";
+ $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)';
+ }
+ }
+ if ( defined $estimateddeliverydateto ) {
+ $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime,0) DAY) <= ?';
+ push @query_params, $estimateddeliverydateto;
+ }
+
+ my $sth = $dbh->prepare($query);
+ $sth->execute( @query_params );
my %supplierlist;
while ( my ( $id, $name ) = $sth->fetchrow ) {
$supplierlist{$id} = $name;
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, gstrate, 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->{'gstrate'},
- $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
sub ModBookseller {
my ($data) = @_;
my $dbh = C4::Context->dbh;
+ 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=?
+ discount=?,notes=?,gstrate=?,deliverytime=?
WHERE id=?';
my $sth = $dbh->prepare($query);
- $sth->execute(
+ 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->{'invoiceprice'}, $data->{'gstreg'},
$data->{'listincgst'}, $data->{'invoiceincgst'},
$data->{'discount'}, $data->{'notes'},
- $data->{'gstrate'}, $data->{'id'}
+ $data->{'gstrate'},
+ $data->{deliverytime},
+ $data->{'id'}
);
- return;
}
=head2 DelBookseller
my $id = shift;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare('DELETE FROM aqbooksellers WHERE id=?');
- $sth->execute($id);
- return;
+ return $sth->execute($id);
}
1;
projects / koha.git / blobdiff