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

(-)a/acqui/basketgroup.pl (-4 / +26 lines)
Lines 220-227 sub generate_edifact_orders { Link Here
220
    my $baskets       = GetBasketsByBasketgroup($basketgroupid);
220
    my $baskets       = GetBasketsByBasketgroup($basketgroupid);
221
    my $ean           = get_edifact_ean();
221
    my $ean           = get_edifact_ean();
222
222
223
    for my $basket ( @{$baskets} ) {
223
    if($ean) {
224
        create_edi_order( { ean => $ean, basketno => $basket->{basketno}, } );
224
        for my $basket ( @{$baskets} ) {
225
            create_edi_order( { ean => $ean, basketno => $basket->{basketno}, } );
226
        }
227
    } else {
228
        my $booksellerid = $input->param('booksellerid') || 0;
229
        print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' .
230
                               $booksellerid .
231
                               '&message=No%20EDIFACT%20Setup');
225
    }
232
    }
226
    return;
233
    return;
227
}
234
}
Lines 240-245 my $op = $input->param('op') || 'display'; Link Here
240
# - display : display the list of all basketgroups for a vendor
247
# - display : display the list of all basketgroups for a vendor
241
my $booksellerid = $input->param('booksellerid');
248
my $booksellerid = $input->param('booksellerid');
242
$template->param(booksellerid => $booksellerid);
249
$template->param(booksellerid => $booksellerid);
250
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
251
252
my $schema = Koha::Database->new()->schema();
253
my $rs = $schema->resultset('VendorEdiAccount')->search(
254
    { vendor_id => $booksellerid, } );
255
$template->param( ediaccount => ($rs->count > 0));
243
256
244
if ( $op eq "add" ) {
257
if ( $op eq "add" ) {
245
#
258
#
Lines 391-398 if ( $op eq "add" ) { Link Here
391
    
404
    
392
} elsif ( $op eq 'ediprint') {
405
} elsif ( $op eq 'ediprint') {
393
    my $basketgroupid = $input->param('basketgroupid');
406
    my $basketgroupid = $input->param('basketgroupid');
394
    generate_edifact_orders( $basketgroupid );
407
    if ($template->param( 'ediaccount' )) {
395
    exit;
408
        generate_edifact_orders( $basketgroupid );
409
        exit;
410
    } else {
411
        $template->param('NoEDIMessage' => 1);
412
        my $basketgroups = &GetBasketgroups($booksellerid);
413
        my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
414
        my $baskets = &GetBasketsByBookseller($booksellerid);
415
416
        displaybasketgroups($basketgroups, $bookseller, $baskets);
417
    }
396
}else{
418
}else{
397
# no param : display the list of all basketgroups for a given vendor
419
# no param : display the list of all basketgroups for a given vendor
398
    my $basketgroups = &GetBasketgroups($booksellerid);
420
    my $basketgroups = &GetBasketgroups($booksellerid);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-6 / +12 lines)
Lines 144-153 function submitForm(form) { Link Here
144
                [% IF ( grouping ) %]
144
                [% IF ( grouping ) %]
145
                    [% IF (closedbg) %]
145
                    [% IF (closedbg) %]
146
                        <div id="toolbar" class="btn-toolbar">
146
                        <div id="toolbar" class="btn-toolbar">
147
                            <div class="btn-group"><a href="[% script_name | html %]?op=reopen&amp;basketgroupid=[% basketgroupid | html %]&amp;booksellerid=[% booksellerid | html %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
147
                            <div class="btn-group"><a href="[% script_name | uri %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
148
                            <div class="btn-group"><a href="[% script_name | html %]?op=export&amp;basketgroupid=[% basketgroupid | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
148
                            <div class="btn-group"><a href="[% script_name | uri %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
149
                            <div class="btn-group"><a href="[% script_name | html %]?op=print&amp;basketgroupid=[% basketgroupid | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
149
                            <div class="btn-group"><a href="[% script_name | uri %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
150
                            <div class="btn-group"><a href="[% script_name | html %]?op=ediprint&amp;basketgroupid=[% basketgroupid | html %]&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
150
                        [% IF (ediaccount) %]
151
                            <div class="btn-group"><a href="[% script_name | uri %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
152
                        [% END %]
151
                        </div>
153
                        </div>
152
                    [% END %]
154
                    [% END %]
153
                    [% IF (name && closedbg) %]
155
                    [% IF (name && closedbg) %]
Lines 295-301 function submitForm(form) { Link Here
295
                    <div id="toolbar" class="btn-toolbar">
297
                    <div id="toolbar" class="btn-toolbar">
296
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
298
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
297
                    </div>
299
                    </div>
298
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1>
300
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
301
                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
299
                    <div id="basket_groups" class="toptabs">
302
                    <div id="basket_groups" class="toptabs">
300
                        <ul class="ui-tabs-nav">
303
                        <ul class="ui-tabs-nav">
301
                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
304
                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
Lines 374-380 function submitForm(form) { Link Here
374
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
377
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Reopen" /></form>
375
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
378
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as PDF" /></form>
376
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
379
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Export as CSV" /></form>
380
                                            [% IF (ediaccount) %]
377
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
381
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" value="Generate EDIFACT order" /></form>
382
                                            [% ELSE %]
383
                                                    <div>No EDIFACT configuration for [% booksellername | html %]</div>
384
                                            [% END %]
378
                                                </td>
385
                                                </td>
379
                                            </tr>
386
                                            </tr>
380
                                        [% END %]
387
                                        [% END %]
381
- 

Return to bug 16739