From b0f583ca426468347dc759165981862cbbb850b9 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 4 Jan 2024 16:44:39 +0100
Subject: [PATCH] Bug 35329: Move patron search to modal - neworderempty

Test plan:
Create a new acquisition order and add users.

FIXME:
Note that rules for .modal-dialog .dialog.message need to be adjusted.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/acqui/neworderempty.tt    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index cfbabea11e..5a52f08ed1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -7,6 +7,7 @@
 [% USE AuthorisedValues %]
 [% USE Branches %]
 [% PROCESS 'i18n.inc' %]
+[% PROCESS 'patron-search.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% FILTER collapse %]
     [% IF ( ordernumber ) %]
@@ -198,14 +199,6 @@
             $("#budget_id").change();
         });
 
-        function UserSearchPopup(f) {
-            window.open(
-                "/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,action&selection_type=add",
-                'UserSearchPopup',
-                'width=1024, height=768, scrollbars=yes, toolbar=no,'
-             );
-        }
-
         function add_user(borrowernumber, borrowername) {
             var ids = $("#users_ids").val();
             if(ids.length > 0) {
@@ -232,6 +225,10 @@
             $("#users_ids").val(ids.join(':'));
         }
     </script>
+
+    [% SET columns = ['cardnumber','name','category','branch','action'] %]
+    [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %]
+
 [% Asset.css("css/addbiblio.css") | $raw %]
 </head>
 
@@ -338,8 +335,7 @@
                       [% END %]
                     </ul>
                     <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
-                    <input type="hidden" id="op" name="op" value="cud-order" />
-                    <input type="button" id="add_user" class="btn btn-default" onclick="UserSearchPopup();" value="Add user" />
+                    <a href="#patron_search_modal" id="add_user" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add user</a>
                 </div>
             </li>
         </ol>
@@ -738,6 +734,7 @@
 [% END %]
 
     <fieldset class="action">
+        <input type="hidden" id="op" name="op" value="cud-order" />
         <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
         <input type="submit" class="btn btn-primary" value="Save" />
         [% IF (suggestionid) %]
@@ -781,6 +778,8 @@
 </div> <!-- /.col-sm-2.col-sm-pull-10 -->
 </div> <!-- /.row -->
 
+[% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %]
+
 [% MACRO jsinclude BLOCK %]
 [% END %]
 
-- 
2.39.5