From b47f7e8cf1266b1d27d037d0e8eebc7304a1d629 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 31 Jan 2019 12:11:23 -0500
Subject: [PATCH] enable paypal for orgs. and paypal method changes

---
 src/app/settings/adjust-payment.component.html      | 13 ++-----------
 src/app/settings/adjust-payment.component.ts        |  4 ----
 src/app/settings/create-organization.component.html |  2 +-
 src/locales/en/messages.json                        |  3 ---
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/app/settings/adjust-payment.component.html b/src/app/settings/adjust-payment.component.html
index b923bde7b4b..2bfc1409942 100644
--- a/src/app/settings/adjust-payment.component.html
+++ b/src/app/settings/adjust-payment.component.html
@@ -1,16 +1,7 @@
-<app-callout title="{{'contactSupport' | i18n}}" icon="fa-info-circle" *ngIf="!canChange">
-    <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">
+<form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
         <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">
             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
diff --git a/src/app/settings/adjust-payment.component.ts b/src/app/settings/adjust-payment.component.ts
index ebe25c39f25..2f871cdb665 100644
--- a/src/app/settings/adjust-payment.component.ts
+++ b/src/app/settings/adjust-payment.component.ts
@@ -59,8 +59,4 @@ export class AdjustPaymentComponent {
     cancel() {
         this.onCanceled.emit();
     }
-
-    get canChange() {
-        return this.currentType == null || this.currentType === PaymentMethodType.Card || this.organizationId != null;
-    }
 }
diff --git a/src/app/settings/create-organization.component.html b/src/app/settings/create-organization.component.html
index 5115053bd51..7f5078efaa4 100644
--- a/src/app/settings/create-organization.component.html
+++ b/src/app/settings/create-organization.component.html
@@ -183,7 +183,7 @@
         </div>
         <small class="text-muted font-italic">{{'paymentChargedWithTrial' | i18n : (interval | i18n) }}</small>
         <h2 class="spaced-header mb-4">{{'paymentInformation' | i18n}}</h2>
-        <app-payment [hidePaypal]="true"></app-payment>
+        <app-payment></app-payment>
     </ng-container>
     <div [ngClass]="{'mt-4': plans[plan].noPayment}">
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 4ed947ed8f0..60da9aadfc4 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1731,9 +1731,6 @@
   "contactSupport": {
     "message": "Contact Customer Support"
   },
-  "contactSupportPaymentMethod": {
-    "message": "If you would like to change from this payment method please contact customer support."
-  },
   "updatedPaymentMethod": {
     "message": "Updated payment method."
   },