Merge branch 'release/1.2.1'

CHANGELOG.md

@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [1.2.1] - 2016-11-16
+- Added support for Maestro payment method.
+- Default order ID uses payment ID in `format_string()`.
+
 ## [1.2.0] - 2016-10-20
 - Use the new $payment->format_string() function.
 - Added support for new Bancontact constant.
@@ -54,7 +58,8 @@ 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/omnikassa/compare/1.2.0...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/omnikassa/compare/1.2.1...HEAD
+[1.2.1]: https://github.com/wp-pay-gateways/omnikassa/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.9...1.2.0
 [1.1.9]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.8...1.1.9
 [1.1.8]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.7...1.1.8

composer.json

@@ -29,7 +29,7 @@
 	"require": {
 		"php": ">=5.2.4",
 		"xrstf/composer-php52": "1.*",
-		"wp-pay/core": "^1.3",
+		"wp-pay/core": "^1.3.10",
 		"wp-pay-gateways/common": "^1.0.2"
 	},
 	"require-dev": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnikassa",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "OmniKassa driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

src/Gateway.php

@@ -7,7 +7,7 @@
  * Company: Pronamic
  *
  * @author Remco Tolsma
- * @version 1.2.0
+ * @version 1.2.1
  * @since 1.0.0
  */
 class Pronamic_WP_Pay_Gateways_OmniKassa_Gateway extends Pronamic_WP_Pay_Gateway {
@@ -119,6 +119,11 @@ public function start( Pronamic_Pay_Payment $payment ) {
 			 * redirect the customer directly to the payment page for
 			 * this payment method.
 			 */
+			case Pronamic_WP_Pay_PaymentMethods::BANCONTACT :
+			case Pronamic_WP_Pay_PaymentMethods::MISTER_CASH :
+				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::BCMC );
+
+				break;
 			case Pronamic_WP_Pay_PaymentMethods::CREDIT_CARD :
 				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::MAESTRO );
 				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::MASTERCARD );
@@ -130,13 +135,12 @@ public function start( Pronamic_Pay_Payment $payment ) {
 				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::INCASSO );
 
 				break;
-			case Pronamic_WP_Pay_PaymentMethods::IDEAL :
-				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::IDEAL );
+			case Pronamic_WP_Pay_PaymentMethods::MAESTRO :
+				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::MAESTRO );
 
 				break;
-			case Pronamic_WP_Pay_PaymentMethods::BANCONTACT :
-			case Pronamic_WP_Pay_PaymentMethods::MISTER_CASH :
-				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::BCMC );
+			case Pronamic_WP_Pay_PaymentMethods::IDEAL :
+				$this->client->add_payment_mean_brand( Pronamic_WP_Pay_Gateways_OmniKassa_PaymentMethods::IDEAL );
 
 				break;
 			default :

src/Settings.php

@@ -7,7 +7,7 @@
  * Company: Pronamic
  *
  * @author Remco Tolsma
- * @version 1.1.6
+ * @version 1.2.1
  * @since 1.0.0
  */
 class Pronamic_WP_Pay_Gateways_OmniKassa_Settings extends Pronamic_WP_Pay_GatewaySettings {
@@ -87,7 +87,7 @@ public function fields( array $fields ) {
 				),
 				sprintf(
 					__( 'Default: <code>%s</code>', 'pronamic_ideal' ),
-					'{order_id}'
+					'{payment_id}'
 				)
 			),
 		);