From d421a74cfd6de1513e826f228e171e1b18c20d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Garde?= Date: Tue, 19 Sep 2017 15:21:20 +1000 Subject: [PATCH] [MNOE-616] feat(currency): use the settings attribute If user[:settings] has the attributes currencies and/or default_widget_currency, it uses them for the creation of a dashboard / selection of currency for the widgets --- src/services/dashboards/dashboards.svc.coffee | 3 +-- src/services/main/main.svc.coffee | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/dashboards/dashboards.svc.coffee b/src/services/dashboards/dashboards.svc.coffee index 9c511b4c..cfc1cb84 100644 --- a/src/services/dashboards/dashboards.svc.coffee +++ b/src/services/dashboards/dashboards.svc.coffee @@ -275,8 +275,7 @@ angular org = ImpacMainSvc.config.currentOrganization - unless dashboard.currency? - dashboard.currency = org.currency || 'USD' + dashboard.currency = ImpacMainSvc.config.userData.settings.default_widget_currency || org.currency || 'USD' data = { dashboard: dashboard } diff --git a/src/services/main/main.svc.coffee b/src/services/main/main.svc.coffee index 4a2f4404..9699786c 100644 --- a/src/services/main/main.svc.coffee +++ b/src/services/main/main.svc.coffee @@ -133,6 +133,9 @@ angular ImpacLinking.getUserData().then( (user) -> angular.extend _self.config.userData, user + if user.settings.currencies + _self.config.currencies = user.settings.currencies + $log.info("Impac! - MainSvc: User data loaded (force=#{force}) with sso_session #{_self.config.userData.sso_session}") deferred.resolve(_self.config.userData)