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

(-)a/C4/Bookseller.pm (-2 / +2 lines)
Lines 248-254 sub ModBookseller { Link Here
248
            discount=?,notes=?,gstrate=?,deliverytime=?
248
            discount=?,notes=?,gstrate=?,deliverytime=?
249
        WHERE id=?';
249
        WHERE id=?';
250
    my $sth = $dbh->prepare($query);
250
    my $sth = $dbh->prepare($query);
251
    return $sth->execute(
251
    my $cnt = $sth->execute(
252
        $data->{'name'},         $data->{'address1'},
252
        $data->{'name'},         $data->{'address1'},
253
        $data->{'address2'},     $data->{'address3'},
253
        $data->{'address2'},     $data->{'address3'},
254
        $data->{'address4'},     $data->{'postal'},
254
        $data->{'address4'},     $data->{'postal'},
Lines 278-284 sub ModBookseller { Link Here
278
    }
278
    }
279
    $sth = $dbh->prepare($contactquery);
279
    $sth = $dbh->prepare($contactquery);
280
    $sth->execute(@contactparams);
280
    $sth->execute(@contactparams);
281
    return;
281
    return $cnt;
282
}
282
}
283
283
284
=head2 DelBookseller
284
=head2 DelBookseller
(-)a/t/db_dependent/Bookseller.t (-40 / +4 lines)
Lines 2-8 Link Here
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
5
use Test::More tests => 70;
5
use Test::More tests => 68;
6
use C4::Context;
6
use C4::Context;
7
use Koha::DateUtils;
7
use Koha::DateUtils;
8
use DateTime::Duration;
8
use DateTime::Duration;
Lines 48-60 my $sample_supplier1 = { Link Here
48
    accountnumber => 'accountnumber1',
48
    accountnumber => 'accountnumber1',
49
    fax           => 'fax1',
49
    fax           => 'fax1',
50
    url           => 'url1',
50
    url           => 'url1',
51
    contact       => 'contact1',
52
    contpos       => 'contpos1',
53
    contphone     => 'contphone1',
54
    contfax       => 'contefax1',
55
    contaltphone  => 'contaltphone1',
56
    contemail     => 'contemail1',
57
    contnotes     => 'contnotes1',
58
    active        => 1,
51
    active        => 1,
59
    gstreg        => 1,
52
    gstreg        => 1,
60
    listincgst    => 1,
53
    listincgst    => 1,
Lines 75-87 my $sample_supplier2 = { Link Here
75
    accountnumber => 'accountnumber2',
68
    accountnumber => 'accountnumber2',
76
    fax           => 'fax2',
69
    fax           => 'fax2',
77
    url           => 'url2',
70
    url           => 'url2',
78
    contact       => 'contact2',
79
    contpos       => 'contpos2',
80
    contphone     => 'contphone2',
81
    contfax       => 'contefax2',
82
    contaltphone  => 'contaltphone2',
83
    contemail     => 'contemail2',
84
    contnotes     => 'contnotes2',
85
    active        => 1,
71
    active        => 1,
86
    gstreg        => 1,
72
    gstreg        => 1,
87
    listincgst    => 1,
73
    listincgst    => 1,
Lines 89-95 my $sample_supplier2 = { Link Here
89
    gstrate       => '2.0000',
75
    gstrate       => '2.0000',
90
    discount      => '2.0000',
76
    discount      => '2.0000',
91
    notes         => 'notes2',
77
    notes         => 'notes2',
92
    deliverytime  => 2,
78
    deliverytime  => 2
93
};
79
};
94
80
95
my $id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
81
my $id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
Lines 229-241 $sample_supplier2 = { Link Here
229
    accountnumber => 'accountnumber2 modified',
215
    accountnumber => 'accountnumber2 modified',
230
    fax           => 'fax2 modified',
216
    fax           => 'fax2 modified',
231
    url           => 'url2 modified',
217
    url           => 'url2 modified',
232
    contact       => 'contact2 modified',
233
    contpos       => 'contpos2 modified',
234
    contphone     => 'contphone2 modified',
235
    contfax       => 'contefax2 modified',
236
    contaltphone  => 'contaltphone2 modified',
237
    contemail     => 'contemail2 modified',
238
    contnotes     => 'contnotes2 modified',
239
    active        => 1,
218
    active        => 1,
240
    gstreg        => 1,
219
    gstreg        => 1,
241
    listincgst    => 1,
220
    listincgst    => 1,
Lines 276-288 my $sample_supplier3 = { Link Here
276
    accountnumber => 'accountnumber3',
255
    accountnumber => 'accountnumber3',
277
    fax           => 'fax3',
256
    fax           => 'fax3',
278
    url           => 'url3',
257
    url           => 'url3',
279
    contact       => 'contact3',
280
    contpos       => 'contpos3',
281
    contphone     => 'contphone3',
282
    contfax       => 'contefax3',
283
    contaltphone  => 'contaltphone3',
284
    contemail     => 'contemail3',
285
    contnotes     => 'contnotes3',
286
    active        => 1,
258
    active        => 1,
287
    gstreg        => 1,
259
    gstreg        => 1,
288
    listincgst    => 1,
260
    listincgst    => 1,
Lines 303-315 my $sample_supplier4 = { Link Here
303
    accountnumber => 'accountnumber4',
275
    accountnumber => 'accountnumber4',
304
    fax           => 'fax4',
276
    fax           => 'fax4',
305
    url           => 'url4',
277
    url           => 'url4',
306
    contact       => 'contact4',
307
    contpos       => 'contpos4',
308
    contphone     => 'contphone4',
309
    contfax       => 'contefax4',
310
    contaltphone  => 'contaltphone4',
311
    contemail     => 'contemail4',
312
    contnotes     => 'contnotes4',
313
    active        => 1,
278
    active        => 1,
314
    gstreg        => 1,
279
    gstreg        => 1,
315
    listincgst    => 1,
280
    listincgst    => 1,
Lines 664-670 my $booksellerid = C4::Bookseller::AddBookseller( Link Here
664
    ]
629
    ]
665
);
630
);
666
631
667
my @booksellers = C4::Bookseller::GetBookSeller('my vendor');
632
@booksellers = C4::Bookseller::GetBookSeller('my vendor');
668
ok(
633
ok(
669
    ( grep { $_->{'id'} == $booksellerid } @booksellers ),
634
    ( grep { $_->{'id'} == $booksellerid } @booksellers ),
670
    'GetBookSeller returns correct record when passed a name'
635
    'GetBookSeller returns correct record when passed a name'
Lines 725-731 sub field_filter { Link Here
725
        'bookselleremail', 'booksellerfax',
690
        'bookselleremail', 'booksellerfax',
726
        'booksellerurl',   'othersupplier',
691
        'booksellerurl',   'othersupplier',
727
        'currency',        'invoiceprice',
692
        'currency',        'invoiceprice',
728
        'listprice'
693
        'listprice',       'contacts'
729
      )
694
      )
730
    {
695
    {
731
696
732
- 

Return to bug 10402