From 042aeac3ff4bd90d8d1207dc6a5cfe902af19e5f Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 4 May 2006 20:45:21 +0000 Subject: [PATCH] now including addrs that do not point to the user in fleshed call git-svn-id: svn://svn.open-ils.org/ILS/trunk@4088 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Actor.pm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index d04a6b8534..642eae4cb7 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -297,6 +297,23 @@ sub flesh_user { $user->id() ); $user->addresses( $add_req->gather(1) ); + if( @{$user->addresses} ) { + if( ! grep { $_->id eq $user->billing_address } @{$user->addresses} ) { + my $ba = $session->request( + 'open-ils.storage.direct.actor.user_address.retrieve', + $user->billing_address)->gather(1); + push( @{$user->addresses}, $ba ); + } + + if( ! grep { $_->id eq $user->mailing_address } @{$user->addresses} ) { + my $ba = $session->request( + 'open-ils.storage.direct.actor.user_address.retrieve', + $user->mailing_address)->gather(1); + push( @{$user->addresses}, $ba ); + } + } + + for my $c(@{$user->addresses}) { if($c->id eq $user->billing_address ) { $user->billing_address($c); } if($c->id eq $user->mailing_address ) { $user->mailing_address($c); } -- 2.43.2