From 14cbeef31d33d36041793d4d2aa1c21a6301a8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= <timothee.alby@gmail.com>
Date: Tue, 4 Jun 2019 13:10:29 +0200
Subject: [PATCH] Merge pull request #1806 from overleaf/ta-use-billing-name

Use Billing Name when Creating Subscription

GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
---
 .../web/app/src/Features/Subscription/RecurlyWrapper.js  | 4 ++--
 services/web/public/src/main/new-subscription.js         | 2 ++
 .../test/unit/src/Subscription/RecurlyWrapperTests.js    | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/RecurlyWrapper.js b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
index 9fabfa42e0..858055525f 100644
--- a/services/web/app/src/Features/Subscription/RecurlyWrapper.js
+++ b/services/web/app/src/Features/Subscription/RecurlyWrapper.js
@@ -376,8 +376,8 @@ module.exports = RecurlyWrapper = {
       account: {
         account_code: user._id,
         email: user.email,
-        first_name: user.first_name,
-        last_name: user.last_name,
+        first_name: subscriptionDetails.first_name || user.first_name,
+        last_name: subscriptionDetails.last_name || user.last_name,
         billing_info: {
           token_id: recurly_token_id
         }
diff --git a/services/web/public/src/main/new-subscription.js b/services/web/public/src/main/new-subscription.js
index bd86f54af2..10855eaacf 100644
--- a/services/web/public/src/main/new-subscription.js
+++ b/services/web/public/src/main/new-subscription.js
@@ -193,6 +193,8 @@ define(['base', 'directives/creditCards', 'libs/recurly-4.8.5'], App =>
             currencyCode: pricing.items.currency,
             plan_code: pricing.items.plan.code,
             coupon_code: pricing.items.coupon ? pricing.items.coupon.code : '',
+            first_name: $scope.data.first_name,
+            last_name: $scope.data.last_name,
 
             isPaypal: $scope.paymentMethod.value === 'paypal',
             address: {
diff --git a/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js b/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js
index cf454475ca..d9aefcc48b 100644
--- a/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js
+++ b/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js
@@ -622,13 +622,16 @@ describe('RecurlyWrapper', function() {
     beforeEach(function() {
       this.user = {
         _id: 'some_id',
-        email: 'user@example.com'
+        email: 'user@example.com',
+        first_name: 'Foo',
+        last_name: 'Johnson'
       }
       this.subscriptionDetails = {
         currencyCode: 'EUR',
         plan_code: 'some_plan_code',
         coupon_code: '',
         isPaypal: true,
+        first_name: 'Prairie',
         address: {
           address1: 'addr_one',
           address2: 'addr_two',
@@ -674,8 +677,8 @@ describe('RecurlyWrapper', function() {
 	<account>
 		<account_code>some_id</account_code>
 		<email>user@example.com</email>
-		<first_name/>
-		<last_name/>
+		<first_name>Prairie</first_name>
+		<last_name>Johnson</last_name>
 		<billing_info>
 			<token_id>a-token-id</token_id>
 		</billing_info>