Bugzilla – Attachment 37039 Details for
Bug 12820
SIP2 does not send rental charge fee!
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12820 [QA Followup] - Tab and whitespace cleanup
Bug-12820-QA-Followup---Tab-and-whitespace-cleanup.patch (text/plain), 2.75 KB, created by
Kyle M Hall (khall)
on 2015-03-20 13:11:49 UTC
(
hide
)
Description:
Bug 12820 [QA Followup] - Tab and whitespace cleanup
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-03-20 13:11:49 UTC
Size:
2.75 KB
patch
obsolete
>From 508101f6b22a1f92e06e8963eef576a7177d1be4 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 20 Mar 2015 09:09:45 -0400 >Subject: [PATCH] Bug 12820 [QA Followup] - Tab and whitespace cleanup > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/SIP/Sip/MsgType.pm | 42 +++++++++++++++++++++--------------------- > 1 files changed, 21 insertions(+), 21 deletions(-) > >diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm >index cf3a737..5ef7465 100644 >--- a/C4/SIP/Sip/MsgType.pm >+++ b/C4/SIP/Sip/MsgType.pm >@@ -514,19 +514,18 @@ sub handle_checkout { > my $fee_ack = $fields->{(FID_FEE_ACK)}; > > >- if ($no_block eq 'Y') { >- # Off-line transactions need to be recorded, but there's >- # not a lot we can do about it >- syslog("LOG_WARNING", "received no-block checkout from terminal '%s'", >- $account->{id}); >- >- $status = $ils->checkout_no_block($patron_id, $item_id, >- $sc_renewal_policy, >- $trans_date, $nb_due_date); >- } else { >- # Does the transaction date really matter for items that are >- # checkout out while the terminal is online? I'm guessing 'no' >- $status = $ils->checkout($patron_id, $item_id, $sc_renewal_policy, $fee_ack); >+ if ( $no_block eq 'Y' ) { >+ >+ # Off-line transactions need to be recorded, but there's >+ # not a lot we can do about it >+ syslog( "LOG_WARNING", "received no-block checkout from terminal '%s'", $account->{id} ); >+ >+ $status = $ils->checkout_no_block( $patron_id, $item_id, $sc_renewal_policy, $trans_date, $nb_due_date ); >+ } >+ else { >+ # Does the transaction date really matter for items that are >+ # checkout out while the terminal is online? I'm guessing 'no' >+ $status = $ils->checkout( $patron_id, $item_id, $sc_renewal_policy, $fee_ack ); > } > > $item = $status->item; >@@ -601,14 +600,15 @@ sub handle_checkout { > } > } > } >- if ($protocol_version >= 2) { >- # Financials : return irrespective of ok status >- if ($status->fee_amount) { >- $resp .= add_field(FID_FEE_AMT, $status->fee_amount); >- $resp .= maybe_add(FID_CURRENCY, $status->sip_currency); >- $resp .= maybe_add(FID_FEE_TYPE, $status->sip_fee_type); >- $resp .= maybe_add(FID_TRANSACTION_ID, >- $status->transaction_id); >+ >+ if ( $protocol_version >= 2 ) { >+ >+ # Financials : return irrespective of ok status >+ if ( $status->fee_amount ) { >+ $resp .= add_field( FID_FEE_AMT, $status->fee_amount ); >+ $resp .= maybe_add( FID_CURRENCY, $status->sip_currency ); >+ $resp .= maybe_add( FID_FEE_TYPE, $status->sip_fee_type ); >+ $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id ); > } > } > >-- >1.7.2.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 12820
:
31136
|
31153
|
33901
|
33902
|
33911
|
33994
|
35878
|
36155
|
37038
| 37039