From 3a406617539d840311130b9ddd0cb94c28a655d8 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Wed, 24 May 2023 09:44:49 -0300
Subject: [PATCH] Bug 33784: Make buttons more meaningful

This patch makes dismissing the modal equivalent to cancelling the
receipt and thus returning to parcel.pl.

The 'Save' button is renamed to 'Confirm' and is disabled when no items
are selected for receiving.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/acqui/orderreceive.tt            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 7bbffea00be..3e1acca3ae0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -393,10 +393,15 @@
                     </div>
                 </div>
                 <div class="modal-footer">
+                [% IF multiple_orders.split(',').size == 1 %]
+                    <button type="button" class="btn btn-primary modal-save" disabled>Confirm</button>
+                    <a class="cancel btn btn-default" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a>
+                [% ELSE %]
                     <button type="button" class="btn btn-defualt modal-prev">Previous order</button>
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                     <button type="button" class="btn btn-primary modal-save">Save changes</button>
                     <button type="button" class="btn btn-defualt modal-next">Next order</button>
+                [% END %]
                 </div>
             </div>
         </div>
@@ -873,6 +878,9 @@
                 $("#quantity").val(qty);
                 var row = $("#order_edit").data('row');
                 row.quantity_received = qty;
+            [% IF multiple_orders.split(',').size == 1 %]
+                $('.modal-save').prop('disabled', qty < 1 );
+            [% END %]
             })
 
             $("#order_edit").on("change", "#tax_rate", function() {
@@ -1317,7 +1325,11 @@
             });
 
             $("#order_edit").on("hide.bs.modal", function() {
+            [% IF multiple_orders.split(',').size == 1 %] [%# 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 %]
             });
         });
     </script>
-- 
2.34.1