@@ -, +, @@ - Confirm that those pickup locations are correctly displayed under the Holds tab in Circulation. - Check in and confirm a hold which is to be picked up at the current branch. Confirm that the revised language appears. - Confirm that table sorting works correctly. --- .../intranet-tmpl/prog/en/includes/strings.inc | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 14 +++++++++++--- .../prog/en/modules/circ/circulation.tt | 1 + svc/holds | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -6,7 +6,7 @@ var CIRCULATION_RENEW_FAILED = _("Renew failed:") var NOT_CHECKED_OUT = _("not checked out"); var TOO_MANY_RENEWALS = _("too many renewals"); - var ON_RESERVE = _("on reserve"); + var ON_RESERVE = _("on hold"); var REASON_UNKNOWN = _("reason unkown"); var TODAYS_CHECKOUTS = _("Today's checkouts"); var PREVIOUS_CHECKOUTS = _("Previous checkouts"); @@ -19,7 +19,8 @@ var RENEWALS_REMAINING = _("%s of %s renewals remaining"); var HOLD_IS_SUSPENDED = _("Hold is suspended"); var UNTIL = _("until %s"); - var ITEM_IS_WAITING = _("Item is waiting"); // + var ITEM_IS_WAITING = _("Item is waiting"); + var ITEM_IS_WAITING_HERE = _("Item is waiting here"); var AT = _("at %s"); var ITEM_IS_IN_TRANSIT = _("Item is in transit from %s"); var FROM = _("from"); --- a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js @@ -5,7 +5,7 @@ $(document).ready(function() { if ( ! holdsTable ) { holdsTable = $("#holds-table").dataTable({ "bAutoWidth": false, - "sDom": "<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t", + "sDom": "rt", "aoColumns": [ { "mDataProp": "reservedate_formatted" @@ -58,11 +58,14 @@ $(document).ready(function() { if ( oObj.barcode ) { data += ""; if ( oObj.found == "W" ) { - data += ITEM_IS_WAITING; - if ( ! oObj.waiting_here ) { + if ( oObj.waiting_here ) { + data += ITEM_IS_WAITING_HERE; + } else { + data += ITEM_IS_WAITING; data += " " + AT.format( oObj.waiting_at ); } + } else if ( oObj.transferred ) { data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch ); } else if ( oObj.not_transferred ) { @@ -84,6 +87,11 @@ $(document).ready(function() { return data; } }, + { + "mDataProp": function( oObj ) { + return oObj.branchcode || ""; + } + }, { "mDataProp": "expirationdate_formatted" }, { "mDataProp": function( oObj ) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -764,6 +764,7 @@ No patron matched [% message %] Title Call number Barcode + Pickup at Expiration Priority Delete? --- a/svc/holds +++ a/svc/holds @@ -80,6 +80,7 @@ while ( my $h = $holds_rs->next() ) { title => $h->biblio()->title(), author => $h->biblio()->author(), reserve_id => $h->reserve_id(), + branchcode => $h->branchcode()->branchname(), reservedate => $h->reservedate(), expirationdate => $h->expirationdate(), suspend => $h->suspend(), --