Lines 19-25
use Modern::Perl;
Link Here
|
19 |
|
19 |
|
20 |
use POSIX qw(strftime); |
20 |
use POSIX qw(strftime); |
21 |
|
21 |
|
22 |
use Test::More tests => 63; |
22 |
use Test::More tests => 65; |
23 |
use Koha::Database; |
23 |
use Koha::Database; |
24 |
|
24 |
|
25 |
BEGIN { |
25 |
BEGIN { |
Lines 166-171
my ( $biblionumber1, $biblioitemnumber1 ) = AddBiblio( MARC::Record->new, '' );
Link Here
|
166 |
my ( $biblionumber2, $biblioitemnumber2 ) = AddBiblio( MARC::Record->new, '' ); |
166 |
my ( $biblionumber2, $biblioitemnumber2 ) = AddBiblio( MARC::Record->new, '' ); |
167 |
my ( $biblionumber3, $biblioitemnumber3 ) = AddBiblio( MARC::Record->new, '' ); |
167 |
my ( $biblionumber3, $biblioitemnumber3 ) = AddBiblio( MARC::Record->new, '' ); |
168 |
my ( $biblionumber4, $biblioitemnumber4 ) = AddBiblio( MARC::Record->new, '' ); |
168 |
my ( $biblionumber4, $biblioitemnumber4 ) = AddBiblio( MARC::Record->new, '' ); |
|
|
169 |
my ( $biblionumber5, $biblioitemnumber5 ) = AddBiblio( MARC::Record->new, '' ); |
169 |
|
170 |
|
170 |
# Prepare 5 orders, and make distinction beween fields to be tested with eq and with == |
171 |
# Prepare 5 orders, and make distinction beween fields to be tested with eq and with == |
171 |
# Ex : a price of 50.1 will be stored internally as 5.100000 |
172 |
# Ex : a price of 50.1 will be stored internally as 5.100000 |
Lines 256-266
my @order_content = (
Link Here
|
256 |
uncertainprice => 0, |
257 |
uncertainprice => 0, |
257 |
tax_rate_on_ordering => 0 |
258 |
tax_rate_on_ordering => 0 |
258 |
} |
259 |
} |
|
|
260 |
}, |
261 |
{ |
262 |
str => { |
263 |
basketno => $basketno, |
264 |
biblionumber => $biblionumber5, |
265 |
budget_id => $budget->{budget_id}, |
266 |
order_internalnote => "internal note", |
267 |
order_vendornote => "vendor note" |
268 |
}, |
269 |
num => { |
270 |
quantity => 1, |
271 |
ecost => 10, |
272 |
rrp => 10, |
273 |
listprice => 10, |
274 |
ecost => 10, |
275 |
rrp => 10, |
276 |
discount => 0, |
277 |
uncertainprice => 0, |
278 |
tax_rate => 0 |
279 |
} |
259 |
} |
280 |
} |
260 |
); |
281 |
); |
261 |
|
282 |
|
262 |
# Create 4 orders in database |
283 |
# Create 5 orders in database |
263 |
for ( 0 .. 4 ) { |
284 |
for ( 0 .. 5 ) { |
264 |
my %ocontent; |
285 |
my %ocontent; |
265 |
@ocontent{ keys %{ $order_content[$_]->{num} } } = |
286 |
@ocontent{ keys %{ $order_content[$_]->{num} } } = |
266 |
values %{ $order_content[$_]->{num} }; |
287 |
values %{ $order_content[$_]->{num} }; |
Lines 297-303
my $search_orders = SearchOrders({
Link Here
|
297 |
isa_ok( $search_orders, 'ARRAY' ); |
318 |
isa_ok( $search_orders, 'ARRAY' ); |
298 |
ok( |
319 |
ok( |
299 |
( |
320 |
( |
300 |
( scalar @$search_orders == 4 ) |
321 |
( scalar @$search_orders == 5 ) |
301 |
and !grep ( $_->{ordernumber} eq $ordernumbers[3], @$search_orders ) |
322 |
and !grep ( $_->{ordernumber} eq $ordernumbers[3], @$search_orders ) |
302 |
), |
323 |
), |
303 |
"SearchOrders only gets non-cancelled orders" |
324 |
"SearchOrders only gets non-cancelled orders" |
Lines 310-316
$search_orders = SearchOrders({
Link Here
|
310 |
}); |
331 |
}); |
311 |
ok( |
332 |
ok( |
312 |
( |
333 |
( |
313 |
( scalar @$search_orders == 3 ) and !grep ( ( |
334 |
( scalar @$search_orders == 4 ) and !grep ( ( |
314 |
( $_->{ordernumber} eq $ordernumbers[3] ) |
335 |
( $_->{ordernumber} eq $ordernumbers[3] ) |
315 |
or ( $_->{ordernumber} eq $ordernumbers[4] ) |
336 |
or ( $_->{ordernumber} eq $ordernumbers[4] ) |
316 |
), |
337 |
), |
Lines 367-373
$search_orders = SearchOrders({
Link Here
|
367 |
pending => 1, |
388 |
pending => 1, |
368 |
ordered => 1, |
389 |
ordered => 1, |
369 |
}); |
390 |
}); |
370 |
is( scalar (@$search_orders), 3, "SearchOrders with pending and ordered params gets only pending ordered orders. After closing the basket, orders are marked as 'ordered' (bug 11170)" ); |
391 |
is( scalar (@$search_orders), 4, "SearchOrders with pending and ordered params gets only pending ordered orders. After closing the basket, orders are marked as 'ordered' (bug 11170)" ); |
371 |
|
392 |
|
372 |
# |
393 |
# |
373 |
# Test AddClaim |
394 |
# Test AddClaim |
Lines 497-502
$order4 = GetOrder($order4->{ordernumber});
Link Here
|
497 |
ok((defined $order4->{datecancellationprinted}), "order is cancelled"); |
518 |
ok((defined $order4->{datecancellationprinted}), "order is cancelled"); |
498 |
ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\""); |
519 |
ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\""); |
499 |
ok((not defined GetBiblio($order4->{biblionumber})), "biblio does not exist anymore"); |
520 |
ok((not defined GetBiblio($order4->{biblionumber})), "biblio does not exist anymore"); |
|
|
521 |
|
522 |
my $order5 = GetOrder($ordernumbers[4]); |
523 |
C4::Items::AddItem( { barcode => '0102030405' }, $order5->{biblionumber} ); |
524 |
$error = DelOrder($order5->{biblionumber}, $order5->{ordernumber}, 1); |
525 |
$order5 = GetOrder($order5->{ordernumber}); |
526 |
ok((defined $order5->{datecancellationprinted}), "order is cancelled"); |
527 |
ok(GetBiblio($order5->{biblionumber}), "biblio still exists"); |
528 |
|
500 |
# End of tests for DelOrder |
529 |
# End of tests for DelOrder |
501 |
|
530 |
|
502 |
subtest 'ModOrder' => sub { |
531 |
subtest 'ModOrder' => sub { |