added org settings for deleting addrs, cards, and deactivating cards at user merge

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11855 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index 8dab7b6..2a5d545 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -3110,6 +3110,13 @@ sub merge_users {
        return $e->die_event unless $e->checkauth;
 
     my $master_user = $e->retrieve_actor_user($master_id) or return $e->die_event;
+    my $del_addrs = ($U->ou_ancestor_setting_value(
+        $master_user->home_ou, 'circ.user_merge.delete_addresses', $e)) ? 't' : 'f';
+    my $del_cards = ($U->ou_ancestor_setting_value(
+        $master_user->home_ou, 'circ.user_merge.delete_cards', $e)) ? 't' : 'f';
+    my $deactivate_cards = ($U->ou_ancestor_setting_value(
+        $master_user->home_ou, 'circ.user_merge.deactivate_cards', $e)) ? 't' : 'f';
+
     for my $src_id (@$user_ids) {
         my $src_user = $e->retrieve_actor_user($src_id) or return $e->die_event;
 
@@ -3119,7 +3126,14 @@ sub merge_users {
         }
 
         return $e->die_event unless 
-            $e->json_query({from => ['actor.usr_merge', $src_id, $master_id]});
+            $e->json_query({from => [
+                'actor.usr_merge', 
+                $src_id, 
+                $master_id,
+                $del_addrs,
+                $del_cards,
+                $deactivate_cards
+            ]});
     }
 
     $e->commit;