From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 2 Jun 2020 18:51:35 +0000 (-0400)
Subject: LP#1879983: add Curbside Pickup to the Angular navbar
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e143c8696e8e203e13a1477ee8d49bce24375bd2;p=evergreen%2Fpines.git

LP#1879983: add Curbside Pickup to the Angular navbar

For both the Angular and AngularJS staff interfaces, the
Curbside Pickup option in the Circulation menu is displayed
only if circ.curbside has been enabled for the workstation
library.

Sponsored-by: PaILS

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 77253416cb..7f0eb23812 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -137,6 +137,11 @@
             <span class="material-icons" aria-hidden="true">signal_wifi_off</span>
             <span i18n>Offline Circulation</span>
           </a>
+          <div *ngIf="curbsideEnabled" class="dropdown-divider"></div>
+          <a *ngIf="curbsideEnabled" class="dropdown-item" href="/eg/staff/circ/curbside/index">
+            <span class="material-icons">directions_bus</span>
+            <span i18n>Curbside Pickup</span>
+          </a>
         </div>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts
index 497cd30ea0..89d98ac31e 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts
@@ -25,6 +25,7 @@ export class StaffNavComponent implements OnInit, OnDestroy {
 
     // When active, show a link to the experimental Angular staff catalog
     showAngularCatalog: boolean;
+    curbsideEnabled: boolean;
 
     @ViewChild('navOpChange', {static: false}) opChange: OpChangeComponent;
     permFailedSub: Subscription;
@@ -60,6 +61,9 @@ export class StaffNavComponent implements OnInit, OnDestroy {
             this.org.settings('ui.staff.angular_catalog.enabled')
             .then(settings => this.showAngularCatalog =
                 Boolean(settings['ui.staff.angular_catalog.enabled']));
+            this.org.settings('circ.curbside')
+            .then(settings => this.curbsideEnabled =
+                Boolean(settings['circ.curbside']));
         }
 
         // Wire up our op-change component as the general purpose