From aea3ad0b7bbe900840998d3e6597328708350b05 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 31 Aug 2023 22:31:36 +0000 Subject: [PATCH] Bug 34036: Reload 'already received' table when edit modal closed Bug 33784 introduced a fix that prevents the 'already received' table from reloading completely if the modal is hidden and there is only one order in the table. This appears to assume that the 'hidden modal' event is only triggered if the receive form is cancelled, but the 'hidden modal' event is also triggered when the receive form is submitted. This means that the table isn't redrawn when the form is submitted and there's one order already received, so the next order does not show in the table when the page reloads. To test: 1. Set up a vendor, budget, fund, and create a new basket. 2. Add two orders (two different records) to this basket. 3. Close the basket and go to receive the orders. 4. Once on the 'Receive orders' page, use the checkboxes in the Pending orders table to receive both orders at once. Choose the 'Receive selected' button 5. Click Edit for the first order, receive the item and click 'Next order'. Receive the next item and click 'Save changes'. Then Confirm 6. Both orders should now show under Already received. Click Cancel receipt for one of the orders. It should go back to Pending orders. 7. Click Receive for the now pending order. Receive the item and Confirm. 8. Notice that the page appears to reload but the order doesn't show under Already received with the other order. The order also no longer shows under Pending orders. 9. Apply the patch and restart services. Reload the page. Cancel receipt of the order again. 10. Click Receive for the now pending order. Receive the item and Confirm. 11. The Already received table should reload so that both orders now show under Already received. 12. Click Cancel receipt for the order. 13. Click Receive for the now pending order, then Cancel without receiving the item. 14. Confirm the page loads as expected with one pending order and one already received order. Sponsored-by: Toi Ohomai Institute of Technology Signed-off-by: Michaela Sieber Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 72c1140b60..0681c355b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -1376,11 +1376,7 @@ }); $("#order_edit").on("hide.bs.modal", function() { - [% IF only_one_order %] [%# On the single case, dismissing the modal equals to cancelling %] - location.href = "/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1"; - [% ELSE %] $("#child_orders_table").DataTable().off('preDraw').destroy(); - [% END %] }); }); -- 2.39.5