Bug 13321: Rename variables

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

diff --git a/t/db_dependent/Acquisition/OrderFromSubscription.t b/t/db_dependent/Acquisition/OrderFromSubscription.t
index 72d4c68..d0a970a 100644 (file)
--- a/t/db_dependent/Acquisition/OrderFromSubscription.t
+++ b/t/db_dependent/Acquisition/OrderFromSubscription.t
@@ -1,21 +1,22 @@
 use Modern::Perl;
 
 use Test::More tests => 13;
-use Data::Dumper;
 
 use_ok('C4::Acquisition');
 use_ok('C4::Biblio');
+use_ok('C4::Bookseller');
 use_ok('C4::Budgets');
 use_ok('C4::Serials');
 
+use Koha::Acquisition::Order;
+use Koha::Database;
+
 # Start transaction
+my $schema = Koha::Database->new()->schema();
+$schema->storage->txn_begin();
 my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
 $dbh->{RaiseError} = 1;
 
-my $supplierlist=eval{GetSuppliersWithLateIssues()};
-ok(length($@)==0,"No SQL problem in GetSuppliersWithLateIssues");
-
 my $booksellerid = C4::Bookseller::AddBookseller(
     {
         name => "my vendor",
@@ -56,8 +57,8 @@ ok($basketno = NewBasket($booksellerid, 1), "NewBasket(  $booksellerid , 1  ) re
 
 my $cost = 42.00;
 my $subscription = GetSubscription( $subscriptionid );
-my $ordernumber;
-( $basketno, $ordernumber ) = NewOrder({
+
+my $order = Koha::Acquisition::Order->new({
     biblionumber => $subscription->{biblionumber},
     entrydate => '01-01-2013',
     quantity => 1,
@@ -67,33 +68,33 @@ my $ordernumber;
     basketno => $basketno,
     rrp => $cost,
     ecost => $cost,
-    gstrate => 0.0500,
+    tax_rate => 0.0500,
     orderstatus => 'new',
     subscriptionid => $subscription->{subscriptionid},
     budget_id => $budget_id,
-});
+})->insert;
+my $ordernumber = $order->{ordernumber};
 
 my $is_currently_on_order = subscriptionCurrentlyOnOrder( $subscription->{subscriptionid} );
 is ( $is_currently_on_order, 1, "The subscription is currently on order");
 
-my $order = GetLastOrderNotReceivedFromSubscriptionid( $subscription->{subscriptionid} );
+$order = GetLastOrderNotReceivedFromSubscriptionid( $subscription->{subscriptionid} );
 is ( $order->{subscriptionid}, $subscription->{subscriptionid}, "test subscriptionid for the last order not received");
 ok( $order->{ecost} == $cost, "test cost for the last order not received");
 
 $dbh->do(q{DELETE FROM aqinvoices});
 my $invoiceid = AddInvoice(invoicenumber => 'invoice1', booksellerid => $booksellerid, unknown => "unknown");
 
+my $invoice = GetInvoice( $invoiceid );
+$invoice->{datereceived} = '02-01-2013';
+
 my ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
     {
         biblionumber     => $biblionumber,
-        ordernumber      => $ordernumber,
+        order            => $order,
         quantityreceived => 1,
-        cost             => $cost,
-        ecost            => $cost,
-        rrp              => $cost,
         budget_id        => $budget_id,
-        datereceived     => '02-01-2013',
-        invoiceid        => $invoiceid,
+        invoice          => $invoice,
     }
 );
 
@@ -109,4 +110,4 @@ my @invoices_linked_to_subscriptions = grep { $_->{is_linked_to_subscriptions} }
 is(scalar(@invoices_linked_to_subscriptions), 1, 'GetInvoices() can identify invoices that are linked to a subscription');
 
 # Cleanup
-$dbh->rollback;
+$schema->storage->txn_rollback();