use POSIX qw(strftime);
-use Test::More tests => 65;
+use Test::More tests => 73;
+use t::lib::Mocks;
use Koha::Database;
+use MARC::File::XML ( BinaryEncoding => 'utf8', RecordFormat => 'MARC21' );
+
BEGIN {
use_ok('C4::Acquisition');
use_ok('C4::Biblio');
use_ok('C4::Budgets');
- use_ok('Koha::Acquisition::Order');
+ use_ok('Koha::Acquisition::Orders');
use_ok('Koha::Acquisition::Booksellers');
+ use_ok('t::lib::TestBuilder');
}
# Sub used for testing C4::Acquisition subs returning order(s):
my $budgetid = C4::Budgets::AddBudget(
{
- budget_code => "budget_code_test_getordersbybib",
- budget_name => "budget_name_test_getordersbybib",
+ budget_code => "budget_code_test_1",
+ budget_name => "budget_name_test_1",
budget_period_id => $bpid,
}
);
my ( $biblionumber4, $biblioitemnumber4 ) = AddBiblio( MARC::Record->new, '' );
my ( $biblionumber5, $biblioitemnumber5 ) = AddBiblio( MARC::Record->new, '' );
+
+
# Prepare 5 orders, and make distinction beween fields to be tested with eq and with ==
# Ex : a price of 50.1 will be stored internally as 5.100000
ecost => 38.15,
rrp => 40.15,
discount => 5.1111,
- tax_rate => 0.0515
}
},
{
ecost => 38.1,
rrp => 11.0,
discount => 5.1,
- tax_rate => 0.1
}
},
{
rrp => 11.00,
discount => 0,
uncertainprice => 0,
- tax_rate => 0
}
},
{
rrp => 10,
discount => 0,
uncertainprice => 0,
- tax_rate => 0
}
},
{
rrp => 10,
discount => 0,
uncertainprice => 0,
- tax_rate => 0
}
}
);
values %{ $order_content[$_]->{num} };
@ocontent{ keys %{ $order_content[$_]->{str} } } =
values %{ $order_content[$_]->{str} };
- $ordernumbers[$_] = Koha::Acquisition::Order->new( \%ocontent )->insert->{ordernumber};
+ $ordernumbers[$_] = Koha::Acquisition::Order->new( \%ocontent )->store->ordernumber;
$order_content[$_]->{str}->{ordernumber} = $ordernumbers[$_];
}
my ($datereceived, $new_ordernumber) = ModReceiveOrder(
{
biblionumber => $biblionumber4,
- order => GetOrder( $ordernumbers[4] ),
+ order => Koha::Acquisition::Orders->find( $ordernumbers[4] )->unblessed,
quantityreceived => 1,
invoice => $invoice,
budget_id => $order_content[4]->{str}->{budget_id},
"AddClaim : Check claimed_date"
);
-my $order2 = GetOrder( $ordernumbers[1] );
+my $order2 = Koha::Acquisition::Orders->find( $ordernumbers[1] )->unblessed;
$order2->{order_internalnote} = "my notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
is( scalar( @$orders ), 1, 'GetHistory with a given ordernumber returns 1 order' );
$orders = GetHistory( ordernumber => $ordernumbers[1], search_children_too => 1 );
is( scalar( @$orders ), 2, 'GetHistory with a given ordernumber and search_children_too set returns 2 orders' );
+$orders = GetHistory( ordernumbers => [$ordernumbers[1]] );
+is( scalar( @$orders ), 1, 'GetHistory with a given ordernumbers returns 1 order' );
+$orders = GetHistory( ordernumbers => \@ordernumbers );
+is( scalar( @$orders ), scalar( @ordernumbers ) - 1, 'GetHistory with a list of ordernumbers returns N-1 orders (was has been deleted [3])' );
+
+
+# Test GetHistory() with and without SearchWithISBNVariations
+# The ISBN passed as a param is the ISBN-10 version of the 13-digit ISBN in the sample record declared in $marcxml
my $budgetid2 = C4::Budgets::AddBudget(
{
}
);
-my $order3 = GetOrder( $ordernumbers[2] );
+my $order3 = Koha::Acquisition::Orders->find( $ordernumbers[2] )->unblessed;
$order3->{order_internalnote} = "my other notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
2, 'Splitting up order received items on new order' );
is( $neworder->{'budget_id'}, $budgetid2, 'Budget on new order is changed' );
-$order3 = GetOrder( $ordernumbers[2] );
+$order3 = Koha::Acquisition::Orders->find( $ordernumbers[2] )->unblessed;
$order3->{order_internalnote} = "my third notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
is($all_count, scalar GetBudgetsReport(), "GetBudgetReport returns inactive budget period acquisitions.");
ok($active_count >= scalar GetBudgetsReport(1), "GetBudgetReport doesn't return inactive budget period acquisitions.");
+# "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');
+$biblio_module->mock(
+ 'GetMarcSubfieldStructure',
+ sub {
+ my ($self) = shift;
+
+ my ( $title_field, $title_subfield ) = get_title_field();
+ my ( $isbn_field, $isbn_subfield ) = get_isbn_field();
+ my ( $issn_field, $issn_subfield ) = get_issn_field();
+ my ( $biblionumber_field, $biblionumber_subfield ) = ( '999', 'c' );
+ my ( $biblioitemnumber_field, $biblioitemnumber_subfield ) = ( '999', '9' );
+ my ( $itemnumber_field, $itemnumber_subfield ) = get_itemnumber_field();
+
+ return {
+ 'biblio.title' => [ { tagfield => $title_field, tagsubfield => $title_subfield } ],
+ 'biblio.biblionumber' => [ { tagfield => $biblionumber_field, tagsubfield => $biblionumber_subfield } ],
+ 'biblioitems.isbn' => [ { tagfield => $isbn_field, tagsubfield => $isbn_subfield } ],
+ 'biblioitems.issn' => [ { tagfield => $issn_field, tagsubfield => $issn_subfield } ],
+ 'biblioitems.biblioitemnumber' => [ { tagfield => $biblioitemnumber_field, tagsubfield => $biblioitemnumber_subfield } ],
+ 'items.itemnumber' => [ { tagfield => $itemnumber_subfield, tagsubfield => $itemnumber_subfield } ],
+ };
+ }
+);
+
+sub run_flavoured_tests {
+ my $marcflavour = shift;
+ t::lib::Mocks::mock_preference('marcflavour', $marcflavour);
+
+ #
+ # Test SearchWithISBNVariations syspref
+ #
+ my $marc_record = MARC::Record->new;
+ $marc_record->append_fields( create_isbn_field( '9780136019701', $marcflavour ) );
+ my ( $biblionumber6, $biblioitemnumber6 ) = AddBiblio( $marc_record, '' );
+
+ # Create order
+ my $ordernumber = Koha::Acquisition::Order->new( {
+ basketno => $basketno,
+ biblionumber => $biblionumber6,
+ budget_id => $budget->{budget_id},
+ order_internalnote => "internal note",
+ order_vendornote => "vendor note",
+ quantity => 1,
+ ecost => 10,
+ rrp => 10,
+ listprice => 10,
+ ecost => 10,
+ rrp => 10,
+ discount => 0,
+ uncertainprice => 0,
+ } )->store->ordernumber;
+
+ t::lib::Mocks::mock_preference('SearchWithISBNVariations', 0);
+ $orders = GetHistory( isbn => '0136019706' );
+ is( scalar(@$orders), 0, "GetHistory searches correctly by ISBN" );
+
+ t::lib::Mocks::mock_preference('SearchWithISBNVariations', 1);
+ $orders = GetHistory( isbn => '0136019706' );
+ is( scalar(@$orders), 1, "GetHistory searches correctly by ISBN" );
+
+ my $order = GetOrder($ordernumber);
+ DelOrder($order->{biblionumber}, $order->{ordernumber}, 1);
+}
+
+# Do "flavoured" tests
+subtest 'MARC21' => sub {
+ plan tests => 2;
+ run_flavoured_tests('MARC21');
+};
+
+subtest 'UNIMARC' => sub {
+ plan tests => 2;
+ run_flavoured_tests('UNIMARC');
+};
+
+subtest 'NORMARC' => sub {
+ plan tests => 2;
+ run_flavoured_tests('NORMARC');
+};
+
+### Functions required for "flavoured" tests
+sub get_title_field {
+ my $marc_flavour = C4::Context->preference('marcflavour');
+ return ( $marc_flavour eq 'UNIMARC' ) ? ( '200', 'a' ) : ( '245', 'a' );
+}
+
+sub get_isbn_field {
+ my $marc_flavour = C4::Context->preference('marcflavour');
+ return ( $marc_flavour eq 'UNIMARC' ) ? ( '010', 'a' ) : ( '020', 'a' );
+}
+
+sub get_issn_field {
+ my $marc_flavour = C4::Context->preference('marcflavour');
+ return ( $marc_flavour eq 'UNIMARC' ) ? ( '011', 'a' ) : ( '022', 'a' );
+}
+
+sub get_itemnumber_field {
+ my $marc_flavour = C4::Context->preference('marcflavour');
+ return ( $marc_flavour eq 'UNIMARC' ) ? ( '995', '9' ) : ( '952', '9' );
+}
+
+sub create_isbn_field {
+ my ( $isbn, $marcflavour ) = @_;
+
+ my ( $isbn_field, $isbn_subfield ) = get_isbn_field();
+ my $field = MARC::Field->new( $isbn_field, '', '', $isbn_subfield => $isbn );
+
+ # Add the price subfield
+ my $price_subfield = ( $marcflavour eq 'UNIMARC' ) ? 'd' : 'c';
+ $field->add_subfields( $price_subfield => '$100' );
+
+ return $field;
+}
+
+subtest 'ModReceiveOrder replacementprice tests' => sub {
+ 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_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 $order_vendor = $builder->build({ source => 'Aqbookseller',value => { listincgst => 0, listprice => $order_currency->{currency}, invoiceprice => $order_currency->{currency} } });
+ my $orderinfo ={
+ basketno => $order_basket->{basketno},
+ booksellerid => $order_vendor->{id},
+ rrp => 19.99,
+ replacementprice => undef,
+ quantity => 1,
+ quantityreceived => 0,
+ datereceived => undef,
+ datecancellationprinted => undef,
+ };
+ my $receive_order = $builder->build({ source => 'Aqorder', value => $orderinfo });
+ (undef, my $received_ordernumber) = ModReceiveOrder({
+ biblionumber => $order_biblio->{biblionumber},
+ order => $receive_order,
+ invoice => $order_invoice,
+ quantityreceived => $receive_order->{quantity},
+ budget_id => $order->{budget_id},
+ });
+ my $received_order = GetOrder($received_ordernumber);
+ is ($received_order->{replacementprice},undef,"No price set if none passed in");
+ $orderinfo->{replacementprice} = 16.12;
+ $receive_order = $builder->build({ source => 'Aqorder', value => $orderinfo });
+ (undef, $received_ordernumber) = ModReceiveOrder({
+ biblionumber => $order_biblio->{biblionumber},
+ order => $receive_order,
+ invoice => $order_invoice,
+ quantityreceived => $receive_order->{quantity},
+ budget_id => $order->{budget_id},
+ });
+ $received_order = GetOrder($received_ordernumber);
+ is ($received_order->{replacementprice},'16.120000',"Replacement price set if none passed in");
+};
+
+subtest 'ModReceiveOrder and subscription' => sub {
+ plan tests => 2;
+
+ my $builder = t::lib::TestBuilder->new;
+ my $first_note = 'first note';
+ my $second_note = 'second note';
+ my $subscription = $builder->build_object( { class => 'Koha::Subscriptions' } );
+ my $order = $builder->build_object(
+ {
+ class => 'Koha::Acquisition::Orders',
+ value => {
+ subscriptionid => $subscription->subscriptionid,
+ order_internalnote => $first_note,
+ quantity => 5,
+ quantityreceived => 0,
+ ecost_tax_excluded => 42,
+ unitprice_tax_excluded => 42,
+ }
+ }
+ );
+ my $order_info = $order->unblessed;
+ # We do not want the note from the original note to be modified
+ # Keeping it will permit to display it for future receptions
+ $order_info->{order_internalnote} = $second_note;
+ my ( undef, $received_ordernumber ) = ModReceiveOrder(
+ {
+ biblionumber => $order->biblionumber,
+ order => $order_info,
+ invoice => $order->{invoiceid},
+ quantityreceived => 1,
+ budget_id => $order->budget_id,
+ }
+ );
+ my $received_order = Koha::Acquisition::Orders->find($received_ordernumber);
+ is( $received_order->order_internalnote,
+ $second_note, "No price set if none passed in" );
+
+ $order->get_from_storage;
+ is( $order->get_from_storage->order_internalnote, $first_note );
+};
+
$schema->storage->txn_rollback();
projects / koha.git / blobdiff