From b7cce4d5412b3ada5f5dfe230813b1801bc45d7b Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 30 Nov 2021 14:34:48 +0000
Subject: [PATCH] Bug 28854: Add modal after checkin to print missing items
 list

This patch adds a further modal to the post checkin alert to allow the
user to print a view and print a list of items that went missing at this
checkin to allow for replacements to be picked.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 circ/returns.pl                               | 61 ++++++++++---------
 .../prog/en/modules/circ/returns.tt           | 43 ++++++++++++-
 2 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index 545de9b5020..7399568cf53 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -444,34 +444,39 @@ if ($barcode) {
         }
         for my $missing_item ( keys %{$expected_items} ) {
             my $bundle_item = $expected_items->{$missing_item};
-            $bundle_item->itemlost($BundleLostValue)->store();
-            # Add return_claim record if this is an actual checkin
-            if ($issue) {
-                $bundle_item->_result->create_related(
-                    'return_claims',
-                    {
-                        issue_id       => $issue->issue_id,
-                        itemnumber     => $bundle_item->itemnumber,
-                        borrowernumber => $issue->borrowernumber,
-                        created_by     => C4::Context->userenv()->{number},
-                        created_on     => dt_from_string
-                    }
-                );
-            }
-            push @missing_items, $bundle_item;
-            # NOTE: We cannot use C4::LostItem here because the item itself doesn't have a checkout
-            # and thus would not get charged.. it's checked out as part of the bundle.
-            if ( C4::Context->preference('WhenLostChargeReplacementFee') && $issue ) {
-                C4::Accounts::chargelostitem(
-                    $issue->borrowernumber,
-                    $bundle_item->itemnumber,
-                    $bundle_item->replacementprice,
-                    sprintf( "%s %s %s",
-                        $bundle_item->biblio->title  || q{},
-                        $bundle_item->barcode        || q{},
-                        $bundle_item->itemcallnumber || q{},
-                    ),
-                );
+            # Mark as lost if it's not already lost
+            if ( !$bundle_item->itemlost ) {
+                $bundle_item->itemlost($BundleLostValue)->store();
+
+                # Add return_claim record if this is an actual checkin
+                if ($issue) {
+                    $bundle_item->_result->create_related(
+                        'return_claims',
+                        {
+                            issue_id       => $issue->issue_id,
+                            itemnumber     => $bundle_item->itemnumber,
+                            borrowernumber => $issue->borrowernumber,
+                            created_by     => C4::Context->userenv()->{number},
+                            created_on     => dt_from_string
+                        }
+                    );
+                }
+                push @missing_items, $bundle_item;
+
+                # NOTE: We cannot use C4::LostItem here because the item itself doesn't have a checkout
+                # and thus would not get charged.. it's checked out as part of the bundle.
+                if ( C4::Context->preference('WhenLostChargeReplacementFee') && $issue ) {
+                    C4::Accounts::chargelostitem(
+                        $issue->borrowernumber,
+                        $bundle_item->itemnumber,
+                        $bundle_item->replacementprice,
+                        sprintf( "%s %s %s",
+                            $bundle_item->biblio->title  || q{},
+                            $bundle_item->barcode        || q{},
+                            $bundle_item->itemcallnumber || q{},
+                        ),
+                    );
+                }
             }
         }
         $template->param(
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 4ed6318f431..77493baa3c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -223,7 +223,10 @@
                                 <div id="bundle_missing_items" class="dialog alert">
                                     <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></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>
+                                    </p>
                                 </div>
                             [% END %]
 
@@ -1306,6 +1309,44 @@
 
     [% INCLUDE 'modals/bundle_contents.inc' %]
 
+    [% IF ( missing_items ) %]
+    <!-- Bundle missing modal -->
+    <div class="modal printable" id="bundleMissingModal" tabindex="-1" role="dialog" aria-labelledby="bundleMissingLabel">
+        <div class="modal-dialog" role="document">
+            <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="bundleMissingLabel">Items missing from bundle at checking for [% item.barcode | html %]</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 missing_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-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>
+                </div> <!-- /.modal-footer -->
+            </div> <!-- /.modal-content -->
+        </div> <!-- /.modal-dialog -->
+    </div> <!-- /#bundleMissingModal -->
+    [% END %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
-- 
2.30.2