[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. 8ff89f6aa99518cd71485944d29ea5929c4597a3

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_11 has been updated
       via  8ff89f6aa99518cd71485944d29ea5929c4597a3 (commit)
       via  3208e7efa9bfaef16f16bbf96db1ad75cd1c7dec (commit)
      from  f52d6b649d5fe4b63cc6a1fe8c6dcc350acb9636 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ff89f6aa99518cd71485944d29ea5929c4597a3
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon May 1 14:47:58 2017 -0400

    LP#1667221: (follow-up) remove comment that is now a lie
    
    Also, here's a test plan:
    
    [1] Edit /openils/conf/oils_sip.xml and set the currency
        defined in the implementation section to be something
        other than USD.
    [2] Start the SIP server and perform a patron information
        request; note that the BH field in the response contains
        'USD'.
    [3] Apply the patch and restart the SIP server.
    [4] Repeat step 2; this time, the currency should be whatever
        is specified in oils_sip.xml.
    [5] Comment out the currency section in oils_sip.xml and restart
        the SIP server.
    [6] Repeat step 2; this time, the currency should be back to 'USD'.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 706db2c..34972cc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -427,7 +427,7 @@ sub check_password {
         $self->{editor},$self->{user}->id, $pwd);
 }
 
-sub currency {              # not really implemented
+sub currency {
     my $self = shift;
     syslog('LOG_DEBUG', 'OILS: Patron->currency()');
     return OpenILS::SIP->config()->{implementation_config}->{currency} || 'USD';

commit 3208e7efa9bfaef16f16bbf96db1ad75cd1c7dec
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Mon Feb 20 17:20:26 2017 -0800

    LP#1667221: use library currency as SIP patron currency instead of always using USD
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 0845084..706db2c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -430,7 +430,7 @@ sub check_password {
 sub currency {              # not really implemented
     my $self = shift;
     syslog('LOG_DEBUG', 'OILS: Patron->currency()');
-    return 'USD';
+    return OpenILS::SIP->config()->{implementation_config}->{currency} || 'USD';
 }
 
 sub fee_amount {

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS