vaultwarden/bitwarden-estensione-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-01-12 10:27:20 +01:00
Code Issues 1 Releases Wiki Activity

Display sponsored status for sponsored org subscription (#1312)

Browse Source 
* Display sponsored status for sponsored org subscription

* Linter fixes
This commit is contained in:
Matt Gibson 2021-11-24 08:33:34 -06:00 committed by GitHub
parent 346052922e
commit f8c943c042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/organizations/settings/account.component.ts
View File

@ -4,7 +4,7 @@ import {
ViewContainerRef, ViewContainerRef,
} from '@angular/core'; } from '@angular/core';
import { import {
ActivatedRoute, ActivatedRoute,
Router Router
} from '@angular/router'; } from '@angular/router';

2
src/app/organizations/settings/delete-organization.component.ts
View File

@ -1,4 +1,4 @@
import { import {
Component, Component,
EventEmitter, EventEmitter,
Output, Output,

2
src/app/organizations/settings/organization-subscription.component.html
View File

@ -32,7 +32,7 @@
<ng-container *ngIf="subscription"> <ng-container *ngIf="subscription">
<dt>{{'status' | i18n}}</dt> <dt>{{'status' | i18n}}</dt>
<dd> <dd>
<span class="text-capitalize">{{subscription.status || '-'}}</span> <span class="text-capitalize">{{isSponsoredSubscription ? 'sponsored' : subscription.status || '-'}}</span>
<span class="badge badge-warning" <span class="badge badge-warning"
*ngIf="subscriptionMarkedForCancel">{{'pendingCancellation' | *ngIf="subscriptionMarkedForCancel">{{'pendingCancellation' |
i18n}}</span> i18n}}</span>

4
src/app/organizations/sponsorships/families-for-enterprise-setup.component.ts
View File

@ -40,7 +40,7 @@ import { OrganizationPlansComponent } from 'src/app/settings/organization-plans.
templateUrl: 'families-for-enterprise-setup.component.html', templateUrl: 'families-for-enterprise-setup.component.html',
}) })
export class FamiliesForEnterpriseSetupComponent implements OnInit { export class FamiliesForEnterpriseSetupComponent implements OnInit {
@ViewChild(OrganizationPlansComponent, { static: false }) @ViewChild(OrganizationPlansComponent, { static: false })
set organizationPlansComponent(value: OrganizationPlansComponent) { set organizationPlansComponent(value: OrganizationPlansComponent) {
if (!value) { if (!value) {
return; return;
@ -109,7 +109,7 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit {
get selectedFamilyOrganizationId() { get selectedFamilyOrganizationId() {
return this._selectedFamilyOrganizationId; return this._selectedFamilyOrganizationId;
} }
set selectedFamilyOrganizationId(value: string) { set selectedFamilyOrganizationId(value: string) {
this._selectedFamilyOrganizationId = value; this._selectedFamilyOrganizationId = value;
this.showNewOrganization = value === 'createNew'; this.showNewOrganization = value === 'createNew';

2
src/app/settings/sponsoring-org-row.component.ts
View File

@ -50,7 +50,7 @@ export class SponsoringOrgRowComponent {
private async doRevokeSponsorship() { private async doRevokeSponsorship() {
const isConfirmed = await this.platformUtilsService.showDialog( const isConfirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('revokeSponsorshipConfirmation'), this.i18nService.t('revokeSponsorshipConfirmation'),
`${this.i18nService.t('remove')} ${this.sponsoringOrg.familySponsorshipFriendlyName}?`, `${this.i18nService.t('remove')} ${this.sponsoringOrg.familySponsorshipFriendlyName}?`,
this.i18nService.t('remove'), this.i18nService.t('cancel'), 'warning'); this.i18nService.t('remove'), this.i18nService.t('cancel'), 'warning');