Merge branch 'release/1.1.2'

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [Unreleased][unreleased]
+-
+
+## [1.1.2] - 2016-03-02
 - Added an gateway settings class.
 
 ## [1.1.1] - 2016-01-29

composer.json

@@ -7,7 +7,8 @@
 		"classmap": ["src/"]
 	},
 	"require": {
-		"wp-pay/core": "^1.3.1"
+		"wp-pay/core": "^1.3.4",
+		"wp-pay-gateways/common": "^1.0.1"
 	},
 	"require-dev": {
 		"satooshi/php-coveralls": "dev-master"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ideal",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "iDEAL driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

src/AbstractIntegration.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Title: iDEAL abstract integration
+ * Description:
+ * Copyright: Copyright (c) 2005 - 2016
+ * Company: Pronamic
+ *
+ * @author Remco Tolsma
+ * @version 1.1.2
+ * @since 1.1.2
+ */
+abstract class Pronamic_WP_Pay_Gateways_IDeal_AbstractIntegration extends Pronamic_WP_Pay_Gateways_AbstractIntegration {
+	public function get_settings_class() {
+		return 'Pronamic_WP_Pay_Gateways_IDeal_Settings';
+	}
+
+	/**
+	 * Get required settings for this integration.
+	 *
+	 * @see https://github.com/wp-premium/gravityforms/blob/1.9.16/includes/fields/class-gf-field-multiselect.php#L21-L42
+	 * @return array
+	 */
+	public function get_settings() {
+		$settings = parent::get_settings();
+
+		$settings[] = 'ideal';
+
+		return $settings;
+	}
+}

src/Settings.php

@@ -20,11 +20,7 @@ public function sections( array $sections ) {
 		// iDEAL
 		$sections['ideal'] = array(
 			'title'   => __( 'iDEAL', 'pronamic_ideal' ),
-			'methods' => array(
-				'ideal_basic',
-				'ideal_advanced',
-				'ideal_advanced_v3',
-			),
+			'methods' => array( 'ideal' ),
 		);
 
 		// Return sections
@@ -41,11 +37,7 @@ public function fields( array $fields ) {
 			'type'        => 'text',
 			'classes'     => array( 'code' ),
 			'description' => __( 'You receive the merchant ID (also known as: acceptant ID) from your iDEAL provider.', 'pronamic_ideal' ),
-			'methods'     => array(
-				'ideal_basic',
-				'ideal_advanced',
-				'ideal_advanced_v3',
-			),
+			'methods'     => array( 'ideal' ),
 		);
 
 		// Sub ID
@@ -59,11 +51,7 @@ public function fields( array $fields ) {
 			'type'        => 'text',
 			'classes'     => array( 'small-text', 'code' ),
 			'description' => sprintf( __( 'You receive the sub ID from your iDEAL provider, the default is: %s.', 'pronamic_ideal' ), 0 ),
-			'methods'     => array(
-				'ideal_basic',
-				'ideal_advanced',
-				'ideal_advanced_v3',
-			),
+			'methods'     => array( 'ideal' ),
 		);
 
 		// Purchase ID
@@ -83,11 +71,7 @@ public function fields( array $fields ) {
 				sprintf( __( 'Default: <code>%s</code>.', 'pronamic_ideal' ), '{payment_id}' ),
 				sprintf( __( 'Tags: %s', 'pronamic_ideal' ), sprintf( '<code>%s</code> <code>%s</code>', '{order_id}', '{payment_id}' ) )
 			),
-			'methods'     => array(
-				'ideal_basic',
-				'ideal_advanced',
-				'ideal_advanced_v3',
-			),
+			'methods'     => array( 'ideal' ),
 		);
 
 		// Return fields