Attachment 125807 Details for Bug 29062 – Bug 29062: (follow-up) Adjust SendCirculationAlert

[patch] Bug 29062: (follow-up) Adjust SendCirculationAlert

Bug-29062-follow-up-Adjust-SendCirculationAlert.patch (text/plain), 2.64 KB, created by Marcel de Rooy on 2021-10-06 13:34:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-10-06 13:34:24 UTC

Size: 2.64 KB

patch

obsolete

>From 01e44e07d93e8b2f021090246f7145fe7efffa53 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Mon, 4 Oct 2021 18:43:52 +0000
>Subject: [PATCH] Bug 29062: (follow-up) Adjust SendCirculationAlert
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Circulation.pm | 30 +++++++++++++++++++-----------
> 1 file changed, 19 insertions(+), 11 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index ebc7988744..3a148aad52 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -2259,6 +2259,7 @@ sub AddReturn {
>                 item     => $item->unblessed,
>                 borrower => $patron->unblessed,
>                 branch   => $branch,
>+                issue    => $issue
>             });
>         }
> 
>@@ -3453,8 +3454,8 @@ B<Example>:
> 
> sub SendCirculationAlert {
>     my ($opts) = @_;
>-    my ($type, $item, $borrower, $branch) =
>-        ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch});
>+    my ($type, $item, $borrower, $branch, $issue) =
>+        ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch}, $opts->{issue});
>     my %message_name = (
>         CHECKIN  => 'Item_Check_in',
>         CHECKOUT => 'Item_Checkout',
>@@ -3464,7 +3465,21 @@ sub SendCirculationAlert {
>         borrowernumber => $borrower->{borrowernumber},
>         message_name   => $message_name{$type},
>     });
>-    my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues';
>+
>+
>+    my $tables = {
>+        items => $item->{itemnumber},
>+        biblio      => $item->{biblionumber},
>+        biblioitems => $item->{biblionumber},
>+        borrowers   => $borrower,
>+        branches    => $branch,
>+    };
>+
>+    if( $type eq 'CHECKIN' ){
>+        $tables->{old_issues} = $issue->issue_id;
>+    } else {
>+        $tables->{issues} = $item->{itemnumber};
>+    }
> 
>     my $schema = Koha::Database->new->schema;
>     my @transports = keys %{ $borrower_preferences->{transports} };
>@@ -3482,14 +3497,7 @@ sub SendCirculationAlert {
>             branchcode => $branch,
>             message_transport_type => $mtt,
>             lang => $borrower->{lang},
>-            tables => {
>-                $issues_table => $item->{itemnumber},
>-                'items'       => $item->{itemnumber},
>-                'biblio'      => $item->{biblionumber},
>-                'biblioitems' => $item->{biblionumber},
>-                'borrowers'   => $borrower,
>-                'branches'    => $branch,
>-            }
>+            tables => $tables,
>         ) or next;
> 
>         C4::Context->dbh->do(q|LOCK TABLE message_queue READ|) unless $do_not_lock;
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29062: 125129 | 125154 | 125712 | 125749 | 125806 | 125807 | 125809 | 125879