Attachment 94003 Details for Bug 23049 – Bug 23049: Capitalise type passed to add_debit for `overdue`

[patch] Bug 23049: Capitalise type passed to add_debit for `overdue`

Bug-23049-Capitalise-type-passed-to-adddebit-for-o.patch (text/plain), 11.29 KB, created by Martin Renvoize (ashimema) on 2019-10-11 11:43:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-10-11 11:43:48 UTC

Size: 11.29 KB

patch

obsolete

>From 9c2b028a8f0cf53a4f3044518926b19e92a01e44 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 10 Oct 2019 16:48:41 +0100
>Subject: [PATCH] Bug 23049: Capitalise type passed to add_debit for `overdue`
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>---
> C4/Overdues.pm                      |  2 +-
> Koha/Account.pm                     |  8 ++---
> t/db_dependent/Circulation.t        |  8 ++---
> t/db_dependent/Koha/Account.t       | 48 ++++++++++++++---------------
> t/db_dependent/Koha/Account/Lines.t |  2 +-
> 5 files changed, 34 insertions(+), 34 deletions(-)
>
>diff --git a/C4/Overdues.pm b/C4/Overdues.pm
>index d97cde98de..14c5980414 100644
>--- a/C4/Overdues.pm
>+++ b/C4/Overdues.pm
>@@ -587,7 +587,7 @@ sub UpdateFine {
>                     user_id     => undef,
>                     interface   => C4::Context->interface,
>                     library_id  => undef, #FIXME: Should we grab the checkout or circ-control branch here perhaps?
>-                    type        => 'overdue',
>+                    type        => 'OVERDUE',
>                     item_id     => $itemnum,
>                     issue_id    => $issue_id,
>                 }
>diff --git a/Koha/Account.pm b/Koha/Account.pm
>index 33b65f5c58..91f5879c1c 100644
>--- a/Koha/Account.pm
>+++ b/Koha/Account.pm
>@@ -450,7 +450,7 @@ $debit_type can be any of:
>   - LOST
>   - sundry
>   - new_card
>-  - overdue
>+  - OVERDUE
>   - PROCESSING
>   - RENT
>   - RENT_DAILY
>@@ -516,7 +516,7 @@ sub add_debit {
>                     itemnumber        => $item_id,
>                     issue_id          => $issue_id,
>                     branchcode        => $library_id,
>-                    ( $type eq 'overdue' ? ( status => 'UNRETURNED' ) : () ),
>+                    ( $type eq 'OVERDUE' ? ( status => 'UNRETURNED' ) : () ),
>                 }
>             )->store();
> 
>@@ -717,7 +717,7 @@ our $offset_type = {
>     'RENT_DAILY'       => 'Rental Fee',
>     'RENT_RENEW'       => 'Rental Fee',
>     'RENT_DAILY_RENEW' => 'Rental Fee',
>-    'overdue'          => 'OVERDUE',
>+    'OVERDUE'          => 'OVERDUE',
>     'RESERVE_EXPIRED'  => 'Hold Expired'
> };
> 
>@@ -743,7 +743,7 @@ our $account_type_debit = {
>     'RESERVE_EXPIRED'  => 'RESERVE_EXPIRED',
>     'LOST_ITEM'        => 'LOST',
>     'new_card'         => 'N',
>-    'overdue'          => 'OVERDUE',
>+    'OVERDUE'          => 'OVERDUE',
>     'PROCESSING'       => 'PROCESSING',
>     'RENT'             => 'RENT',
>     'RENT_DAILY'       => 'RENT_DAILY',
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index 571674d8f6..b93fd50cd1 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -745,7 +745,7 @@ subtest "CanBookBeRenewed tests" => sub {
>             {
>                 amount      => $fines_amount,
>                 interface   => 'test',
>-                type        => 'overdue',
>+                type        => 'OVERDUE',
>                 item_id     => $item_to_auto_renew->{itemnumber},
>                 description => "Some fines"
>             }
>@@ -759,7 +759,7 @@ subtest "CanBookBeRenewed tests" => sub {
>             {
>                 amount      => $fines_amount,
>                 interface   => 'test',
>-                type        => 'overdue',
>+                type        => 'OVERDUE',
>                 item_id     => $item_to_auto_renew->{itemnumber},
>                 description => "Some fines"
>             }
>@@ -773,7 +773,7 @@ subtest "CanBookBeRenewed tests" => sub {
>             {
>                 amount      => $fines_amount,
>                 interface   => 'test',
>-                type        => 'overdue',
>+                type        => 'OVERDUE',
>                 item_id     => $item_to_auto_renew->{itemnumber},
>                 description => "Some fines"
>             }
>@@ -2450,7 +2450,7 @@ subtest '_FixAccountForLostAndReturned' => sub {
>         );
> 
>         my $manual_debit_amount = 80;
>-        $account->add_debit( { amount => $manual_debit_amount, type => 'overdue', interface =>'test' } );
>+        $account->add_debit( { amount => $manual_debit_amount, type => 'OVERDUE', interface =>'test' } );
> 
>         is( $account->balance, $manual_debit_amount + $replacement_amount - $payment_amount, 'Manual debit applied' );
> 
>diff --git a/t/db_dependent/Koha/Account.t b/t/db_dependent/Koha/Account.t
>index de949208a4..02efbd1c04 100755
>--- a/t/db_dependent/Koha/Account.t
>+++ b/t/db_dependent/Koha/Account.t
>@@ -60,10 +60,10 @@ subtest 'outstanding_debits() tests' => sub {
>     my $account = $patron->account;
> 
>     my @generated_lines;
>-    push @generated_lines, $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-    push @generated_lines, $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-    push @generated_lines, $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>-    push @generated_lines, $account->add_debit({ amount => 4, interface => 'commandline', type => 'overdue' });
>+    push @generated_lines, $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+    push @generated_lines, $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+    push @generated_lines, $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
>+    push @generated_lines, $account->add_debit({ amount => 4, interface => 'commandline', type => 'OVERDUE' });
> 
>     my $lines     = $account->outstanding_debits();
>     my @lines_arr = $account->outstanding_debits();
>@@ -405,10 +405,10 @@ subtest 'lines() tests' => sub {
>     $account->add_credit({ amount => 4, interface => 'commandline' });
> 
>     # Add Debits
>-    $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-    $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-    $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>-    $account->add_debit({ amount => 4, interface => 'commandline', type => 'overdue' });
>+    $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+    $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+    $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
>+    $account->add_debit({ amount => 4, interface => 'commandline', type => 'OVERDUE' });
> 
>     # Paid Off
>     $account->add_credit( { amount => 1, interface => 'commandline' } )
>@@ -441,10 +441,10 @@ subtest 'reconcile_balance' => sub {
>         $account->add_credit({ amount => 5, interface => 'commandline' });
> 
>         # Add Debits
>-        $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 4, interface => 'commandline', type => 'overdue' });
>+        $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 4, interface => 'commandline', type => 'OVERDUE' });
> 
>         # Paid Off
>         Koha::Account::Line->new({ borrowernumber => $patron->id, amount => 1, amountoutstanding => 0, interface => 'commandline' })->store;
>@@ -479,10 +479,10 @@ subtest 'reconcile_balance' => sub {
>         $account->add_credit({ amount => 4, interface => 'commandline' });
> 
>         # Add Debits
>-        $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 4, interface => 'commandline', type => 'overdue' });
>+        $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 4, interface => 'commandline', type => 'OVERDUE' });
> 
>         # Paid Off
>         Koha::Account::Line->new({ borrowernumber => $patron->id, amount => 1, amountoutstanding => 0, interface => 'commandline' })->store;
>@@ -517,11 +517,11 @@ subtest 'reconcile_balance' => sub {
>         $account->add_credit({ amount => 4, interface => 'commandline' });
> 
>         # Add Debits
>-        $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 4, interface => 'commandline', type => 'overdue' });
>-        $account->add_debit({ amount => 5, interface => 'commandline', type => 'overdue' });
>+        $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 4, interface => 'commandline', type => 'OVERDUE' });
>+        $account->add_debit({ amount => 5, interface => 'commandline', type => 'OVERDUE' });
> 
>         # Paid Off
>         Koha::Account::Line->new({ borrowernumber => $patron->id, amount => 1, amountoutstanding => 0, interface => 'commandline' })->store;
>@@ -554,9 +554,9 @@ subtest 'reconcile_balance' => sub {
>         $account->add_credit({ amount => 3, interface => 'commandline' });
> 
>         # Add Debits
>-        my $debit_1 = $account->add_debit({ amount => 1, interface => 'commandline', type => 'overdue' });
>-        my $debit_2 = $account->add_debit({ amount => 2, interface => 'commandline', type => 'overdue' });
>-        my $debit_3 = $account->add_debit({ amount => 3, interface => 'commandline', type => 'overdue' });
>+        my $debit_1 = $account->add_debit({ amount => 1, interface => 'commandline', type => 'OVERDUE' });
>+        my $debit_2 = $account->add_debit({ amount => 2, interface => 'commandline', type => 'OVERDUE' });
>+        my $debit_3 = $account->add_debit({ amount => 3, interface => 'commandline', type => 'OVERDUE' });
> 
>         is( $account->balance(), 2, "Account balance is 2" );
>         is( $account->outstanding_debits->total_outstanding, 6, 'Outstanding debits sum 6' );
>diff --git a/t/db_dependent/Koha/Account/Lines.t b/t/db_dependent/Koha/Account/Lines.t
>index 9a0a101eef..31ff05fd5e 100755
>--- a/t/db_dependent/Koha/Account/Lines.t
>+++ b/t/db_dependent/Koha/Account/Lines.t
>@@ -497,7 +497,7 @@ subtest 'checkout() tests' => sub {
>         interface => 'commandline',
>         item_id   => $item->itemnumber,
>         issue_id  => $checkout->issue_id,
>-        type      => 'overdue',
>+        type      => 'OVERDUE',
>     });
> 
>     my $line_checkout = $line->checkout;
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23049: 93513 | 93514 | 93515 | 93516 | 93518 | 93519 | 93520 | 93521 | 93522 | 93523 | 93529 | 93557 | 93564 | 93565 | 93567 | 93568 | 93569 | 93570 | 93571 | 93572 | 93573 | 93574 | 93575 | 93576 | 93577 | 93578 | 93579 | 93960 | 93961 | 93962 | 93963 | 93964 | 93965 | 93966 | 93967 | 93968 | 93969 | 93970 | 93972 | 93973 | 93974 | 93975 | 93976 | 93977 | 93978 | 93979 | 93989 | 93990 | 93991 | 93992 | 93993 | 93994 | 93995 | 93996 | 93997 | 93998 | 93999 | 94000 | 94001 | 94002 | 94003 | 94004 | 94005 | 94006 | 94007 | 94008 | 94073 | 94074 | 94075 | 94076 | 94077 | 94078 | 94079 | 94080 | 94081 | 94082 | 94083 | 94084 | 94085 | 94086 | 94087 | 94088 | 94089 | 94090 | 94091 | 94092 | 94093 | 94111 | 94112 | 94113 | 94114 | 94115 | 94116 | 94117 | 94118 | 94119 | 94120 | 94121 | 94122 | 94123 | 94124 | 94125 | 94126 | 94127 | 94128 | 94129 | 94130 | 94131 | 94132 | 94133 | 94134 | 94135 | 94136 | 94137 | 94138 | 94139 | 94140 | 94141 | 94142 | 94143 | 94144 | 94145 | 94146 | 94147 | 94148 | 94149 | 94150 | 94151 | 94152 | 94165 | 94307 | 94308 | 94309 | 94310 | 94311 | 94312 | 94313 | 94314 | 94315 | 94316 | 94317 | 94318 | 94319 | 94320 | 94321 | 94323 | 94324 | 94325 | 94326 | 94327 | 94328 | 94329 | 94331 | 94332 | 94333 | 94334 | 94335 | 94336 | 94337 | 94338 | 94339 | 94340 | 94341 | 94342 | 94343 | 94344 | 94345 | 94346 | 94347 | 94348 | 94349 | 94350 | 94351 | 94352 | 94648