remove the dead validation

services/web/app/views/subscriptions/new.pug

@@ -101,9 +101,8 @@ block content
 															ng-model="data.last_name"
 															required
 														)
-														span.input-feedback-message {{ simpleCCForm.lastName.$error.required ? 'This field is required' : '' }}
 
-											.form-group(ng-class="validation.correctCardNumber == false || validation.errorFields.number || inputHasError(simpleCCForm.ccNumber) ? 'has-error' : ''")
+											.form-group()
 												label(for="card-no") #{translate("credit_card_number")}
 												div#card-no(
 													type="text"
@@ -113,41 +112,36 @@ block content
 													ng-blur="validateCardNumber();"
 													required
 												)
-												span.input-feedback-message {{ simpleCCForm.ccNumber.$error.required ? 'This field is required' : 'Please re-check the card number' }}
 
 											.row
 												.col-xs-3
-													.form-group.has-feedback(ng-class="validation.correctExpiry == false || validation.errorFields.expiry || inputHasError(simpleCCForm.expiry) ? 'has-error' : ''")
+													.form-group.has-feedback()
 														label(for="month") #{translate("month")}
 														div(
-															type="text"
+															type="number"
 															name="month"
 															ng-focus="validation.correctExpiry = true; validation.errorFields.expiry = false;"
 															ng-blur="updateExpiry(); validateExpiry()"
 															data-recurly="month"
 															required
 														)
-														span.input-feedback-message {{ simpleCCForm.expiry.$error.required ? 'This field is required' : 'Please re-check the expiry date' }}
 												.col-xs-3
-													.form-group.has-feedback(ng-class="validation.correctExpiry == false || validation.errorFields.expiry || inputHasError(simpleCCForm.expiry) ? 'has-error' : ''")
+													.form-group.has-feedback()
 														label(for="year") #{translate("year")}
 														div(
-															type="text"
+															type="number"
 															name="year"
 															data-recurly="year"
 															ng-focus="validation.correctExpiry = true; validation.errorFields.expiry = false;"
 															ng-blur="updateExpiry(); validateExpiry()"
 															required
 														)
-														span.input-feedback-message {{ simpleCCForm.expiry.$error.required ? 'This field is required' : 'Please re-check the expiry date' }}
-							
-
 							
 												.col-xs-6
-													.form-group.has-feedback(ng-class="validation.correctCvv == false || validation.errorFields.cvv || inputHasError(simpleCCForm.cvv) ? 'has-error' : ''")
+													.form-group.has-feedback()
 														label #{translate("security_code")}
 														div(
-															type="text"
+															type="number"
 															ng-model="data.cvv"
 															ng-focus="validation.correctCvv = true; validation.errorFields.cvv = false;"
 															ng-blur="validateCvv()"
@@ -164,8 +158,6 @@ block content
 																tooltip-trigger="mouseenter"
 																tooltip-append-to-body="true"
 															) ?
-														span.input-feedback-message {{ simpleCCForm.cvv.$error.required ? 'This field is required' : 'Please re-check the security code' }}
-
 
 										div
 											.form-group(ng-class="validation.errorFields.country || inputHasError(simpleCCForm.country) ? 'has-error' : ''")

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

@@ -21,10 +21,6 @@ define [
 			value: "credit_card"
 
 		$scope.data =
-			number: ""
-			month: ""
-			year: ""
-			cvv: ""
 			first_name: ""
 			last_name: ""
 			postal_code: ""
@@ -34,12 +30,8 @@ define [
 			city:""
 			country:window.countryCode
 			coupon: window.couponCode
-			mmYY: ""
 			
-		$scope.validation =
-			correctCardNumber : true
-			correctExpiry: true
-			correctCvv: true
+		$scope.validation = {}
 
 		$scope.processing = false
 
@@ -49,12 +41,13 @@ define [
 				all: 
 					fontFamily: '"Open Sans", sans-serif',
 					fontSize: '16px',
+					fontColor: '#7a7a7a'
 				month: 
-					placeholder: 'mm'
+					placeholder: 'MM'
 				year: 
-					placeholder: 'yy'
+					placeholder: 'YY'
 				cvv:
-					placeholder: 'cvv'
+					placeholder: 'CVV'
 
 
 		pricing = recurly.Pricing()
@@ -97,26 +90,6 @@ define [
 			$scope.currencyCode = newCurrency
 			pricing.currency(newCurrency).done()
 
-		$scope.updateExpiry = () ->
-			parsedDateObj = ccUtils.parseExpiry $scope.data.mmYY
-			if parsedDateObj?
-				$scope.data.month = parsedDateObj.month
-				$scope.data.year = parsedDateObj.year
-
-		$scope.validateCardNumber = validateCardNumber = ->
-			$scope.validation.errorFields = {}
-			if $scope.data.number?.length != 0
-				$scope.validation.correctCardNumber = recurly.validate.cardNumber($scope.data.number)
-
-		$scope.validateExpiry = validateExpiry = ->
-			$scope.validation.errorFields = {}
-			if $scope.data.month?.length != 0 and $scope.data.year?.length != 0
-				$scope.validation.correctExpiry = recurly.validate.expiry($scope.data.month, $scope.data.year)
-
-		$scope.validateCvv = validateCvv = ->
-			$scope.validation.errorFields = {}
-			if $scope.data.cvv?.length != 0
-				$scope.validation.correctCvv = recurly.validate.cvv($scope.data.cvv)
 
 		$scope.inputHasError = inputHasError = (formItem) ->
 			if !formItem?
@@ -128,10 +101,7 @@ define [
 			if $scope.paymentMethod.value == 'paypal' 
 				return $scope.data.country != ""
 			else 
-				return (form.$valid and 
-						$scope.validation.correctCardNumber and
-						$scope.validation.correctExpiry and
-						$scope.validation.correctCvv)
+				return form.$valid
 
 		$scope.updateCountry = ->
 			pricing.address({country:$scope.data.country}).done()