X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FAcquisition.t;h=c7b3c4a92782fa05d5465e1352710dbcf36c6f1f;hb=c26ab35be632e7130a13e94e5767d182a42a2595;hp=1d4f36a4a860f845c19584ed168a76d13eba8fd2;hpb=f098258e8cf2d616c6bbc35e44c6a1df47be8517;p=koha.git

diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t
index 1d4f36a4a8..c7b3c4a927 100755
--- a/t/db_dependent/Acquisition.t
+++ b/t/db_dependent/Acquisition.t
@@ -3,71 +3,128 @@
 # This Koha test module is a stub!
 # Add more tests here!!!
 
-use strict;
-use warnings;
-use Data::Dumper;
+use Modern::Perl;
+use POSIX qw(strftime);
 
 use C4::Bookseller qw( GetBookSellerFromId );
 
-use Test::More tests => 37;
+use Test::More tests => 41;
 
 BEGIN {
     use_ok('C4::Acquisition');
+    use_ok('C4::Bookseller');
+    use_ok('C4::Biblio');
+    use_ok('C4::Budgets');
+    use_ok('C4::Bookseller');
 }
 
-my $booksellerid = 1;
-my $booksellerinfo = GetBookSellerFromId( $booksellerid );
-# diag( Data::Dumper->Dump( [ $booksellerinfo ], [ 'booksellerinfo' ] ) );
-SKIP: {
-    skip 'No booksellers in database, cannot test baskets', 2 unless $booksellerinfo;
-    my ($basket, $basketno);
-    ok($basketno = NewBasket(1,1),			"NewBasket(  1 , 1  ) returns $basketno");
-    ok($basket   = GetBasket($basketno),	"GetBasket($basketno) returns $basket");
-}
+my $dbh = C4::Context->dbh;
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+my $booksellerid = C4::Bookseller::AddBookseller(
+    {
+        name => "my vendor",
+        address1 => "bookseller's address",
+        phone => "0123456",
+        active => 1,
+        deliverytime => 5,
+    }
+);
+
+my $booksellerinfo = C4::Bookseller::GetBookSellerFromId( $booksellerid );
+
+is($booksellerinfo->{deliverytime}, 5, 'set deliverytime when creating vendor (Bug 10556)');
 
+my ($basket, $basketno);
+ok($basketno = NewBasket($booksellerid, 1), "NewBasket(  $booksellerid , 1  ) returns $basketno");
+ok($basket   = GetBasket($basketno), "GetBasket($basketno) returns $basket");
+
+my $budgetid = C4::Budgets::AddBudget(
+    {
+        budget_code => "budget_code_test_getordersbybib",
+        budget_name => "budget_name_test_getordersbybib",
+    }
+);
+my $budget = C4::Budgets::GetBudget( $budgetid );
+
+my ($ordernumber1, $ordernumber2, $ordernumber3);
+my ($biblionumber1, $biblioitemnumber1) = AddBiblio(MARC::Record->new, '');
+my ($biblionumber2, $biblioitemnumber2) = AddBiblio(MARC::Record->new, '');
+( undef, $ordernumber1 ) = C4::Acquisition::NewOrder(
+    {
+        basketno => $basketno,
+        quantity => 24,
+        biblionumber => $biblionumber1,
+        budget_id => $budget->{budget_id},
+    }
+);
+
+( undef, $ordernumber2 ) = C4::Acquisition::NewOrder(
+    {
+        basketno => $basketno,
+        quantity => 42,
+        biblionumber => $biblionumber2,
+        budget_id => $budget->{budget_id},
+    }
+);
+
+( undef, $ordernumber3 ) = C4::Acquisition::NewOrder(
+    {
+        basketno => $basketno,
+        quantity => 4,
+        biblionumber => $biblionumber2,
+        budget_id => $budget->{budget_id},
+        ecost => 42,
+        rrp => 42,
+    }
+);
 
-my $supplierid = 1;
 my $grouped    = 0;
-my $orders = GetPendingOrders( $supplierid, $grouped );
+my $orders = GetPendingOrders( $booksellerid, $grouped );
 isa_ok( $orders, 'ARRAY' );
-SKIP: {
-    skip 'No relevant orders in database, cannot test baskets', 33 unless( scalar @$orders );
-    # diag( Data::Dumper->Dump( [ $orders ], [ 'orders' ] ) );
-    my @expectedfields = qw( basketno
-                             biblioitemnumber
-                             biblionumber
-                             booksellerinvoicenumber
-                             budgetdate
-                             cancelledby
-                             closedate
-                             creationdate
-                             currency
-                             datecancellationprinted
-                             datereceived
-                             ecost
-                             entrydate
-                             firstname
-                             freight
-                             gst
-                             listprice
-                             notes
-                             ordernumber
-                             purchaseordernumber
-                             quantity
-                             quantityreceived
-                             rrp
-                             serialid
-                             sort1
-                             sort2
-                             subscription
-                             supplierreference
-                             surname
-                             timestamp
-                             title
-                             totalamount
-                             unitprice );
-    my $firstorder = $orders->[0];
-    for my $field ( @expectedfields ) {
-        ok( exists( $firstorder->{ $field } ), "This order has a $field field" );
-    }
+
+C4::Acquisition::CloseBasket( $basketno );
+my @lateorders = GetLateOrders(0);
+my $order = $lateorders[0];
+AddClaim( $order->{ordernumber} );
+my $neworder = GetOrder( $order->{ordernumber} );
+is( $neworder->{claimed_date}, strftime( "%Y-%m-%d", localtime(time) ), "AddClaim : Check claimed_date" );
+
+my @expectedfields = qw( basketno
+                         biblionumber
+                         invoiceid
+                         budgetdate
+                         cancelledby
+                         closedate
+                         creationdate
+                         currency
+                         datecancellationprinted
+                         datereceived
+                         ecost
+                         entrydate
+                         firstname
+                         freight
+                         gstrate
+                         listprice
+                         notes
+                         ordernumber
+                         purchaseordernumber
+                         quantity
+                         quantityreceived
+                         rrp
+                         sort1
+                         sort2
+                         subscriptionid
+                         supplierreference
+                         surname
+                         timestamp
+                         title
+                         totalamount
+                         unitprice );
+my $firstorder = $orders->[0];
+for my $field ( @expectedfields ) {
+    ok( exists( $firstorder->{ $field } ), "This order has a $field field" );
 }
+
+$dbh->rollback;