View | Details | Raw Unified | Return to bug 20144
Collapse All | Expand All

(-)a/t/db_dependent/Bookseller.t (-4 / +5 lines)
Lines 46-51 $dbh->do(q|DELETE FROM aqbasket|); Link Here
46
$dbh->do(q|DELETE FROM aqbooksellers|);
46
$dbh->do(q|DELETE FROM aqbooksellers|);
47
$dbh->do(q|DELETE FROM subscription|);
47
$dbh->do(q|DELETE FROM subscription|);
48
48
49
my $patron = $builder->build_object({ class => 'Koha::Patrons' });
49
# Add currency
50
# Add currency
50
my $curcode = $builder->build({ source => 'Currency' })->{currencycode};
51
my $curcode = $builder->build({ source => 'Currency' })->{currencycode};
51
52
Lines 137-145 is_deeply( \@booksellers, \@tab, Link Here
137
my @bookseller1 = Koha::Acquisition::Booksellers->search({name => $sample_supplier1->{name} });
138
my @bookseller1 = Koha::Acquisition::Booksellers->search({name => $sample_supplier1->{name} });
138
is( $bookseller1[0]->baskets->count, 0, 'Supplier1 has 0 basket' );
139
is( $bookseller1[0]->baskets->count, 0, 'Supplier1 has 0 basket' );
139
my $basketno1 =
140
my $basketno1 =
140
  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' );
141
  C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname1' );
141
my $basketno2 =
142
my $basketno2 =
142
  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' );
143
  C4::Acquisition::NewBasket( $id_supplier1, $patron->borrowernumber, 'basketname2' );
143
@bookseller1 = Koha::Acquisition::Booksellers->search({ name => $sample_supplier1->{name} });
144
@bookseller1 = Koha::Acquisition::Booksellers->search({ name => $sample_supplier1->{name} });
144
is( $bookseller1[0]->baskets->count, 2, 'Supplier1 has 2 baskets' );
145
is( $bookseller1[0]->baskets->count, 2, 'Supplier1 has 2 baskets' );
145
146
Lines 289-298 my $id_supplier4 = $supplier4->id; Link Here
289
290
290
#Add 2 baskets
291
#Add 2 baskets
291
my $basketno3 =
292
my $basketno3 =
292
  C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3',
293
  C4::Acquisition::NewBasket( $id_supplier3, $patron->borrowernumber, 'basketname3',
293
    'basketnote3' );
294
    'basketnote3' );
294
my $basketno4 =
295
my $basketno4 =
295
  C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4',
296
  C4::Acquisition::NewBasket( $id_supplier4, $patron->borrowernumber, 'basketname4',
296
    'basketnote4' );
297
    'basketnote4' );
297
298
298
#Modify the basket to add a close date
299
#Modify the basket to add a close date
(-)a/t/db_dependent/Koha/Acquisition/Booksellers.t (-3 / +3 lines)
Lines 44-57 subtest '->baskets() tests' => sub { Link Here
44
    $schema->resultset('Aqbasket')->delete();
44
    $schema->resultset('Aqbasket')->delete();
45
    Koha::Acquisition::Booksellers->delete();
45
    Koha::Acquisition::Booksellers->delete();
46
    $schema->resultset('Subscription')->delete();
46
    $schema->resultset('Subscription')->delete();
47
    my $patron = $builder->build_object({ class => 'Koha::Patrons' });
47
48
48
    my $vendor = $builder->build_object( { class => 'Koha::Acquisition::Booksellers' } );
49
    my $vendor = $builder->build_object( { class => 'Koha::Acquisition::Booksellers' } );
49
50
50
    is( $vendor->baskets, 0, 'Vendor has no baskets' );
51
    is( $vendor->baskets, 0, 'Vendor has no baskets' );
51
52
52
    # Add two baskets
53
    # Add two baskets
53
    my $basket_1_id = C4::Acquisition::NewBasket( $vendor->id, 'authorizedby1', 'basketname1' );
54
    my $basket_1_id = C4::Acquisition::NewBasket( $vendor->id, $patron->borrowernumber, 'basketname1' );
54
    my $basket_2_id = C4::Acquisition::NewBasket( $vendor->id, 'authorizedby2', 'basketname2' );
55
    my $basket_2_id = C4::Acquisition::NewBasket( $vendor->id, $patron->borrowernumber, 'basketname2' );
55
56
56
    # Re-fetch vendor
57
    # Re-fetch vendor
57
    $vendor = Koha::Acquisition::Booksellers->find( $vendor->id );
58
    $vendor = Koha::Acquisition::Booksellers->find( $vendor->id );
58
- 

Return to bug 20144