diff --git a/jslib b/jslib index ec012c99341..575a28e25fd 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit ec012c99341ee65c0d5a7a7fdf153e79bfb274be +Subproject commit 575a28e25fd27969d0335f06b1778027f1214c3e diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/organization-billing.component.ts index 3de11ce579a..21506dcccb6 100644 --- a/src/app/organizations/settings/organization-billing.component.ts +++ b/src/app/organizations/settings/organization-billing.component.ts @@ -9,6 +9,7 @@ import { Angulartics2 } from 'angulartics2'; import { ApiService } from 'jslib/abstractions/api.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { UserBillingComponent } from '../../settings/user-billing.component'; @@ -19,8 +20,8 @@ import { UserBillingComponent } from '../../settings/user-billing.component'; export class OrganizationBillingComponent extends UserBillingComponent implements OnInit { constructor(apiService: ApiService, i18nService: I18nService, analytics: Angulartics2, toasterService: ToasterService, - private route: ActivatedRoute) { - super(apiService, i18nService, analytics, toasterService); + private route: ActivatedRoute, platformUtilsService: PlatformUtilsService) { + super(apiService, i18nService, analytics, toasterService, platformUtilsService); } async ngOnInit() { diff --git a/src/app/settings/user-billing.component.html b/src/app/settings/user-billing.component.html index 4d88b02b351..875ae41771b 100644 --- a/src/app/settings/user-billing.component.html +++ b/src/app/settings/user-billing.component.html @@ -50,8 +50,11 @@
+ 'fa-university': paymentSource.type === paymentMethodType.BankAccount, + 'fa-paypal text-primary': paymentSource.type === paymentMethodType.PayPal, + 'fa-apple text-muted': paymentSource.type === paymentMethodType.AppleInApp, + 'fa-google text-muted': paymentSource.type === paymentMethodType.GoogleInApp}"> + {{'inAppPurchase' | i18n}} {{paymentSource.description}}
diff --git a/src/app/settings/user-billing.component.ts b/src/app/settings/user-billing.component.ts index e50c7a9776b..5e244922f79 100644 --- a/src/app/settings/user-billing.component.ts +++ b/src/app/settings/user-billing.component.ts @@ -10,6 +10,7 @@ import { BillingResponse } from 'jslib/models/response/billingResponse'; import { ApiService } from 'jslib/abstractions/api.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; import { TransactionType } from 'jslib/enums/transactionType'; @@ -34,7 +35,8 @@ export class UserBillingComponent implements OnInit { verifyBankPromise: Promise