From 041cf1268dbe1f925c3092c905440d54e136572a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 20 Feb 2019 20:37:27 -0500
Subject: [PATCH] credit fixes

---
 src/app/settings/add-credit.component.html | 19 +++++++++++--------
 src/app/settings/add-credit.component.ts   |  2 ++
 src/locales/en/messages.json               |  3 +++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/settings/add-credit.component.html b/src/app/settings/add-credit.component.html
index 018d57ed3a..8f86c21a57 100644
--- a/src/app/settings/add-credit.component.html
+++ b/src/app/settings/add-credit.component.html
@@ -15,17 +15,20 @@
             </div>
             -->
         </div>
-        <div class="row">
-            <div class="form-group col-4">
-                <label for="creditAmount">{{'amount' | i18n}}</label>
-                <div class="input-group mb-3">
-                    <div class="input-group-prepend"><span class="input-group-text">$USD</span></div>
-                    <input id="creditAmount" class="form-control" type="text" name="CreditAmount" [(ngModel)]="creditAmount"
-                        (blur)="formatAmount()" required>
+        <div class="form-group">
+            <div class="row">
+                <div class="col-4">
+                    <label for="creditAmount">{{'amount' | i18n}}</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend"><span class="input-group-text">$USD</span></div>
+                        <input id="creditAmount" class="form-control" type="text" name="CreditAmount" [(ngModel)]="creditAmount"
+                            (blur)="formatAmount()" required>
+                    </div>
                 </div>
             </div>
+            <small class="form-text text-muted">{{'creditDelayed' | i18n}}</small>
         </div>
-        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+        <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading || ppLoading">
             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
             <span>{{'submit' | i18n}}</span>
         </button>
diff --git a/src/app/settings/add-credit.component.ts b/src/app/settings/add-credit.component.ts
index 4e3174d7a4..294a008d4e 100644
--- a/src/app/settings/add-credit.component.ts
+++ b/src/app/settings/add-credit.component.ts
@@ -37,6 +37,7 @@ export class AddCreditComponent implements OnInit {
     ppButtonFormAction = WebConstants.paypal.buttonActionProduction;
     ppButtonBusinessId = WebConstants.paypal.businessIdProduction;
     ppButtonCustomField: string;
+    ppLoading = false;
     subject: string;
     formPromise: Promise<any>;
 
@@ -71,6 +72,7 @@ export class AddCreditComponent implements OnInit {
 
         if (this.method === PaymentMethodType.PayPal) {
             this.ppButtonFormRef.nativeElement.submit();
+            this.ppLoading = true;
             return;
         }
         try {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index c68673a09b..02dabd08d0 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1506,6 +1506,9 @@
     "message": "Amount",
     "description": "Dollar amount, or quantity."
   },
+  "creditDelayed": {
+    "message": "Added credit will appear on your account after the payment has been fully processed. Some payment methods are delayed and can take longer to process than others."
+  },
   "makeSureEnoughCredit": {
     "message": "Please make sure that your account has enough credit available for this purchase. If your account does not have enough credit available, your default payment method on file will be used for the difference. You can add credit to your account from the Billing page."
   },