|
Lines 121-127
Link Here
|
| 121 |
<th>Basket group</th> |
121 |
<th>Basket group</th> |
| 122 |
<th>Order line</th> |
122 |
<th>Order line</th> |
| 123 |
<th>Summary</th> |
123 |
<th>Summary</th> |
| 124 |
<th>More</th> |
124 |
<th>View</th> |
| 125 |
<th>Replacement price</th> |
125 |
<th>Replacement price</th> |
| 126 |
<th>Quantity</th> |
126 |
<th>Quantity</th> |
| 127 |
<th>Unit cost</th> |
127 |
<th>Unit cost</th> |
|
Lines 298-319
Link Here
|
| 298 |
[% ELSE %]There are no received orders.[% END %] |
298 |
[% ELSE %]There are no received orders.[% END %] |
| 299 |
</div> |
299 |
</div> |
| 300 |
|
300 |
|
| 301 |
<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> |
301 |
<div class="modal" id="dataPreview" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel"> |
| 302 |
<div class="modal-dialog"> |
302 |
<div class="modal-dialog modal-wide" role="document"> |
| 303 |
<div class="modal-content"> |
303 |
<div class="modal-content"> |
| 304 |
<div class="modal-header"> |
304 |
<div class="modal-header"> |
| 305 |
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> |
305 |
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> |
| 306 |
<h3 id="dataPreviewLabel">MARC preview</h3> |
306 |
<h3 id="dataPreviewLabel">MARC previews</h3> |
| 307 |
</div> |
307 |
</div> |
| 308 |
<div class="modal-body"> |
308 |
<div class="modal-body"> |
| 309 |
<div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> |
309 |
<div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> |
| 310 |
</div> |
310 |
</div> |
| 311 |
<div class="modal-footer"> |
311 |
<div class="modal-footer"> |
| 312 |
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> |
312 |
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> |
| 313 |
</div> |
313 |
</div> |
| 314 |
</div> |
314 |
</div> <!-- /.modal-content --> |
| 315 |
</div> |
315 |
</div> <!-- /.modal-dialog --> |
| 316 |
</div> |
316 |
</div> <!-- /.modal --> |
| 317 |
|
317 |
|
| 318 |
[% IF (invoiceclosedate) %] |
318 |
[% IF (invoiceclosedate) %] |
| 319 |
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a> |
319 |
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a> |
|
Lines 343-349
Link Here
|
| 343 |
[% Asset.js("js/acquisitions-menu.js") | $raw %] |
343 |
[% Asset.js("js/acquisitions-menu.js") | $raw %] |
| 344 |
[% INCLUDE 'datatables.inc' %] |
344 |
[% INCLUDE 'datatables.inc' %] |
| 345 |
[% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] |
345 |
[% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] |
| 346 |
<style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> |
|
|
| 347 |
<script> |
346 |
<script> |
| 348 |
dt_overwrite_html_sorting_localeCompare(); |
347 |
dt_overwrite_html_sorting_localeCompare(); |
| 349 |
var columns_filter = {}; |
348 |
var columns_filter = {}; |
|
Lines 519-527
Link Here
|
| 519 |
{ |
518 |
{ |
| 520 |
"data": "", |
519 |
"data": "", |
| 521 |
"render": function(data, type, row, meta) { |
520 |
"render": function(data, type, row, meta) { |
| 522 |
var result = '<a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=' + encodeURIComponent(row.order_id) + '" class="previewData">' + _("Order") + '</a><br>' |
521 |
var result = '<div class="btn-group dropup">'; |
| 523 |
+ '<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=' + encodeURIComponent(row.biblio_id) + '" class="previewData">' + _("MARC") + '</a><br>' |
522 |
result += '<button id="view' + row.order_id + '" type="button" class="btn btn-default btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'; |
| 524 |
+ '<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=' + encodeURIComponent(row.biblio_id) + '" class="previewData">' + _("Card") + '</a>'; |
523 |
result += ' <i class="fa fa-eye" aria-hidden="true"></i> ' + _("View"); |
|
|
524 |
result += ' <span class="caret"></span> '; |
| 525 |
result += '</button>'; |
| 526 |
result += '<ul class="dropdown-menu" aria-labelledby="view' + row.order_id + '">'; |
| 527 |
result += '<li><a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=' + encodeURIComponent(row.order_id) + '" class="previewData">' + _("Order") + '</a></li>'; |
| 528 |
result += '<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=' + encodeURIComponent(row.biblio_id) + '" class="previewData">' + _("MARC") + '</a></li>'; |
| 529 |
result += '<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=' + encodeURIComponent(row.biblio_id) + '" class="previewData">' + _("Card") + '</a></li>'; |
| 530 |
result += '</ul>'; |
| 531 |
result += '</div>'; |
| 525 |
return result; |
532 |
return result; |
| 526 |
}, |
533 |
}, |
| 527 |
"orderable": false, |
534 |
"orderable": false, |
|
Lines 642-648
Link Here
|
| 642 |
var page = $(this).attr("href"); |
649 |
var page = $(this).attr("href"); |
| 643 |
$("#dataPreviewLabel").text(ltitle); |
650 |
$("#dataPreviewLabel").text(ltitle); |
| 644 |
$("#dataPreview .modal-body").load(page + " div"); |
651 |
$("#dataPreview .modal-body").load(page + " div"); |
| 645 |
$('#dataPreview').modal({show:true}); |
652 |
$('#dataPreview').modal("show"); |
| 646 |
}); |
653 |
}); |
| 647 |
|
654 |
|
| 648 |
$("#dataPreview").on("hidden.bs.modal", function(){ |
655 |
$("#dataPreview").on("hidden.bs.modal", function(){ |
| 649 |
- |
|
|