From 5cfcc4b324321c0a15c2a8b4ba230c84ffb35821 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
---
 C4/Acquisition.pm                                  | 29 ++++++++++++++++++++++
 .../intranet-tmpl/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 eb75009c48..e846778215 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -265,6 +265,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;
 }
 
@@ -633,6 +642,16 @@ sub ModBasketHeader {
         $sth2->execute($contractnumber,$basketno);
     }
 
+    # Log the basket update
+    if (C4::Context->preference("AcqLog")) {
+        logaction(
+            'ACQUISITIONS',
+            'MODIFY_BASKET_HEADER',
+            $basketno
+        );
+    }
+
+    return;
     return;
 }
 
@@ -813,6 +832,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 24a3a0188d..8fa01ab45d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -59,8 +59,11 @@
 [%        CASE 'STATUS_CHANGE'  %]Change ILL request status
 [%        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 %][% action | html %]
 [%    END %]
@@ -128,7 +131,7 @@
                                         <option value="">All</option>
                                     [% END %]
 
-                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' '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' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]
                                         [% IF actions.grep(actx).size %]
                                             <option value="[% actx | html %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
                                         [% ELSE %]
-- 
2.11.0