Attachment 100233 Details for Bug 24474 – Bug 24474: (follow-up) Add LOST_FOUND logic to Koha::Account::pay

[patch] Bug 24474: (follow-up) Add LOST_FOUND logic to Koha::Account::pay

Bug-24474-follow-up-Add-LOSTFOUND-logic-to-KohaAcc.patch (text/plain), 3.92 KB, created by Martin Renvoize (ashimema) on 2020-03-06 10:15:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-03-06 10:15:46 UTC

Size: 3.92 KB

patch

obsolete

>From 7c33dd47c28846552470eb1f517372aa48ae8699 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 14 Feb 2020 10:39:21 +0000
>Subject: [PATCH] Bug 24474: (follow-up) Add LOST_FOUND logic to
> Koha::Account::pay
>
>This patch adds the same updated logic as found in
>Koha::Account::Line->apply to handle LOST_FOUND credits being applied
>against their associated LOST debit.
>
>Currently a 'LOST_FOUND' credit is never created via the pay method and
>so the additional test will always pass, but the addition here accounts
>for possible future uses.
>---
> Koha/Account.pm | 37 ++++++++++++++++++++++++-------------
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
>diff --git a/Koha/Account.pm b/Koha/Account.pm
>index 81f7a344ce..de251c52da 100644
>--- a/Koha/Account.pm
>+++ b/Koha/Account.pm
>@@ -65,6 +65,7 @@ Koha::Account->new( { patron_id => $borrowernumber } )->pay(
>         lines       => $lines, # Arrayref of Koha::Account::Line objects to pay
>         credit_type => $type,  # credit_type_code code
>         offset_type => $offset_type,    # offset type code
>+        item_id     => $itemnumber,     # pass the itemnumber if this is a credit pertianing to a specific item (i.e LOST_FOUND)
>     }
> );
> 
>@@ -83,9 +84,15 @@ sub pay {
>     my $credit_type   = $params->{credit_type};
>     my $offset_type   = $params->{offset_type} || $type eq 'WRITEOFF' ? 'Writeoff' : 'Payment';
>     my $cash_register = $params->{cash_register};
>+    my $item_id       = $params->{item_id};
> 
>     my $userenv = C4::Context->userenv;
> 
>+    $credit_type ||=
>+      $type eq 'WRITEOFF'
>+      ? 'WRITEOFF'
>+      : 'PAYMENT';
>+
>     my $patron = Koha::Patrons->find( $self->{patron_id} );
> 
>     my $manager_id = $userenv ? $userenv->{number} : 0;
>@@ -130,12 +137,16 @@ sub pay {
>         }
> 
>         # Same logic exists in Koha::Account::Line::apply
>-        if (   $new_amountoutstanding == 0
>-            && $fine->itemnumber
>+        if ( C4::Context->preference('MarkLostItemsAsReturned') =~ m|onpayment|
>             && $fine->debit_type_code
>-            && ( $fine->debit_type_code eq 'LOST' ) )
>+            && $fine->debit_type_code eq 'LOST'
>+            && $new_amountoutstanding == 0
>+            && $fine->itemnumber
>+            && !(  $credit_type eq 'LOST_FOUND'
>+                && $item_id == $fine->itemnumber ) )
>         {
>-            C4::Circulation::ReturnLostItem( $self->{patron_id}, $fine->itemnumber );
>+            C4::Circulation::ReturnLostItem( $self->{patron_id},
>+                $fine->itemnumber );
>         }
> 
>         my $account_offset = Koha::Account::Offset->new(
>@@ -197,12 +208,16 @@ sub pay {
>             push @{$renew_outcomes}, $outcome;
>         }
> 
>-        if (   $fine->amountoutstanding == 0
>-            && $fine->itemnumber
>+        if ( C4::Context->preference('MarkLostItemsAsReturned') =~ m|onpayment|
>             && $fine->debit_type_code
>-            && ( $fine->debit_type_code eq 'LOST' ) )
>+            && $fine->debit_type_code eq 'LOST'
>+            && $fine->amountoutstanding == 0
>+            && $fine->itemnumber
>+            && !(  $credit_type eq 'LOST_FOUND'
>+                && $item_id == $fine->itemnumber ) )
>         {
>-            C4::Circulation::ReturnLostItem( $self->{patron_id}, $fine->itemnumber );
>+            C4::Circulation::ReturnLostItem( $self->{patron_id},
>+                $fine->itemnumber );
>         }
> 
>         my $account_offset = Koha::Account::Offset->new(
>@@ -239,11 +254,6 @@ sub pay {
>         last unless $balance_remaining > 0;
>     }
> 
>-    $credit_type ||=
>-      $type eq 'WRITEOFF'
>-      ? 'WRITEOFF'
>-      : 'PAYMENT';
>-
>     $description ||= $type eq 'WRITEOFF' ? 'Writeoff' : q{};
> 
>     my $payment = Koha::Account::Line->new(
>@@ -260,6 +270,7 @@ sub pay {
>             branchcode        => $library_id,
>             register_id       => $cash_register,
>             note              => $note,
>+            itemnumber        => $item_id,
>         }
>     )->store();
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24474: 98392 | 98393 | 98436 | 98437 | 98438 | 98439 | 98460 | 98485 | 98486 | 98487 | 98645 | 98646 | 98647 | 98648 | 98673 | 98674 | 98675 | 98676 | 98923 | 100229 | 100230 | 100231 | 100232 | 100233 | 102104 | 102105 | 102106 | 102107 | 102108 | 102109 | 102110 | 102132 | 102133 | 102134 | 102135 | 102136 | 102137 | 102138