LP1840773 SCKO Angular

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/scko/scko.service.ts b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
index 619bb00..26627ee 100644 (file)
--- a/Open-ILS/src/eg2/src/app/scko/scko.service.ts
+++ b/Open-ILS/src/eg2/src/app/scko/scko.service.ts
@@ -26,7 +26,7 @@ interface CheckoutContext {
     displayText: string; // string key
     alertSound: string;
     shouldPopup: boolean;
-    previousCirc?: number;
+    previousCirc?: IdlObject;
     renewalFailure?: boolean;
 }
 
@@ -419,7 +419,7 @@ export class SckoService {
             const age = this.orgSettings['circ.checkout_auto_renew_age'];
 
             if (!age || (age && ctx.payload.auto_renew)) {
-                ctx.previousCirc = Number(ctx.payload.old_circ.id());
+                ctx.previousCirc = ctx.payload.old_circ;
                 ctx.renew = true;
                 return Promise.resolve(ctx);
             }

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PrintTemplate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PrintTemplate.pm
index a5931ef..4454221 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PrintTemplate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PrintTemplate.pm
@@ -78,7 +78,12 @@ sub handler {
         return Apache2::Const::HTTP_BAD_REQUEST;
     }
 
-    my ($staff_org) = $U->fetch_org_unit($e->requestor->ws_ou);
+    my $staff_org = $e->retrieve_actor_org_unit([
+        $e->requestor->ws_ou, {
+            flesh => 1, 
+            flesh_fields => {aou => ['billing_address', 'mailing_address']}
+        }
+    ]);
 
     my $output = '';
     my $tt = Template->new;