Lines 127-135
is_deeply( \@booksellers, \@tab,
Link Here
|
127 |
my @bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} ); |
127 |
my @bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} ); |
128 |
#FIXME : if there is 0 basket, GetBookSeller returns 1 as basketcount |
128 |
#FIXME : if there is 0 basket, GetBookSeller returns 1 as basketcount |
129 |
#is( $bookseller1[0]->{basketcount}, 0, 'Supplier1 has 0 basket' ); |
129 |
#is( $bookseller1[0]->{basketcount}, 0, 'Supplier1 has 0 basket' ); |
130 |
my $sample_basket1 = |
130 |
my $basketno1 = |
131 |
C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' ); |
131 |
C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' ); |
132 |
my $sample_basket2 = |
132 |
my $basketno2 = |
133 |
C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' ); |
133 |
C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' ); |
134 |
@bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} ); |
134 |
@bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} ); |
135 |
is( $bookseller1[0]->{basketcount}, 2, 'Supplier1 has 2 baskets' ); |
135 |
is( $bookseller1[0]->{basketcount}, 2, 'Supplier1 has 2 baskets' ); |
Lines 290-311
my $id_supplier3 = C4::Bookseller::AddBookseller($sample_supplier3);
Link Here
|
290 |
my $id_supplier4 = C4::Bookseller::AddBookseller($sample_supplier4); |
290 |
my $id_supplier4 = C4::Bookseller::AddBookseller($sample_supplier4); |
291 |
|
291 |
|
292 |
#Add 2 baskets |
292 |
#Add 2 baskets |
293 |
my $sample_basket3 = |
293 |
my $basketno3 = |
294 |
C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3', |
294 |
C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3', |
295 |
'basketnote3' ); |
295 |
'basketnote3' ); |
296 |
my $sample_basket4 = |
296 |
my $basketno4 = |
297 |
C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4', |
297 |
C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4', |
298 |
'basketnote4' ); |
298 |
'basketnote4' ); |
299 |
|
299 |
|
300 |
#Modify the basket to add a close date |
300 |
#Modify the basket to add a close date |
301 |
my $basket1info = { |
301 |
my $basket1info = { |
302 |
basketno => $sample_basket1, |
302 |
basketno => $basketno1, |
303 |
closedate => $today, |
303 |
closedate => $today, |
304 |
booksellerid => $id_supplier1 |
304 |
booksellerid => $id_supplier1 |
305 |
}; |
305 |
}; |
306 |
|
306 |
|
307 |
my $basket2info = { |
307 |
my $basket2info = { |
308 |
basketno => $sample_basket2, |
308 |
basketno => $basketno2, |
309 |
closedate => $daysago5, |
309 |
closedate => $daysago5, |
310 |
booksellerid => $id_supplier2 |
310 |
booksellerid => $id_supplier2 |
311 |
}; |
311 |
}; |
Lines 315-326
my $dur10 = DateTime::Duration->new( days => -10 );
Link Here
|
315 |
$dt_today2->add_duration($dur10); |
315 |
$dt_today2->add_duration($dur10); |
316 |
my $daysago10 = output_pref({ dt => $dt_today2, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }); |
316 |
my $daysago10 = output_pref({ dt => $dt_today2, dateformat => 'iso', timeformat => '24hr', dateonly => 1 }); |
317 |
my $basket3info = { |
317 |
my $basket3info = { |
318 |
basketno => $sample_basket3, |
318 |
basketno => $basketno3, |
319 |
closedate => $daysago10, |
319 |
closedate => $daysago10, |
320 |
}; |
320 |
}; |
321 |
|
321 |
|
322 |
my $basket4info = { |
322 |
my $basket4info = { |
323 |
basketno => $sample_basket4, |
323 |
basketno => $basketno4, |
324 |
closedate => $today, |
324 |
closedate => $today, |
325 |
}; |
325 |
}; |
326 |
ModBasket($basket1info); |
326 |
ModBasket($basket1info); |
Lines 351-360
is(scalar(@subscriptions), 1, 'search for subscriptions by location');
Link Here
|
351 |
|
351 |
|
352 |
#Add 4 orders |
352 |
#Add 4 orders |
353 |
my ( $ordernumber1, $ordernumber2, $ordernumber3, $ordernumber4 ); |
353 |
my ( $ordernumber1, $ordernumber2, $ordernumber3, $ordernumber4 ); |
354 |
my ( $basketno1, $basketno2, $basketno3, $basketno4 ); |
354 |
$ordernumber1 = C4::Acquisition::NewOrder( |
355 |
( $basketno1, $ordernumber1 ) = C4::Acquisition::NewOrder( |
|
|
356 |
{ |
355 |
{ |
357 |
basketno => $sample_basket1, |
356 |
basketno => $basketno1, |
358 |
quantity => 24, |
357 |
quantity => 24, |
359 |
biblionumber => $biblionumber, |
358 |
biblionumber => $biblionumber, |
360 |
budget_id => $id_budget, |
359 |
budget_id => $id_budget, |
Lines 370-378
my ( $basketno1, $basketno2, $basketno3, $basketno4 );
Link Here
|
370 |
datereceived => '01-06-2013' |
369 |
datereceived => '01-06-2013' |
371 |
} |
370 |
} |
372 |
); |
371 |
); |
373 |
( $basketno2, $ordernumber2 ) = C4::Acquisition::NewOrder( |
372 |
$ordernumber2 = C4::Acquisition::NewOrder( |
374 |
{ |
373 |
{ |
375 |
basketno => $sample_basket2, |
374 |
basketno => $basketno2, |
376 |
quantity => 20, |
375 |
quantity => 20, |
377 |
biblionumber => $biblionumber, |
376 |
biblionumber => $biblionumber, |
378 |
budget_id => $id_budget, |
377 |
budget_id => $id_budget, |
Lines 386-394
my ( $basketno1, $basketno2, $basketno3, $basketno4 );
Link Here
|
386 |
ecost => 10, |
385 |
ecost => 10, |
387 |
} |
386 |
} |
388 |
); |
387 |
); |
389 |
( $basketno3, $ordernumber3 ) = C4::Acquisition::NewOrder( |
388 |
$ordernumber3 = C4::Acquisition::NewOrder( |
390 |
{ |
389 |
{ |
391 |
basketno => $sample_basket3, |
390 |
basketno => $basketno3, |
392 |
quantity => 20, |
391 |
quantity => 20, |
393 |
biblionumber => $biblionumber, |
392 |
biblionumber => $biblionumber, |
394 |
budget_id => $id_budget, |
393 |
budget_id => $id_budget, |
Lines 402-410
my ( $basketno1, $basketno2, $basketno3, $basketno4 );
Link Here
|
402 |
ecost => 11, |
401 |
ecost => 11, |
403 |
} |
402 |
} |
404 |
); |
403 |
); |
405 |
( $basketno4, $ordernumber4 ) = C4::Acquisition::NewOrder( |
404 |
$ordernumber4 = C4::Acquisition::NewOrder( |
406 |
{ |
405 |
{ |
407 |
basketno => $sample_basket4, |
406 |
basketno => $basketno4, |
408 |
quantity => 20, |
407 |
quantity => 20, |
409 |
biblionumber => $biblionumber, |
408 |
biblionumber => $biblionumber, |
410 |
budget_id => $id_budget, |
409 |
budget_id => $id_budget, |
Lines 604-610
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
Link Here
|
604 |
|
603 |
|
605 |
#Basket1 closedate -> $daysago10 |
604 |
#Basket1 closedate -> $daysago10 |
606 |
$basket1info = { |
605 |
$basket1info = { |
607 |
basketno => $sample_basket1, |
606 |
basketno => $basketno1, |
608 |
closedate => $daysago10, |
607 |
closedate => $daysago10, |
609 |
}; |
608 |
}; |
610 |
ModBasket($basket1info); |
609 |
ModBasket($basket1info); |