Bug 25266: Remove C4::Bookseller
This was the only occurrence of GetBooksellersWithLateOrders and it was the only subroutine of C4::Bookseller Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart
parent
9e1d4c978d
commit
3ce4024fcb
116
C4/Bookseller.pm
116
C4/Bookseller.pm
|
|
@ -1,116 +0,0 @@
|
|||
package C4::Bookseller;
|
||||
|
||||
# Copyright 2000-2002 Katipo Communications
|
||||
# Copyright 2010 PTFS Europe
|
||||
#
|
||||
# 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 base qw( Exporter );
|
||||
|
||||
our @EXPORT_OK = qw(
|
||||
GetBooksellersWithLateOrders
|
||||
);
|
||||
|
||||
=head1 NAME
|
||||
|
||||
C4::Bookseller - Koha functions for dealing with booksellers.
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
use C4::Bookseller;
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
The functions in this module deal with booksellers. They allow to
|
||||
add a new bookseller, to modify it or to get some informations around
|
||||
a bookseller.
|
||||
|
||||
=head1 FUNCTIONS
|
||||
|
||||
=head2 GetBooksellersWithLateOrders
|
||||
|
||||
%results = GetBooksellersWithLateOrders( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto );
|
||||
|
||||
Searches for suppliers with late orders.
|
||||
|
||||
=cut
|
||||
|
||||
sub GetBooksellersWithLateOrders {
|
||||
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 IS NULL
|
||||
OR aqorders.quantityreceived < aqorders.quantity
|
||||
)
|
||||
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 && $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;
|
||||
}
|
||||
|
||||
return %supplierlist;
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
__END__
|
||||
|
||||
=head1 AUTHOR
|
||||
|
||||
Koha Development Team <http://koha-community.org/>
|
||||
|
||||
=cut
|
||||
|
|
@ -45,7 +45,6 @@ To know on which branch this script have to display late order.
|
|||
|
||||
use Modern::Perl;
|
||||
use CGI qw ( -utf8 );
|
||||
use C4::Bookseller qw( GetBooksellersWithLateOrders );
|
||||
use C4::Auth;
|
||||
use C4::Koha;
|
||||
use C4::Output;
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
#
|
||||
# This Koha test module is a stub!
|
||||
# Add more tests here!!!
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Test::More tests => 1;
|
||||
|
||||
BEGIN {
|
||||
use_ok('C4::Bookseller');
|
||||
}
|
||||
|
||||
|
|
@ -1,786 +0,0 @@
|
|||
#!/usr/bin/perl
|
||||
|
||||
use Modern::Perl;
|
||||
|
||||
use Test::More tests => 86;
|
||||
use Test::MockModule;
|
||||
use Test::Warn;
|
||||
|
||||
use t::lib::TestBuilder;
|
||||
|
||||
use C4::Context;
|
||||
use Koha::DateUtils;
|
||||
use DateTime::Duration;
|
||||
use t::lib::Mocks;
|
||||
use C4::Acquisition;
|
||||
use C4::Serials;
|
||||
use C4::Budgets;
|
||||
use C4::Biblio;
|
||||
|
||||
use Koha::Acquisition::Booksellers;
|
||||
use Koha::Acquisition::Orders;
|
||||
use Koha::Database;
|
||||
|
||||
BEGIN {
|
||||
use_ok('C4::Bookseller');
|
||||
}
|
||||
|
||||
can_ok(
|
||||
|
||||
'C4::Bookseller', qw(
|
||||
GetBooksellersWithLateOrders
|
||||
)
|
||||
);
|
||||
|
||||
#Start transaction
|
||||
my $dbh = C4::Context->dbh;
|
||||
my $database = Koha::Database->new();
|
||||
my $schema = $database->schema();
|
||||
$schema->storage->txn_begin();
|
||||
my $builder = t::lib::TestBuilder->new;
|
||||
|
||||
#Start tests
|
||||
$dbh->do(q|DELETE FROM aqorders|);
|
||||
$dbh->do(q|DELETE FROM aqbasket|);
|
||||
$dbh->do(q|DELETE FROM aqbooksellers|);
|
||||
$dbh->do(q|DELETE FROM subscription|);
|
||||
|
||||
my $patron = $builder->build_object({ class => 'Koha::Patrons' });
|
||||
# Add currency
|
||||
my $curcode = $builder->build({ source => 'Currency' })->{currencycode};
|
||||
|
||||
#Test AddBookseller
|
||||
my $count = Koha::Acquisition::Booksellers->search()->count();
|
||||
my $sample_supplier1 = {
|
||||
name => 'Name1',
|
||||
address1 => 'address1_1',
|
||||
address2 => 'address1-2',
|
||||
address3 => 'address1_2',
|
||||
address4 => 'address1_2',
|
||||
postal => 'postal1',
|
||||
phone => 'phone1',
|
||||
accountnumber => 'accountnumber1',
|
||||
fax => 'fax1',
|
||||
url => 'url1',
|
||||
active => 1,
|
||||
gstreg => 1,
|
||||
listincgst => 1,
|
||||
invoiceincgst => 1,
|
||||
tax_rate => '1.0000',
|
||||
discount => 1.0000,
|
||||
notes => 'notes1',
|
||||
deliverytime => undef
|
||||
};
|
||||
my $sample_supplier2 = {
|
||||
name => 'Name2',
|
||||
address1 => 'address1_2',
|
||||
address2 => 'address2-2',
|
||||
address3 => 'address3_2',
|
||||
address4 => 'address4_2',
|
||||
postal => 'postal2',
|
||||
phone => 'phone2',
|
||||
accountnumber => 'accountnumber2',
|
||||
fax => 'fax2',
|
||||
url => 'url2',
|
||||
active => 1,
|
||||
gstreg => 1,
|
||||
listincgst => 1,
|
||||
invoiceincgst => 1,
|
||||
tax_rate => '2.0000',
|
||||
discount => 2.0000,
|
||||
notes => 'notes2',
|
||||
deliverytime => 2
|
||||
};
|
||||
|
||||
my $supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
|
||||
my $id_supplier1 = $supplier1->id;
|
||||
my $supplier2 = Koha::Acquisition::Bookseller->new($sample_supplier2)->store;
|
||||
my $id_supplier2 = $supplier2->id;
|
||||
|
||||
like( $id_supplier1, '/^\d+$/', "AddBookseller for supplier1 return an id" );
|
||||
like( $id_supplier2, '/^\d+$/', "AddBookseller for supplier2 return an id" );
|
||||
is( Koha::Acquisition::Booksellers->search()->count,
|
||||
$count + 2, "Supplier1 and Supplier2 have been added" );
|
||||
|
||||
#Test DelBookseller
|
||||
my $del = $supplier1->delete;
|
||||
is( ref($del), 'Koha::Acquisition::Bookseller', "DelBookseller returns the supplier object - supplier has been deleted " );
|
||||
my $b = Koha::Acquisition::Booksellers->find( $id_supplier1 );
|
||||
is( $b,
|
||||
undef, "Supplier1 has been deleted - id_supplier1 $id_supplier1 doesnt exist anymore" );
|
||||
|
||||
#Test get bookseller
|
||||
my @bookseller2 = Koha::Acquisition::Booksellers->search({name => $sample_supplier2->{name} });
|
||||
is( scalar(@bookseller2), 1, "Get only Supplier2" );
|
||||
for my $bookseller ( @bookseller2 ) {
|
||||
$bookseller = field_filter( $bookseller->unblessed );
|
||||
}
|
||||
|
||||
$sample_supplier2->{id} = $id_supplier2;
|
||||
is_deeply( cast_precision($bookseller2[0]), $sample_supplier2,
|
||||
"Koha::Acquisition::Booksellers->search returns the right informations about supplier $sample_supplier2->{name}" );
|
||||
|
||||
$supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
|
||||
$id_supplier1 = $supplier1->id;
|
||||
my @booksellers = Koha::Acquisition::Booksellers->search();
|
||||
for my $bookseller ( @booksellers ) {
|
||||
$bookseller = field_filter( $bookseller->unblessed );
|
||||
$bookseller = cast_precision($bookseller);
|
||||
}
|
||||
|
||||
$sample_supplier1->{id} = $id_supplier1;
|
||||
is( scalar(@booksellers), $count + 2, "Get Supplier1 and Supplier2" );
|
||||
my @tab = ( $sample_supplier2, $sample_supplier1 );
|
||||
is_deeply( \@booksellers, \@tab,
|
||||
"Returns right fields of Supplier1 and Supplier2" );
|
||||
|
||||
#Test baskets
|
||||
my @bookseller1 = Koha::Acquisition::Booksellers->search({name => $sample_supplier1->{name} });
|
||||
is( $bookseller1[0]->baskets->count, 0, 'Supplier1 has 0 basket' );
|
||||
my $basketno1 =
|
||||
C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname1' );
|
||||
my $basketno2 =
|
||||
C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname2' );
|
||||
@bookseller1 = Koha::Acquisition::Booksellers->search({ name => $sample_supplier1->{name} });
|
||||
is( $bookseller1[0]->baskets->count, 2, 'Supplier1 has 2 baskets' );
|
||||
|
||||
#Test Koha::Acquisition::Bookseller->new using id
|
||||
my $bookseller1fromid = Koha::Acquisition::Booksellers->find;
|
||||
is( $bookseller1fromid, undef,
|
||||
"find returns undef if no id given" );
|
||||
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
|
||||
$bookseller1fromid = field_filter($bookseller1fromid->unblessed);
|
||||
is_deeply( cast_precision($bookseller1fromid), $sample_supplier1,
|
||||
"Get Supplier1 (find a bookseller by id)" );
|
||||
|
||||
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
|
||||
is( $bookseller1fromid->baskets->count, 2, 'Supplier1 has 2 baskets' );
|
||||
|
||||
#Test subscriptions
|
||||
my $dt_today = dt_from_string;
|
||||
my $today = output_pref({ dt => $dt_today, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
|
||||
|
||||
my $dt_today1 = dt_from_string;
|
||||
my $dur5 = DateTime::Duration->new( days => -5 );
|
||||
$dt_today1->add_duration($dur5);
|
||||
my $daysago5 = output_pref({ dt => $dt_today1, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
|
||||
|
||||
my $budgetperiod = C4::Budgets::AddBudgetPeriod({
|
||||
budget_period_startdate => $daysago5,
|
||||
budget_period_enddate => $today,
|
||||
budget_period_description => "budget desc"
|
||||
});
|
||||
my $id_budget = AddBudget({
|
||||
budget_code => "CODE",
|
||||
budget_amount => "123.132",
|
||||
budget_name => "Budgetname",
|
||||
budget_notes => "This is a note",
|
||||
budget_period_id => $budgetperiod
|
||||
});
|
||||
my $bib = MARC::Record->new();
|
||||
$bib->append_fields(
|
||||
MARC::Field->new('245', ' ', ' ', a => 'Journal of ethnology'),
|
||||
MARC::Field->new('500', ' ', ' ', a => 'bib notes'),
|
||||
);
|
||||
my ($biblionumber, $biblioitemnumber) = AddBiblio($bib, '');
|
||||
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
|
||||
is( $bookseller1fromid->subscriptions->count,
|
||||
0, 'Supplier1 has 0 subscription' );
|
||||
|
||||
my $id_subscription1 = NewSubscription(
|
||||
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
|
||||
'2013-01-01',undef, undef, undef, undef,
|
||||
undef, undef, undef, undef, undef, undef,
|
||||
1, "subscription notes",undef, '2013-01-01', undef, undef,
|
||||
undef, 'CALL ABC', 0, "intnotes", 0,
|
||||
undef, undef, 0, undef, '2013-11-30', 0
|
||||
);
|
||||
|
||||
my @subscriptions = SearchSubscriptions({biblionumber => $biblionumber});
|
||||
is($subscriptions[0]->{publicnotes}, 'subscription notes', 'subscription search results include public notes (bug 10689)');
|
||||
|
||||
my $id_subscription2 = NewSubscription(
|
||||
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
|
||||
'2013-01-01',undef, undef, undef, undef,
|
||||
undef, undef, undef, undef, undef, undef,
|
||||
1, "subscription notes",undef, '2013-01-01', undef, undef,
|
||||
undef, 'CALL DEF', 0, "intnotes", 0,
|
||||
undef, undef, 0, undef, '2013-07-31', 0
|
||||
);
|
||||
|
||||
$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
|
||||
is( $bookseller1fromid->subscriptions->count,
|
||||
2, 'Supplier1 has 2 subscriptions' );
|
||||
|
||||
#Test ModBookseller
|
||||
$sample_supplier2 = {
|
||||
id => $id_supplier2,
|
||||
name => 'Name2 modified',
|
||||
address1 => 'address1_2 modified',
|
||||
address2 => 'address2-2 modified',
|
||||
address3 => 'address3_2 modified',
|
||||
address4 => 'address4_2 modified',
|
||||
postal => 'postal2 modified',
|
||||
phone => 'phone2 modified',
|
||||
accountnumber => 'accountnumber2 modified',
|
||||
fax => 'fax2 modified',
|
||||
url => 'url2 modified',
|
||||
active => 1,
|
||||
gstreg => 1,
|
||||
listincgst => 1,
|
||||
invoiceincgst => 1,
|
||||
tax_rate => '2.0000',
|
||||
discount => 2.0000,
|
||||
notes => 'notes2 modified',
|
||||
deliverytime => 2,
|
||||
};
|
||||
|
||||
my $modif1 = Koha::Acquisition::Booksellers->find($id_supplier2)->set($sample_supplier2)->store;
|
||||
is( ref $modif1, 'Koha::Acquisition::Bookseller', "ModBookseller has updated the bookseller" );
|
||||
is( Koha::Acquisition::Booksellers->search->count,
|
||||
$count + 2, "Supplier2 has been modified - Nothing added" );
|
||||
$supplier2 = Koha::Acquisition::Booksellers->find($id_supplier2);
|
||||
is( $supplier2->name, 'Name2 modified', "supplier's name should have been modified" );
|
||||
|
||||
#Test GetBooksellersWithLateOrders
|
||||
#Add 2 suppliers
|
||||
my $sample_supplier3 = {
|
||||
name => 'Name3',
|
||||
address1 => 'address1_3',
|
||||
address2 => 'address1-3',
|
||||
address3 => 'address1_3',
|
||||
address4 => 'address1_3',
|
||||
postal => 'postal3',
|
||||
phone => 'phone3',
|
||||
accountnumber => 'accountnumber3',
|
||||
fax => 'fax3',
|
||||
url => 'url3',
|
||||
active => 1,
|
||||
gstreg => 1,
|
||||
listincgst => 1,
|
||||
invoiceincgst => 1,
|
||||
tax_rate => '3.0000',
|
||||
discount => 3.0000,
|
||||
notes => 'notes3',
|
||||
deliverytime => 3
|
||||
};
|
||||
my $sample_supplier4 = {
|
||||
name => 'Name4',
|
||||
address1 => 'address1_4',
|
||||
address2 => 'address1-4',
|
||||
address3 => 'address1_4',
|
||||
address4 => 'address1_4',
|
||||
postal => 'postal4',
|
||||
phone => 'phone4',
|
||||
accountnumber => 'accountnumber4',
|
||||
fax => 'fax4',
|
||||
url => 'url4',
|
||||
active => 1,
|
||||
gstreg => 1,
|
||||
listincgst => 1,
|
||||
invoiceincgst => 1,
|
||||
tax_rate => '3.0000',
|
||||
discount => 3.0000,
|
||||
notes => 'notes3',
|
||||
};
|
||||
my $supplier3 = Koha::Acquisition::Bookseller->new($sample_supplier3)->store;
|
||||
my $id_supplier3 = $supplier3->id;
|
||||
my $supplier4 = Koha::Acquisition::Bookseller->new($sample_supplier4)->store;
|
||||
my $id_supplier4 = $supplier4->id;
|
||||
|
||||
#Add 2 baskets
|
||||
my $basketno3 =
|
||||
C4::Acquisition::NewBasket( $id_supplier3, $patron->borrowernumber, 'basketname3',
|
||||
'basketnote3' );
|
||||
my $basketno4 =
|
||||
C4::Acquisition::NewBasket( $id_supplier4, $patron->borrowernumber, 'basketname4',
|
||||
'basketnote4' );
|
||||
|
||||
#Modify the basket to add a close date
|
||||
my $basket1info = {
|
||||
basketno => $basketno1,
|
||||
closedate => $today,
|
||||
booksellerid => $id_supplier1
|
||||
};
|
||||
|
||||
my $basket2info = {
|
||||
basketno => $basketno2,
|
||||
closedate => $daysago5,
|
||||
booksellerid => $id_supplier2
|
||||
};
|
||||
|
||||
my $dt_today2 = dt_from_string;
|
||||
my $dur10 = DateTime::Duration->new( days => -10 );
|
||||
$dt_today2->add_duration($dur10);
|
||||
my $daysago10 = output_pref({ dt => $dt_today2, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
|
||||
my $basket3info = {
|
||||
basketno => $basketno3,
|
||||
closedate => $daysago10,
|
||||
};
|
||||
|
||||
my $basket4info = {
|
||||
basketno => $basketno4,
|
||||
closedate => $today,
|
||||
};
|
||||
ModBasket($basket1info);
|
||||
ModBasket($basket2info);
|
||||
ModBasket($basket3info);
|
||||
ModBasket($basket4info);
|
||||
|
||||
#Add 1 subscription
|
||||
my $id_subscription3 = NewSubscription(
|
||||
undef, "BRANCH1", $id_supplier1, undef, $id_budget, $biblionumber,
|
||||
'2013-01-01',undef, undef, undef, undef,
|
||||
undef, undef, undef, undef, undef, undef,
|
||||
1, "subscription notes",undef, '2013-01-01', undef, undef,
|
||||
undef, undef, 0, "intnotes", 0,
|
||||
undef, undef, 0, 'LOCA', '2013-12-31', 0
|
||||
);
|
||||
|
||||
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
|
||||
is(scalar(@subscriptions), 3, 'search for subscriptions by expiration date');
|
||||
@subscriptions = SearchSubscriptions({expiration_date => '2013-08-15'});
|
||||
is(scalar(@subscriptions), 1, 'search for subscriptions by expiration date');
|
||||
@subscriptions = SearchSubscriptions({callnumber => 'CALL'});
|
||||
is(scalar(@subscriptions), 2, 'search for subscriptions by call number');
|
||||
@subscriptions = SearchSubscriptions({callnumber => 'DEF'});
|
||||
is(scalar(@subscriptions), 1, 'search for subscriptions by call number');
|
||||
@subscriptions = SearchSubscriptions({location => 'LOCA'});
|
||||
is(scalar(@subscriptions), 1, 'search for subscriptions by location');
|
||||
|
||||
#Add 4 orders
|
||||
my $order1 = Koha::Acquisition::Order->new(
|
||||
{
|
||||
basketno => $basketno1,
|
||||
quantity => 24,
|
||||
biblionumber => $biblionumber,
|
||||
budget_id => $id_budget,
|
||||
entrydate => '2013-01-01',
|
||||
currency => $curcode,
|
||||
notes => "This is a note1",
|
||||
tax_rate => 0.0500,
|
||||
orderstatus => 1,
|
||||
subscriptionid => $id_subscription1,
|
||||
quantityreceived => 2,
|
||||
rrp => 10,
|
||||
ecost => 10,
|
||||
datereceived => '2013-06-01'
|
||||
}
|
||||
)->store;
|
||||
my $ordernumber1 = $order1->ordernumber;
|
||||
|
||||
my $order2 = Koha::Acquisition::Order->new(
|
||||
{
|
||||
basketno => $basketno2,
|
||||
quantity => 20,
|
||||
biblionumber => $biblionumber,
|
||||
budget_id => $id_budget,
|
||||
entrydate => '2013-01-01',
|
||||
currency => $curcode,
|
||||
notes => "This is a note2",
|
||||
tax_rate => 0.0500,
|
||||
orderstatus => 1,
|
||||
subscriptionid => $id_subscription2,
|
||||
rrp => 10,
|
||||
ecost => 10,
|
||||
}
|
||||
)->store;
|
||||
my $ordernumber2 = $order2->ordernumber;
|
||||
|
||||
my $order3 = Koha::Acquisition::Order->new(
|
||||
{
|
||||
basketno => $basketno3,
|
||||
quantity => 20,
|
||||
biblionumber => $biblionumber,
|
||||
budget_id => $id_budget,
|
||||
entrydate => '2013-02-02',
|
||||
currency => $curcode,
|
||||
notes => "This is a note3",
|
||||
tax_rate => 0.0500,
|
||||
orderstatus => 2,
|
||||
subscriptionid => $id_subscription3,
|
||||
rrp => 11,
|
||||
ecost => 11,
|
||||
}
|
||||
)->store;
|
||||
my $ordernumber3 = $order3->ordernumber;
|
||||
|
||||
my $order4 = Koha::Acquisition::Order->new(
|
||||
{
|
||||
basketno => $basketno4,
|
||||
quantity => 20,
|
||||
biblionumber => $biblionumber,
|
||||
budget_id => $id_budget,
|
||||
entrydate => '2013-02-02',
|
||||
currency => $curcode,
|
||||
notes => "This is a note3",
|
||||
tax_rate => 0.0500,
|
||||
orderstatus => 2,
|
||||
subscriptionid => $id_subscription3,
|
||||
rrp => 11,
|
||||
ecost => 11,
|
||||
quantityreceived => 20
|
||||
}
|
||||
)->store;
|
||||
my $ordernumber4 = $order4->ordernumber;
|
||||
|
||||
#Test cases:
|
||||
# Sample datas :
|
||||
# Supplier1: delivery -> undef Basket1 : closedate -> today
|
||||
# Supplier2: delivery -> 2 Basket2 : closedate -> $daysago5
|
||||
# Supplier3: delivery -> 3 Basket3 : closedate -> $daysago10
|
||||
#Case 1 : Without parameters:
|
||||
# quantityreceived < quantity AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
|
||||
# datereceived !null AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
|
||||
# datereceived !null AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
my %suppliers = C4::Bookseller::GetBooksellersWithLateOrders();
|
||||
ok( exists( $suppliers{$id_supplier1} ), "Supplier1 has late orders" );
|
||||
ok( exists( $suppliers{$id_supplier2} ), "Supplier2 has late orders" );
|
||||
ok( exists( $suppliers{$id_supplier3} ), "Supplier3 has late orders" );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" )
|
||||
; # Quantity = quantityreceived
|
||||
|
||||
#Case 2: With $delay = 4
|
||||
# today + 0 > now-$delay -NOT LATE-
|
||||
# (today-5) + 2 <= now() - $delay -NOT LATE-
|
||||
# (today-10) + 3 <= now() - $delay -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 4, undef, undef );
|
||||
isnt( exists( $suppliers{$id_supplier1} ),
|
||||
1, "Supplier1 has late orders but today > now() - 4 days" );
|
||||
isnt( exists( $suppliers{$id_supplier2} ),
|
||||
1, "Supplier2 has late orders and $daysago5 <= now() - (4 days+2)" );
|
||||
ok( exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier3 has late orders and $daysago10 <= now() - (4 days+3)" );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 3: With $delay = -1
|
||||
my $bslo;
|
||||
warning_like
|
||||
{ $bslo = C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ) }
|
||||
qr/^WARNING: GetBooksellerWithLateOrders is called with a negative value/,
|
||||
"GetBooksellerWithLateOrders prints a warning on negative values";
|
||||
|
||||
is( $bslo, undef, "-1 is a wrong value for a delay" );
|
||||
|
||||
#Case 4: With $delay = 0
|
||||
# today == now-0 -LATE- (if no deliverytime or deliverytime == 0)
|
||||
# today-5 <= now() - $delay+2 -LATE-
|
||||
# today-10 <= now() - $delay+3 -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 0, undef, undef );
|
||||
|
||||
ok( exists( $suppliers{$id_supplier1} ),
|
||||
"Supplier1 has late orders but $today == now() - 0 days" )
|
||||
;
|
||||
ok( exists( $suppliers{$id_supplier2} ),
|
||||
"Supplier2 has late orders and $daysago5 <= now() - 2" );
|
||||
ok( exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier3 has late orders and $daysago10 <= now() - 3" );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 5 : With $estimateddeliverydatefrom = today-4
|
||||
# today >= today-4 -NOT LATE-
|
||||
# (today-5)+ 2 days >= today-4 -LATE-
|
||||
# (today-10) + 3 days < today-4 -NOT LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
my $dt_today3 = dt_from_string;
|
||||
my $dur4 = DateTime::Duration->new( days => -4 );
|
||||
$dt_today3->add_duration($dur4);
|
||||
my $daysago4 = output_pref({ dt => $dt_today3, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago4, undef );
|
||||
|
||||
ok( exists( $suppliers{$id_supplier1} ),
|
||||
"Supplier1 has late orders and $today >= $daysago4 -deliverytime undef" );
|
||||
ok( exists( $suppliers{$id_supplier2} ),
|
||||
"Supplier2 has late orders and $daysago5 + 2 days >= $daysago4 " );
|
||||
isnt( exists( $suppliers{$id_supplier3} ),
|
||||
1, "Supplier3 has late orders and $daysago10 + 5 days < $daysago4 " );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 6: With $estimateddeliverydatefrom =today-10 and $estimateddeliverydateto = today - 5
|
||||
# $daysago10<$daysago5<today -NOT LATE-
|
||||
# $daysago10<$daysago5<$daysago5 +2 -NOT lATE-
|
||||
# $daysago10<$daysago10 +3 <$daysago5 -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10,
|
||||
$daysago5 );
|
||||
isnt( exists( $suppliers{$id_supplier1} ),
|
||||
1, "Supplier1 has late orders but $daysago10 < $daysago5 < $today" );
|
||||
isnt(
|
||||
exists( $suppliers{$id_supplier2} ),
|
||||
1,
|
||||
"Supplier2 has late orders but $daysago10 < $daysago5 < $daysago5+2"
|
||||
);
|
||||
ok(
|
||||
exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier3 has late orders and $daysago10 <= $daysago10 +3 <= $daysago5"
|
||||
);
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 7: With $estimateddeliverydateto = today-5
|
||||
# $today >= $daysago5 -NOT LATE-
|
||||
# $daysago5 + 2 days > $daysago5 -NOT LATE-
|
||||
# $daysago10 + 3 <+ $daysago5 -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( undef, undef, $daysago5 );
|
||||
isnt( exists( $suppliers{$id_supplier1} ),
|
||||
1,
|
||||
"Supplier1 has late orders but $today >= $daysago5 - deliverytime undef" );
|
||||
isnt( exists( $suppliers{$id_supplier2} ),
|
||||
1, "Supplier2 has late orders but $daysago5 + 2 days > $daysago5 " );
|
||||
ok( exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier3 has late orders and $daysago10 + 3 <= $daysago5" );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Test with $estimateddeliverydatefrom and $estimateddeliverydateto and $delay
|
||||
#Case 8 :With $estimateddeliverydatefrom = 2013-07-05 and $estimateddeliverydateto = 2013-07-08 and $delay =5
|
||||
# $daysago4<today<=$today and $today<now()-3 -NOT LATE-
|
||||
# $daysago4 < $daysago5 + 2days <= today and $daysago5 <= now()-3+2 days -LATE-
|
||||
# $daysago4 > $daysago10 + 3days < today and $daysago10 <= now()-3+3 days -NOT LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( 3, $daysago4, $today );
|
||||
isnt(
|
||||
exists( $suppliers{$id_supplier1} ),
|
||||
1,
|
||||
"Supplier1 has late orders but $daysago4<today<=$today and $today<now()-3"
|
||||
);
|
||||
ok(
|
||||
exists( $suppliers{$id_supplier2} ),
|
||||
"Supplier2 has late orders and $daysago4 < $daysago5 + 2days <= today and $daysago5 <= now()-3+2 days"
|
||||
);
|
||||
isnt(
|
||||
exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier3 has late orders but $daysago4 > $daysago10 + 3days < today and $daysago10 <= now()-3+3 days"
|
||||
);
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 9 :With $estimateddeliverydatefrom = $daysago5 and $delay = 3
|
||||
# $today < $daysago5 and $today > $today-5 -NOT LATE-
|
||||
# $daysago5 + 2 days >= $daysago5 and $daysago5 < today - 3+2 -LATE-
|
||||
# $daysago10 + 3 days < $daysago5 and $daysago10 < today -3+2-NOT LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( 3, $daysago5, undef );
|
||||
isnt( exists( $suppliers{$id_supplier1} ),
|
||||
1, "$today < $daysago10 and $today > $today-3" );
|
||||
ok(
|
||||
exists( $suppliers{$id_supplier2} ),
|
||||
"Supplier2 has late orders and $daysago5 + 2 days >= $daysago5 and $daysago5 < today - 3+2"
|
||||
);
|
||||
isnt(
|
||||
exists( $suppliers{$id_supplier3} ),
|
||||
1,
|
||||
"Supplier2 has late orders but $daysago10 + 3 days < $daysago5 and $daysago10 < today -3+2 "
|
||||
);
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Test with $estimateddeliverydateto and $delay
|
||||
#Case 10:With $estimateddeliverydateto = $daysago5 and $delay = 5
|
||||
# today > $daysago5 today > now() -5 -NOT LATE-
|
||||
# $daysago5 + 2 days > $daysago5 and $daysago5 > now() - 2+5 days -NOT LATE-
|
||||
# $daysago10 + 3 days <= $daysago5 and $daysago10 <= now() - 3+5 days -LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( 5, undef, $daysago5 );
|
||||
isnt( exists( $suppliers{$id_supplier1} ),
|
||||
1, "Supplier2 has late orders but today > $daysago5 today > now() -5" );
|
||||
isnt(
|
||||
exists( $suppliers{$id_supplier2} ),
|
||||
1,
|
||||
"Supplier2 has late orders but $daysago5 + 2 days > $daysago5 and $daysago5 > now() - 2+5 days"
|
||||
);
|
||||
ok(
|
||||
exists( $suppliers{$id_supplier3} ),
|
||||
"Supplier2 has late orders and $daysago10 + 3 days <= $daysago5 and $daysago10 <= now() - 3+5 days "
|
||||
);
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 11: With $estimateddeliverydatefrom =today-10 and $estimateddeliverydateto = today - 10
|
||||
# $daysago10==$daysago10==$daysago10 -NOT LATE-
|
||||
# $daysago10==$daysago10<$daysago5+2-NOT lATE-
|
||||
# $daysago10==$daysago10 <$daysago10+3-LATE-
|
||||
# quantityreceived = quantity -NOT LATE-
|
||||
|
||||
#Basket1 closedate -> $daysago10
|
||||
$basket1info = {
|
||||
basketno => $basketno1,
|
||||
closedate => $daysago10,
|
||||
};
|
||||
ModBasket($basket1info);
|
||||
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10,
|
||||
$daysago10 );
|
||||
ok( exists( $suppliers{$id_supplier1} ),
|
||||
"Supplier1 has late orders and $daysago10==$daysago10==$daysago10 " )
|
||||
;
|
||||
isnt( exists( $suppliers{$id_supplier2} ),
|
||||
1,
|
||||
"Supplier2 has late orders but $daysago10==$daysago10<$daysago5+2" );
|
||||
isnt( exists( $suppliers{$id_supplier3} ),
|
||||
1,
|
||||
"Supplier3 has late orders but $daysago10==$daysago10 <$daysago10+3" );
|
||||
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
|
||||
|
||||
#Case 12: closedate == $estimateddeliverydatefrom =today-10
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10, undef );
|
||||
ok( exists( $suppliers{$id_supplier1} ),
|
||||
"Supplier1 has late orders and $daysago10==$daysago10 " );
|
||||
|
||||
#Case 13: closedate == $estimateddeliverydateto =today-10
|
||||
%suppliers =
|
||||
C4::Bookseller::GetBooksellersWithLateOrders( undef, undef, $daysago10 );
|
||||
ok( exists( $suppliers{$id_supplier1} ),
|
||||
"Supplier1 has late orders and $daysago10==$daysago10 " )
|
||||
;
|
||||
|
||||
t::lib::Mocks::mock_userenv({ flags => 0, branchcode => 'BRANCH1' });
|
||||
|
||||
my $module = Test::MockModule->new('C4::Auth');
|
||||
$module->mock(
|
||||
'haspermission',
|
||||
sub {
|
||||
# simulate user that has serials permissions but
|
||||
# NOT superserials
|
||||
my ($userid, $flagsrequired) = @_;
|
||||
return 0 if 'superserials' eq ($flagsrequired->{serials} // 0);
|
||||
return exists($flagsrequired->{serials});
|
||||
}
|
||||
);
|
||||
|
||||
t::lib::Mocks::mock_preference('IndependentBranches', 0);
|
||||
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
|
||||
is(
|
||||
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
|
||||
3,
|
||||
'ordinary user can see all subscriptions with IndependentBranches off'
|
||||
);
|
||||
|
||||
t::lib::Mocks::mock_preference('IndependentBranches', 1);
|
||||
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
|
||||
is(
|
||||
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
|
||||
1,
|
||||
'ordinary user can see only their library\'s subscriptions with IndependentBranches on'
|
||||
);
|
||||
|
||||
# don the cape and turn into Superlibrarian!
|
||||
t::lib::Mocks::mock_userenv({ flags => 1, branchcode => 'BRANCH1' });
|
||||
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
|
||||
is(
|
||||
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
|
||||
3,
|
||||
'superlibrarian can see all subscriptions with IndependentBranches on (bug 12048)'
|
||||
);
|
||||
|
||||
#Test contact editing
|
||||
my $sample_supplier = {
|
||||
name => "my vendor",
|
||||
address1 => "bookseller's address",
|
||||
phone => "0123456",
|
||||
active => 1
|
||||
};
|
||||
my $supplier = Koha::Acquisition::Bookseller->new($sample_supplier)->store;
|
||||
my $booksellerid = $supplier->id;
|
||||
my $contact1 = Koha::Acquisition::Bookseller::Contact->new({
|
||||
name => 'John Smith',
|
||||
phone => '0123456x1',
|
||||
booksellerid => $booksellerid,
|
||||
})->store;
|
||||
my $contact2 = Koha::Acquisition::Bookseller::Contact->new({
|
||||
name => 'Leo Tolstoy',
|
||||
phone => '0123456x2',
|
||||
booksellerid => $booksellerid,
|
||||
})->store;
|
||||
|
||||
@booksellers = Koha::Acquisition::Booksellers->search({ name => 'my vendor' });
|
||||
ok(
|
||||
( grep { $_->id == $booksellerid } @booksellers ),
|
||||
'Koha::Acquisition::Booksellers->search returns correct record when passed a name'
|
||||
);
|
||||
|
||||
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
|
||||
is( $bookseller->id, $booksellerid, 'Retrieved desired record' );
|
||||
is( $bookseller->phone, '0123456', 'New bookseller has expected phone' );
|
||||
my $contacts = $bookseller->contacts;
|
||||
is( $contacts->count,
|
||||
2, 'bookseller should have 2 contacts' );
|
||||
my $first_contact = $contacts->next;
|
||||
is(
|
||||
ref $first_contact,
|
||||
'Koha::Acquisition::Bookseller::Contact',
|
||||
'First contact is a AqContact'
|
||||
);
|
||||
is( $first_contact->phone,
|
||||
'0123456x1', 'Contact has expected phone number' );
|
||||
|
||||
my $second_contact = $contacts->next;
|
||||
$second_contact->delete;
|
||||
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
|
||||
$bookseller->name('your vendor')->store;
|
||||
$contacts = $bookseller->contacts;
|
||||
$first_contact = $contacts->next;
|
||||
$first_contact->phone('654321');
|
||||
$first_contact->store;
|
||||
|
||||
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
|
||||
is( $bookseller->name, 'your vendor',
|
||||
'Successfully changed name of vendor' );
|
||||
$contacts = $bookseller->contacts;
|
||||
is( $contacts->count,
|
||||
1, 'Only one contact after modification' );
|
||||
$first_contact = $contacts->next;
|
||||
is( $first_contact->phone,
|
||||
'654321',
|
||||
'Successfully changed contact phone number by modifying bookseller hash' );
|
||||
|
||||
$first_contact->name( 'John Jacob Jingleheimer Schmidt' );
|
||||
$first_contact->phone(undef);
|
||||
$first_contact->store;
|
||||
|
||||
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
|
||||
$contacts = $bookseller->contacts;
|
||||
$first_contact = $contacts->next;
|
||||
is(
|
||||
$first_contact->name,
|
||||
'John Jacob Jingleheimer Schmidt',
|
||||
'Changed name of contact'
|
||||
);
|
||||
is( $first_contact->phone,
|
||||
undef, 'Removed phone number from contact' );
|
||||
is( $contacts->count,
|
||||
1, 'Only one contact after modification' );
|
||||
|
||||
#End transaction
|
||||
$schema->storage->txn_rollback();
|
||||
|
||||
#field_filter filters the useless fields or foreign keys
|
||||
#NOTE: all the fields of aqbookseller arent considered
|
||||
#returns a cleaned structure
|
||||
sub field_filter {
|
||||
my ($struct) = @_;
|
||||
|
||||
for my $field ( qw(invoiceprice listprice contacts) )
|
||||
{
|
||||
|
||||
if ( grep { /^$field$/ } keys %$struct ) {
|
||||
delete $struct->{$field};
|
||||
}
|
||||
}
|
||||
return $struct;
|
||||
}
|
||||
|
||||
# ensure numbers are actually tested as numbers to prevent
|
||||
# precision changes causing test failures (D8->D9 Upgrades)
|
||||
sub cast_precision {
|
||||
my ($struct) = @_;
|
||||
my @cast = ('discount');
|
||||
for my $cast (@cast) {
|
||||
$struct->{$cast} = $struct->{$cast}+0;
|
||||
}
|
||||
return $struct;
|
||||
}
|
||||
Loading…
Reference in New Issue