Jonathan Druart
3aeb1fc7e8
At the moment we have 2 different modules for acquisition orders: Koha::Tmp::Order[s] and Koha::Acquisition::Order The later has been added before the creation of Koha::Object. Koha::Tmp::Order[s] has been created to make the TT syntax for notices works with acquisition order data. This patch removes the temporary packages Koha::Tmp::Order[s] and adapt the code of Koha::Acquisition::Order[s] to be based on Koha::Object[s]. It also overloads Koha::Object->new to add the trick that was done in Koha::Acquisition::Order->insert. This is needed because acqui/addorder.pl is called from several places and CGI->Vars is used to retrieved order's attributes (and so much more). To avoid regression, the easiest (but not cleanest) way to do is to filter on aqorders column's names. This is *not* a pattern to follow! Test plan: Create basket and add orders from different ways, then continue a whole acquisition process Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
116 lines
3.4 KiB
Perl
116 lines
3.4 KiB
Perl
use Modern::Perl;
|
|
use Test::More tests => 3;
|
|
|
|
use C4::Acquisition;
|
|
use C4::Biblio;
|
|
use C4::Letters;
|
|
use Koha::Database;
|
|
use Koha::Acquisition::Booksellers;
|
|
use Koha::Acquisition::Orders;
|
|
|
|
use t::lib::TestBuilder;
|
|
|
|
my $schema = Koha::Database->schema;
|
|
$schema->storage->txn_begin;
|
|
my $builder = t::lib::TestBuilder->new;
|
|
|
|
my $library = $builder->build({
|
|
source => "Branch",
|
|
});
|
|
my $patron_category = $builder->build({ source => 'Category' });
|
|
my $currency = $builder->build({ source => 'Currency' });
|
|
|
|
# Creating some orders
|
|
my $bookseller = Koha::Acquisition::Bookseller->new(
|
|
{
|
|
name => "my vendor",
|
|
address1 => "bookseller's address",
|
|
phone => "0123456",
|
|
active => 1,
|
|
}
|
|
)->store;
|
|
|
|
my $basketno = NewBasket( $bookseller->id, 1 );
|
|
|
|
my $budgetid = C4::Budgets::AddBudget(
|
|
{
|
|
budget_code => "budget_code_test_getordersbybib",
|
|
budget_name => "budget_name_test_getordersbybib",
|
|
}
|
|
);
|
|
my $budget = C4::Budgets::GetBudget($budgetid);
|
|
|
|
my @ordernumbers;
|
|
my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio( MARC::Record->new, '' );
|
|
|
|
my $order = Koha::Acquisition::Order->new(
|
|
{
|
|
basketno => $basketno,
|
|
quantity => 2,
|
|
biblionumber => $biblionumber,
|
|
budget_id => $budgetid,
|
|
entrydate => '01-01-2014',
|
|
currency => $currency->{currency},
|
|
orderstatus => 1,
|
|
quantityreceived => 0,
|
|
rrp => 10,
|
|
ecost => 10,
|
|
}
|
|
)->store;
|
|
my $ordernumber = $order->ordernumber;
|
|
|
|
my $invoiceid = AddInvoice(
|
|
invoicenumber => 'invoice',
|
|
booksellerid => $bookseller->id,
|
|
unknown => "unknown"
|
|
);
|
|
|
|
my $borrowernumber = C4::Members::AddMember(
|
|
cardnumber => 'TESTCARD',
|
|
firstname => 'TESTFN',
|
|
surname => 'TESTSN',
|
|
categorycode => $patron_category->{categorycode},
|
|
branchcode => $library->{branchcode},
|
|
dateofbirth => '',
|
|
dateexpiry => '9999-12-31',
|
|
userid => 'TESTUSERID'
|
|
);
|
|
|
|
C4::Acquisition::ModOrderUsers( $ordernumber, $borrowernumber );
|
|
|
|
my $is_added = grep { /^$borrowernumber$/ } C4::Acquisition::GetOrderUsers( $ordernumber );
|
|
is( $is_added, 1, 'ModOrderUsers should link patrons to an order' );
|
|
|
|
$order = Koha::Acquisition::Orders->find( $ordernumber );
|
|
ModReceiveOrder(
|
|
{
|
|
biblionumber => $biblionumber,
|
|
order => $order->unblessed,
|
|
quantityreceived => 1,
|
|
cost => 10,
|
|
ecost => 10,
|
|
invoiceid => $invoiceid,
|
|
rrp => 10,
|
|
budget_id => $budgetid,
|
|
}
|
|
);
|
|
|
|
my $messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber });
|
|
is( scalar( @$messages ), 0, 'The letter has not been sent to message queue on receiving the order, the order is not entire received');
|
|
|
|
$order = Koha::Acquisition::Orders->find( $ordernumber );
|
|
ModReceiveOrder(
|
|
{
|
|
biblionumber => $biblionumber,
|
|
order => $order->unblessed,
|
|
quantityreceived => 1,
|
|
cost => 10,
|
|
ecost => 10,
|
|
invoiceid => $invoiceid,
|
|
rrp => 10,
|
|
budget_id => $budgetid,
|
|
}
|
|
);
|
|
|
|
$messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber });
|
|
is( scalar( @$messages ), 1, 'The letter has been sent to message queue on receiving the order');
|