Bug 17829: Move GetMember to Koha::Patron

[srvgit] / t / db_dependent / Acquisition / OrderUsers.t

diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t
index 2d09ef5..1c9a415 100644 (file)
--- a/t/db_dependent/Acquisition/OrderUsers.t
+++ b/t/db_dependent/Acquisition/OrderUsers.t
@@ -3,10 +3,10 @@ use Test::More tests => 3;
 
 use C4::Acquisition;
 use C4::Biblio;
-use C4::Bookseller;
 use C4::Letters;
 use Koha::Database;
 use Koha::Acquisition::Order;
+use Koha::Acquisition::Booksellers;
 
 use t::lib::TestBuilder;
 
@@ -17,18 +17,20 @@ my $builder = t::lib::TestBuilder->new;
 my $library = $builder->build({
     source => "Branch",
 });
+my $patron_category = $builder->build({ source => 'Category' });
+my $currency = $builder->build({ source => 'Currency' });
 
 # Creating some orders
-my $booksellerid = C4::Bookseller::AddBookseller(
+my $bookseller = Koha::Acquisition::Bookseller->new(
     {
         name         => "my vendor",
         address1     => "bookseller's address",
         phone        => "0123456",
         active       => 1,
     }
-);
+)->store;
 
-my $basketno = NewBasket( $booksellerid, 1 );
+my $basketno = NewBasket( $bookseller->id, 1 );
 
 my $budgetid = C4::Budgets::AddBudget(
     {
@@ -48,9 +50,8 @@ my $order = Koha::Acquisition::Order->new(
         biblionumber     => $biblionumber,
         budget_id        => $budgetid,
         entrydate        => '01-01-2014',
-        currency         => 'EUR',
+        currency         => $currency->{currency},
         notes            => "This is a note1",
-        gstrate          => 0.0500,
         orderstatus      => 1,
         quantityreceived => 0,
         rrp              => 10,
@@ -61,7 +62,7 @@ my $ordernumber = $order->{ordernumber};
 
 my $invoiceid = AddInvoice(
     invoicenumber => 'invoice',
-    booksellerid  => $booksellerid,
+    booksellerid  => $bookseller->id,
     unknown       => "unknown"
 );
 
@@ -69,15 +70,13 @@ my $borrowernumber = C4::Members::AddMember(
     cardnumber => 'TESTCARD',
     firstname =>  'TESTFN',
     surname => 'TESTSN',
-    categorycode => 'S',
+    categorycode => $patron_category->{categorycode},
     branchcode => $library->{branchcode},
     dateofbirth => '',
     dateexpiry => '9999-12-31',
     userid => 'TESTUSERID'
 );
 
-my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
-
 C4::Acquisition::ModOrderUsers( $ordernumber, $borrowernumber );
 
 my $is_added = grep { /^$borrowernumber$/ } C4::Acquisition::GetOrderUsers( $ordernumber );