diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee index f8c1aa2f..6842ca38 100755 --- a/src/app/views/apps/modals/app-settings-modal.coffee +++ b/src/app/views/apps/modals/app-settings-modal.coffee @@ -7,14 +7,6 @@ angular.module 'mnoEnterpriseAngular' $scope.sentence = "Please proceed to the deletion of my app and all data it contains" $scope.organization_uid = ImpacMainSvc.config.currentOrganization.uid - # ---------------------------------------------------------- - # Permissions helper - # ---------------------------------------------------------- - - $scope.helper = {} - $scope.helper.canDeleteApp = -> - MnoeOrganizations.can.destroy.appInstance() - $scope.modal.close = -> $uibModalInstance.close() @@ -31,6 +23,16 @@ angular.module 'mnoEnterpriseAngular' $scope.modal.errors = Utilities.processRailsError(error) ).finally(-> $scope.modal.loading = false) + # ---------------------------------------------------------- + # Permissions helper + # ---------------------------------------------------------- + $scope.helper = {} + $scope.helper.canDeleteApp = -> + MnoeOrganizations.can.destroy.appInstance() + + $scope.helper.canDisplayBilling = -> + MnoeOrganizations.can.read.billing() + $scope.helper.isDataSyncShown = (app) -> app.stack == 'connector' && app.oauth_keys_valid diff --git a/src/app/views/apps/modals/app-settings-modal.html b/src/app/views/apps/modals/app-settings-modal.html index 2807ae01..6ab5d8b0 100755 --- a/src/app/views/apps/modals/app-settings-modal.html +++ b/src/app/views/apps/modals/app-settings-modal.html @@ -26,13 +26,23 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }} -

- + +
+
+
+ {{ 'mno_enterprise.templates.impac.dock.settings.free_trial' | translate }}: {{ app.free_trial_end_at }} +
+
+ +
+
{{ 'mno_enterprise.templates.impac.dock.settings.pricing_details' | translate }}
+

@@ -41,7 +51,6 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }} {{ 'mno_enterprise.templates.impac.dock.settings.manual_data_sharing' | translate }}

-
{{ 'mno_enterprise.templates.impac.dock.settings.linked_to' | translate }}: {{ helper.companyName(app) | truncate:45 }} @@ -55,7 +64,6 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }} {{ 'mno_enterprise.templates.impac.dock.settings.manual_data_sync' | translate }}

-
@@ -64,7 +72,6 @@

{{ 'mno_enterprise.templates.impac.dock.settings.settings' | translate }}

-
@@ -92,7 +99,6 @@

{{ 'mno_enterprise.templates.impac.dock.settings.confirm_app_deletion' | tra

-

diff --git a/src/locales/en.locale.json b/src/locales/en.locale.json index 357c8874..54f26d96 100644 --- a/src/locales/en.locale.json +++ b/src/locales/en.locale.json @@ -544,6 +544,8 @@ "mno_enterprise.templates.impac.dock.settings.manual_data_sync": "Manual Data Sync", "mno_enterprise.templates.impac.dock.settings.disconnect_link": "Disconnect Link", "mno_enterprise.templates.impac.dock.settings.delete": "Delete", + "mno_enterprise.templates.impac.dock.settings.pricing_details": "Pricing details inside your app", + "mno_enterprise.templates.impac.dock.settings.free_trial": "Free Trial", "mno_enterprise.templates.impac.dock.settings.confirm_app_deletion": "Confirm app deletion", "mno_enterprise.templates.impac.dock.settings.please_note_this_app": "Please note this app is on a monthly plan. Your billing for this app will be calculated pro rata.", "mno_enterprise.templates.impac.dock.settings.delete_instructions": "In order to delete your app, please enter the following statement in the box below.",