@@ -, +, @@
need to test that normal claims functionality continue to work as
expected.
claimed as returned (but not yet resolved). The dialogue box should
now contain a 'resolve' button next to each claimant and clicking
upon it should trigger the resolution modal where the librarian can
subsequently pick the resolution and submit it.
---
.../prog/en/includes/checkouts-table.inc | 42 -------------------
.../includes/modals/resolve_return_claim.inc | 42 +++++++++++++++++++
.../prog/en/modules/circ/circulation.tt | 7 ++++
.../prog/en/modules/circ/returns.tt | 13 +++++-
.../prog/en/modules/members/moremember.tt | 7 ++++
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 42 -------------------
.../prog/js/resolve_claim_modal.js | 40 ++++++++++++++++++
7 files changed, 108 insertions(+), 85 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/resolve_return_claim.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/resolve_claim_modal.js
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -127,45 +127,3 @@
-
-
-
@@ -978,6 +982,9 @@
[% Asset.js("js/pages/circulation.js") | $raw %]
[% Asset.js("js/checkouts.js") | $raw %]
+ [% IF Koha.Preference('ClaimReturnedLostValue') %]
+ [% Asset.js("js/resolve_claim_modal.js") | $raw %]
+ [% END %]
[% Asset.js("js/holds.js") | $raw %]
+ [% Asset.js("js/resolve_claim_modal.js") | $raw %]
+ [% END %]
[% INCLUDE 'timepicker.inc' %]
[% Asset.js("js/pages/circulation.js") | $raw %]
[% Asset.js("js/checkouts.js") | $raw %]
+ [% IF Koha.Preference('ClaimReturnedLostValue') %]
+ [% Asset.js("js/resolve_claim_modal.js") | $raw %]
+ [% END %]
[% Asset.js("js/holds.js") | $raw %]
[% INCLUDE 'str/members-menu.inc' %]
[% Asset.js("js/members-menu.js") | $raw %]
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -1185,48 +1185,6 @@ $(document).ready(function() {
}
});
- // Handle return claim resolution
- $('body').on('click', '.return-claim-tools-resolve', function() {
- let id = $(this).data('return-claim-id');
- let current_lost_status = $(this).data('current-lost-status');
-
- $('#claims-returned-resolved-modal-id').val(id);
- $("#new_lost_status").val(current_lost_status);
- let selected_option = $("#new_lost_status option:selected");
- $(selected_option).text(_("%s (current status)").format($(selected_option).text()));
- $('#claims-returned-resolved-modal').modal()
- });
-
- $(document).on('click', '#claims-returned-resolved-modal-btn-submit', function(e) {
- let resolution = $('#claims-returned-resolved-modal-resolved-code').val();
- let new_lost_status = $('#new_lost_status').val();
- let id = $('#claims-returned-resolved-modal-id').val();
-
- $('#claims-returned-resolved-modal-btn-submit-spinner').show();
- $('#claims-returned-resolved-modal-btn-submit-icon').hide();
-
- params = {
- resolution: resolution,
- resolved_by: logged_in_user_borrowernumber,
- new_lost_status: new_lost_status
- };
-
- $.ajax({
- url: '/api/v1/return_claims/' + id + '/resolve',
- type: 'PUT',
- data: JSON.stringify(params),
- success: function( data ) {
- $('#claims-returned-resolved-modal-btn-submit-spinner').hide();
- $('#claims-returned-resolved-modal-btn-submit-icon').show();
- $('#claims-returned-resolved-modal').modal('hide')
-
- refreshReturnClaimsTable();
- },
- contentType: "json"
- });
-
- });
-
$("#show_all_claims").on("click", function(e){
e.preventDefault();
$(".ctrl_link").removeClass("disabled");
--- a/koha-tmpl/intranet-tmpl/prog/js/resolve_claim_modal.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/resolve_claim_modal.js
@@ -0,0 +1,40 @@
+$('body').on('click', '.return-claim-tools-resolve', function() {
+ let id = $(this).data('return-claim-id');
+ let current_lost_status = $(this).data('current-lost-status');
+
+ $('#claims-returned-resolved-modal-id').val(id);
+ $("#new_lost_status").val(current_lost_status);
+ let selected_option = $("#new_lost_status option:selected");
+ $(selected_option).text(_("%s (current status)").format($(selected_option).text()));
+ $('#claims-returned-resolved-modal').modal()
+});
+
+$(document).on('click', '#claims-returned-resolved-modal-btn-submit', function(e) {
+ let resolution = $('#claims-returned-resolved-modal-resolved-code').val();
+ let new_lost_status = $('#new_lost_status').val();
+ let id = $('#claims-returned-resolved-modal-id').val();
+
+ $('#claims-returned-resolved-modal-btn-submit-spinner').show();
+ $('#claims-returned-resolved-modal-btn-submit-icon').hide();
+
+ params = {
+ resolution: resolution,
+ resolved_by: logged_in_user_borrowernumber,
+ new_lost_status: new_lost_status
+ };
+
+ $.ajax({
+ url: '/api/v1/return_claims/' + id + '/resolve',
+ type: 'PUT',
+ data: JSON.stringify(params),
+ success: function(data) {
+ $('#claims-returned-resolved-modal-btn-submit-spinner').hide();
+ $('#claims-returned-resolved-modal-btn-submit-icon').show();
+ $('#claims-returned-resolved-modal').modal('hide')
+
+ refreshReturnClaimsTable();
+ },
+ contentType: "json"
+ });
+
+});
--