use POSIX qw(strftime);
-use Test::More tests => 92;
+use Test::More tests => 65;
use Koha::Database;
BEGIN {
use_ok('C4::Acquisition');
- use_ok('C4::Bookseller');
use_ok('C4::Biblio');
use_ok('C4::Budgets');
- use_ok('C4::Bookseller');
use_ok('Koha::Acquisition::Order');
- use_ok('Koha::Acquisition::Bookseller');
+ use_ok('Koha::Acquisition::Booksellers');
}
# Sub used for testing C4::Acquisition subs returning order(s):
$dbh->{RaiseError} = 1;
# Creating some orders
-my $booksellerid = C4::Bookseller::AddBookseller(
+my $bookseller = Koha::Acquisition::Bookseller->new(
{
name => "my vendor",
address1 => "bookseller's address",
active => 1,
deliverytime => 5,
}
-);
-
-my $booksellerinfo = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+)->store;
+my $booksellerid = $bookseller->id;
-is( $booksellerinfo->{deliverytime},
+my $booksellerinfo = Koha::Acquisition::Booksellers->find( $booksellerid );
+is( $booksellerinfo->deliverytime,
5, 'set deliverytime when creating vendor (Bug 10556)' );
my ( $basket, $basketno );
my ( $biblionumber2, $biblioitemnumber2 ) = AddBiblio( MARC::Record->new, '' );
my ( $biblionumber3, $biblioitemnumber3 ) = AddBiblio( MARC::Record->new, '' );
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,
- gstrate => 0.0515
+ tax_rate => 0.0515
}
},
{
ecost => 38.1,
rrp => 11.0,
discount => 5.1,
- gstrate => 0.1
+ tax_rate => 0.1
}
},
{
rrp => 11.00,
discount => 0,
uncertainprice => 0,
- gstrate => 0
+ tax_rate => 0
}
},
{
rrp => 10,
discount => 0,
uncertainprice => 0,
- gstrate => 0
+ tax_rate => 0
+ }
+ },
+ {
+ str => {
+ basketno => $basketno,
+ biblionumber => $biblionumber5,
+ budget_id => $budget->{budget_id},
+ order_internalnote => "internal note",
+ order_vendornote => "vendor note"
+ },
+ num => {
+ quantity => 1,
+ ecost => 10,
+ rrp => 10,
+ listprice => 10,
+ ecost => 10,
+ rrp => 10,
+ discount => 0,
+ uncertainprice => 0,
+ tax_rate => 0
}
}
);
-# Create 4 orders in database
-for ( 0 .. 4 ) {
+# Create 5 orders in database
+for ( 0 .. 5 ) {
my %ocontent;
@ocontent{ keys %{ $order_content[$_]->{num} } } =
values %{ $order_content[$_]->{num} };
$order_content[$_]->{str}->{ordernumber} = $ordernumbers[$_];
}
-# Test UT sub _check_fields_of_order
-
-my (
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_order(
- [qw /a b c d e/],
- { str => { a => "bla", b => "105" }, num => { c => 15.12 } },
- { a => "blabla", f => "f", b => "105", c => 15.1200, g => '' }
- );
-ok(
- (
- ( $test_nbr_fields == 5 )
- and ( join( " ", sort @$test_missing_fields ) eq 'd e' )
- and ( join( " ", sort @$test_extra_fields ) eq 'f g' )
- and ( join( " ", @$test_different_fields ) eq 'a' )
- ),
- "_check_fields_of_order can check an order (test 1)"
-);
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_order(
- [qw /a b c /],
- { str => { a => "bla", b => "105" }, num => { c => 15.00 } },
- { a => "bla", b => "105", c => 15 }
- );
-ok(
- (
- ( $test_nbr_fields == 3 )
- and ( scalar @$test_missing_fields == 0 )
- and ( scalar @$test_extra_fields == 0 )
- and ( scalar @$test_different_fields == 0 )
- ),
- "_check_fields_of_order can check an order (test 2)"
-);
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_order(
- [qw /a b c d e/],
- { str => { a => "bla", b => "105" }, num => { c => 15.12 } },
- { a => "blabla", b => "105", c => 15, d => "error" }
- );
-ok(
- (
- ( $test_nbr_fields == 4 )
- and ( join( " ", sort @$test_missing_fields ) eq 'e' )
- and ( scalar @$test_extra_fields == 0 )
- and ( join( " ", @$test_different_fields ) eq 'a c' )
- ),
- "_check_fields_of_order can check an order (test 3)"
-);
-
-#
-# test GetOrder
-#
-
-my @expectedfields = qw(
- order_internalnote
- order_vendornote
- ordernumber
- biblionumber
- entrydate
- quantity
- currency
- listprice
- datereceived
- invoiceid
- freight
- unitprice
- quantityreceived
- datecancellationprinted
- purchaseordernumber
- basketno
- timestamp
- rrp
- ecost
- unitpricesupplier
- unitpricelib
- gstrate
- discount
- budget_id
- budgetdate
- sort1
- sort2
- sort1_authcat
- sort2_authcat
- uncertainprice
- claims_count
- claimed_date
- subscriptionid
- parent_ordernumber
- orderstatus
- line_item_id
- suppliers_reference_number
- suppliers_reference_qualifier
- suppliers_report
- title
- author
- basketname
- branchcode
- publicationyear
- copyrightdate
- editionstatement
- isbn
- ean
- seriestitle
- publishercode
- publisher
- budget
- supplier
- supplierid
- estimateddeliverydate
- orderdate
- quantity_to_receive
- subtotal
- latesince
- cancellationreason
-);
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_order( \@expectedfields, $order_content[0],
- GetOrder( $ordernumbers[0] ) );
-is(
- $test_nbr_fields,
- scalar @expectedfields,
- "GetOrder gets an order with the right number of fields"
-);
-is( join( " ", @$test_missing_fields ),
- '', "GetOrder gets an order with no missing fields" );
-is( join( " ", @$test_extra_fields ),
- '', "GetOrder gets an order with no unexpected fields" );
-is( join( " ", @$test_different_fields ),
- '', "GetOrder gets an order with the right content in every fields" );
-
-#
-# Test GetOrders
-#
-
-my @base_expectedfields = qw(
- order_internalnote
- order_vendornote
- notes
- ordernumber
- ecost
- uncertainprice
- url
- isbn
- copyrightdate
- serial
- cn_suffix
- cn_item
- marcxml
- freight
- cn_class
- title
- pages
- budget_encumb
- budget_name
- number
- itemtype
- totalissues
- author
- budget_permission
- parent_ordernumber
- size
- claims_count
- currency
- seriestitle
- timestamp
- editionstatement
- budget_parent_id
- publishercode
- unitprice
- collectionvolume
- budget_amount
- budget_owner_id
- datecreated
- claimed_date
- subscriptionid
- editionresponsibility
- sort2
- volumedate
- budget_id
- illus
- ean
- biblioitemnumber
- datereceived
- orderstatus
- line_item_id
- suppliers_reference_number
- suppliers_reference_qualifier
- suppliers_report
- agerestriction
- budget_branchcode
- gstrate
- listprice
- budget_code
- budgetdate
- basketno
- discount
- abstract
- collectionissn
- publicationyear
- collectiontitle
- invoiceid
- place
- issn
- quantityreceived
- entrydate
- cn_source
- sort1_authcat
- budget_notes
- biblionumber
- unititle
- sort2_authcat
- budget_expend
- rrp
- cn_sort
- lccn
- sort1
- volume
- purchaseordernumber
- quantity
- budget_period_id
- frameworkcode
- volumedesc
- datecancellationprinted
- cancellationreason
-);
-@expectedfields =
- ( @base_expectedfields,
- ( 'transferred_from_timestamp', 'transferred_from' ) );
-is( GetOrders(), undef, "GetOrders with no params returns undef" );
DelOrder( $order_content[3]->{str}->{biblionumber}, $ordernumbers[3] );
-my @get_orders = GetOrders($basketno);
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_orders( \@expectedfields, \@order_content, \@get_orders );
-is(
- $$test_nbr_fields[0],
- scalar @expectedfields,
- "GetOrders gets orders with the right number of fields"
-);
-is( join( " ", @$test_missing_fields ),
- '', "GetOrders gets orders with no missing fields" );
-is( join( " ", @$test_extra_fields ),
- '', "GetOrders gets orders with no unexpected fields" );
-is( join( " ", @$test_different_fields ),
- '', "GetOrders gets orders with the right content in every fields" );
-ok(
- (
- ( scalar @get_orders == 4 )
- and !grep ( $_->{ordernumber} eq $ordernumbers[3], @get_orders )
- ),
- "GetOrders only gets non-cancelled orders"
-);
-
-#
-# Test GetOrders { cancelled => 1 }
-#
-
-@expectedfields =
- ( @base_expectedfields, ( 'transferred_to_timestamp', 'transferred_to' ) );
-@get_orders = GetOrders($basketno, { cancelled => 1 });
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_orders( \@expectedfields, \@order_content, \@get_orders );
-is(
- $$test_nbr_fields[0],
- scalar @expectedfields,
- "GetOrders { cancelled => 1 } gets orders with the right number of fields"
-);
-is( join( " ", @$test_missing_fields ),
- '', "GetOrders { cancelled => 1 } gets orders with no missing fields" );
-is( join( " ", @$test_extra_fields ),
- '', "GetOrders { cancelled => 1 } gets orders with no unexpected fields" );
-is( join( " ", @$test_different_fields ),
- '',
- "GetOrders { cancelled => 1 } gets orders with the right content in every fields" );
-ok(
- (
- ( scalar @get_orders == 1 )
- and grep ( $_->{ordernumber} eq $ordernumbers[3], @get_orders )
- ),
- "GetOrders { cancelled => 1 } only gets cancelled orders"
-);
-
-#
-# Test SearchOrders
-#
-
-@expectedfields = qw (
- order_internalnote
- order_vendornote
- notes
- basketgroupid
- basketgroupname
- firstname
- biblioitemnumber
- ecost
- uncertainprice
- creationdate
- datereceived
- orderstatus
- line_item_id
- suppliers_reference_number
- suppliers_reference_qualifier
- suppliers_report
- isbn
- copyrightdate
- gstrate
- serial
- listprice
- budgetdate
- basketno
- discount
- surname
- freight
- abstract
- title
- closedate
- basketname
- invoiceid
- author
- parent_ordernumber
- claims_count
- entrydate
- currency
- quantityreceived
- seriestitle
- sort1_authcat
- timestamp
- biblionumber
- unititle
- sort2_authcat
- rrp
- unitprice
- sort1
- ordernumber
- datecreated
- purchaseordernumber
- quantity
- claimed_date
- subscriptionid
- frameworkcode
- sort2
- datecancellationprinted
- budget_id
- authorisedby
- booksellerid
- cancellationreason
-);
-
-# note that authorisedby was added to the return of SearchOrder by the
-# patch for bug 11777
my $invoiceid = AddInvoice(
invoicenumber => 'invoice',
unknown => "unknown"
);
+my $invoice = GetInvoice( $invoiceid );
+
my ($datereceived, $new_ordernumber) = ModReceiveOrder(
{
biblionumber => $biblionumber4,
- ordernumber => $ordernumbers[4],
+ order => GetOrder( $ordernumbers[4] ),
quantityreceived => 1,
- cost => 10,
- ecost => 10,
- invoiceid => $invoiceid,
- rrp => 10,
+ invoice => $invoice,
budget_id => $order_content[4]->{str}->{budget_id},
}
);
basketno => $basketno
});
isa_ok( $search_orders, 'ARRAY' );
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_orders( \@expectedfields, \@order_content,
- $search_orders );
-is(
- $$test_nbr_fields[0],
- scalar @expectedfields,
- "SearchOrders gets orders with the right number of fields"
-);
-is( join( " ", @$test_missing_fields ),
- '', "SearchOrders gets orders with no missing fields" );
-is( join( " ", @$test_extra_fields ),
- '', "SearchOrders gets orders with no unexpected fields" );
-is( join( " ", @$test_different_fields ),
- '', "SearchOrders gets orders with the right content in every fields" );
ok(
(
- ( scalar @$search_orders == 4 )
+ ( scalar @$search_orders == 5 )
and !grep ( $_->{ordernumber} eq $ordernumbers[3], @$search_orders )
),
"SearchOrders only gets non-cancelled orders"
});
ok(
(
- ( scalar @$search_orders == 3 ) and !grep ( (
+ ( scalar @$search_orders == 4 ) and !grep ( (
( $_->{ordernumber} eq $ordernumbers[3] )
or ( $_->{ordernumber} eq $ordernumbers[4] )
),
ok( GetBudgetByOrderNumber( $ordernumbers[0] )->{'budget_id'} eq $budgetid,
"GetBudgetByOrderNumber returns expected budget" );
-#
-# Test GetLateOrders
-#
-
-@expectedfields = qw (
- orderdate
- author
- budget
- supplierid
- claims_count
- supplier
- publisher
- ordernumber
- quantity
- basketno
- claimed_date
- branch
- estimateddeliverydate
- title
- publicationyear
- unitpricelib
- unitpricesupplier
- subtotal
- latesince
- basketname
- basketgroupid
- basketgroupname
-);
my @lateorders = GetLateOrders(0);
is( scalar grep ( $_->{basketno} eq $basketno, @lateorders ),
0, "GetLateOrders does not get orders from opened baskets" );
"GetLateOrders does not gets cancelled orders" );
ok( !grep ( $_->{ordernumber} eq $ordernumbers[4], @lateorders ),
"GetLateOrders does not gets reveived orders" );
-(
- $test_missing_fields, $test_extra_fields,
- $test_different_fields, $test_nbr_fields
- )
- = _check_fields_of_orders( \@expectedfields, \@order_content, \@lateorders );
-is(
- $$test_nbr_fields[0],
- scalar @expectedfields,
- "GetLateOrders gets orders with the right number of fields"
-);
-is( join( " ", @$test_missing_fields ),
- '', "GetLateOrders gets orders with no missing fields" );
-is( join( " ", @$test_extra_fields ),
- '', "GetLateOrders gets orders with no unexpected fields" );
-is( join( " ", @$test_different_fields ),
- '', "GetLateOrders gets orders with the right content in every fields" );
$search_orders = SearchOrders({
booksellerid => $booksellerid,
pending => 1,
ordered => 1,
});
-is( scalar (@$search_orders), 3, "SearchOrders with pending and ordered params gets only pending ordered orders. After closing the basket, orders are marked as 'ordered' (bug 11170)" );
+is( scalar (@$search_orders), 4, "SearchOrders with pending and ordered params gets only pending ordered orders. After closing the basket, orders are marked as 'ordered' (bug 11170)" );
#
# Test AddClaim
"AddClaim : Check claimed_date"
);
+my $order2 = GetOrder( $ordernumbers[1] );
+$order2->{order_internalnote} = "my notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
biblionumber => $biblionumber2,
- ordernumber => $ordernumbers[1],
+ order => $order2,
quantityreceived => 2,
- cost => 12,
- ecost => 12,
- invoiceid => $invoiceid,
- rrp => 42,
- order_internalnote => "my notes",
- order_vendornote => "my vendor notes",
+ invoice => $invoice,
}
-);
-my $order2 = GetOrder( $ordernumbers[1] );
+)
+;
+$order2 = GetOrder( $ordernumbers[1] );
is( $order2->{'quantityreceived'},
0, 'Splitting up order did not receive any on original order' );
is( $order2->{'quantity'}, 40, '40 items on original order' );
'Budget on original order is unchanged' );
is( $order2->{order_internalnote}, "my notes",
'ModReceiveOrder and GetOrder deal with internal notes' );
-is( $order2->{order_vendornote}, "my vendor notes",
- 'ModReceiveOrder and GetOrder deal with vendor notes' );
$neworder = GetOrder($new_ordernumber);
is( $neworder->{'quantity'}, 2, '2 items on new order' );
}
);
+my $order3 = GetOrder( $ordernumbers[2] );
+$order3->{order_internalnote} = "my other notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
biblionumber => $biblionumber2,
- ordernumber => $ordernumbers[2],
+ order => $order3,
quantityreceived => 2,
- cost => 12,
- ecost => 12,
- invoiceid => $invoiceid,
- rrp => 42,
+ invoice => $invoice,
budget_id => $budgetid2,
- order_internalnote => "my other notes",
}
);
-my $order3 = GetOrder( $ordernumbers[2] );
+$order3 = GetOrder( $ordernumbers[2] );
is( $order3->{'quantityreceived'},
0, 'Splitting up order did not receive any on original order' );
is( $order3->{'quantity'}, 2, '2 items on original order' );
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->{order_internalnote} = "my third notes";
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
biblionumber => $biblionumber2,
- ordernumber => $ordernumbers[2],
+ order => $order3,
quantityreceived => 2,
- cost => 12,
- ecost => 12,
- invoiceid => $invoiceid,
- rrp => 42,
+ invoice => $invoice,
budget_id => $budgetid2,
- order_internalnote => "my third notes",
}
);
ok((defined $order4->{datecancellationprinted}), "order is cancelled");
ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\"");
ok((not defined GetBiblio($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(GetBiblio($order5->{biblionumber}), "biblio still exists");
+
# End of tests for DelOrder
subtest 'ModOrder' => sub {
projects / koha.git / blobdiff