Bug 20287: Replace occurrences of AddMember with Koha::Patron->new->store->borrowernumber

[koha.git] / t / db_dependent / Acquisition / OrderUsers.t

diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t
index b63f5a2..9d88734 100644 (file)
--- a/t/db_dependent/Acquisition/OrderUsers.t
+++ b/t/db_dependent/Acquisition/OrderUsers.t
@@ -5,8 +5,9 @@ use C4::Acquisition;
 use C4::Biblio;
 use C4::Letters;
 use Koha::Database;
-use Koha::Acquisition::Order;
 use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use Koha::Patrons;
 
 use t::lib::TestBuilder;
 
@@ -17,6 +18,8 @@ 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 $bookseller = Koha::Acquisition::Bookseller->new(
@@ -32,8 +35,8 @@ my $basketno = NewBasket( $bookseller->id, 1 );
 
 my $budgetid = C4::Budgets::AddBudget(
     {
-        budget_code => "budget_code_test_getordersbybib",
-        budget_name => "budget_name_test_getordersbybib",
+        budget_code => "budget_code_test",
+        budget_name => "budget_name_test",
     }
 );
 my $budget = C4::Budgets::GetBudget($budgetid);
@@ -47,16 +50,15 @@ my $order = Koha::Acquisition::Order->new(
         quantity         => 2,
         biblionumber     => $biblionumber,
         budget_id        => $budgetid,
-        entrydate        => '01-01-2014',
-        currency         => 'EUR',
-        notes            => "This is a note1",
+        entrydate        => '2014-01-01',
+        currency         => $currency->{currency},
         orderstatus      => 1,
         quantityreceived => 0,
         rrp              => 10,
         ecost            => 10,
     }
-)->insert;
-my $ordernumber = $order->{ordernumber};
+)->store;
+my $ordernumber = $order->ordernumber;
 
 my $invoiceid = AddInvoice(
     invoicenumber => 'invoice',
@@ -64,29 +66,27 @@ my $invoiceid = AddInvoice(
     unknown       => "unknown"
 );
 
-my $borrowernumber = C4::Members::AddMember(
+my $borrowernumber = Koha::Patron->new({
     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 );
+})->store->borrowernumber;
 
 C4::Acquisition::ModOrderUsers( $ordernumber, $borrowernumber );
 
 my $is_added = grep { /^$borrowernumber$/ } C4::Acquisition::GetOrderUsers( $ordernumber );
 is( $is_added, 1, 'ModOrderUsers should link patrons to an order' );
 
-$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber });
+$order = Koha::Acquisition::Orders->find( $ordernumber );
 ModReceiveOrder(
     {
         biblionumber      => $biblionumber,
-        order             => $order,
+        order             => $order->unblessed,
         quantityreceived  => 1,
         cost              => 10,
         ecost             => 10,
@@ -99,11 +99,11 @@ ModReceiveOrder(
 my $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber });
 is( scalar( @$messages ), 0, 'The letter has not been sent to message queue on receiving the order, the order is not entire received');
 
-$order = Koha::Acquisition::Order->fetch({ ordernumber => $ordernumber });
+$order = Koha::Acquisition::Orders->find( $ordernumber );
 ModReceiveOrder(
     {
         biblionumber      => $biblionumber,
-        order             => $order,
+        order             => $order->unblessed,
         quantityreceived  => 1,
         cost              => 10,
         ecost             => 10,