Skip to content

Commit

Permalink
Fix error on thank you page for separate payment methods. Update vers…
Browse files Browse the repository at this point in the history
…ions for docker stuff.
  • Loading branch information
ndeet committed Jan 20, 2023
1 parent 41b6a99 commit 98eb772
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wp-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Composer dependencies
uses: php-actions/composer@v6
with:
Expand Down
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM wordpress:6.0
FROM wordpress:6.1-php8.2

ENV WOOCOMMERCE_VERSION 6.6.1
ENV WOOCOMMERCE_VERSION 7.3.0

# Fetch WooCommerce.
RUN apt-get update \
Expand All @@ -24,7 +24,9 @@ RUN curl -L "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cl
chmod +x /usr/bin/wp

RUN { \
echo 'file_uploads = On'; \
echo 'post_max_size=100M'; \
echo 'upload_max_filesize=100M'; \
echo 'file_uploads = On'; \
echo 'post_max_size=100M'; \
echo 'upload_max_filesize=100M'; \
echo 'display_errors=on'; \
echo 'display_errors=E_ALL'; \
} > /usr/local/etc/php/conf.d/custom.ini
12 changes: 6 additions & 6 deletions btcpay-greenfield-for-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
* Author URI: https://btcpayserver.org
* Text Domain: btcpay-greenfield-for-woocommerce
* Domain Path: /languages
* Version: 1.1.2
* Version: 1.1.3
* Requires PHP: 7.4
* Tested up to: 6.1
* Requires at least: 5.2
* WC requires at least: 5.0.0
* WC tested up to: 7.1
* WC requires at least: 6.0.0
* WC tested up to: 7.3
*/

use BTCPayServer\WC\Admin\Notice;
Expand All @@ -24,7 +24,7 @@

defined( 'ABSPATH' ) || exit();

define( 'BTCPAYSERVER_VERSION', '1.1.2' );
define( 'BTCPAYSERVER_VERSION', '1.1.3' );
define( 'BTCPAYSERVER_VERSION_KEY', 'btcpay_gf_version' );
define( 'BTCPAYSERVER_PLUGIN_FILE_PATH', plugin_dir_path( __FILE__ ) );
define( 'BTCPAYSERVER_PLUGIN_URL', plugin_dir_url(__FILE__ ) );
Expand All @@ -37,7 +37,7 @@ class BTCPayServerWCPlugin {
public function __construct() {
$this->includes();

add_action('woocommerce_thankyou_btcpaygf_default', [$this, 'orderStatusThankYouPage'], 10, 1);
add_action('woocommerce_thankyou_btcpaygf_default', ['BTCPayServerWCPlugin', 'orderStatusThankYouPage'], 10, 1);

// Run the updates.
\BTCPayServer\WC\Helper\UpdateManager::processUpdates();
Expand Down Expand Up @@ -201,7 +201,7 @@ public function processAjaxApiUrl() {
wp_send_json_error("Error processing Ajax request.");
}

public function orderStatusThankYouPage($order_id)
public static function orderStatusThankYouPage($order_id)
{
if (!$order = wc_get_order($order_id)) {
return;
Expand Down
4 changes: 4 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ You'll find extensive documentation and answers to many of your questions on [BT
6. Example of the PoS app you can launch.

== Changelog ==
= 1.1.3 :: 2023-01-20 =
* Fix: fixed error on thank you page for separate payment methods.
* Dev: updating Docker to latest WP and WC versions.
* Dev: switch Github action for checkout to v3.

= 1.1.2 :: 2022-12-09 =
* Fix existing invoice check, wrongly marking invoice invalid on some use cases.
Expand Down

0 comments on commit 98eb772

Please sign in to comment.