From 68d3d7abfd8874992f68808cec370bdb5703a73b Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Wed, 17 Jun 2020 20:11:30 -0400
Subject: [PATCH] Combine tax info with other updates

---
 src/app/settings/add-credit.component.html   | 1 -
 src/app/settings/add-credit.component.ts     | 4 ----
 src/app/settings/adjust-payment.component.ts | 9 ++++++++-
 src/app/settings/premium.component.ts        | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/settings/add-credit.component.html b/src/app/settings/add-credit.component.html
index 2e3a0e67d6..7ec14b9944 100644
--- a/src/app/settings/add-credit.component.html
+++ b/src/app/settings/add-credit.component.html
@@ -30,7 +30,6 @@
             </div>
             <small class="form-text text-muted">{{'creditDelayed' | i18n}}</small>
         </div>
-        <app-tax-info></app-tax-info>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading || ppLoading">
             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
             <span>{{'submit' | i18n}}</span>
diff --git a/src/app/settings/add-credit.component.ts b/src/app/settings/add-credit.component.ts
index 131c7e91ab..552d8980cc 100644
--- a/src/app/settings/add-credit.component.ts
+++ b/src/app/settings/add-credit.component.ts
@@ -21,8 +21,6 @@ import { BitPayInvoiceRequest } from 'jslib/models/request/bitPayInvoiceRequest'
 
 import { WebConstants } from '../../services/webConstants';
 
-import { TaxInfoComponent } from './tax-info.component';
-
 @Component({
     selector: 'app-add-credit',
     templateUrl: 'add-credit.component.html',
@@ -36,7 +34,6 @@ export class AddCreditComponent implements OnInit {
     @Output() onCanceled = new EventEmitter();
 
     @ViewChild('ppButtonForm', { read: ElementRef }) ppButtonFormRef: ElementRef;
-    @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
 
     paymentMethodType = PaymentMethodType;
     ppButtonFormAction = WebConstants.paypal.buttonActionProduction;
@@ -89,7 +86,6 @@ export class AddCreditComponent implements OnInit {
             return;
         }
 
-        await this.taxInfoComponent.submitTaxInfo();
         if (this.method === PaymentMethodType.PayPal) {
             this.ppButtonFormRef.nativeElement.submit();
             this.ppLoading = true;
diff --git a/src/app/settings/adjust-payment.component.ts b/src/app/settings/adjust-payment.component.ts
index c700afd52d..331c2f3100 100644
--- a/src/app/settings/adjust-payment.component.ts
+++ b/src/app/settings/adjust-payment.component.ts
@@ -41,13 +41,20 @@ export class AdjustPaymentComponent {
     async submit() {
         try {
             const request = new PaymentRequest();
-            await this.taxInfoComponent.submitTaxInfo();
             this.formPromise = this.paymentComponent.createPaymentToken().then((result) => {
                 request.paymentToken = result[0];
                 request.paymentMethodType = result[1];
+                request.postalCode = this.taxInfoComponent.taxInfo.postalCode;
+                request.country = this.taxInfoComponent.taxInfo.country;
                 if (this.organizationId == null) {
                     return this.apiService.postAccountPayment(request);
                 } else {
+                    request.taxId = this.taxInfoComponent.taxInfo.taxId;
+                    request.state = this.taxInfoComponent.taxInfo.state;
+                    request.line1 = this.taxInfoComponent.taxInfo.line1;
+                    request.line2 = this.taxInfoComponent.taxInfo.line2;
+                    request.city = this.taxInfoComponent.taxInfo.city;
+                    request.state = this.taxInfoComponent.taxInfo.state;
                     return this.apiService.postOrganizationPayment(this.organizationId, request);
                 }
             });
diff --git a/src/app/settings/premium.component.ts b/src/app/settings/premium.component.ts
index 90ac10c04c..09723cbde6 100644
--- a/src/app/settings/premium.component.ts
+++ b/src/app/settings/premium.component.ts
@@ -78,7 +78,6 @@ export class PremiumComponent implements OnInit {
                     return this.finalizePremium();
                 });
             } else {
-                await this.taxInfoComponent.submitTaxInfo();
                 this.formPromise = this.paymentComponent.createPaymentToken().then((result) => {
                     const fd = new FormData();
                     fd.append('paymentMethodType', result[1].toString());
@@ -86,6 +85,8 @@ export class PremiumComponent implements OnInit {
                         fd.append('paymentToken', result[0]);
                     }
                     fd.append('additionalStorageGb', (this.additionalStorage || 0).toString());
+                    fd.append('country', this.taxInfoComponent.taxInfo.country);
+                    fd.append('postalCode', this.taxInfoComponent.taxInfo.postalCode);
                     return this.apiService.postPremium(fd);
                 }).then((paymentResponse) => {
                     if (!paymentResponse.success && paymentResponse.paymentIntentClientSecret != null) {