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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-6 / +41 lines)
Lines 126-141 Link Here
126
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
126
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
127
                                [% SET quote_messages = [] %]
127
                                [% SET quote_messages = [] %]
128
                                [% SET order_messages = [] %]
128
                                [% SET order_messages = [] %]
129
                                [% SET ordrsp_messages = [] %]
129
                                [% FOR message IN edifact_messages %]
130
                                [% FOR message IN edifact_messages %]
130
                                    [% IF message.message_type == 'QUOTE' %]
131
                                    [% IF message.message_type == 'QUOTE' %]
131
                                        [% quote_messages.push(message) %]
132
                                        [% quote_messages.push(message) %]
132
                                    [% ELSIF message.message_type == 'ORDERS' %]
133
                                    [% ELSIF message.message_type == 'ORDERS' %]
133
                                        [% order_messages.push(message) %]
134
                                        [% order_messages.push(message) %]
135
                                    [% ELSIF message.message_type == 'ORDRSP' %]
136
                                        [% ordrsp_messages.push(message) %]
134
                                    [% END %]
137
                                    [% END %]
135
                                [% END %]
138
                                [% END %]
136
139
137
                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
140
                                [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %]
138
                                    <!-- Both quote and order messages exist -->
141
                                [% IF total_messages > 1 %]
142
                                    <!-- Multiple messages exist - show dropdown -->
139
                                    <div class="btn-group">
143
                                    <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 interchanges </button>
144
                                        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button>
141
                                        <ul class="dropdown-menu">
145
                                        <ul class="dropdown-menu">
Lines 153-158 Link Here
153
                                                    </a>
157
                                                    </a>
154
                                                </li>
158
                                                </li>
155
                                            [% END %]
159
                                            [% END %]
160
                                            [% FOR message IN ordrsp_messages %]
161
                                                <li>
162
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
163
                                                        <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %])
164
                                                    </a>
165
                                                </li>
166
                                            [% END %]
156
                                        </ul>
167
                                        </ul>
157
                                    </div>
168
                                    </div>
158
                                [% ELSIF quote_messages.size > 0 %]
169
                                [% ELSIF quote_messages.size > 0 %]
Lines 169-174 Link Here
169
                                            <i class="fa fa-shopping-cart"></i> View EDIFACT order
180
                                            <i class="fa fa-shopping-cart"></i> View EDIFACT order
170
                                        </button>
181
                                        </button>
171
                                    </div>
182
                                    </div>
183
                                [% ELSIF ordrsp_messages.size > 0 %]
184
                                    <!-- Only order response messages exist -->
185
                                    <div class="btn-group">
186
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
187
                                            <i class="fa fa-reply"></i> View EDIFACT order response
188
                                        </button>
189
                                    </div>
172
                                [% END %]
190
                                [% END %]
173
                            [% END %]
191
                            [% END %]
174
192
Lines 338-353 Link Here
338
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
356
                            [% IF edifact_enabled && edifact_messages.size > 0 %]
339
                                [% SET quote_messages = [] %]
357
                                [% SET quote_messages = [] %]
340
                                [% SET order_messages = [] %]
358
                                [% SET order_messages = [] %]
359
                                [% SET ordrsp_messages = [] %]
341
                                [% FOR message IN edifact_messages %]
360
                                [% FOR message IN edifact_messages %]
342
                                    [% IF message.message_type == 'QUOTE' %]
361
                                    [% IF message.message_type == 'QUOTE' %]
343
                                        [% quote_messages.push(message) %]
362
                                        [% quote_messages.push(message) %]
344
                                    [% ELSIF message.message_type == 'ORDERS' %]
363
                                    [% ELSIF message.message_type == 'ORDERS' %]
345
                                        [% order_messages.push(message) %]
364
                                        [% order_messages.push(message) %]
365
                                    [% ELSIF message.message_type == 'ORDRSP' %]
366
                                        [% ordrsp_messages.push(message) %]
346
                                    [% END %]
367
                                    [% END %]
347
                                [% END %]
368
                                [% END %]
348
369
349
                                [% IF quote_messages.size > 0 && order_messages.size > 0 %]
370
                                [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %]
350
                                    <!-- Both quote and order interchanges exist -->
371
                                [% IF total_messages > 1 %]
372
                                    <!-- Multiple messages exist - show dropdown -->
351
                                    <div class="btn-group">
373
                                    <div class="btn-group">
352
                                        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button>
374
                                        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button>
353
                                        <ul class="dropdown-menu">
375
                                        <ul class="dropdown-menu">
Lines 365-374 Link Here
365
                                                    </a>
387
                                                    </a>
366
                                                </li>
388
                                                </li>
367
                                            [% END %]
389
                                            [% END %]
390
                                            [% FOR message IN ordrsp_messages %]
391
                                                <li>
392
                                                    <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
393
                                                        <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %])
394
                                                    </a>
395
                                                </li>
396
                                            [% END %]
368
                                        </ul>
397
                                        </ul>
369
                                    </div>
398
                                    </div>
370
                                [% ELSIF quote_messages.size > 0 %]
399
                                [% ELSIF quote_messages.size > 0 %]
371
                                    <!-- Only quote interchanges exist -->
400
                                    <!-- Only quote messages exist -->
372
                                    <div class="btn-group">
401
                                    <div class="btn-group">
373
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
402
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
374
                                            <i class="fa fa-quote-left"></i> View EDIFACT quote
403
                                            <i class="fa fa-quote-left"></i> View EDIFACT quote
Lines 381-386 Link Here
381
                                            <i class="fa fa-shopping-cart"></i> View EDIFACT order
410
                                            <i class="fa fa-shopping-cart"></i> View EDIFACT order
382
                                        </button>
411
                                        </button>
383
                                    </div>
412
                                    </div>
413
                                [% ELSIF ordrsp_messages.size > 0 %]
414
                                    <!-- Only order response messages exist -->
415
                                    <div class="btn-group">
416
                                        <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]">
417
                                            <i class="fa fa-reply"></i> View EDIFACT order response
418
                                        </button>
419
                                    </div>
384
                                [% END %]
420
                                [% END %]
385
                            [% END %]
421
                            [% END %]
386
                        [% END %]
422
                        [% END %]
387
- 

Return to bug 32938