Move billing info first/last name into credit card only dom. #74

The PayPal API gives us first/last so no point in requiring it. Unfortunately can't say the same for address, which is needed for sales tax.
recurly · Aug 13, 2013 · e7453e3 · e7453e3
1 parent 2261374
commit e7453e3
Show file tree

Hide file tree

Showing 11 changed files with 11,567 additions and 21 deletions.
diff --git a/build/recurly.js b/build/recurly.js
diff --git a/build/recurly.min.js b/build/recurly.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 #Recurly.js CHANGELOG
 
+##Version 2.2.3 (Aug 13, 2013)
+- Fix an issue where first/last name show up for PayPal when distinguishContactFromBillingInfo is true
+
 ##Version 2.2.2 (June 6, 2013)
 - Fix bug in PayPal integration.
 - Fix a bug where a coupon specified by initial prefilled values would not get applied to the subscription.

diff --git a/examples/subscribe.html b/examples/subscribe.html
@@ -23,6 +23,7 @@
     planCode: 'simpleplan',
     distinguishContactFromBillingInfo: true,
     collectCompany: true,
+    collectContact: false,
     termsOfServiceURL: 'http://example.com/tos',
     acceptPaypal: true,
     acceptedCards: ['mastercard',

diff --git a/src/dom/billing_info_fields.jade b/src/dom/billing_info_fields.jade
@@ -10,15 +10,15 @@
     input(type="radio", name="payment_method", value="paypal")
     .logo
 
-.field.first_name
-  .placeholder First Name
-  input(type="text")
+.credit_card
+  .field.first_name
+    .placeholder First Name
+    input(type="text")
 
-.field.last_name
-  .placeholder Last Name
-  input(type="text")
+  .field.last_name
+    .placeholder Last Name
+    input(type="text")
 
-.credit_card
   .card_cvv
     .field.card_number
       .placeholder Credit Card Number

diff --git a/src/js/ui.js b/src/js/ui.js
@@ -540,10 +540,10 @@ function pullBillingInfoFields($form, billingInfo, options, pull) {
 
   billingInfo.paymentMethod = pull.field($form, '.payment_method'); 
 
-  billingInfo.firstName = pull.field($form, '.billing_info .first_name', V(R.isNotEmpty)); 
-  billingInfo.lastName = pull.field($form, '.billing_info .last_name', V(R.isNotEmpty)); 
-
   if(billingInfo.paymentMethod !== 'paypal') {
+    billingInfo.firstName = pull.field($form, '.billing_info .first_name', V(R.isNotEmpty)); 
+    billingInfo.lastName = pull.field($form, '.billing_info .last_name', V(R.isNotEmpty)); 
+
     billingInfo.number = pull.field($form, '.card_number', V(R.isNotEmpty), V(R.isValidCC)); 
     billingInfo.cvv = pull.field($form, '.cvv', V(R.isNotEmpty), V(R.isValidCVV)); 
     billingInfo.month = pull.field($form, '.month');

diff --git a/test/all.html b/test/all.html
@@ -2,9 +2,9 @@
 
 <html>
 <head>
-  <link rel="stylesheet" href="http://code.jquery.com/qunit/git/qunit.css" type="text/css" media="screen" />
-  <script src="http://code.jquery.com/jquery-1.10.0.js"></script>
-  <script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>
+  <link rel="stylesheet" href="support/qunit.css" type="text/css" media="screen" />
+  <script src="support/jquery-1.10.0.js"></script>
+  <script type="text/javascript" src="support/qunit.js"></script>
   <script type="text/javascript" src="../build/recurly.js"></script>
 
   <script>