use POSIX qw(strftime);
-use Test::More tests => 78;
+use Test::More tests => 67;
use t::lib::Mocks;
use Koha::Database;
+use Koha::DateUtils qw(dt_from_string output_pref);
use Koha::Acquisition::Basket;
use MARC::File::XML ( BinaryEncoding => 'utf8', RecordFormat => 'MARC21' );
my $schema = Koha::Database->new()->schema();
$schema->storage->txn_begin();
-my $dbh = C4::Context->dbh;
-$dbh->{RaiseError} = 1;
-
# Creating some orders
my $bookseller = Koha::Acquisition::Bookseller->new(
{
$order_content[$_]->{str}->{ordernumber} = $ordernumbers[$_];
}
-DelOrder( $order_content[3]->{str}->{biblionumber}, $ordernumbers[3] );
+Koha::Acquisition::Orders->find($ordernumbers[3])->cancel;
my $invoiceid = AddInvoice(
invoicenumber => 'invoice',
my $invoice = GetInvoice( $invoiceid );
+my $reception_date = output_pref(
+ {
+ dt => dt_from_string->add( days => 1 ),
+ dateformat => 'iso',
+ dateonly => 1,
+ }
+);
my ($datereceived, $new_ordernumber) = ModReceiveOrder(
{
biblionumber => $biblionumber4,
order => Koha::Acquisition::Orders->find( $ordernumbers[4] )->unblessed,
quantityreceived => 1,
invoice => $invoice,
- budget_id => $order_content[4]->{str}->{budget_id},
+ budget_id => $order_content[4]->{str}->{budget_id},
+ datereceived => $reception_date,
}
);
+is(
+ output_pref(
+ {
+ dt => dt_from_string($datereceived),
+ dateformat => 'iso',
+ dateonly => 1
+ }
+ ),
+ $reception_date,
+ 'ModReceiveOrder sets the passed date'
+);
+
my $search_orders = SearchOrders({
booksellerid => $booksellerid,
basketno => $basketno
ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid,
"GetBudgetByOrderNumber returns expected budget" );
-my @lateorders = GetLateOrders(0);
-is( scalar grep ( $_->{basketno} eq $basketno, @lateorders ),
+my $lateorders = Koha::Acquisition::Orders->filter_by_lates({ delay => 0 });
+is( $lateorders->search({ 'me.basketno' => $basketno })->count,
0, "GetLateOrders does not get orders from opened baskets" );
-C4::Acquisition::CloseBasket($basketno);
-@lateorders = GetLateOrders(0);
-isnt( scalar grep ( $_->{basketno} eq $basketno, @lateorders ),
+Koha::Acquisition::Baskets->find($basketno)->close;
+$lateorders = Koha::Acquisition::Orders->filter_by_lates({ delay => 0 });
+isnt( $lateorders->search({ 'me.basketno' => $basketno })->count,
0, "GetLateOrders gets orders from closed baskets" );
-ok( !grep ( $_->{ordernumber} eq $ordernumbers[3], @lateorders ),
+is( $lateorders->search({ ordernumber => $ordernumbers[3] })->count, 0,
"GetLateOrders does not get cancelled orders" );
-ok( !grep ( $_->{ordernumber} eq $ordernumbers[4], @lateorders ),
+is( $lateorders->search({ ordernumber => $ordernumbers[4] })->count, 0,
"GetLateOrders does not get received orders" );
$search_orders = SearchOrders({
# Test AddClaim
#
-my $order = $lateorders[0];
-AddClaim( $order->{ordernumber} );
-my $neworder = GetOrder( $order->{ordernumber} );
+my $order = $lateorders->next;
+$order->claim();
is(
- $neworder->{claimed_date},
+ output_pref({ str => $order->claimed_date, dateformat => 'iso', dateonly => 1 }),
strftime( "%Y-%m-%d", localtime(time) ),
- "AddClaim : Check claimed_date"
+ "Koha::Acquisition::Order->claim: Check claimed_date"
);
my $order2 = Koha::Acquisition::Orders->find( $ordernumbers[1] )->unblessed;
"ModReceiveOrder only changes the supplied orders internal notes"
);
-$neworder = GetOrder($new_ordernumber);
+my $neworder = GetOrder($new_ordernumber);
is( $neworder->{'quantity'}, 2, '2 items on new order' );
is( $neworder->{'quantityreceived'},
2, 'Splitting up order received items on new order' );
$nonexistent_order = GetOrder( 424242424242 );
is( $nonexistent_order, undef, 'GetOrder returns undef if a nonexistent ordernumber is given' );
-# Tests for DelOrder
-$order1 = GetOrder($ordernumbers[0]);
-my $error = DelOrder($order1->{biblionumber}, $order1->{ordernumber});
-ok((not defined $error), "DelOrder does not fail");
-$order1 = GetOrder($order1->{ordernumber});
-ok((defined $order1->{datecancellationprinted}), "order is cancelled");
-ok((not defined $order1->{cancellationreason}), "order has no cancellation reason");
-ok((defined Koha::Biblios->find( $order1->{biblionumber} )), "biblio still exists");
-
-$order2 = GetOrder($ordernumbers[1]);
-$error = DelOrder($order2->{biblionumber}, $order2->{ordernumber}, 1);
-ok((not defined $error), "DelOrder does not fail");
-$order2 = GetOrder($order2->{ordernumber});
-ok((defined $order2->{datecancellationprinted}), "order is cancelled");
-ok((not defined $order2->{cancellationreason}), "order has no cancellation reason");
-ok((not defined Koha::Biblios->find( $order2->{biblionumber} )), "biblio does not exist anymore");
-
-my $order4 = GetOrder($ordernumbers[3]);
-$error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
-ok((not defined $error), "DelOrder does not fail");
-$order4 = GetOrder($order4->{ordernumber});
-ok((defined $order4->{datecancellationprinted}), "order is cancelled");
-ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\"");
-ok((not defined Koha::Biblios->find( $order4->{biblionumber} )), "biblio does not exist anymore");
-
-my $order5 = GetOrder($ordernumbers[4]);
-C4::Items::AddItem( { barcode => '0102030405' }, $order5->{biblionumber} );
-$error = DelOrder($order5->{biblionumber}, $order5->{ordernumber}, 1);
-$order5 = GetOrder($order5->{ordernumber});
-ok((defined $order5->{datecancellationprinted}), "order is cancelled");
-ok((defined Koha::Biblios->find( $order5->{biblionumber} )), "biblio still exists");
-
-# End of tests for DelOrder
-
subtest 'ModOrder' => sub {
plan tests => 1;
ModOrder( { ordernumber => $order1->{ordernumber}, unitprice => 42 } );
# "Flavoured" tests (tests that required a run for each marc flavour)
# Tests should be added to the run_flavoured_tests sub below
-my $biblio_module = new Test::MockModule('C4::Biblio');
+my $biblio_module = Test::MockModule->new('C4::Biblio');
$biblio_module->mock(
'GetMarcSubfieldStructure',
sub {
$orders = GetHistory( isbn => '0136019706' );
is( scalar(@$orders), 1, "GetHistory searches correctly by ISBN" );
- my $order = GetOrder($ordernumber);
- DelOrder($order->{biblionumber}, $order->{ordernumber}, 1);
+ Koha::Acquisition::Orders->find($ordernumber)->cancel;
}
# Do "flavoured" tests
plan tests => 2;
#Let's build an order, we need a couple things though
my $builder = t::lib::TestBuilder->new;
- my $order_biblio = $builder->build({ source => 'Biblio' });
+ my $order_biblio = $builder->build_sample_biblio;
my $order_basket = $builder->build({ source => 'Aqbasket', value => { is_standing => 0 } });
my $order_invoice = $builder->build({ source => 'Aqinvoice'});
my $order_currency = $builder->build({ source => 'Currency', value => { active => 1, archived => 0, symbol => 'F', rate => 2, isocode => undef, currency => 'FOO' } });
};
my $receive_order = $builder->build({ source => 'Aqorder', value => $orderinfo });
(undef, my $received_ordernumber) = ModReceiveOrder({
- biblionumber => $order_biblio->{biblionumber},
+ biblionumber => $order_biblio->biblionumber,
order => $receive_order,
invoice => $order_invoice,
quantityreceived => $receive_order->{quantity},
$orderinfo->{replacementprice} = 16.12;
$receive_order = $builder->build({ source => 'Aqorder', value => $orderinfo });
(undef, $received_ordernumber) = ModReceiveOrder({
- biblionumber => $order_biblio->{biblionumber},
+ biblionumber => $order_biblio->biblionumber,
order => $receive_order,
invoice => $order_invoice,
quantityreceived => $receive_order->{quantity},
};
+subtest 'GetHistory - is_standing' => sub {
+
+ plan tests => 1;
+
+ my $orders = GetHistory( is_standing => '1' );
+
+ my $builder = t::lib::TestBuilder->new;
+
+ my $order_basket1 = $builder->build( { source => 'Aqbasket', value => { is_standing => 0 } } );
+ my $orderinfo1 = {
+ basketno => $order_basket1->{basketno},
+ rrp => 19.99,
+ replacementprice => undef,
+ quantity => 1,
+ quantityreceived => 0,
+ datereceived => undef,
+ datecancellationprinted => undef,
+ };
+ my $order1 = $builder->build( { source => 'Aqorder', value => $orderinfo1 } );
+
+ my $order_basket2 = $builder->build( { source => 'Aqbasket', value => { is_standing => 1 } } );
+ my $orderinfo2 = {
+ basketno => $order_basket2->{basketno},
+ rrp => 19.99,
+ replacementprice => undef,
+ quantity => 1,
+ quantityreceived => 0,
+ datereceived => undef,
+ datecancellationprinted => undef,
+ };
+ my $order2 = $builder->build( { source => 'Aqorder', value => $orderinfo2 } );
+
+ my $history = GetHistory( is_standing => 1 );
+ is(
+ scalar(@$history),
+ scalar(@$orders) + 1,
+ "GetHistory returns number of standing orders"
+ );
+
+};
+
+subtest 'Acquisition logging' => sub {
+
+ plan tests => 5;
+
+ t::lib::Mocks::mock_preference('AcquisitionLog', 1);
+
+ Koha::ActionLogs->delete;
+ my $basketno = NewBasket( $booksellerid, 1 );
+ my @create_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'ADD_BASKET', object => $basketno });
+ is (scalar @create_logs, 1, 'Basket creation is logged');
+
+ Koha::ActionLogs->delete;
+ C4::Acquisition::ReopenBasket($basketno);
+ my @reopen_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'REOPEN_BASKET', object => $basketno });
+ is (scalar @reopen_logs, 1, 'Basket reopen is logged');
+
+ Koha::ActionLogs->delete;
+ C4::Acquisition::ModBasket({
+ basketno => $basketno,
+ booksellerid => $booksellerid
+ });
+ my @mod_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET', object => $basketno });
+ is (scalar @mod_logs, 1, 'Basket modify is logged');
+
+ Koha::ActionLogs->delete;
+ C4::Acquisition::ModBasketHeader($basketno,"Test","","","",$booksellerid);
+ my @mod_header_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_HEADER', object => $basketno });
+ is (scalar @mod_header_logs, 1, 'Basket header modify is logged');
+
+ Koha::ActionLogs->delete;
+ C4::Acquisition::ModBasketUsers($basketno,(1));
+ my @mod_users_logs = Koha::ActionLogs->search({ module =>'ACQUISITIONS', action => 'MODIFY_BASKET_USERS', object => $basketno });
+ is (scalar @mod_users_logs, 1, 'Basket users modify is logged');
+
+ t::lib::Mocks::mock_preference('AcquisitionLog', 0);
+};
+
$schema->storage->txn_rollback();
projects / srvgit / blobdiff