gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40395: Reimplement suspend 

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 4780892239)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Pedro Amorim 2025-07-15 12:46:39 +00:00 committed by Paul Derscheid
parent 9baff1aeb2
commit 70892313a1
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
2 changed files with 70 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc
View File

@ -182,21 +182,9 @@
</form>
[% IF Koha.Preference('SuspendHoldsIntranet') %]
<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<fieldset class="action">
<input type="hidden" name="op" value="cud-suspendall" />
<input type="hidden" name="from" value="[% patronpage | html %]" />
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
<input type="submit" class="btn btn-primary" value="Suspend all holds" />
[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
<label for="suspend_until">until</label>
<input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true" />
<span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
[% END %]
</fieldset>
</form>
<fieldset class="action">
<button class="btn btn-primary suspend_selected_holds" data-bulk="true"></button>
</fieldset>
<form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]

96
koha-tmpl/intranet-tmpl/prog/js/holds.js
View File

@ -107,16 +107,22 @@ function display_pickup_location(state) {
/* global __ borrowernumber SuspendHoldsIntranet */
$(document).ready(function () {
function suspend_hold(hold_id, end_date) {
var params;
if (end_date !== null && end_date !== "")
params = JSON.stringify({ end_date: end_date });
var url = window.location.href;
let patron_page;
if (url.indexOf("/circ/circulation.pl?borrowernumber=") !== -1)
patron_page = "circ";
else if (url.indexOf("/members/moremember.pl?borrowernumber=") !== -1)
patron_page = "borrower";
function suspend_hold(hold_ids, end_date) {
var params = { hold_ids: hold_ids };
if (end_date !== null && end_date !== "") params.end_date = end_date;
return $.ajax({
method: "POST",
url: "/api/v1/holds/" + encodeURIComponent(hold_id) + "/suspension",
url: "/api/v1/holds/suspension_bulk",
contentType: "application/json",
data: params,
data: JSON.stringify(params),
});
}
@ -124,6 +130,10 @@ $(document).ready(function () {
return $.ajax({
method: "DELETE",
url: "/api/v1/holds/" + encodeURIComponent(hold_id) + "/suspension",
}).done(function () {
if ($(".select_hold_all").prop("checked")) {
$(".select_hold_all").click();
}
});
}
@ -599,7 +609,6 @@ $(document).ready(function () {
</div>\
\
<div class='modal-body'>\
<input type='hidden' id='suspend-modal-reserve_id' name='reserve_id' />\
\
<label for='suspend-modal-until'>" +
__("Suspend until:") +
@ -620,6 +629,7 @@ $(document).ready(function () {
__("Cancel") +
"</button>\
</div>\
<div id='suspend-selected-container'></div>\
</form>\
</div>\
</div>\
@ -633,31 +643,59 @@ $(document).ready(function () {
$("#suspend-modal-submit").on("click", function (e) {
e.preventDefault();
let selected_holds;
if (!$(this).data("hold-id")) {
selected_holds =
"[" +
$(".holds_table .select_hold:checked")
.toArray()
.map(el =>
JSON.stringify({
hold: $(el).data("id"),
borrowernumber: $(el).data("borrowernumber"),
biblionumber: $(el).data("biblionumber"),
})
)
.join(",") +
"]";
} else {
selected_holds =
"[" + JSON.stringify({ hold: $(this).data("hold-id") }) + "]";
$(this).removeData("hold-id");
}
var suspend_until_date = $("#suspend-modal-until").val();
if (suspend_until_date !== null)
suspend_until_date = $date(suspend_until_date, {
dateformat: "rfc3339",
});
suspend_hold($(this).data("hold-id"), suspend_until_date)
.success(function () {
holdsTable.api().ajax.reload();
})
.error(function (jqXHR, textStatus, errorThrown) {
if (jqXHR.status === 404) {
alert(__("Unable to suspend, hold not found."));
} else {
alert(
__(
"Your request could not be processed. Check the logs for details."
)
);
}
holdsTable.api().ajax.reload();
})
.done(function () {
$("#suspend-modal-until").flatpickr().clear(); // clean the input
$("#suspend-modal").modal("hide");
});
const hold_ids = JSON.parse(selected_holds).map(hold => hold.hold);
try {
suspend_hold(hold_ids, suspend_until_date)
.success(function () {
holdsTable.api().ajax.reload();
})
.done(function () {
if ($("#suspend-modal-until").length) {
$("#suspend-modal-until").flatpickr().clear(); // clean the input
}
$("#suspend-modal").modal("hide");
if ($(".select_hold_all").prop("checked")) {
$(".select_hold_all").click();
}
});
} catch (error) {
if (error.status === 404) {
alert(__("Unable to suspend, hold not found."));
} else {
alert(
__(
"Your request could not be processed. Check the logs for details."
)
);
}
}
});
function toggle_suspend(node, inputs) {
@ -702,7 +740,7 @@ $(document).ready(function () {
});
var MSG_SUSPEND_SELECTED = _("Suspend selected (%s)");
var MSG_SUSPEND_SELECTED_HOLDS = _("Suspend selected holds");
var MSG_SUSPEND_SELECTED_HOLDS = _("selected holds");
$(".suspend_selected_holds").html(
MSG_SUSPEND_SELECTED.format(
$(".holds_table .select_hold:checked").length
@ -714,7 +752,7 @@ $(document).ready(function () {
if (!$(".holds_table .select_hold:checked").length) {
return false;
}
$(".modal-title").html(MSG_SUSPEND_SELECTED_HOLDS);
$("#suspend-modal-title").html(MSG_SUSPEND_SELECTED_HOLDS);
$("#suspend-modal").modal("show");
return false;
});