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 257-262 Link Here
257
                            </div>
302
                            </div>
258
303
259
                            [% PROCESS csv_export %]
304
                            [% PROCESS csv_export %]
305
306
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
307
                                [% SET quote_messages = [] %]
308
                                [% SET order_messages = [] %]
309
                                [% FOR message IN edifact_messages %]
310
                                    [% IF message.message_type == 'QUOTE' %]
311
                                        [% quote_messages.push(message) %]
312
                                    [% ELSIF message.message_type == 'ORDERS' %]
313
                                        [% order_messages.push(message) %]
314
                                    [% END %]
315
                                [% END %]
316
317
                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
318
                                    <!-- Both quote and order messages exist -->
319
                                    <div class="btn-group">
320
                                        <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>
321
                                        <ul class="dropdown-menu">
322
                                            [% FOR message IN quote_messages %]
323
                                                <li>
324
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
325
                                                        <i class="fa fa-quote-left"></i> View quote ([% message.transfer_date | $KohaDates %])
326
                                                    </a>
327
                                                </li>
328
                                            [% END %]
329
                                            [% FOR message IN order_messages %]
330
                                                <li>
331
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]">
332
                                                        <i class="fa fa-shopping-cart"></i> View order ([% message.transfer_date | $KohaDates %])
333
                                                    </a>
334
                                                </li>
335
                                            [% END %]
336
                                        </ul>
337
                                    </div>
338
                                [% ELSIF quote_messages.size > 0 %]
339
                                    <!-- Only quote messages exist -->
340
                                    <div class="btn-group">
341
                                        <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>
342
                                    </div>
343
                                [% ELSIF order_messages.size > 0 %]
344
                                    <!-- Only order messages exist -->
345
                                    <div class="btn-group">
346
                                        <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>
347
                                    </div>
348
                                [% END %]
349
                            [% END %]
260
                        [% END %]
350
                        [% END %]
261
                    </div>
351
                    </div>
262
                [% END # /UNLESS ( closedate ) %]
352
                [% END # /UNLESS ( closedate ) %]
Lines 315-320 Link Here
315
405
316
                    [% IF ( basketno ) %]
406
                    [% IF ( basketno ) %]
317
                        <div id="acqui_basket_summary" class="row">
407
                        <div id="acqui_basket_summary" class="row">
408
                            [% IF edifact_enabled && edifact_errors.size > 0 %]
409
                                <div class="col-md-12 col-sm-12">
410
                                    <div class="page-section">
411
                                        <h2>EDIFACT parsing errors</h2>
412
413
                                        [% SET errors_by_message = {} %]
414
                                        [% FOR error IN edifact_errors %]
415
                                            [% SET msg_id = error.message_id %]
416
                                            [% IF !errors_by_message.$msg_id %]
417
                                                [% errors_by_message.$msg_id = [] %]
418
                                            [% END %]
419
                                            [% errors_by_message.$msg_id.push(error) %]
420
                                        [% END %]
421
422
                                        [% FOR message IN edifact_messages %]
423
                                            [% SET msg_id = message.id %]
424
                                            [% IF errors_by_message.$msg_id %]
425
                                                <div class="alert alert-warning">
426
                                                    <h4><i class="fa fa-exclamation-triangle"></i> [% message.message_type | html %] message ([% message.transfer_date | $KohaDates %])</h4>
427
                                                    [% IF message.filename %]
428
                                                        <p><strong>Filename:</strong> [% message.filename | html %]</p>
429
                                                    [% END %]
430
                                                    <ul>
431
                                                        [% FOR error IN errors_by_message.$msg_id %]
432
                                                            <li>
433
                                                                <strong>[% error.details | html %]</strong>
434
                                                                [% IF error.section %]
435
                                                                    <br /><pre class="mt-1 mb-0 small text-muted">[% error.section | html %] section</pre>
436
                                                                [% END %]
437
                                                            </li>
438
                                                        [% END %]
439
                                                    </ul>
440
                                                </div>
441
                                            [% END %]
442
                                        [% END %]
443
                                    </div>
444
                                    <!-- /.page-section -->
445
                                </div>
446
                                <!-- /.col-md-12 col-sm-12 -->
447
                            [% END %]
448
318
                            <div class="col-md-6 col-sm-12">
449
                            <div class="col-md-6 col-sm-12">
319
                                <div class="page-section rows">
450
                                <div class="page-section rows">
320
                                    <h2>General information</h2>
451
                                    <h2>General information</h2>
Lines 1111-1116 Link Here
1111
</div>
1242
</div>
1112
<!-- /.modal#dateEditor -->
1243
<!-- /.modal#dateEditor -->
1113
1244
1245
[% IF edifact_enabled && edifact_messages.size > 0 %]
1246
    [% INCLUDE 'modals/edifact-modal.inc' %]
1247
[% END %]
1248
1114
[% MACRO jsinclude BLOCK %]
1249
[% MACRO jsinclude BLOCK %]
1115
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
1250
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
1116
    [% INCLUDE 'datatables.inc' %]
1251
    [% INCLUDE 'datatables.inc' %]
Lines 1336-1341 Link Here
1336
    [% SET filter = 'baskets_managers' %]
1471
    [% SET filter = 'baskets_managers' %]
1337
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %]
1472
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %]
1338
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
1473
    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
1474
1475
    [% IF edifact_enabled && edifact_messages.size > 0 %]
1476
        [% Asset.js("js/modals/edifact-modal.js") | $raw %]
1477
    [% END %]
1339
[% END %]
1478
[% END %]
1340
1479
1341
[% INCLUDE 'intranet-bottom.inc' %]
1480
[% INCLUDE 'intranet-bottom.inc' %]
1342
- 

Return to bug 40334