set postal_code as zip

services/web/app/coffee/Features/Subscription/RecurlyWrapper.coffee

@@ -10,9 +10,11 @@ module.exports = RecurlyWrapper =
 	apiUrl : "https://api.recurly.com/v2"
 
 	_addressToXml: (address) ->
-		allowedKeys = ['address1', 'address2', 'city', 'country', 'state', 'zip']
+		allowedKeys = ['address1', 'address2', 'city', 'country', 'state', 'zip', 'postal_code']
 		resultString = "<billing_info>\n"
 		for k, v of address
+			if k == 'postal_code'
+				k = 'zip'
 			if v and (k in allowedKeys)
 				resultString += "<#{k}#{if k == 'address2' then ' nil="nil"' else ''}>#{v || ''}</#{k}>\n"
 		resultString += "</billing_info>\n"

services/web/public/coffee/main/new-subscription.coffee

@@ -122,7 +122,6 @@ define [
 							country:     $scope.data.country
 							state:       $scope.data.state
 							postal_code: $scope.data.postal_code
-							zip:         $scope.data.zip
 				$http.post("/user/subscription/create", postData)
 					.success (data, status, headers)->
 						sixpack.convert "in-editor-free-trial-plan", pricing.items.plan.code, (err)->

services/web/test/UnitTests/coffee/Subscription/RecurlyWrapperTests.coffee

@@ -354,11 +354,11 @@ describe "RecurlyWrapper", ->
 
 		beforeEach ->
 			@address =
-				address1: "addr_one"
-				address2: "addr_two"
-				country:  "some_country"
-				state:    "some_state"
-				zip:      "some_zip"
+				address1:    "addr_one"
+				address2:    "addr_two"
+				country:     "some_country"
+				state:       "some_state"
+				postal_code: "some_zip"
 				nonsenseKey: "rubbish"
 
 		it 'should generate the correct xml', () ->