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

(-)a/acqui/basket.pl (+40 lines)
Lines 40-45 use Koha::Database; Link Here
40
use Koha::EDI qw( create_edi_order );
40
use Koha::EDI qw( create_edi_order );
41
use Koha::CsvProfiles;
41
use Koha::CsvProfiles;
42
use Koha::Patrons;
42
use Koha::Patrons;
43
use Koha::Edifact::Files;
43
44
44
use Koha::AdditionalFields;
45
use Koha::AdditionalFields;
45
use Koha::Old::Biblios;
46
use Koha::Old::Biblios;
Lines 106-111 if ($ediaccount) { Link Here
106
    $template->param( eans => \@eans );
107
    $template->param( eans => \@eans );
107
}
108
}
108
109
110
# Check for EDIFACT messages associated with this basket
111
my $edifact_enabled  = C4::Context->preference('EDIFACT');
112
my @edifact_messages = ();
113
my @edifact_errors   = ();
114
115
if ( $edifact_enabled && $basketno ) {
116
    my $edifact_messages_rs = Koha::Edifact::Files->search(
117
        { basketno => $basketno },
118
        { order_by => 'message_type' }
119
    );
120
121
    while ( my $message = $edifact_messages_rs->next ) {
122
        push @edifact_messages, {
123
            id            => $message->id,
124
            message_type  => $message->message_type,
125
            transfer_date => $message->transfer_date,
126
            status        => $message->status,
127
            filename      => $message->filename,
128
        };
129
130
        # Get errors for this message
131
        my $errors = $message->errors;
132
        while ( my $error = $errors->next ) {
133
            push @edifact_errors, {
134
                message_id   => $message->id,
135
                message_type => $message->message_type,
136
                section      => $error->section,
137
                details      => $error->details,
138
            };
139
        }
140
    }
141
}
142
143
$template->param(
144
    edifact_enabled  => $edifact_enabled,
145
    edifact_messages => \@edifact_messages,
146
    edifact_errors   => \@edifact_errors,
147
);
148
109
unless ( CanUserManageBasket( $loggedinuser, $basket, $userflags ) ) {
149
unless ( CanUserManageBasket( $loggedinuser, $basket, $userflags ) ) {
110
    $template->param(
150
    $template->param(
111
        cannot_manage_basket => 1,
151
        cannot_manage_basket => 1,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +139 lines)
Lines 123-128 Link Here
123
123
124
                            [% PROCESS csv_export %]
124
                            [% PROCESS csv_export %]
125
125
126
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
127
                                [% SET quote_messages = [] %]
128
                                [% SET order_messages = [] %]
129
                                [% FOR message IN edifact_messages %]
130
                                    [% IF message.message_type == 'QUOTE' %]
131
                                        [% quote_messages.push(message) %]
132
                                    [% ELSIF message.message_type == 'ORDERS' %]
133
                                        [% order_messages.push(message) %]
134
                                    [% END %]
135
                                [% END %]
136
137
                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
138
                                    <!-- Both quote and order messages exist -->
139
                                    <div class="btn-group">
140
                                        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT messages </button>
141
                                        <ul class="dropdown-menu">
142
                                            [% FOR message IN quote_messages %]
143
                                                <li>
144
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
145
                                                        <i class="fa fa-quote-left"></i> View quote ([% message.transfer_date | $KohaDates %])
146
                                                    </a>
147
                                                </li>
148
                                            [% END %]
149
                                            [% FOR message IN order_messages %]
150
                                                <li>
151
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
152
                                                        <i class="fa fa-shopping-cart"></i> View order ([% message.transfer_date | $KohaDates %])
153
                                                    </a>
154
                                                </li>
155
                                            [% END %]
156
                                        </ul>
157
                                    </div>
158
                                [% ELSIF quote_messages.size > 0 %]
159
                                    <!-- Only quote messages exist -->
160
                                    <div class="btn-group">
161
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]"> <i class="fa fa-quote-left"></i> View EDIFACT quote </button>
162
                                    </div>
163
                                [% ELSIF order_messages.size > 0 %]
164
                                    <!-- Only order messages exist -->
165
                                    <div class="btn-group">
166
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% order_messages.0.id | html %]"> <i class="fa fa-shopping-cart"></i> View EDIFACT order </button>
167
                                    </div>
168
                                [% END %]
169
                            [% END %]
170
126
                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
171
                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
127
                                [% UNLESS eans.size %]
172
                                [% UNLESS eans.size %]
128
                                    <div class="btn-group" title="You must define an EAN in Administration -> Library EANs">
173
                                    <div class="btn-group" title="You must define an EAN in Administration -> Library EANs">
Lines 259-264 Link Here
259
                            </div>
304
                            </div>
260
305
261
                            [% PROCESS csv_export %]
306
                            [% PROCESS csv_export %]
307
308
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
309
                                [% SET quote_messages = [] %]
310
                                [% SET order_messages = [] %]
311
                                [% FOR message IN edifact_messages %]
312
                                    [% IF message.message_type == 'QUOTE' %]
313
                                        [% quote_messages.push(message) %]
314
                                    [% ELSIF message.message_type == 'ORDERS' %]
315
                                        [% order_messages.push(message) %]
316
                                    [% END %]
317
                                [% END %]
318
319
                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
320
                                    <!-- Both quote and order messages exist -->
321
                                    <div class="btn-group">
322
                                        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT messages </button>
323
                                        <ul class="dropdown-menu">
324
                                            [% FOR message IN quote_messages %]
325
                                                <li>
326
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
327
                                                        <i class="fa fa-quote-left"></i> View quote ([% message.transfer_date | $KohaDates %])
328
                                                    </a>
329
                                                </li>
330
                                            [% END %]
331
                                            [% FOR message IN order_messages %]
332
                                                <li>
333
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
334
                                                        <i class="fa fa-shopping-cart"></i> View order ([% message.transfer_date | $KohaDates %])
335
                                                    </a>
336
                                                </li>
337
                                            [% END %]
338
                                        </ul>
339
                                    </div>
340
                                [% ELSIF quote_messages.size > 0 %]
341
                                    <!-- Only quote messages exist -->
342
                                    <div class="btn-group">
343
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]"> <i class="fa fa-quote-left"></i> View EDIFACT quote </button>
344
                                    </div>
345
                                [% ELSIF order_messages.size > 0 %]
346
                                    <!-- Only order messages exist -->
347
                                    <div class="btn-group">
348
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% order_messages.0.id | html %]"> <i class="fa fa-shopping-cart"></i> View EDIFACT order </button>
349
                                    </div>
350
                                [% END %]
351
                            [% END %]
262
                        [% END %]
352
                        [% END %]
263
                    </div>
353
                    </div>
264
                [% END # /UNLESS ( closedate ) %]
354
                [% END # /UNLESS ( closedate ) %]
Lines 317-322 Link Here
317
407
318
                    [% IF ( basketno ) %]
408
                    [% IF ( basketno ) %]
319
                        <div id="acqui_basket_summary" class="row">
409
                        <div id="acqui_basket_summary" class="row">
410
                            [% IF edifact_enabled && edifact_errors.size > 0 %]
411
                                <div class="col-md-12 col-sm-12">
412
                                    <div class="page-section">
413
                                        <h2>EDIFACT parsing errors</h2>
414
415
                                        [% SET errors_by_message = {} %]
416
                                        [% FOR error IN edifact_errors %]
417
                                            [% SET msg_id = error.message_id %]
418
                                            [% IF !errors_by_message.$msg_id %]
419
                                                [% errors_by_message.$msg_id = [] %]
420
                                            [% END %]
421
                                            [% errors_by_message.$msg_id.push(error) %]
422
                                        [% END %]
423
424
                                        [% FOR message IN edifact_messages %]
425
                                            [% SET msg_id = message.id %]
426
                                            [% IF errors_by_message.$msg_id %]
427
                                                <div class="alert alert-warning">
428
                                                    <h4><i class="fa fa-exclamation-triangle"></i> [% message.message_type | html %] message ([% message.transfer_date | $KohaDates %])</h4>
429
                                                    [% IF message.filename %]
430
                                                        <p><strong>Filename:</strong> [% message.filename | html %]</p>
431
                                                    [% END %]
432
                                                    <ul>
433
                                                        [% FOR error IN errors_by_message.$msg_id %]
434
                                                            <li>
435
                                                                <strong>[% error.details | html %]</strong>
436
                                                                [% IF error.section %]
437
                                                                    <br /><pre class="mt-1 mb-0 small text-muted">[% error.section | html %] section</pre>
438
                                                                [% END %]
439
                                                            </li>
440
                                                        [% END %]
441
                                                    </ul>
442
                                                </div>
443
                                            [% END %]
444
                                        [% END %]
445
                                    </div>
446
                                    <!-- /.page-section -->
447
                                </div>
448
                                <!-- /.col-md-12 col-sm-12 -->
449
                            [% END %]
450
320
                            <div class="col-md-6 col-sm-12">
451
                            <div class="col-md-6 col-sm-12">
321
                                <div class="page-section rows">
452
                                <div class="page-section rows">
322
                                    <h2>General information</h2>
453
                                    <h2>General information</h2>
Lines 1117-1122 Link Here
1117
</div>
1248
</div>
1118
<!-- /.modal#dateEditor -->
1249
<!-- /.modal#dateEditor -->
1119
1250
1251
[% IF edifact_enabled && edifact_messages.size > 0 %]
1252
    [% INCLUDE 'modals/edifact-modal.inc' %]
1253
[% END %]
1254
1120
[% MACRO jsinclude BLOCK %]
1255
[% MACRO jsinclude BLOCK %]
1121
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
1256
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
1122
    [% INCLUDE 'datatables.inc' %]
1257
    [% INCLUDE 'datatables.inc' %]
Lines 1342-1347 Link Here
1342
    [% SET filter = 'baskets_managers' %]
1477
    [% SET filter = 'baskets_managers' %]
1343
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %]
1478
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %]
1344
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
1479
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
1480
1481
    [% IF edifact_enabled && edifact_messages.size > 0 %]
1482
        [% Asset.js("js/modals/edifact-modal.js") | $raw %]
1483
    [% END %]
1345
[% END %]
1484
[% END %]
1346
1485
1347
[% INCLUDE 'intranet-bottom.inc' %]
1486
[% INCLUDE 'intranet-bottom.inc' %]
1348
- 

Return to bug 40334