use Modern::Perl;
-use Test::More tests => 72;
+use Test::More tests => 86;
use Test::MockModule;
+use Test::Warn;
+
+use t::lib::TestBuilder;
+
use C4::Context;
use Koha::DateUtils;
use DateTime::Duration;
+use t::lib::Mocks;
use C4::Acquisition;
use C4::Serials;
use C4::Budgets;
use C4::Biblio;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use Koha::Database;
+
BEGIN {
use_ok('C4::Bookseller');
}
can_ok(
'C4::Bookseller', qw(
- AddBookseller
- DelBookseller
- GetBookSeller
- GetBookSellerFromId
GetBooksellersWithLateOrders
- ModBookseller )
+ )
);
#Start transaction
my $dbh = C4::Context->dbh;
+my $database = Koha::Database->new();
+my $schema = $database->schema();
+$schema->storage->txn_begin();
$dbh->{RaiseError} = 1;
-$dbh->{AutoCommit} = 0;
+my $builder = t::lib::TestBuilder->new;
#Start tests
$dbh->do(q|DELETE FROM aqorders|);
$dbh->do(q|DELETE FROM aqbooksellers|);
$dbh->do(q|DELETE FROM subscription|);
+my $patron = $builder->build_object({ class => 'Koha::Patrons' });
+# Add currency
+my $curcode = $builder->build({ source => 'Currency' })->{currencycode};
+
#Test AddBookseller
-my $count = scalar( C4::Bookseller::GetBookSeller('') );
+my $count = Koha::Acquisition::Booksellers->search()->count();
my $sample_supplier1 = {
name => 'Name1',
address1 => 'address1_1',
accountnumber => 'accountnumber1',
fax => 'fax1',
url => 'url1',
- contact => 'contact1',
- contpos => 'contpos1',
- contphone => 'contphone1',
- contfax => 'contefax1',
- contaltphone => 'contaltphone1',
- contemail => 'contemail1',
- contnotes => 'contnotes1',
active => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- gstrate => '1.0000',
- discount => '1.0000',
+ tax_rate => '1.0000',
+ discount => 1.0000,
notes => 'notes1',
deliverytime => undef
};
accountnumber => 'accountnumber2',
fax => 'fax2',
url => 'url2',
- contact => 'contact2',
- contpos => 'contpos2',
- contphone => 'contphone2',
- contfax => 'contefax2',
- contaltphone => 'contaltphone2',
- contemail => 'contemail2',
- contnotes => 'contnotes2',
active => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- gstrate => '2.0000',
- discount => '2.0000',
+ tax_rate => '2.0000',
+ discount => 2.0000,
notes => 'notes2',
- deliverytime => 2,
+ deliverytime => 2
};
-my $id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
-my $id_supplier2 = C4::Bookseller::AddBookseller($sample_supplier2);
-
-#my $id_bookseller3 = C4::Bookseller::AddBookseller();# NOTE : Doesn't work because the field name cannot be null
+my $supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
+my $id_supplier1 = $supplier1->id;
+my $supplier2 = Koha::Acquisition::Bookseller->new($sample_supplier2)->store;
+my $id_supplier2 = $supplier2->id;
like( $id_supplier1, '/^\d+$/', "AddBookseller for supplier1 return an id" );
like( $id_supplier2, '/^\d+$/', "AddBookseller for supplier2 return an id" );
-is( scalar( C4::Bookseller::GetBookSeller('') ),
+is( Koha::Acquisition::Booksellers->search()->count,
$count + 2, "Supplier1 and Supplier2 have been added" );
#Test DelBookseller
-my $del = C4::Bookseller::DelBookseller($id_supplier1);
+my $del = $supplier1->delete;
is( $del, 1, "DelBookseller returns 1 - 1 supplier has been deleted " );
-is( C4::Bookseller::GetBookSellerFromId($id_supplier1),
- undef, "Supplier1 has been deleted - id_supplier1 doesnt exist anymore" );
+my $b = Koha::Acquisition::Booksellers->find( $id_supplier1 );
+is( $b,
+ undef, "Supplier1 has been deleted - id_supplier1 $id_supplier1 doesnt exist anymore" );
-#Test GetBookSeller
-my @bookseller2 = C4::Bookseller::GetBookSeller( $sample_supplier2->{name} );
+#Test get bookseller
+my @bookseller2 = Koha::Acquisition::Booksellers->search({name => $sample_supplier2->{name} });
is( scalar(@bookseller2), 1, "Get only Supplier2" );
-$bookseller2[0] = field_filter( $bookseller2[0] );
-delete $bookseller2[0]->{basketcount};
+for my $bookseller ( @bookseller2 ) {
+ $bookseller = field_filter( $bookseller->unblessed );
+}
$sample_supplier2->{id} = $id_supplier2;
-is_deeply( $bookseller2[0], $sample_supplier2,
- "GetBookSeller returns the right informations about $sample_supplier2" );
-
-$id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
-my @booksellers = C4::Bookseller::GetBookSeller('')
- ; #NOTE :without params, it returns all the booksellers
-for my $i ( 0 .. scalar(@booksellers) - 1 ) {
- $booksellers[$i] = field_filter( $booksellers[$i] );
- delete $booksellers[$i]->{basketcount};
+is_deeply( cast_precision($bookseller2[0]), $sample_supplier2,
+ "Koha::Acquisition::Booksellers->search returns the right informations about supplier $sample_supplier2->{name}" );
+
+$supplier1 = Koha::Acquisition::Bookseller->new($sample_supplier1)->store;
+$id_supplier1 = $supplier1->id;
+my @booksellers = Koha::Acquisition::Booksellers->search();
+for my $bookseller ( @booksellers ) {
+ $bookseller = field_filter( $bookseller->unblessed );
+ $bookseller = cast_precision($bookseller);
}
$sample_supplier1->{id} = $id_supplier1;
is( scalar(@booksellers), $count + 2, "Get Supplier1 and Supplier2" );
-my @tab = ( $sample_supplier1, $sample_supplier2 );
+my @tab = ( $sample_supplier2, $sample_supplier1 );
is_deeply( \@booksellers, \@tab,
"Returns right fields of Supplier1 and Supplier2" );
-#Test basketcount
-my @bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} );
-#FIXME : if there is 0 basket, GetBookSeller returns 1 as basketcount
-#is( $bookseller1[0]->{basketcount}, 0, 'Supplier1 has 0 basket' );
-my $sample_basket1 =
- C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' );
-my $sample_basket2 =
- C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' );
-@bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} );
-is( $bookseller1[0]->{basketcount}, 2, 'Supplier1 has 2 baskets' );
-
-#Test GetBookSellerFromId
-my $bookseller1fromid = C4::Bookseller::GetBookSellerFromId();
+#Test baskets
+my @bookseller1 = Koha::Acquisition::Booksellers->search({name => $sample_supplier1->{name} });
+is( $bookseller1[0]->baskets->count, 0, 'Supplier1 has 0 basket' );
+my $basketno1 =
+ C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname1' );
+my $basketno2 =
+ C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname2' );
+@bookseller1 = Koha::Acquisition::Booksellers->search({ name => $sample_supplier1->{name} });
+is( $bookseller1[0]->baskets->count, 2, 'Supplier1 has 2 baskets' );
+
+#Test Koha::Acquisition::Bookseller->new using id
+my $bookseller1fromid = Koha::Acquisition::Booksellers->find;
is( $bookseller1fromid, undef,
- "GetBookSellerFromId returns undef if no id given" );
-$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
-$bookseller1fromid = field_filter($bookseller1fromid);
-delete $bookseller1fromid->{basketcount};
-delete $bookseller1fromid->{subscriptioncount};
-is_deeply( $bookseller1fromid, $sample_supplier1,
- "Get Supplier1 (GetBookSellerFromId)" );
-
-#Test basketcount
-$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
-is( $bookseller1fromid->{basketcount}, 2, 'Supplier1 has 2 baskets' );
-
-#Test subscriptioncount
+ "find returns undef if no id given" );
+$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
+$bookseller1fromid = field_filter($bookseller1fromid->unblessed);
+is_deeply( cast_precision($bookseller1fromid), $sample_supplier1,
+ "Get Supplier1 (find a bookseller by id)" );
+
+$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
+is( $bookseller1fromid->baskets->count, 2, 'Supplier1 has 2 baskets' );
+
+#Test subscriptions
my $dt_today = dt_from_string;
my $today = output_pref({ dt => $dt_today, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
MARC::Field->new('500', ' ', ' ', a => 'bib notes'),
);
my ($biblionumber, $biblioitemnumber) = AddBiblio($bib, '');
-$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
-is( $bookseller1fromid->{subscriptioncount},
+$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
+is( $bookseller1fromid->subscriptions->count,
0, 'Supplier1 has 0 subscription' );
my $id_subscription1 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
- '01-01-2013',undef, undef, undef, undef,
+ '2013-01-01',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '01-01-2013', undef, undef,
+ 1, "subscription notes",undef, '2013-01-01', undef, undef,
undef, 'CALL ABC', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-11-30', 0
);
my $id_subscription2 = NewSubscription(
undef, 'BRANCH2', $id_supplier1, undef, $id_budget, $biblionumber,
- '01-01-2013',undef, undef, undef, undef,
+ '2013-01-01',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '01-01-2013', undef, undef,
+ 1, "subscription notes",undef, '2013-01-01', undef, undef,
undef, 'CALL DEF', 0, "intnotes", 0,
undef, undef, 0, undef, '2013-07-31', 0
);
-$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
-is( $bookseller1fromid->{subscriptioncount},
+$bookseller1fromid = Koha::Acquisition::Booksellers->find( $id_supplier1 );
+is( $bookseller1fromid->subscriptions->count,
2, 'Supplier1 has 2 subscriptions' );
#Test ModBookseller
accountnumber => 'accountnumber2 modified',
fax => 'fax2 modified',
url => 'url2 modified',
- contact => 'contact2 modified',
- contpos => 'contpos2 modified',
- contphone => 'contphone2 modified',
- contfax => 'contefax2 modified',
- contaltphone => 'contaltphone2 modified',
- contemail => 'contemail2 modified',
- contnotes => 'contnotes2 modified',
active => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- gstrate => '2.0000 ',
- discount => '2.0000',
+ tax_rate => '2.0000',
+ discount => 2.0000,
notes => 'notes2 modified',
deliverytime => 2,
};
-my $modif1 = C4::Bookseller::ModBookseller();
-is( $modif1, undef,
- "ModBookseller returns undef if no params given - Nothing happened" );
-$modif1 = C4::Bookseller::ModBookseller($sample_supplier2);
-is( $modif1, 1, "ModBookseller modifies only the supplier2" );
-is( scalar( C4::Bookseller::GetBookSeller('') ),
+my $modif1 = Koha::Acquisition::Booksellers->find($id_supplier2)->set($sample_supplier2)->store;
+is( ref $modif1, 'Koha::Acquisition::Bookseller', "ModBookseller has updated the bookseller" );
+is( Koha::Acquisition::Booksellers->search->count,
$count + 2, "Supplier2 has been modified - Nothing added" );
-
-$modif1 = C4::Bookseller::ModBookseller(
- {
- id => -1,
- name => 'name3'
- }
-);
-#is( $modif1, '0E0',
-# "ModBookseller returns OEO if the id doesnt exist - Nothing modified" );
+$supplier2 = Koha::Acquisition::Booksellers->find($id_supplier2);
+is( $supplier2->name, 'Name2 modified', "supplier's name should have been modified" );
#Test GetBooksellersWithLateOrders
#Add 2 suppliers
accountnumber => 'accountnumber3',
fax => 'fax3',
url => 'url3',
- contact => 'contact3',
- contpos => 'contpos3',
- contphone => 'contphone3',
- contfax => 'contefax3',
- contaltphone => 'contaltphone3',
- contemail => 'contemail3',
- contnotes => 'contnotes3',
active => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- gstrate => '3.0000',
- discount => '3.0000',
+ tax_rate => '3.0000',
+ discount => 3.0000,
notes => 'notes3',
deliverytime => 3
};
accountnumber => 'accountnumber4',
fax => 'fax4',
url => 'url4',
- contact => 'contact4',
- contpos => 'contpos4',
- contphone => 'contphone4',
- contfax => 'contefax4',
- contaltphone => 'contaltphone4',
- contemail => 'contemail4',
- contnotes => 'contnotes4',
active => 1,
gstreg => 1,
listincgst => 1,
invoiceincgst => 1,
- gstrate => '3.0000',
- discount => '3.0000',
+ tax_rate => '3.0000',
+ discount => 3.0000,
notes => 'notes3',
};
-my $id_supplier3 = C4::Bookseller::AddBookseller($sample_supplier3);
-my $id_supplier4 = C4::Bookseller::AddBookseller($sample_supplier4);
+my $supplier3 = Koha::Acquisition::Bookseller->new($sample_supplier3)->store;
+my $id_supplier3 = $supplier3->id;
+my $supplier4 = Koha::Acquisition::Bookseller->new($sample_supplier4)->store;
+my $id_supplier4 = $supplier4->id;
#Add 2 baskets
-my $sample_basket3 =
- C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3',
+my $basketno3 =
+ C4::Acquisition::NewBasket( $id_supplier3, $patron->borrowernumber, 'basketname3',
'basketnote3' );
-my $sample_basket4 =
- C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4',
+my $basketno4 =
+ C4::Acquisition::NewBasket( $id_supplier4, $patron->borrowernumber, 'basketname4',
'basketnote4' );
#Modify the basket to add a close date
my $basket1info = {
- basketno => $sample_basket1,
+ basketno => $basketno1,
closedate => $today,
booksellerid => $id_supplier1
};
my $basket2info = {
- basketno => $sample_basket2,
+ basketno => $basketno2,
closedate => $daysago5,
booksellerid => $id_supplier2
};
$dt_today2->add_duration($dur10);
my $daysago10 = output_pref({ dt => $dt_today2, dateformat => 'iso', timeformat => '24hr', dateonly => 1 });
my $basket3info = {
- basketno => $sample_basket3,
+ basketno => $basketno3,
closedate => $daysago10,
};
my $basket4info = {
- basketno => $sample_basket4,
+ basketno => $basketno4,
closedate => $today,
};
ModBasket($basket1info);
#Add 1 subscription
my $id_subscription3 = NewSubscription(
undef, "BRANCH1", $id_supplier1, undef, $id_budget, $biblionumber,
- '01-01-2013',undef, undef, undef, undef,
+ '2013-01-01',undef, undef, undef, undef,
undef, undef, undef, undef, undef, undef,
- 1, "subscription notes",undef, '01-01-2013', undef, undef,
+ 1, "subscription notes",undef, '2013-01-01', undef, undef,
undef, undef, 0, "intnotes", 0,
undef, undef, 0, 'LOCA', '2013-12-31', 0
);
is(scalar(@subscriptions), 1, 'search for subscriptions by location');
#Add 4 orders
-my ( $ordernumber1, $ordernumber2, $ordernumber3, $ordernumber4 );
-my ( $basketno1, $basketno2, $basketno3, $basketno4 );
-( $basketno1, $ordernumber1 ) = C4::Acquisition::NewOrder(
+my $order1 = Koha::Acquisition::Order->new(
{
- basketno => $sample_basket1,
+ basketno => $basketno1,
quantity => 24,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '01-01-2013',
- currency => 'EUR',
+ entrydate => '2013-01-01',
+ currency => $curcode,
notes => "This is a note1",
- gstrate => 0.0500,
+ tax_rate => 0.0500,
orderstatus => 1,
subscriptionid => $id_subscription1,
quantityreceived => 2,
rrp => 10,
ecost => 10,
- datereceived => '01-06-2013'
+ datereceived => '2013-06-01'
}
-);
-( $basketno2, $ordernumber2 ) = C4::Acquisition::NewOrder(
+)->store;
+my $ordernumber1 = $order1->ordernumber;
+
+my $order2 = Koha::Acquisition::Order->new(
{
- basketno => $sample_basket2,
+ basketno => $basketno2,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '01-01-2013',
- currency => 'EUR',
+ entrydate => '2013-01-01',
+ currency => $curcode,
notes => "This is a note2",
- gstrate => 0.0500,
+ tax_rate => 0.0500,
orderstatus => 1,
subscriptionid => $id_subscription2,
rrp => 10,
ecost => 10,
}
-);
-( $basketno3, $ordernumber3 ) = C4::Acquisition::NewOrder(
+)->store;
+my $ordernumber2 = $order2->ordernumber;
+
+my $order3 = Koha::Acquisition::Order->new(
{
- basketno => $sample_basket3,
+ basketno => $basketno3,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '02-02-2013',
- currency => 'EUR',
+ entrydate => '2013-02-02',
+ currency => $curcode,
notes => "This is a note3",
- gstrate => 0.0500,
+ tax_rate => 0.0500,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
ecost => 11,
}
-);
-( $basketno4, $ordernumber4 ) = C4::Acquisition::NewOrder(
+)->store;
+my $ordernumber3 = $order3->ordernumber;
+
+my $order4 = Koha::Acquisition::Order->new(
{
- basketno => $sample_basket4,
+ basketno => $basketno4,
quantity => 20,
biblionumber => $biblionumber,
budget_id => $id_budget,
- entrydate => '02-02-2013',
- currency => 'EUR',
+ entrydate => '2013-02-02',
+ currency => $curcode,
notes => "This is a note3",
- gstrate => 0.0500,
+ tax_rate => 0.0500,
orderstatus => 2,
subscriptionid => $id_subscription3,
rrp => 11,
ecost => 11,
quantityreceived => 20
}
-);
+)->store;
+my $ordernumber4 = $order4->ordernumber;
#Test cases:
# Sample datas :
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
#Case 3: With $delay = -1
-is( C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ),
- undef, "-1 is a wrong value for a delay" );
+my $bslo;
+warning_like
+ { $bslo = C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ) }
+ qr/^WARNING: GetBooksellerWithLateOrders is called with a negative value/,
+ "GetBooksellerWithLateOrders prints a warning on negative values";
+
+is( $bslo, undef, "-1 is a wrong value for a delay" );
#Case 4: With $delay = 0
# today == now-0 -LATE- (if no deliverytime or deliverytime == 0)
#Basket1 closedate -> $daysago10
$basket1info = {
- basketno => $sample_basket1,
+ basketno => $basketno1,
closedate => $daysago10,
};
ModBasket($basket1info);
"Supplier1 has late orders and $daysago10==$daysago10 " )
;
-C4::Context->_new_userenv('DUMMY SESSION');
-C4::Context::set_userenv(0,0,0,'firstname','surname', 'BRANCH1', 'Library 1', 0, '', '');
-my $userenv = C4::Context->userenv;
+t::lib::Mocks::mock_userenv({ flags => 0, branchcode => 'BRANCH1' });
my $module = Test::MockModule->new('C4::Auth');
$module->mock(
}
);
-C4::Context->set_preference('IndependentBranches', 0);
+t::lib::Mocks::mock_preference('IndependentBranches', 0);
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
is(
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
'ordinary user can see all subscriptions with IndependentBranches off'
);
-C4::Context->set_preference('IndependentBranches', 1);
+t::lib::Mocks::mock_preference('IndependentBranches', 1);
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
is(
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
);
# don the cape and turn into Superlibrarian!
-C4::Context::set_userenv(0,0,0,'firstname','surname', 'BRANCH1', 'Library 1', 1, '', '');
+t::lib::Mocks::mock_userenv({ flags => 1, branchcode => 'BRANCH1' });
@subscriptions = SearchSubscriptions({expiration_date => '2013-12-31'});
is(
scalar(grep { !$_->{cannotdisplay} } @subscriptions ),
'superlibrarian can see all subscriptions with IndependentBranches on (bug 12048)'
);
+#Test contact editing
+my $sample_supplier = {
+ name => "my vendor",
+ address1 => "bookseller's address",
+ phone => "0123456",
+ active => 1
+ };
+my $supplier = Koha::Acquisition::Bookseller->new($sample_supplier)->store;
+my $booksellerid = $supplier->id;
+my $contact1 = Koha::Acquisition::Bookseller::Contact->new({
+ name => 'John Smith',
+ phone => '0123456x1',
+ booksellerid => $booksellerid,
+})->store;
+my $contact2 = Koha::Acquisition::Bookseller::Contact->new({
+ name => 'Leo Tolstoy',
+ phone => '0123456x2',
+ booksellerid => $booksellerid,
+})->store;
+
+@booksellers = Koha::Acquisition::Booksellers->search({ name => 'my vendor' });
+ok(
+ ( grep { $_->id == $booksellerid } @booksellers ),
+ 'Koha::Acquisition::Booksellers->search returns correct record when passed a name'
+);
+
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+is( $bookseller->id, $booksellerid, 'Retrieved desired record' );
+is( $bookseller->phone, '0123456', 'New bookseller has expected phone' );
+my $contacts = $bookseller->contacts;
+is( $contacts->count,
+ 2, 'bookseller should have 2 contacts' );
+my $first_contact = $contacts->next;
+is(
+ ref $first_contact,
+ 'Koha::Acquisition::Bookseller::Contact',
+ 'First contact is a AqContact'
+);
+is( $first_contact->phone,
+ '0123456x1', 'Contact has expected phone number' );
+
+my $second_contact = $contacts->next;
+$second_contact->delete;
+$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+$bookseller->name('your vendor')->store;
+$contacts = $bookseller->contacts;
+$first_contact = $contacts->next;
+$first_contact->phone('654321');
+$first_contact->store;
+
+$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+is( $bookseller->name, 'your vendor',
+ 'Successfully changed name of vendor' );
+$contacts = $bookseller->contacts;
+is( $contacts->count,
+ 1, 'Only one contact after modification' );
+$first_contact = $contacts->next;
+is( $first_contact->phone,
+ '654321',
+ 'Successfully changed contact phone number by modifying bookseller hash' );
+
+$first_contact->name( 'John Jacob Jingleheimer Schmidt' );
+$first_contact->phone(undef);
+$first_contact->store;
+
+$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+$contacts = $bookseller->contacts;
+$first_contact = $contacts->next;
+is(
+ $first_contact->name,
+ 'John Jacob Jingleheimer Schmidt',
+ 'Changed name of contact'
+);
+is( $first_contact->phone,
+ undef, 'Removed phone number from contact' );
+is( $contacts->count,
+ 1, 'Only one contact after modification' );
+
#End transaction
-$dbh->rollback;
+$schema->storage->txn_rollback();
#field_filter filters the useless fields or foreign keys
#NOTE: all the fields of aqbookseller arent considered
'bookselleremail', 'booksellerfax',
'booksellerurl', 'othersupplier',
'currency', 'invoiceprice',
- 'listprice'
+ 'listprice', 'contacts'
)
{
}
return $struct;
}
+
+# ensure numbers are actually tested as numbers to prevent
+# precision changes causing test failures (D8->D9 Upgrades)
+sub cast_precision {
+ my ($struct) = @_;
+ my @cast = ('discount');
+ for my $cast (@cast) {
+ $struct->{$cast} = $struct->{$cast}+0;
+ }
+ return $struct;
+}
projects / koha.git / blobdiff