Merge branch 'release/1.1.3'

CHANGELOG.md

@@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [1.1.3] - 2016-03-22
+- Updated gateway settings.
+
 ## [1.1.2] - 2016-03-02
 - Added an gateway settings class.
 
@@ -21,3 +24,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 
 ## 1.0.0 - 2015-01-19
 - First release.
+
+[unreleased]: https://github.com/wp-pay-gateways/ideal/compare/1.1.3...HEAD
+[1.1.3]: https://github.com/wp-pay-gateways/ideal/compare/1.1.2...1.1.3
+[1.1.2]: https://github.com/wp-pay-gateways/ideal/compare/1.1.1...1.1.2
+[1.1.1]: https://github.com/wp-pay-gateways/ideal/compare/1.1.0...1.1.1
+[1.1.0]: https://github.com/wp-pay-gateways/ideal/compare/1.0.1...1.1.0
+[1.0.1]: https://github.com/wp-pay-gateways/ideal/compare/1.0.0...1.0.1

composer.json

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

src/Settings.php

@@ -7,8 +7,8 @@
  * Company: Pronamic
  *
  * @author Remco Tolsma
- * @version 1.2.0
- * @since 1.2.0
+ * @version 1.1.3
+ * @since 1.0.0
  */
 class Pronamic_WP_Pay_Gateways_IDeal_Settings extends Pronamic_WP_Pay_GatewaySettings {
 	public function __construct() {
@@ -19,8 +19,16 @@ public function __construct() {
 	public function sections( array $sections ) {
 		// iDEAL
 		$sections['ideal'] = array(
-			'title'   => __( 'iDEAL', 'pronamic_ideal' ),
-			'methods' => array( 'ideal' ),
+			'title'       => __( 'iDEAL', 'pronamic_ideal' ),
+			'methods'     => array( 'ideal' ),
+			'description' => __( 'Account details are provided by the payment provider after registration. These settings need to match with the payment provider dashboard.', 'pronamic_ideal' ),
+		);
+
+		// Advanced
+		$sections['ideal_advanced'] = array(
+			'title'       => __( 'Advanced', 'pronamic_ideal' ),
+			'methods'     => array( 'ideal' ),
+			'description' => __( 'Optional settings for advanced usage only.', 'pronamic_ideal' ),
 		);
 
 		// Return sections
@@ -36,40 +44,58 @@ public function fields( array $fields ) {
 			'title'       => __( 'Merchant ID', 'pronamic_ideal' ),
 			'type'        => 'text',
 			'classes'     => array( 'code' ),
-			'description' => __( 'You receive the merchant ID (also known as: acceptant ID) from your iDEAL provider.', 'pronamic_ideal' ),
+			'tooltip'     => sprintf(
+				'%s %s.',
+				__( 'Merchant ID (or Acceptant ID)', 'pronamic_ideal' ),
+				__( 'as mentioned in the payment provider dashboard', 'pronamic_ideal' )
+			),
 			'methods'     => array( 'ideal' ),
 		);
 
 		// Sub ID
 		$fields[] = array(
 			'filter'      => FILTER_SANITIZE_STRING,
-			'section'     => 'ideal',
+			'section'     => 'ideal_advanced',
 			'meta_key'    => '_pronamic_gateway_ideal_sub_id',
 			'name'        => 'subId',
 			'id'          => 'pronamic_ideal_sub_id',
 			'title'       => __( 'Sub ID', 'pronamic_ideal' ),
 			'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 ),
+			'default'     => '0',
+			'description' => sprintf( __( 'Default: <code>%s</code>', 'pronamic_ideal' ), 0 ),
+			'tooltip'     => sprintf(
+				'%s %s.',
+				__( 'Sub ID', 'pronamic_ideal' ),
+				__( 'as mentioned in the payment provider dashboard', 'pronamic_ideal' )
+			),
 			'methods'     => array( 'ideal' ),
 		);
 
 		// Purchase ID
 		$fields[] = array(
 			'filter'      => FILTER_SANITIZE_STRING,
-			'section'     => 'ideal',
+			'section'     => 'ideal_advanced',
 			'meta_key'    => '_pronamic_gateway_ideal_purchase_id',
 			'title'       => __( 'Purchase ID', 'pronamic_ideal' ),
 			'type'        => 'text',
 			'classes'     => array( 'regular-text', 'code' ),
+			'tooltip'     => sprintf(
+				__( 'The iDEAL %s parameter.', 'pronamic_ideal' ),
+				sprintf( '<code>%s</code>', 'purchaseID' )
+			),
 			'description' => sprintf(
-				'%s<br />%s<br />%s',
+				'%s %s<br />%s',
+				__( 'Available tags:', 'pronamic_ideal' ),
 				sprintf(
-					__( 'This controls the iDEAL %s parameter.', 'pronamic_ideal' ),
-					sprintf( '<code>%s</code>', 'purchaseID' )
+					'<code>%s</code> <code>%s</code>',
+					'{order_id}',
+					'{payment_id}'
 				),
-				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}' ) )
+				sprintf(
+					__( 'Default: <code>%s</code>', 'pronamic_ideal' ),
+					'{payment_id}'
+				)
 			),
 			'methods'     => array( 'ideal' ),
 		);