Merge branch 'fixes/no-manual-form-fields'

Author: jedateach

code/GatewayFieldsFactory.php

@@ -76,11 +76,8 @@ public function getCardFields() {
 							->setMaxLength(5),
 			"issueNumber" => TextField::create('issueNumber', _t("PaymentForm.ISSUENUMBER", "Issue Number"))
 		);
-		//assumption: no credit card fields are ever required for off-site gateways by default
-		$defaults = GatewayInfo::is_offsite($this->gateway) ? 
-						array() :
-						array('name', 'number', 'expiryMonth', 'expiryYear', 'cvv');
-		$this->cullForGateway($fields, $defaults);
+		
+		$this->cullForGateway($fields);
 		//optionally group date fields
 		if ($this->groupdatefields) {
 			if (isset($fields['startMonth']) && isset($fields['startYear'])) {

code/model/GatewayInfo.php

@@ -72,8 +72,8 @@ public static function is_offsite($gateway) {
 
 	/**
 	 * Check for special 'manual' payment type.
-	 * @param  string  $gateway [description]
-	 * @return boolean          [description]
+	 * @param  string  $gateway
+	 * @return boolean
 	 */
 	public static function is_manual($gateway) {
 		return $gateway === 'Manual';
@@ -91,8 +91,8 @@ public static function required_fields($gateway) {
 			is_array($parameters[$gateway]['required_fields'])){
 				$fields = $parameters[$gateway]['required_fields'];
 		}
-		//always require the following offsite fields
-		if (!self::is_offsite($gateway)) {
+		//always require the following for on-site gateways (and not manual)
+		if (!self::is_offsite($gateway) && !self::is_manual($gateway)) {
 			$fields = array_merge(
 				$fields,
 				array('name','number','expiryMonth','expiryYear','cvv')