Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-24 12:06:15 +01:00
Code Issues Projects Releases Wiki Activity

billing imrovements

Browse Source
This commit is contained in:
Kyle Spearrin 2019-02-21 18:03:39 -05:00
parent 33b539858f
commit 8e9ab12219
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/settings/add-credit.component.html
View File

@ -45,8 +45,8 @@
<input type="hidden" name="no_note" value="1"> <input type="hidden" name="no_note" value="1">
<input type="hidden" name="no_shipping" value="1"> <input type="hidden" name="no_shipping" value="1">
<input type="hidden" name="rm" value="1"> <input type="hidden" name="rm" value="1">
<input type="hidden" name="return" value="https://vault.bitwarden.com"> <input type="hidden" name="return" value="{{ppReturnUrl}}">
<input type="hidden" name="cancel_return" value="https://vault.bitwarden.com"> <input type="hidden" name="cancel_return" value="{{ppReturnUrl}}">
<input type="hidden" name="currency_code" value="USD"> <input type="hidden" name="currency_code" value="USD">
<input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHosted"> <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynow_LG.gif:NonHosted">
<input type="hidden" name="amount" value="{{creditAmount}}"> <input type="hidden" name="amount" value="{{creditAmount}}">

10
src/app/settings/add-credit.component.ts
View File

@ -24,7 +24,7 @@ import { WebConstants } from '../../services/webConstants';
templateUrl: 'add-credit.component.html', templateUrl: 'add-credit.component.html',
}) })
export class AddCreditComponent implements OnInit { export class AddCreditComponent implements OnInit {
@Input() creditAmount = '10.00'; @Input() creditAmount: string;
@Input() showOptions = true; @Input() showOptions = true;
@Input() method = PaymentMethodType.PayPal; @Input() method = PaymentMethodType.PayPal;
@Input() organizationId: string; @Input() organizationId: string;
@ -37,6 +37,7 @@ export class AddCreditComponent implements OnInit {
ppButtonFormAction = WebConstants.paypal.buttonActionProduction; ppButtonFormAction = WebConstants.paypal.buttonActionProduction;
ppButtonBusinessId = WebConstants.paypal.businessIdProduction; ppButtonBusinessId = WebConstants.paypal.businessIdProduction;
ppButtonCustomField: string; ppButtonCustomField: string;
ppReturnUrl: string;
ppLoading = false; ppLoading = false;
subject: string; subject: string;
formPromise: Promise<any>; formPromise: Promise<any>;
@ -52,17 +53,24 @@ export class AddCreditComponent implements OnInit {
async ngOnInit() { async ngOnInit() {
if (this.organizationId != null) { if (this.organizationId != null) {
if (this.creditAmount == null) {
this.creditAmount = '20.00';
}
this.ppButtonCustomField = 'organization_id:' + this.organizationId; this.ppButtonCustomField = 'organization_id:' + this.organizationId;
const org = await this.userService.getOrganization(this.organizationId); const org = await this.userService.getOrganization(this.organizationId);
if (org != null) { if (org != null) {
this.subject = org.name; this.subject = org.name;
} }
} else { } else {
if (this.creditAmount == null) {
this.creditAmount = '10.00';
}
const userId = await this.userService.getUserId(); const userId = await this.userService.getUserId();
this.subject = await this.userService.getEmail(); this.subject = await this.userService.getEmail();
this.ppButtonCustomField = 'user_id:' + userId; this.ppButtonCustomField = 'user_id:' + userId;
} }
this.ppButtonCustomField += ',account_credit:true'; this.ppButtonCustomField += ',account_credit:true';
this.ppReturnUrl = window.location.href;
} }
async submit() { async submit() {

9
src/app/settings/user-billing.component.html
View File

@ -1,10 +1,11 @@
<div class="page-header"> <div class="page-header d-flex">
<h1> <h1>
{{'billing' | i18n}} {{'billing' | i18n}}
<small>
<i class="fa fa-spinner fa-spin text-muted" *ngIf="firstLoaded && loading" title="{{'loading' | i18n}}"></i>
</small>
</h1> </h1>
<button (click)="load()" class="btn btn-sm btn-outline-primary ml-auto" *ngIf="firstLoaded" [disabled]="loading">
<i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loading}"></i>
{{'refresh' | i18n}}
</button>
</div> </div>
<i class="fa fa-spinner fa-spin text-muted" *ngIf="!firstLoaded && loading" title="{{'loading' | i18n}}"></i> <i class="fa fa-spinner fa-spin text-muted" *ngIf="!firstLoaded && loading" title="{{'loading' | i18n}}"></i>
<ng-container *ngIf="billing"> <ng-container *ngIf="billing">