From 89d4b14ecbe93110016b1fa37acd709a35c3e6da Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Mon, 10 Oct 2022 16:22:05 +0000 Subject: [PATCH] Bug 31728: Remove duplicate claims modal template markup This patch removes some markup which duplicates markup now in a separate include file. modal-claims.inc contains the same markup for #claims-returned-modal as checkouts.table.inc. To test, apply the patch and make sure a LOST authorized value code is defined in the ClaimReturnedLostValue system preference. - Check an item out to a patron, e.g. item 39999000001334 to patron 23529000179433. - In the table showing the patron's checkouts, click the "Claim returned" button. - A "Claim returned" modal should appear. - Click "Make claim." - Switch to the "Claims" tab. You should see the item listed there. - Check out another item, e.g. 39999000013313, to the patron and test the return claim process again from the patron detail page. - Check out another item, e.g. 39999000018691, to the patron with a due date specified which is in the past. - Go to Circulation -> Overdues. You should see the item in the list of overdues. Test that the "Claim returned" button works correctly on this page too. Signed-off-by: David Nind <david@davidnind.com> --- .../prog/en/includes/checkouts-table.inc | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index ab75568e52..6e2b869d34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -94,40 +94,4 @@ </div> <!-- Claims Returned Modal --> - [% PROCESS 'modal-claims-display' %] -<div class="modal fade" id="claims-returned-modal" tabindex="-1" role="dialog" aria-labelledby="claims-returned-modal-label"> - <div class="modal-dialog" role="document"> - <div class="modal-content"> - <div class="modal-header"> - <h4 class="modal-title" id="claims-returned-modal-label">Claim returned</h4> - </div> - <div class="modal-body"> - - <div class="form-group"> - <label for="claims-returned-notes" class="control-label">Notes</label> - <div> - <textarea id="claims-returned-notes" class="form-control" rows="3"></textarea> - </div> - </div> - - [% IF Koha.Preference('ClaimReturnedChargeFee') == 'ask' %] - <div class="form-group"> - <div class="checkbox"> - <label for="claims-returned-charge-lost-fee"> - <input id="claims-returned-charge-lost-fee" type="checkbox" value="1"> - Charge lost fee - </label> - </div> - </div> - [% END %] - - <input type="hidden" id="claims-returned-itemnumber" /> - </div> - <div class="modal-footer"> - <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button> - <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button> - </div> - </div> - </div> -</div> -- 2.30.2