Bugzilla – Attachment 172258 Details for
Bug 28575
Add ability to choose if lost fee is refunded based on when lost fee was paid off
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28575: (QA follow-up) Tidy more
Bug-28575-QA-follow-up-Tidy-more.patch (text/plain), 5.54 KB, created by
Nick Clemens (kidclamp)
on 2024-10-01 11:08:58 UTC
(
hide
)
Description:
Bug 28575: (QA follow-up) Tidy more
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-10-01 11:08:58 UTC
Size:
5.54 KB
patch
obsolete
>From 3e5146fc87539671a4dafa1fbbdac2d0525597cd Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 1 Oct 2024 11:00:48 +0000 >Subject: [PATCH] Bug 28575: (QA follow-up) Tidy more > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > circ/returns.pl | 91 +++++++++++++++++-------------------------------- > 1 file changed, 32 insertions(+), 59 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index ea80408684b..7a7c642f95f 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -689,89 +689,62 @@ foreach my $code ( keys %$messages ) { > if ( $code eq 'BadBarcode' ) { > $err{badbarcode} = 1; > $err{msg} = $messages->{'BadBarcode'}; >- } >- elsif ( $code eq 'NotIssued' ) { >+ } elsif ( $code eq 'NotIssued' ) { > $err{notissued} = 1; >- $err{msg} = ''; >- } >- elsif ( $code eq 'LocalUse' ) { >+ $err{msg} = ''; >+ } elsif ( $code eq 'LocalUse' ) { > $err{localuse} = 1; >- } >- elsif ( $code eq 'WasLost' ) { >+ } elsif ( $code eq 'WasLost' ) { > $err{waslost} = 1; >- } >- elsif ( $code eq 'LostItemFeeRefunded' ) { >+ } elsif ( $code eq 'LostItemFeeRefunded' ) { > $template->param( LostItemFeeRefunded => 1 ); >- } >- elsif ( $code eq 'LostItemPaymentNotRefunded' ) { >+ } elsif ( $code eq 'LostItemPaymentNotRefunded' ) { > $template->param( LostItemPaymentNotRefunded => 1 ); >- } >- elsif ( $code eq 'LostItemFeeCharged' ) { >+ } elsif ( $code eq 'LostItemFeeCharged' ) { > $template->param( LostItemFeeCharged => 1 ); >- } >- elsif ( $code eq 'LostItemFeeRestored' ) { >+ } elsif ( $code eq 'LostItemFeeRestored' ) { > $template->param( LostItemFeeRestored => 1 ); >- } >- elsif ( $code eq 'ProcessingFeeRefunded' ) { >+ } elsif ( $code eq 'ProcessingFeeRefunded' ) { > $template->param( ProcessingFeeRefunded => 1 ); >- } >- elsif ( $code eq 'ResFound' ) { >+ } elsif ( $code eq 'ResFound' ) { > ; # FIXME... anything to do here? >- } >- elsif ( $code eq 'WasReturned' ) { >+ } elsif ( $code eq 'WasReturned' ) { > ; # FIXME... anything to do here? >- } >- elsif ( $code eq 'WasTransfered' ) { >+ } elsif ( $code eq 'WasTransfered' ) { > ; # FIXME... anything to do here? >- } >- elsif ( $code eq 'TransferTo' ) { >+ } elsif ( $code eq 'TransferTo' ) { > ; # Handled above, along with WasTransfered >- } >- elsif ( $code eq 'withdrawn' ) { >+ } elsif ( $code eq 'withdrawn' ) { > $err{withdrawn} = 1; >- } >- elsif ( $code eq 'WrongTransfer' ) { >+ } elsif ( $code eq 'WrongTransfer' ) { > ; # FIXME... anything to do here? >- } >- elsif ( $code eq 'WrongTransferItem' ) { >+ } elsif ( $code eq 'WrongTransferItem' ) { > ; # FIXME... anything to do here? >- } >- elsif ( $code eq 'NeedsTransfer' ) { >- } >- elsif ( $code eq 'TransferTrigger' ) { >+ } elsif ( $code eq 'NeedsTransfer' ) { >+ } elsif ( $code eq 'TransferTrigger' ) { > ; # Handled alongside NeedsTransfer >- } >- elsif ( $code eq 'TransferArrived' ) { >+ } elsif ( $code eq 'TransferArrived' ) { > $err{transferred} = $messages->{'TransferArrived'}; >- } >- elsif ( $code eq 'Wrongbranch' ) { >- } >- elsif ( $code eq 'Debarred' ) { >+ } elsif ( $code eq 'Wrongbranch' ) { >+ } elsif ( $code eq 'Debarred' ) { > $err{debarred} = $messages->{'Debarred'}; > $err{debarcardnumber} = $borrower->{cardnumber}; > $err{debarborrowernumber} = $borrower->{borrowernumber}; > $err{debarname} = "$borrower->{firstname} $borrower->{surname}"; >- } >- elsif ( $code eq 'PrevDebarred' ) { >- $err{prevdebarred} = $messages->{'PrevDebarred'}; >- } >- elsif ( $code eq 'ForeverDebarred' ) { >- $err{foreverdebarred} = $messages->{'ForeverDebarred'}; >- } >- elsif ( $code eq 'ItemLocationUpdated' ) { >+ } elsif ( $code eq 'PrevDebarred' ) { >+ $err{prevdebarred} = $messages->{'PrevDebarred'}; >+ } elsif ( $code eq 'ForeverDebarred' ) { >+ $err{foreverdebarred} = $messages->{'ForeverDebarred'}; >+ } elsif ( $code eq 'ItemLocationUpdated' ) { > $err{ItemLocationUpdated} = $messages->{ItemLocationUpdated}; >- } >- elsif ( $code eq 'NotForLoanStatusUpdated' ) { >+ } elsif ( $code eq 'NotForLoanStatusUpdated' ) { > $err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated}; >- } >- elsif ( $code eq 'DataCorrupted' ) { >+ } elsif ( $code eq 'DataCorrupted' ) { > $err{data_corrupted} = 1; >- } >- elsif ( $code eq 'ReturnClaims' ) { >+ } elsif ( $code eq 'ReturnClaims' ) { > $template->param( ReturnClaims => $messages->{ReturnClaims} ); >- } >- elsif ( $code eq 'ClaimAutoResolved' ) { >- $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} ); >+ } elsif ( $code eq 'ClaimAutoResolved' ) { >+ $template->param( ClaimAutoResolved => $messages->{ClaimAutoResolved} ); > } elsif ( $code eq 'RecallFound' ) { > ; > } elsif ( $code eq 'RecallNeedsTransfer' ) { >@@ -782,7 +755,7 @@ foreach my $code ( keys %$messages ) { > $template->param( InBundle => $messages->{InBundle} ); > } else { > die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die. >- # This forces the issue of staying in sync w/ Circulation.pm >+ # This forces the issue of staying in sync w/ Circulation.pm > } > if (%err) { > push( @errmsgloop, \%err ); >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28575
:
167567
|
167568
|
167569
|
167621
|
167622
|
167623
|
167624
|
167627
|
167635
|
167636
|
167637
|
167638
|
168146
|
172252
|
172253
|
172254
|
172255
|
172256
|
172257
| 172258