Skip to content

Commit

Permalink
Merge branch 'trunk' into wizard_page
Browse files Browse the repository at this point in the history
  • Loading branch information
faisal-alvi authored May 27, 2024
2 parents c6f2559 + 0d8387e commit e847f42
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion apple-developer-merchantid-domain-association

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
*** WooCommerce Square Changelog ***

= 4.6.2 - 2024-05-23 =
* Dev - Bump WooCommerce "tested up to" version 8.9.
* Dev - Bump WooCommerce minimum supported version to 8.7.
* Fix - Update the Apple Pay domain verification file.

= 4.6.1 - 2024-04-10 =
* Fix - Problem with connection to Square warning.
* Update - Refreshed plugin marketing copy in readme file.
Expand Down
2 changes: 1 addition & 1 deletion includes/Emails/Gift_Card_Sent.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* An email sent to the recipient of the gift card.
*
* @class Gift_Card_Sent
* @version x.x.x
* @version 4.2.0
* @extends WC_Email
*/
class Gift_Card_Sent extends \WC_Email {
Expand Down
2 changes: 1 addition & 1 deletion includes/Framework/PaymentGateway/Payment_Gateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -4616,7 +4616,7 @@ public function get_partial_total_on_other_gateway() {
* @return float
*/
public function get_partial_total_on_credit_card() {
wc_deprecated_function( __METHOD__, 'x.x.x', __CLASS__ . '::get_partial_total_on_other_gateway()' );
wc_deprecated_function( __METHOD__, '4.6.0', __CLASS__ . '::get_partial_total_on_other_gateway()' );

return $this->get_partial_total_on_other_gateway();
}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "git://github.com/woocommerce/woocommerce-square.git"
},
"title": "WooCommerce Square",
"version": "4.6.1",
"version": "4.6.2",
"homepage": "https://woocommerce.com/products/woocommerce-square/",
"main": "Gruntfile.js",
"scripts": {
Expand Down
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: credit card, square, woocommerce, inventory sync
Requires at least: 6.3
Tested up to: 6.5
Requires PHP: 7.4
Stable tag: 4.6.1
Stable tag: 4.6.2
License: GPL-3.0-or-later
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -72,6 +72,11 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o

== Changelog ==

= 4.6.2 - 2024-05-23 =
* Dev - Bump WooCommerce "tested up to" version 8.9.
* Dev - Bump WooCommerce minimum supported version to 8.7.
* Fix - Update the Apple Pay domain verification file.

= 4.6.1 - 2024-04-10 =
* Fix - Problem with connection to Square warning.
* Update - Refreshed plugin marketing copy in readme file.
Expand Down
4 changes: 2 additions & 2 deletions woocommerce-square.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: WooCommerce Square
* Requires Plugins: woocommerce
* Version: 4.6.1
* Version: 4.6.2
* Plugin URI: https://woocommerce.com/products/square/
* Requires at least: 6.3
* Tested up to: 6.5
Expand All @@ -29,7 +29,7 @@
defined( 'ABSPATH' ) || exit;

if ( ! defined( 'WC_SQUARE_PLUGIN_VERSION' ) ) {
define( 'WC_SQUARE_PLUGIN_VERSION', '4.6.1' ); // WRCS: DEFINED_VERSION.
define( 'WC_SQUARE_PLUGIN_VERSION', '4.6.2' ); // WRCS: DEFINED_VERSION.
}

if ( ! defined( 'WC_SQUARE_PLUGIN_URL' ) ) {
Expand Down

0 comments on commit e847f42

Please sign in to comment.