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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-20 / +20 lines)
Lines 1616-1623 Note that permanent location is a code, and location may be an authval. Link Here
1616
1616
1617
                // Toolbar
1617
                // Toolbar
1618
                var bundle_toolbar = $('<div id="toolbar" class="btn-toolbar"></div>');
1618
                var bundle_toolbar = $('<div id="toolbar" class="btn-toolbar"></div>');
1619
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#addToBundleModal" data-item="' + itemnumber + '"><i class="fa fa-plus"></i> Add to bundle</a>');
1619
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#addToBundleModal" data-item="' + itemnumber + '"><i class="fa fa-plus"></i> ' + _("Add to bundle") + '</a>');
1620
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#removeFromBundleModal" data-item="' + itemnumber + '"><i class="fa fa-minus"></i> Remove from bundle</a>');
1620
                bundle_toolbar.append('<a class="btn btn-default" data-toggle="modal" data-target="#removeFromBundleModal" data-item="' + itemnumber + '"><i class="fa fa-minus"></i> ' + _("Remove from bundle") + '</a>');
1621
1621
1622
                // This is the table we'll convert into a DataTable
1622
                // This is the table we'll convert into a DataTable
1623
                var bundles_table = $('<table class="display tbundle" data-itemnumber="'+itemnumber+'" id="bundle_table_'+itemnumber+'" width="100%"/>');
1623
                var bundles_table = $('<table class="display tbundle" data-itemnumber="'+itemnumber+'" id="bundle_table_'+itemnumber+'" width="100%"/>');
Lines 1649-1655 Note that permanent location is a code, and location may be an authval. Link Here
1649
                    "columns": [
1649
                    "columns": [
1650
                        {
1650
                        {
1651
                            "data": "biblio.title:biblio.medium",
1651
                            "data": "biblio.title:biblio.medium",
1652
                            "title": "Title",
1652
                            "title": _("Title"),
1653
                            "searchable": true,
1653
                            "searchable": true,
1654
                            "orderable": true,
1654
                            "orderable": true,
1655
                            "render": function(data, type, row, meta) {
1655
                            "render": function(data, type, row, meta) {
Lines 1668-1704 Note that permanent location is a code, and location may be an authval. Link Here
1668
                        },
1668
                        },
1669
                        {
1669
                        {
1670
                            "data": "biblio.author",
1670
                            "data": "biblio.author",
1671
                            "title": "Author",
1671
                            "title": _("Author"),
1672
                            "searchable": true,
1672
                            "searchable": true,
1673
                            "orderable": true,
1673
                            "orderable": true,
1674
                        },
1674
                        },
1675
                        {
1675
                        {
1676
                            "data": "collection_code",
1676
                            "data": "collection_code",
1677
                            "title": "Collection code",
1677
                            "title": _("Collection"),
1678
                            "searchable": true,
1678
                            "searchable": true,
1679
                            "orderable": true,
1679
                            "orderable": true,
1680
                        },
1680
                        },
1681
                        {
1681
                        {
1682
                            "data": "item_type",
1682
                            "data": "item_type",
1683
                            "title": "Item Type",
1683
                            "title": _("Item type"),
1684
                            "searchable": false,
1684
                            "searchable": false,
1685
                            "orderable": true,
1685
                            "orderable": true,
1686
                        },
1686
                        },
1687
                        {
1687
                        {
1688
                            "data": "callnumber",
1688
                            "data": "callnumber",
1689
                            "title": "Callnumber",
1689
                            "title": _("Callnumber"),
1690
                            "searchable": true,
1690
                            "searchable": true,
1691
                            "orderable": true,
1691
                            "orderable": true,
1692
                        },
1692
                        },
1693
                        {
1693
                        {
1694
                            "data": "external_id",
1694
                            "data": "external_id",
1695
                            "title": "Barcode",
1695
                            "title": _("Barcode"),
1696
                            "searchable": true,
1696
                            "searchable": true,
1697
                            "orderable": true,
1697
                            "orderable": true,
1698
                        },
1698
                        },
1699
                        {
1699
                        {
1700
                            "data": "lost_status:last_seen_date:return_claim.patron",
1700
                            "data": "lost_status:last_seen_date:return_claim.patron",
1701
                            "title": "Status",
1701
                            "title": _("Status"),
1702
                            "searchable": false,
1702
                            "searchable": false,
1703
                            "orderable": true,
1703
                            "orderable": true,
1704
                            "render": function(data, type, row, meta) {
1704
                            "render": function(data, type, row, meta) {
Lines 1720-1726 Note that permanent location is a code, and location may be an authval. Link Here
1720
                                var result = '<button class="btn btn-default btn-xs remove" role="button" data-itemnumber="'+row.item_id+'"><i class="fa fa-minus" aria-hidden="true"></i> '+_("Remove")+'</button>\n';
1720
                                var result = '<button class="btn btn-default btn-xs remove" role="button" data-itemnumber="'+row.item_id+'"><i class="fa fa-minus" aria-hidden="true"></i> '+_("Remove")+'</button>\n';
1721
                                return result;
1721
                                return result;
1722
                            },
1722
                            },
1723
                            "title": "Actions",
1723
                            "title": _("Actions"),
1724
                            "searchable": false,
1724
                            "searchable": false,
1725
                            "orderable": false,
1725
                            "orderable": false,
1726
                            "class": "noExport"
1726
                            "class": "noExport"
Lines 1776-1782 Note that permanent location is a code, and location may be an authval. Link Here
1776
                  /* Report the results */
1776
                  /* Report the results */
1777
                  posting.done(function(data) {
1777
                  posting.done(function(data) {
1778
                      var barcode = $('#external_id').val();
1778
                      var barcode = $('#external_id').val();
1779
                      $('#addResult').replaceWith('<div id="addResult" class="alert alert-success">Success: Added '+barcode+'</div>');
1779
                      $('#addResult').replaceWith('<div id="addResult" class="alert alert-success">'+_("Success: Added '%s'").format(barcode)+'</div>');
1780
                      $('#external_id').val('').focus();
1780
                      $('#external_id').val('').focus();
1781
                      bundle_changed = 1;
1781
                      bundle_changed = 1;
1782
                  });
1782
                  });
Lines 1785-1796 Note that permanent location is a code, and location may be an authval. Link Here
1785
                      if ( data.status === 409 ) {
1785
                      if ( data.status === 409 ) {
1786
                          var response = data.responseJSON;
1786
                          var response = data.responseJSON;
1787
                          if ( response.key === "PRIMARY" ) {
1787
                          if ( response.key === "PRIMARY" ) {
1788
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">Warning: Item '+barcode+' already attached</div>');
1788
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-warning">'+_("Warning: Item '%s' aready attached").format(barcode)+'</div>');
1789
                          } else {
1789
                          } else {
1790
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">Failure: Item '+barcode+' belongs to another bundle</div>');
1790
                              $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
1791
                          }
1791
                          }
1792
                      } else {
1792
                      } else {
1793
                          $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">Failure: Check the logs for details</div>');
1793
                          $('#addResult').replaceWith('<div id="addResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
1794
                      }
1794
                      }
1795
                      $('#external_id').val('').focus();
1795
                      $('#external_id').val('').focus();
1796
                  });
1796
                  });
Lines 1843-1849 Note that permanent location is a code, and location may be an authval. Link Here
1843
                        /* Report the results */
1843
                        /* Report the results */
1844
                        deleteReq.done(function(data) {
1844
                        deleteReq.done(function(data) {
1845
                            var barcode = $('#rm_external_id').val();
1845
                            var barcode = $('#rm_external_id').val();
1846
                            $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-success">'+_("Success: Removed ")+barcode+'</div>');
1846
                            $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-success">'+_("Success: Removed '%s'").format(barcode)+'</div>');
1847
                            $('#rm_external_id').val('').focus();
1847
                            $('#rm_external_id').val('').focus();
1848
                            bundle_changed = 1;
1848
                            bundle_changed = 1;
1849
                        });
1849
                        });
Lines 1852-1872 Note that permanent location is a code, and location may be an authval. Link Here
1852
                            if ( data.status === 409 ) {
1852
                            if ( data.status === 409 ) {
1853
                                var response = data.responseJSON;
1853
                                var response = data.responseJSON;
1854
                                if ( response.key === "PRIMARY" ) {
1854
                                if ( response.key === "PRIMARY" ) {
1855
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">Warning: Item '+barcode+' already attached</div>');
1855
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-warning">'+_("Warning: Item '%s' already attached").format(barcode)+'</div>');
1856
                                } else {
1856
                                } else {
1857
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">Failure: Item '+barcode+' belongs to another bundle</div>');
1857
                                    $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Item '%s' belongs to another bundle").format(barcode)+'</div>');
1858
                                }
1858
                                }
1859
                            } else {
1859
                            } else {
1860
                                $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">Failure: Check the logs for details</div>');
1860
                                $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failure: Check the logs for details")+'</div>');
1861
                            }
1861
                            }
1862
                            $('#rm_external_id').val('').focus();
1862
                            $('#rm_external_id').val('').focus();
1863
                        });
1863
                        });
1864
                    } else {
1864
                    } else {
1865
                        $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Barcode matched more than one item ")+barcode+'</div>');
1865
                        $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Barcode matched more than one item '%s'").format(barcode)+'</div>');
1866
                    }
1866
                    }
1867
                });
1867
                });
1868
                itemReq.fail(function(data) {
1868
                itemReq.fail(function(data) {
1869
                     $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Item not found ")+barcode+'</div>');
1869
                     $('#removeResult').replaceWith('<div id="removeResult" class="alert alert-danger">'+_("Failed: Item not found '%s'").format(barcode)+'</div>');
1870
                    $('#rm_external_id').val('').focus();
1870
                    $('#rm_external_id').val('').focus();
1871
1871
1872
                });
1872
                });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-11 / +10 lines)
Lines 436-447 Link Here
436
                                            <table class="table table-condensed table-bordered" id="items-bundle-contents-table">
436
                                            <table class="table table-condensed table-bordered" id="items-bundle-contents-table">
437
                                                <thead>
437
                                                <thead>
438
                                                    <tr>
438
                                                    <tr>
439
                                                        <th>[% t('Title') | html %]</th>
439
                                                        <th>Title</th>
440
                                                        <th>[% t('Author') | html %]</th>
440
                                                        <th>Author</th>
441
                                                        <th>[% t('Item type') | html %]</th>
441
                                                        <th>Item type</th>
442
                                                        <th>[% t('Barcode') | html %]</th>
442
                                                        <th>Barcode</th>
443
                                                        [% IF !item.onloan %]
443
                                                        [% IF !item.onloan %]
444
                                                        <th>[% t('Status') | html %]</th>
444
                                                        <th>Status</th>
445
                                                        [% END %]
445
                                                        [% END %]
446
                                                    </tr>
446
                                                    </tr>
447
                                                </thead>
447
                                                </thead>
Lines 478-486 Link Here
478
                                                <label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
478
                                                <label for="verify-items-bundle-contents-barcodes">Barcodes <span id="verify-progress" class="pull-right" style="display: none"><span id="verified">0</span> of <span id="expected"></span> verified</span></label>
479
                                                <textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>
479
                                                <textarea autocomplete="off" id="verify-items-bundle-contents-barcodes" name="verify-items-bundle-contents-barcodes" class="form-control"></textarea>
480
                                                [% IF item.onloan %]
480
                                                [% IF item.onloan %]
481
                                                <div class="help-block">[% t('Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost') | html %]</div>
481
                                                <div class="help-block">Scan all barcodes of items found in the items bundle. If any items are missing, they will be marked as lost</div>
482
                                                [% ELSE %]
482
                                                [% ELSE %]
483
                                                <div class="help-block">[% t('Optionally scan all barcodes of items found in the items bundle to perform an inventory check. If any items are missing, they will be marked as lost') | html %]</div>
483
                                                <div class="help-block">Optionally scan all barcodes of items found in the items bundle to perform an inventory check. If any items are missing, they will be marked as lost</div>
484
                                                [% END %]
484
                                                [% END %]
485
                                            </div>
485
                                            </div>
486
486
Lines 496-506 Link Here
496
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
496
                                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
497
                                            [% END %]
497
                                            [% END %]
498
                                            [% IF item.onloan %]
498
                                            [% IF item.onloan %]
499
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> [% t('Confirm checkin and mark missing items as lost') | html %]</button>
499
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm checkin and mark missing items as lost</button>
500
                                            [% ELSE %]
500
                                            [% ELSE %]
501
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> [% t('Confirm inventory check and mark items as lost') | html %]</button>
501
                                            <button type="submit" class="btn btn-default"><i class="fa fa-check"></i> Confirm inventory check and mark items as lost</button>
502
                                            [% END %]
502
                                            [% END %]
503
                                            <button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> [% t('Cancel') | html %]</button>
503
                                            <button type="button" data-dismiss="modal" class="btn btn-default"><i class="fa fa-close"></i> Cancel</button>
504
                                        </div>
504
                                        </div>
505
                                    </form>
505
                                    </form>
506
                                </div>
506
                                </div>
507
- 

Return to bug 28854