From 132feaa9c989e3b949c620adfb576fa31f98eb23 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 24 Nov 2021 14:16:52 +0000
Subject: [PATCH] Bug 29566: Update modal to use slip api

---
 .../en/includes/modals/bundle_contents.inc    | 23 ++----------
 .../prog/en/modules/circ/returns.tt           | 25 +++----------
 .../prog/js/bundle_contents_modal.js          | 36 +++++++++++++++++++
 3 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/bundle_contents_modal.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/bundle_contents.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/bundle_contents.inc
index fe0041923c..eb7c803d91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/bundle_contents.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/bundle_contents.inc
@@ -4,28 +4,9 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="bundleContentsLabel">Bundle contents for [% item.barcode | html %]</h4>
+                <h4 class="modal-title" id="bundleContentsLabel"></h4>
             </div>
-            <div class="modal-body">
-                <table style="width:100%">
-                    <thead>
-                        <tr>
-                            <th>Barcode</th>
-                            <th>Title</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    [% FOREACH bundle_item IN bundle_items %]
-                        <tr>
-                            <td>[% bundle_item.barcode | html %]</td>
-                            <td>[% INCLUDE 'biblio-title.inc' biblio=bundle_item.biblio %]</td>
-                        </tr>
-                    [% END %]
-                    </tbody>
-                    <tfoot>
-                    </tfoot>
-                </table>
-            </div> <!-- /.modal-body -->
+            <div class="modal-body"></div> <!-- /.modal-body -->
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="printModal btn btn-primary"><i class="fa fa-print"></i> Print</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index dd295153a3..8a366c4f41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -224,8 +224,8 @@
                                     <h3>Bundle had missing items</h3>
                                     <p>Bundle contents list updated</p>
                                     <p>
-                                        <a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleContentsModal"><i class="fa fa-eye" aria-hidden="true"></i> View updated contents list</a>
-                                        <a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleMissingModal"><i class="fa fa-eye" aria-hidden="true"></i> View list of missing items</a>
+                                        <a class="btn btn-default btn-xs bundle-contents" role="button" data-itemnumber="[% item.itemnumber | html %]" href="#bundleContentsModal"><i class="fa fa-eye bundle-contents-icon" aria-hidden="true"></i><i class="fa fa-spinner fa-pulse fa-fw bundle-contents-spinner" style="display:none"></i> View updated contents list</a>
+                                        <a class="btn btn-default btn-xs bundle-missing" role="button" data-toggle="modal" href="#bundleMissingModal"><i class="fa fa-eye" aria-hidden="true"></i> View list of missing items</a>
                                     </p>
                                 </div>
                             [% END %]
@@ -386,7 +386,7 @@
                                 <div class="dialog message">
                                     <h3>Bundle verified</h3>
                                     <p>The bundle content was verified</p>
-                                    <p><a class="btn btn-default btn-xs" role="button" data-toggle="modal" href="#bundleContentsModal"><i class="fa fa-eye" aria-hidden="true"></i> View contents list</a></p>
+                                    <p><a class="btn btn-default btn-xs bundle-contents" role="button" data-itemnumber="[% item.itemnumber | html %]" href="#bundleContentsModal"><i class="fa fa-eye bundle-contents-icon" aria-hidden="true"></i><i class="fa fa-spinner fa-pulse fa-fw bundle-contents-spinner" style="display:none"></i> View contents list</a></p>
                                 </div>
                             [% END %]
                         [% END # /BLOCK all_checkin_messages %]
@@ -1359,6 +1359,8 @@
         </script>
         [% Asset.js("js/resolve_claim_modal.js") | $raw %]
     [% END %]
+    [% Asset.js("js/bundle_contents_modal.js") | $raw %]
+    [% INCLUDE 'timepicker.inc' %]
 
     <script>
         function Dopop(link) {
@@ -1588,23 +1590,6 @@
                 "bInfo": false,
                 "order": [[ 1, 'asc' ], [ 0, 'asc' ]]
             }));
-
-            // print modals
-            $('.modal.printable').on('shown.bs.modal', function() {
-                $('.modal-dialog', this).addClass('focused');
-                $('body').addClass('modalprinter');
-
-                if ($(this).hasClass('autoprint')) {
-                    window.print();
-                }
-            }).on('hidden.bs.modal', function() {
-                $('.modal-dialog', this).removeClass('focused');
-                $('body').removeClass('modalprinter');
-            });
-
-            $('.printModal').click(function() {
-                window.print();
-            });
         });
     </script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/bundle_contents_modal.js b/koha-tmpl/intranet-tmpl/prog/js/bundle_contents_modal.js
new file mode 100644
index 0000000000..2d67bd7504
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/bundle_contents_modal.js
@@ -0,0 +1,36 @@
+$('body').on('click', '.bundle-contents', function (e) {
+    let itemnumber = $(this).data('itemnumber');
+
+    let modal = $('#bundleContentsModal');
+    $('.bundle-contents-icon').hide();
+    $('.bundle-contents-spinner').show();
+    $.ajax({
+        url: '/api/v1/items/' + itemnumber + '/print_slips/BUNDLE',
+        success: function(data) {
+            console.log(data);
+            modal.find('.modal-title').text(data.title);
+            modal.find('.modal-body').html(data.content);
+            modal.modal('show');
+            $('.bundle-contents-spinner').hide();
+            $('.bundle-contents-icon').show();
+        },
+        contentType: "json"
+    });
+
+});
+
+$('.modal.printable').on('shown.bs.modal', function() {
+    $('.modal-dialog', this).addClass('focused');
+    $('body').addClass('modalprinter');
+
+    if ($(this).hasClass('autoprint')) {
+        window.print();
+    }
+}).on('hidden.bs.modal', function() {
+    $('.modal-dialog', this).removeClass('focused');
+    $('body').removeClass('modalprinter');
+});
+
+$('.printModal').click(function() {
+    window.print();
+});
-- 
2.20.1