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

[koha.git] / t / db_dependent / Budgets.t

diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t
index c626528..a583d9b 100755 (executable)
--- a/t/db_dependent/Budgets.t
+++ b/t/db_dependent/Budgets.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Modern::Perl;
-use Test::More tests => 142;
+use Test::More tests => 144;
 
 BEGIN {
     use_ok('C4::Budgets')
@@ -8,10 +8,10 @@ BEGIN {
 use C4::Context;
 use C4::Biblio;
 use C4::Acquisition;
-use C4::Members qw( AddMember );
 
-use Koha::Acquisition::Order;
 use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use Koha::Patrons;
 
 use t::lib::TestBuilder;
 
@@ -357,8 +357,8 @@ for my $infos (@order_infos) {
                 discount           => 0,
                 uncertainprice     => 0,
             }
-        )->insert;
-        my $ordernumber = $order->{ordernumber};
+        )->store;
+        my $ordernumber = $order->ordernumber;
         push @{ $budgets{$infos->{budget_id}} }, $ordernumber;
         $number_of_orders_to_move++;
     }
@@ -378,11 +378,11 @@ for my $infos (@order_infos) {
                 discount           => 0,
                 uncertainprice     => 0,
             }
-        )->insert;
-        my $ordernumber = $order->{ordernumber};
+        )->store;
+        my $ordernumber = $order->ordernumber;
         ModReceiveOrder({
               biblionumber     => $biblionumber,
-              order            => $order,
+              order            => $order->unblessed,
               budget_id        => $infos->{budget_id},
               quantityreceived => $item_quantity,
               invoice          => $invoice,
@@ -394,6 +394,87 @@ is( GetBudgetHierarchySpent( $budget_id1 ), 160, "total spent for budget1 is 160
 is( GetBudgetHierarchySpent( $budget_id11 ), 100, "total spent for budget11 is 100" );
 is( GetBudgetHierarchySpent( $budget_id111 ), 20, "total spent for budget111 is 20" );
 
+# GetBudgetSpent and GetBudgetOrdered
+my $budget_period_amount = 100;
+my $budget_amount = 50;
+
+$budget = AddBudgetPeriod(
+    {
+        budget_period_startdate   => '2017-08-22',
+        budget_period_enddate     => '2018-08-22',
+        budget_period_description => 'Test budget',
+        budget_period_active      => 1,
+        budget_period_total       => $budget_period_amount,
+    }
+);
+
+my $fund = AddBudget(
+    {
+        budget_code       => 'Test fund',
+        budget_name       => 'Test fund',
+        budget_period_id  => $budget,
+        budget_parent_id  => undef,
+        budget_amount     => $budget_amount,
+    }
+);
+
+my $vendor = Koha::Acquisition::Bookseller->new(
+    {
+        name         => "test vendor",
+        address1     => "test address",
+        phone        => "0123456",
+        active       => 1,
+        deliverytime => 5,
+    }
+)->store;
+
+my $vendorid = $vendor->id;
+
+my $basketnumber = C4::Acquisition::NewBasket( $vendorid, 1 );
+my ( $biblio, $biblioitem ) = C4::Biblio::AddBiblio( MARC::Record->new, '' );
+
+my @orders = (
+    {
+        budget_id  => $fund,
+        pending_quantity => 1,
+        spent_quantity => 0,
+    },
+);
+
+my $invoiceident = AddInvoice( invoicenumber => 'invoice_test_clone', booksellerid => $vendorid, shipmentdate => '2017-08-22', shipmentcost => 6, shipmentcost_budgetid => $fund );
+my $test_invoice = GetInvoice( $invoiceident );
+my $individual_item_price = 10;
+
+my $order = Koha::Acquisition::Order->new(
+   {
+      basketno           => $basketnumber,
+      biblionumber       => $biblio,
+      budget_id          => $fund,
+      order_internalnote => "internalnote",
+      order_vendornote   => "vendor note",
+      quantity           => 2,
+      cost_tax_included  => $individual_item_price,
+      rrp_tax_included   => $individual_item_price,
+      listprice          => $individual_item_price,
+      ecost_tax_included => $individual_item_price,
+      discount           => 0,
+      uncertainprice     => 0,
+   }
+)->store;
+
+ModReceiveOrder({
+   bibionumber       => $biblio,
+   order             => $order->unblessed,
+   budget_id         => $fund,
+   quantityreceived  => 2,
+   invoice           => $test_invoice,
+   received_items    => [],
+} );
+
+is ( GetBudgetSpent( $fund ), 6, "total shipping cost is 6");
+is ( GetBudgetOrdered( $fund ), '20.000000', "total ordered price is 20");
+
+
 # CloneBudgetPeriod
 my $budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod(
     {
@@ -600,7 +681,7 @@ for my $new_budget ( @new_budgets ) {
 
 my $patron_category = $builder->build({ source => 'Category' });
 my $branchcode = $library->{branchcode};
-my $john_doe = C4::Members::AddMember(
+my $john_doe = Koha::Patron->new({
     cardnumber   => '123456',
     firstname    => 'John',
     surname      => 'Doe',
@@ -609,7 +690,7 @@ my $john_doe = C4::Members::AddMember(
     dateofbirth  => '',
     dateexpiry   => '9999-12-31',
     userid       => 'john.doe'
-);
+})->store->borrowernumber;
 
 C4::Budgets::SetOwnerToFundHierarchy( $budget_id1, $john_doe );
 is( C4::Budgets::GetBudget($budget_id1)->{budget_owner_id},
@@ -625,7 +706,7 @@ is( C4::Budgets::GetBudget($budget_id2)->{budget_owner_id},
 is( C4::Budgets::GetBudget($budget_id21)->{budget_owner_id},
     undef, "SetOwnerToFundHierarchy should not have set an owner for budget 21 ($budget_id21)" );
 
-my $jane_doe = C4::Members::AddMember(
+my $jane_doe = Koha::Patron->new({
     cardnumber   => '789012',
     firstname    => 'Jane',
     surname      => 'Doe',
@@ -634,7 +715,7 @@ my $jane_doe = C4::Members::AddMember(
     dateofbirth  => '',
     dateexpiry   => '9999-12-31',
     userid       => 'jane.doe'
-);
+})->store->borrowernumber;
 
 C4::Budgets::SetOwnerToFundHierarchy( $budget_id11, $jane_doe );
 is( C4::Budgets::GetBudget($budget_id1)->{budget_owner_id},