From 79c2999c6e916ddc5c4435e4cb7775abe766f025 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Fri, 6 Dec 2019 11:35:00 +0000
Subject: [PATCH] Bug 23971: (follow-up) Add additional basket logging

This patch adds additional basket logging as discussed in comment #14

- Basket reopening
- Basket users (manager) modification
- Basket header modification

Signed-off-by: Holly <hc@interleaf.ie>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 C4/Acquisition.pm                             | 29 +++++++++++++++++++
 .../prog/en/modules/tools/viewlog.tt          |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index e03474a8e7..bd5c307eef 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -232,6 +232,15 @@ sub ReopenBasket {
         WHERE basketno = ?
         AND orderstatus NOT IN ( 'complete', 'cancelled' )
         }, {}, $basketno);
+
+    # Log the basket reopening
+    if (C4::Context->preference("AcqLog")) {
+        logaction(
+            'ACQUISITIONS',
+            'REOPEN_BASKET',
+            $basketno
+        );
+    }
     return;
 }
 
@@ -574,6 +583,16 @@ sub ModBasketHeader {
         $sth2->execute($contractnumber,$basketno);
     }
 
+    # Log the basket update
+    if (C4::Context->preference("AcqLog")) {
+        logaction(
+            'ACQUISITIONS',
+            'MODIFY_BASKET_HEADER',
+            $basketno
+        );
+    }
+
+    return;
     return;
 }
 
@@ -754,6 +773,16 @@ sub ModBasketUsers {
     foreach my $basketuser_id (@basketusers_ids) {
         $sth->execute($basketno, $basketuser_id);
     }
+
+    # Log the basket update
+    if (C4::Context->preference("AcqLog")) {
+        logaction(
+            'ACQUISITIONS',
+            'MODIFY_BASKET_USERS',
+            $basketno
+        );
+    }
+
     return;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index 9841329ff1..b81d75ee38 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -119,8 +119,11 @@
 [%        CASE 'PATRON_NOTICE'  %]ILL notice sent to patron
 [%        CASE 'ADD_BASKET' %]Create an acquisitions basket
 [%        CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
+[%        CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header
+[%        CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users
 [%        CASE 'CLOSE_BASKET' %]Close an acquisitions basket
 [%        CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
+[%        CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket
 [%        CASE 'Run'    %]Run
 [%        CASE 'EDIT_MAPPINGS' %]Edit mappings
 [%        CASE 'RESET_MAPPINGS' %]Reset mappings
@@ -215,7 +218,7 @@
                                         <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
                                     [% END %]
 
-                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS', 'ADD_BASKET' 'MODIFY_BASKET' 'CLOSE_BASKET' 'APPROVE_BASKET' ] %]
+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]
                                         [% IF actions.grep(actx).size %]
                                             <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
                                         [% ELSE %]
-- 
2.39.5