Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-26 03:01:53 +01:00
Code Issues Projects Releases Wiki Activity

enable paypal for orgs. and paypal method changes

Browse Source
This commit is contained in:
Kyle Spearrin 2019-01-31 12:11:23 -05:00
parent 459bc69032
commit b47f7e8cf1
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/settings/adjust-payment.component.html
View File

@ -1,16 +1,7 @@
<app-callout title="{{'contactSupport' | i18n}}" icon="fa-info-circle" *ngIf="!canChange"> <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
<p>{{'contactSupportPaymentMethod' | i18n}}</p>
<a href="https://bitwarden.com/contact/" target="_blank" rel="noopener" class="btn btn-outline-secondary">
{{'contactSupport' | i18n}}
</a>
<button type="button" class="btn btn-outline-secondary" (click)="cancel()">
{{'close' | i18n}}
</button>
</app-callout>
<form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="canChange">
<div class="card-body"> <div class="card-body">
<h3 class="card-body-header">{{(currentType != null ? 'changePaymentMethod' : 'addPaymentMethod') | i18n}}</h3> <h3 class="card-body-header">{{(currentType != null ? 'changePaymentMethod' : 'addPaymentMethod') | i18n}}</h3>
<app-payment [showOptions]="organizationId" [hidePaypal]="true" [hideBank]="!organizationId"></app-payment> <app-payment [hideBank]="!organizationId"></app-payment>
<button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading"> <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
<i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i> <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
<span>{{'submit' | i18n}}</span> <span>{{'submit' | i18n}}</span>

4
src/app/settings/adjust-payment.component.ts
View File

@ -59,8 +59,4 @@ export class AdjustPaymentComponent {
cancel() { cancel() {
this.onCanceled.emit(); this.onCanceled.emit();
} }
get canChange() {
return this.currentType == null || this.currentType === PaymentMethodType.Card || this.organizationId != null;
}
} }

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

@ -183,7 +183,7 @@
</div> </div>
<small class="text-muted font-italic">{{'paymentChargedWithTrial' | i18n : (interval | i18n) }}</small> <small class="text-muted font-italic">{{'paymentChargedWithTrial' | i18n : (interval | i18n) }}</small>
<h2 class="spaced-header mb-4">{{'paymentInformation' | i18n}}</h2> <h2 class="spaced-header mb-4">{{'paymentInformation' | i18n}}</h2>
<app-payment [hidePaypal]="true"></app-payment> <app-payment></app-payment>
</ng-container> </ng-container>
<div [ngClass]="{'mt-4': plans[plan].noPayment}"> <div [ngClass]="{'mt-4': plans[plan].noPayment}">
<button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading"> <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">

3
src/locales/en/messages.json
View File

@ -1731,9 +1731,6 @@
"contactSupport": { "contactSupport": {
"message": "Contact Customer Support" "message": "Contact Customer Support"
}, },
"contactSupportPaymentMethod": {
"message": "If you would like to change from this payment method please contact customer support."
},
"updatedPaymentMethod": { "updatedPaymentMethod": {
"message": "Updated payment method." "message": "Updated payment method."
}, },