Merge branch 'release/3.0.0'

pronamic · Jan 11, 2022 · 2a6c9f6 · 2a6c9f6
2 parents 3c9a3ce + 5c1c030
commit 2a6c9f6
Show file tree

Hide file tree

Showing 106 changed files with 768 additions and 485 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -286,8 +286,8 @@ jobs:
           composer run-script coveralls
           bash <(curl -s https://codecov.io/bash)
 
-  es-sass-linting:
-    name: Scripts and Styles
+  es-linting:
+    name: Scripts
 
     runs-on: ubuntu-latest
 
@@ -311,6 +311,3 @@ jobs:
 
       - name: ESLint
         run: npm run-script eslint
-
-      - name: Sass Lint
-        run: npm run-script sass-lint
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@
 
 # WordPress
 /wordpress/
+/wp-content/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased][unreleased]
 
+## [3.0.0] - 2022-01-11
+### Changed
+- Updated to https://github.com/pronamic/wp-pay-core/releases/tag/4.0.0.
+- Make notifications only update payment status if not already completed (fixes [pronamic/wp-pronamic-pay#245](https://github.com/pronamic/wp-pronamic-pay/issues/245)).
+- Use Drop-in with auto submit for Swish payment method (instead of direct API integration, because of redirect to mobile app on desktop).
+- Removed guessing country code with `\Locale::getRegion()` (can result in e.g. `EN` as invalid country code).
+- Improved error handling on payment creation ([pronamic/wp-pronamic-pay#278](https://github.com/pronamic/wp-pronamic-pay/issues/278)).
+- Removed `pronamicPayAdyenProcessing` in favor of setting drop status to `loading`.
+- Clarified Afterpay.
+- Disable Application Passwords for routes within integration REST route namespace as it interferes with our HTTP Basic authorization permission check.
+
+### Added
+- Added BLIK and MB WAY payment methods.
+- Added support for TWINT payment method.
+
+### Fixed
+- Move script to inside HTML body.
+
 ## [2.0.4] - 2021-09-16
 - Added support for the PayPal payment method.
 - Added country code to Apple Pay payment method configuration.
@@ -96,7 +114,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 1.0.0 - 2019-03-28
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/adyen/compare/2.0.4...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/adyen/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/wp-pay-gateways/adyen/compare/2.0.4...3.0.0
 [2.0.4]: https://github.com/wp-pay-gateways/adyen/compare/2.0.3...2.0.4
 [2.0.3]: https://github.com/wp-pay-gateways/adyen/compare/2.0.2...2.0.3
 [2.0.2]: https://github.com/wp-pay-gateways/adyen/compare/2.0.1...2.0.2

diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
 		"justinrainbow/json-schema": "^5.2",
 		"pronamic/wp-http": "^1.0",
 		"pronamic/wp-money": "^2.0",
-		"wp-pay/core": "^3.0"
+		"wp-pay/core": "^4.0"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
@@ -49,7 +49,8 @@
 		"roots/wordpress": "^5.8",
 		"sirbrillig/phpcs-import-detection": "^1.2",
 		"sirbrillig/phpcs-variable-analysis": "^2.8",
-		"wp-phpunit/wp-phpunit": "^5.8"
+		"wp-phpunit/wp-phpunit": "^5.8",
+		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"scripts": {
 		"ci": [

diff --git a/docs/hooks.md b/docs/hooks.md
@@ -53,7 +53,7 @@ Version | Description
 ------- | -----------
 `1.2.0` | Added.
 
-Source: [./src/DropInGateway.php](../src/DropInGateway.php), [line 262](../src/DropInGateway.php#L262-L269)
+Source: [./src/DropInGateway.php](../src/DropInGateway.php), [line 285](../src/DropInGateway.php#L285-L292)
 
 ### `pronamic_pay_adyen_payment_metadata`
 

diff --git a/js/dist/checkout-drop-in.js b/js/dist/checkout-drop-in.js
diff --git a/js/dist/checkout-drop-in.js.map b/js/dist/checkout-drop-in.js.map
diff --git a/js/src/checkout-drop-in.js b/js/src/checkout-drop-in.js
@@ -48,8 +48,6 @@
 		};
 	}
 
-	let pronamicPayAdyenProcessing = false;
-
 	/**
 	 * Parse JSON and check response status.
 	 * 
@@ -69,18 +67,20 @@
 
 	const dropin = checkout.create( 'dropin', {
 		paymentMethodsConfiguration: pronamicPayAdyenCheckout.paymentMethodsConfiguration,
-		onSubmit: ( state, dropin ) => {
-			if ( pronamicPayAdyenProcessing ) {
-				return false;
-			}
+		onSelect: ( dropin ) => {
+			let configuration = pronamicPayAdyenCheckout.configuration;
 
-			pronamicPayAdyenProcessing = true;
+			if ( false === configuration.showPayButton ) {
+				dropin.submit();
+			}
+		},
+		onSubmit: ( state, dropin ) => {
+			// Set loading status to prevent duplicate submits.
+			dropin.setStatus( 'loading' );
 
 			send_request( pronamicPayAdyenCheckout.paymentsUrl, state.data )
 			.then( validate_response )
 			.then( data => {
-				pronamicPayAdyenProcessing = false;
-
 				// Handle action object.
 				if ( data.action ) {
 					dropin.handleAction( data.action );

diff --git a/json-schemas/redirect.json b/json-schemas/redirect.json
@@ -19,7 +19,6 @@
 		}
 	},
 	"required": [
-		"method",
 		"url"
 	]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adyen",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "description": "Adyen driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

diff --git a/pronamic-pay-adyen.php b/pronamic-pay-adyen.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://www.pronamic.eu/plugins/pronamic-pay-adyen/
  * Description: Extend the Pronamic Pay plugin with the Adyen gateway to receive payments with Adyen through a variety of WordPress plugins.
  *
- * Version: 2.0.2
+ * Version: 3.0.0
  * Requires at least: 4.7
  *
  * Author: Pronamic
@@ -20,7 +20,7 @@
  * GitHub URI: https://github.com/wp-pay-gateways/adyen
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/readme.txt b/readme.txt
@@ -4,6 +4,6 @@ Tags: pronamic, pay, adyen, add-on
 Requires at least: 4.7
 Tested up to: 5.1
 Requires PHP: 5.3
-Stable tag: 2.0.2
+Stable tag: 3.0.0
 
 Extend the Pronamic Pay plugin with the Adyen gateway to receive payments with Adyen through a variety of WordPress plugins.
diff --git a/src/AbstractGateway.php b/src/AbstractGateway.php
@@ -3,7 +3,7 @@
  * Gateway
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/AbstractPaymentRequest.php b/src/AbstractPaymentRequest.php
@@ -3,7 +3,7 @@
  * Abstract payment request
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/ActionInformation.php b/src/ActionInformation.php
@@ -3,7 +3,7 @@
  * Action information
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/AdditionalData.php b/src/AdditionalData.php
@@ -3,7 +3,7 @@
  * Additional data.
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/Address.php b/src/Address.php
@@ -3,7 +3,7 @@
  * Address
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/AddressTransformer.php b/src/AddressTransformer.php
@@ -3,7 +3,7 @@
  * Address transformer
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/Amount.php b/src/Amount.php
@@ -3,7 +3,7 @@
  * Amount
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/AmountTransformer.php b/src/AmountTransformer.php
@@ -3,7 +3,7 @@
  * Amount transformer
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/ApplicationInfo.php b/src/ApplicationInfo.php
@@ -3,7 +3,7 @@
  * Application info
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/BrowserInformation.php b/src/BrowserInformation.php
@@ -3,7 +3,7 @@
  * Browser information
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/Channel.php b/src/Channel.php
@@ -3,7 +3,7 @@
  * Channel
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/Client.php b/src/Client.php
@@ -3,7 +3,7 @@
  * Adyen client
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/Config.php b/src/Config.php
@@ -3,7 +3,7 @@
  * Config
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */

diff --git a/src/DetailsInformation.php b/src/DetailsInformation.php
@@ -3,7 +3,7 @@
  * Details information
  *
  * @author    Pronamic <info@pronamic.eu>
- * @copyright 2005-2021 Pronamic
+ * @copyright 2005-2022 Pronamic
  * @license   GPL-3.0-or-later
  * @package   Pronamic\WordPress\Pay\Gateways\Adyen
  */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@

		# WordPress
		/wordpress/
		/wp-content/
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ @@
     		}
     	},
     	"required": [
-    		"method",
     		"url"
     	]
     }