Skip to content

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Jan 10, 2022
2 parents 07ee3c2 + 474534f commit 484230d
Show file tree
Hide file tree
Showing 225 changed files with 4,751 additions and 5,843 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ trim_trailing_whitespace = false
trim_trailing_whitespace = false
indent_style = space
indent_size = 2

[composer.json]
indent_style = tab
indent_size = 4
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"env": {
"es6": true
},
"plugins": [
"json"
]
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ env:
WP_TESTS_DB_PASS: password
php-version: '7.4'
wp-version: '*'
phpunit-version: '^6.0'

jobs:
phpcs:
Expand Down Expand Up @@ -162,25 +161,6 @@ jobs:
- name: WP 5.2
php-version: 7.3
wp-version: 5.2.*
- name: WP 5.1
php-version: 7.3
wp-version: 5.1.*
- name: WP 5.0
php-version: 7.3
wp-version: 5.0.*
- name: WP 4.9
php-version: 7.3
wp-version: 4.9.*
# WordPress 4.8 (or lower) will trigger PHP 7.2 (or higher) errors.
# @link https://make.wordpress.org/core/2018/10/15/wordpress-and-php-7-3/
# @link https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/
# @link https://make.wordpress.org/core/tag/4-9/?s=7.2
- name: WP 4.8
php-version: 7.1
wp-version: 4.8.*
- name: WP 4.7
php-version: 7.1
wp-version: 4.7.*
- name: Multisite
php-version: 7.4
WP_MULTISITE: 1
Expand Down
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,29 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## [Unreleased][unreleased]
-

## [4.0.0] - 2022-01-10
### Added
- Added setting to disable subscriptions processing (requires debug mode to enable).
- Added https://actionscheduler.org/ library for subscription processes.
- Added BLIK and MB WAY payment methods.
- Added support for TWINT payment method.
- Added payment method icon to amount column and info meta boxes.

### Changed
- Refactored subscription follow-up payments processes.
- Increased WordPress requirement to version `5.2` or higher.
- Improved usage of https://github.com/pronamic/wp-money.
- Updated https://github.com/pronamic/wp-html library.
- Updated https://github.com/pronamic/wp-pay-logos to version `1.7.0`.
- Cleaned up legacy properties and functions.
- Store less data in post meta.
- Solved all PHPStan errors.
- Explain badge count in admin menu by adding `title` attribute.

### Removed
- Removed http://www.ideal-status.nl/ dashboard widget.
- Removed Moneyou brand.

## [3.2.0] - 2021-09-30
- Start using `<input type="number">` in payment forms en test meta box.
- Removed `Util::string_to_amount( $value )` function.
Expand Down Expand Up @@ -417,7 +440,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## 1.0.0
- First release.

[unreleased]: https://github.com/pronamic/wp-pay-core/compare/3.2.0...HEAD
[unreleased]: https://github.com/pronamic/wp-pay-core/compare/4.0.0...HEAD
[4.0.0]: https://github.com/pronamic/wp-pay-core/compare/3.2.0...4.0.0
[3.2.0]: https://github.com/pronamic/wp-pay-core/compare/3.1.1...3.2.0
[3.1.1]: https://github.com/pronamic/wp-pay-core/compare/3.1.0...3.1.1
[3.1.0]: https://github.com/pronamic/wp-pay-core/compare/3.0.1...3.1.0
Expand Down
7 changes: 5 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Grunt tasks.
*
* @author Pronamic <info@pronamic.eu>
* @copyright 2005-2021 Pronamic
* @copyright 2005-2022 Pronamic
* @license GPL-3.0-or-later
* @package Pronamic\WordPress\Pay
*/
Expand Down Expand Up @@ -39,7 +39,10 @@ module.exports = function( grunt ) {
{ // Tippy.js - https://atomiks.github.io/tippyjs/.
expand: true,
cwd: 'node_modules/tippy.js/dist/',
src: 'tippy.all.js',
src: [
'tippy.all.js',
'tippy.all.js.map'
],
dest: 'assets/tippy.js/'
}
]
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
## Table of contents

- [Status](#status)
- [CLI](#cli)
- [WordPress Filters](#wordpress-filters)

## Status
Expand All @@ -23,6 +24,14 @@
[![License](https://poser.pugx.org/wp-pay/core/license.svg)](https://packagist.org/packages/wp-pay/core)
[![Built with Grunt](http://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com/)

## CLI

### Check pending payment status

```
wp pay payment status $( wp post list --field=ID --post_type=pronamic_payment --post_status=payment_pending --order=ASC --orderby=date --posts_per_page=100 --paged=1 )
```

## WordPress Filters

### pronamic_payment_gateway_configuration_id
Expand Down Expand Up @@ -96,3 +105,5 @@
2
);
```

[![Pronamic - Work with us](https://github.com/pronamic/brand-resources/blob/main/banners/pronamic-work-with-us-leaderboard-728x90%404x.png)](https://www.pronamic.eu/contact/)
1 change: 1 addition & 0 deletions assets/tippy.js/tippy.all.js.map

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,34 @@
"ext-libxml": "*",
"ext-simplexml": "*",
"composer/installers": "^1.7",
"pronamic/wp-datetime": "^1.2",
"pronamic/wp-html": "^1.0",
"pronamic/wp-datetime": "^2.0",
"pronamic/wp-html": "^2.0",
"pronamic/wp-http": "^1.0",
"pronamic/wp-money": "^2.0",
"pronamic/wp-number": "^1.0",
"viison/address-splitter": "^0.3.4"
"pronamic/wp-number": "^1.1",
"roots/wordpress": "^5.2",
"viison/address-splitter": "^0.3.4",
"woocommerce/action-scheduler": "^3.4"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4",
"overtrue/phplint": "^2.2",
"php-coveralls/php-coveralls": "^2.4",
"php-stubs/wordpress-globals": "^0.2.0",
"php-stubs/wp-cli-stubs": "^2.4",
"phpmd/phpmd": "^2.9",
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0",
"phpunit/phpunit": "^5.7 || ^6.0",
"pronamic/wp-coding-standards": "^1.0",
"roots/wordpress": "^5.8",
"wp-cli/wp-cli": "^2.3",
"wp-phpunit/wp-phpunit": "^5.8"
"wp-phpunit/wp-phpunit": ">=5.2",
"yoast/phpunit-polyfills": "^1.0"
},
"scripts": {
"ci": [
"@phplint",
"@phpcs",
"@coverage"
"@coverage",
"@phpstan"
],
"coverage": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml --coverage-text",
"coverage-clover": "XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml",
Expand Down
22 changes: 16 additions & 6 deletions css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@
}
.pronamic-pay-chart-legend li {
border-right: 5px solid #aaa;
box-shadow: inset 0 -1px 0 0 #e5e5e5;
-webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5;
box-shadow: inset 0 -1px 0 0 #e5e5e5;
color: #aaa;
display: block;
margin: 0;
padding: 1em;
transition-duration: 0.5s;
-webkit-transition-duration: 0.5s;
transition-duration: 0.5s;
-webkit-transition-property: border, padding, -webkit-box-shadow;
transition-property: border, padding, -webkit-box-shadow;
transition-property: border, box-shadow, padding;
transition-property: border, box-shadow, padding, -webkit-box-shadow;
}
.pronamic-pay-chart-legend li.completed-count {
border-right-color: #dbe1e3;
Expand All @@ -53,7 +58,8 @@
}
.pronamic-pay-chart-legend li:hover {
border-right-color: #23282f;
box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
-webkit-box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
box-shadow: inset 0 -1px 0 0 #e5e5e5, inset 300px 0 0 #f9f9f9;
padding-left: 1.5em;
}
.pronamic-pay-chart-legend strong {
Expand All @@ -74,7 +80,8 @@
}
.pronamic-pay-status-list li {
border-top: 1px solid #eee;
box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #aaa;
float: left;
margin: 0;
Expand All @@ -87,6 +94,7 @@
font-size: 12px;
padding: 9px 12px;
position: relative;
-webkit-transition: color ease 0.5s;
transition: color ease 0.5s;
}
.pronamic-pay-status-list li a strong {
Expand Down Expand Up @@ -336,6 +344,10 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
.widefat .column-pronamic_payment_subscription {
width: 1em;
}
.widefat .column-pronamic_payment_method,
.widefat .column-pronamic_subscription_method {
width: 2.5em;
}

@media only screen and (max-width: 782px) {
.wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status, .wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription, .wp-list-table tr.type-pronamic_payment:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status, .wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_status, .wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_payment_subscription, .wp-list-table tr.type-pronamic_pay_subscr:not(.inline-edit-row):not(.no-items) td:not(.column-primary).column-pronamic_subscription_status {
Expand Down Expand Up @@ -465,5 +477,3 @@ body.post-type-pronamic_payment #post-body-content, body.post-type-pronamic_pay_
.pronamic-pay-cloack {
display: none;
}

/*# sourceMappingURL=admin.css.map */
2 changes: 1 addition & 1 deletion css/admin.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 484230d

Please sign in to comment.