Merge branch 'release/1.1.4'

wp-pay-gateways · Feb 1, 2016 · 8603b43 · 8603b43
2 parents d7da6bd + 6205f40
commit 8603b43
Show file tree

Hide file tree

Showing 24 changed files with 587 additions and 221 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@
 
 # Node.js
 /node_modules/
+/npm-debug.log
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ env:
   - WP_VERSION=4.0 WP_MULTISITE=1
 
 before_script:
+  - composer self-update
   - composer install
   - wget https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh
   - bash install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [1.1.4] - 2016-02-01
+- Added an gateway settings class.
+- Remove discontinued MiniTix gateway.
+
 ## [1.1.3] - 2015-10-14
 - Add locale helper to prevent sending unsupported language codes.
 - Add filter pronamic_pay_omnikassa_payment_mean_brand_list.
@@ -27,7 +31,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.1.3...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.4...HEAD
+[1.1.4]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.3...1.1.4
 [1.1.3]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/wp-pay-gateways/omnikassa/compare/1.1.0...1.1.1

diff --git a/README.md b/README.md
@@ -3,13 +3,23 @@
 **OmniKassa driver for the WordPress payment processing library.**
 
 [![Build Status](https://travis-ci.org/wp-pay-gateways/omnikassa.svg?branch=develop)](https://travis-ci.org/wp-pay-gateways/omnikassa)
-[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/omnikassa/badge.png?branch=develop)](https://coveralls.io/r/wp-pay-gateways/omnikassa?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/omnikassa/badge.svg?branch=master&service=github)](https://coveralls.io/github/wp-pay-gateways/omnikassa?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/omnikassa/v/stable.svg)](https://packagist.org/packages/wp-pay-gateways/omnikassa)
 [![Total Downloads](https://poser.pugx.org/wp-pay-gateways/omnikassa/downloads.svg)](https://packagist.org/packages/wp-pay-gateways/omnikassa)
 [![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/omnikassa/v/unstable.svg)](https://packagist.org/packages/wp-pay-gateways/omnikassa)
 [![License](https://poser.pugx.org/wp-pay-gateways/omnikassa/license.svg)](https://packagist.org/packages/wp-pay-gateways/omnikassa)
 [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
 
+## Test Account
+
+| Option      | Value                                                               |
+| ----------- | ------------------------------------------------------------------- |
+| URL         | `https://payment-webinit.simu.omnikassa.rabobank.nl/paymentServlet` |
+| Merchant ID | `002020000000001`                                                   |
+| Secret Key  | `002020000000001_KEY1`                                              |
+| Key Version | `1`                                                                 |
+
+
 ## Filters
 
 ### Filter `pronamic_pay_omnikassa_payment_mean_brand_list`
@@ -30,6 +40,19 @@ function custom_omnikassa_payment_mean_brand_list( $list ) {
 add_filter( 'pronamic_pay_omnikassa_payment_mean_brand_list', 'custom_omnikassa_payment_mean_brand_list' );
 ```
 
+## Links
+
+*	https://dashboard.omnikassa.rabobank.nl/
+*	https://download.omnikassa.rabobank.nl/
+
+## Production Environment
+
+**Payment Server URL:** https://payment-webinit.omnikassa.rabobank.nl/paymentServlet  
+
+## Test Environment
+
+**Payment Server URL:** https://payment-webinit.simu.omnikassa.rabobank.nl/paymentServlet  
+
 ## Documentation
 
 *	[Integration Guide Rabo OmniKassa, Version 7.1, April 2014](http://pronamic.nl/wp-content/uploads/2014/07/integratiehandleiding_rabo_omnikassa_en_version_7_1_april_2014_final_2_0_29637101.pdf)

diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
 	},
 	"require": {
 		"php": ">=5.2.4",
-		"wp-pay/core": ">=1.0.0"
+		"wp-pay/core": "^1.3.1",
+		"wp-pay-gateways/common": "^1.0.0"
 	},
 	"require-dev": {
 		"satooshi/php-coveralls": "dev-master"