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

(-)a/acqui/basketgroup.pl (-4 / +25 lines)
Lines 216-223 sub generate_edifact_orders { Link Here
216
    my $baskets       = GetBasketsByBasketgroup($basketgroupid);
216
    my $baskets       = GetBasketsByBasketgroup($basketgroupid);
217
    my $ean           = get_edifact_ean();
217
    my $ean           = get_edifact_ean();
218
218
219
    for my $basket ( @{$baskets} ) {
219
    if($ean) {
220
        create_edi_order( { ean => $ean, basketno => $basket->{basketno}, } );
220
	for my $basket ( @{$baskets} ) {
221
	    create_edi_order( { ean => $ean, basketno => $basket->{basketno}, } );
222
	}
223
    } else {
224
	my $booksellerid = $input->param('booksellerid') || 0;
225
	print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' .
226
			       $booksellerid .
227
			       '&message=No%20EDIFACT%20Setup');
221
    }
228
    }
222
    return;
229
    return;
223
}
230
}
Lines 236-241 my $op = $input->param('op') || 'display'; Link Here
236
# - display : display the list of all basketgroups for a vendor
243
# - display : display the list of all basketgroups for a vendor
237
my $booksellerid = $input->param('booksellerid');
244
my $booksellerid = $input->param('booksellerid');
238
$template->param(booksellerid => $booksellerid);
245
$template->param(booksellerid => $booksellerid);
246
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
247
my $schema = Koha::Database->new()->schema();
248
my $rs = $schema->resultset('VendorEdiAccount')->search(
249
    { vendor_id => $booksellerid, } );
250
$template->param( ediaccount => ($rs->count > 0));
239
251
240
if ( $op eq "add" ) {
252
if ( $op eq "add" ) {
241
#
253
#
Lines 387-394 if ( $op eq "add" ) { Link Here
387
    
399
    
388
} elsif ( $op eq 'ediprint') {
400
} elsif ( $op eq 'ediprint') {
389
    my $basketgroupid = $input->param('basketgroupid');
401
    my $basketgroupid = $input->param('basketgroupid');
390
    generate_edifact_orders( $basketgroupid );
402
    if ($template->param( 'ediaccount' )) {
391
    exit;
403
	generate_edifact_orders( $basketgroupid );
404
	exit;
405
    } else {
406
	$template->param('NoEDIMessage' => 1);
407
	my $basketgroups = &GetBasketgroups($booksellerid);
408
	my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
409
	my $baskets = &GetBasketsByBookseller($booksellerid);
410
411
	displaybasketgroups($basketgroups, $bookseller, $baskets);
412
    }
392
}else{
413
}else{
393
# no param : display the list of all basketgroups for a given vendor
414
# no param : display the list of all basketgroups for a given vendor
394
    my $basketgroups = &GetBasketgroups($booksellerid);
415
    my $basketgroups = &GetBasketgroups($booksellerid);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-2 / +10 lines)
Lines 146-152 function submitForm(form) { Link Here
146
                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
146
                            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&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 %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
147
                            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" 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 %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
148
                            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
149
			    [% IF (ediaccount) %]
149
                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
150
                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
151
			    [% ELSE %]
152
                            <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"></div>
153
			    [% END %]
150
                        </div>
154
                        </div>
151
                    [% END %]
155
                    [% END %]
152
                    [% IF (name && closedbg) %]
156
                    [% IF (name && closedbg) %]
Lines 291-296 function submitForm(form) { Link Here
291
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
295
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
292
                    </div>
296
                    </div>
293
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
297
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
298
		    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername |html %]</strong></div>[% END %]
294
                    <div id="basket_groups" class="toptabs">
299
                    <div id="basket_groups" class="toptabs">
295
                        <ul class="ui-tabs-nav">
300
                        <ul class="ui-tabs-nav">
296
                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
301
                            [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>
Lines 369-375 function submitForm(form) { Link Here
369
                                                    <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 %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
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 %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
370
                                                    <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 %]" /><input type="submit" value="Export as PDF" /></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 %]" /><input type="submit" value="Export as PDF" /></form>
371
                                                    <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 %]" /><input type="submit" value="Export as CSV" /></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 %]" /><input type="submit" value="Export as CSV" /></form>
372
                                                    <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 %]" /><input type="submit" value="Generate EDIFACT order" /></form>
377
						    [% IF (ediaccount) %]
378
                                                    <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 %]" /><input type="hidden" name="booksellerid" value="[% booksellerid %]" ><input type="submit" value="Generate EDIFACT order" /></form>
379
						    [% ELSE %]
380
							  <div>No EDIFACT configuration for [% booksellername %]</div>
381
							  [% END %]
373
                                                </td>
382
                                                </td>
374
                                            </tr>
383
                                            </tr>
375
                                        [% END %]
384
                                        [% END %]
376
- 

Return to bug 16739