Skip to content

Commit 6c63744

Browse files
author
Woo
committed
Updates to 1.9.2
1 parent ab76dbe commit 6c63744

File tree

700 files changed

+747
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

700 files changed

+747
-734
lines changed

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
*** Xero Integration ***
22

3+
2024-12-09 - version 1.9.2
4+
* Fix - Prevent deprecation notices by conditionally loading Navigation feature only for stores running WC <= 9.2.
5+
* Dev - Bump WooCommerce "tested up to" version 9.5.
6+
* Dev - Bump WooCommerce minimum supported version to 9.3.
7+
38
2024-11-04 - version 1.9.1
49
* Fix - Prevent fatal errors in the Xero connection process and enhance error handling.
510
* Dev - Bump WordPress "tested up to" version 6.7.

includes/class-wc-xr-settings.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public function setup_hooks() {
288288
add_action( 'admin_notices', array( $this, 'oauth20_migration_notice' ) );
289289
add_action( 'admin_notices', array( $this, 'show_auth_keys_changed_notice' ) );
290290

291-
// Register menu items in the new WooCommerce navigation.
291+
// Register menu items in the WooCommerce navigation. This feature was removed in WC 9.3.
292292
add_action( 'admin_menu', array( $this, 'register_navigation_items' ) );
293293

294294
// If secret or key were changed we don't want to internally disconnect.
@@ -423,6 +423,14 @@ public function enqueue_style() {
423423
* Register the navigation items in the WooCommerce navigation.
424424
*/
425425
public function register_navigation_items() {
426+
/*
427+
* WooCommerce 9.3 removed the Navigation feature making this code obsolete.
428+
* Registering menu items will only work on stores running WooCommerce 9.2 or older.
429+
*/
430+
if ( ! defined( 'WC_VERSION' ) || version_compare( WC_VERSION, '9.3', '>=' ) ) {
431+
return;
432+
}
433+
426434
if (
427435
! method_exists( Menu::class, 'add_setting_item' )
428436
) {

languages/woocommerce-xero.pot

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the same license as the WooCommerce Xero Integration package.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: WooCommerce Xero Integration 1.9.1\n"
5+
"Project-Id-Version: WooCommerce Xero Integration 1.9.2\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-xero\n"
7-
"POT-Creation-Date: 2024-11-04 13:26:36+00:00\n"
7+
"POT-Creation-Date: 2024-12-09 14:57:51+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -138,7 +138,7 @@ msgid "HTTPS for WordPress page"
138138
msgstr ""
139139

140140
#: includes/class-wc-xr-privacy.php:22 includes/class-wc-xr-settings.php:403
141-
#: includes/class-wc-xr-settings.php:404 includes/class-wc-xr-settings.php:435
141+
#: includes/class-wc-xr-settings.php:404 includes/class-wc-xr-settings.php:443
142142
msgid "Xero"
143143
msgstr ""
144144

@@ -417,64 +417,64 @@ msgstr ""
417417
msgid "Xero Settings"
418418
msgstr ""
419419

420-
#: includes/class-wc-xr-settings.php:457 includes/class-wc-xr-settings.php:458
421-
#: includes/class-wc-xr-settings.php:510
420+
#: includes/class-wc-xr-settings.php:465 includes/class-wc-xr-settings.php:466
421+
#: includes/class-wc-xr-settings.php:518
422422
msgid "Xero OAuth"
423423
msgstr ""
424424

425-
#: includes/class-wc-xr-settings.php:485
425+
#: includes/class-wc-xr-settings.php:493
426426
msgid "Something went wrong - token not received!"
427427
msgstr ""
428428

429-
#: includes/class-wc-xr-settings.php:488
429+
#: includes/class-wc-xr-settings.php:496
430430
msgid "Something went wrong - previous state is different. CSRF prevention."
431431
msgstr ""
432432

433-
#: includes/class-wc-xr-settings.php:521
433+
#: includes/class-wc-xr-settings.php:529
434434
msgid "Go back to Xero settings page."
435435
msgstr ""
436436

437-
#: includes/class-wc-xr-settings.php:534
437+
#: includes/class-wc-xr-settings.php:542
438438
msgid "Xero for WooCommerce"
439439
msgstr ""
440440

441-
#: includes/class-wc-xr-settings.php:538
441+
#: includes/class-wc-xr-settings.php:546
442442
msgid "Your settings have been saved."
443443
msgstr ""
444444

445-
#: includes/class-wc-xr-settings.php:551
445+
#: includes/class-wc-xr-settings.php:559
446446
msgid "Missing required fields"
447447
msgstr ""
448448

449-
#: includes/class-wc-xr-settings.php:557
449+
#: includes/class-wc-xr-settings.php:565
450450
msgid "There was an error saving your settings."
451451
msgstr ""
452452

453-
#: includes/class-wc-xr-settings.php:574
453+
#: includes/class-wc-xr-settings.php:582
454454
msgid ""
455455
"Settings for your Xero account including security keys and default account "
456456
"numbers."
457457
msgstr ""
458458

459-
#: includes/class-wc-xr-settings.php:577
459+
#: includes/class-wc-xr-settings.php:585
460460
#. translators: %1$s: opening anchor tag; %2$s: closing anchor tag
461461
msgid "Please ensure you're following all %1$srequirements%2$s prior to setup."
462462
msgstr ""
463463

464-
#: includes/class-wc-xr-settings.php:580
464+
#: includes/class-wc-xr-settings.php:588
465465
#. translators: %1$s: opening strong tag; %2$s: closing strong tag
466466
msgid "%1$sAll%2$s text fields are required for the integration to work properly."
467467
msgstr ""
468468

469-
#: includes/class-wc-xr-settings.php:618
469+
#: includes/class-wc-xr-settings.php:626
470470
msgid "Disconnect from Xero"
471471
msgstr ""
472472

473-
#: includes/class-wc-xr-settings.php:626
473+
#: includes/class-wc-xr-settings.php:634
474474
msgid "Sign in with Xero"
475475
msgstr ""
476476

477-
#: includes/class-wc-xr-settings.php:631
477+
#: includes/class-wc-xr-settings.php:639
478478
#. translators: %1$s: line break tag; %2$s: opening anchor tag; %3$s: closing
479479
#. anchor tag;
480480
msgid ""
@@ -483,75 +483,75 @@ msgid ""
483483
"%2$srequirements%3$s prior to setup."
484484
msgstr ""
485485

486-
#: includes/class-wc-xr-settings.php:667
486+
#: includes/class-wc-xr-settings.php:675
487487
msgid ""
488488
"Please use the following url as your redirect url when creating a Xero "
489489
"application:"
490490
msgstr ""
491491

492-
#: includes/class-wc-xr-settings.php:713
492+
#: includes/class-wc-xr-settings.php:721
493493
msgid "WooCommerce Xero authorization redirect page."
494494
msgstr ""
495495

496-
#: includes/class-wc-xr-settings.php:716
496+
#: includes/class-wc-xr-settings.php:724
497497
msgid "Connection status:"
498498
msgstr ""
499499

500-
#: includes/class-wc-xr-settings.php:720
500+
#: includes/class-wc-xr-settings.php:728
501501
msgid "[OK]"
502502
msgstr ""
503503

504-
#: includes/class-wc-xr-settings.php:726
504+
#: includes/class-wc-xr-settings.php:734
505505
#. translators: %s: company name.
506506
msgid "You are connected to %s organisation."
507507
msgstr ""
508508

509-
#: includes/class-wc-xr-settings.php:736 includes/class-wc-xr-settings.php:749
509+
#: includes/class-wc-xr-settings.php:744 includes/class-wc-xr-settings.php:757
510510
msgid "[ERROR]"
511511
msgstr ""
512512

513-
#: includes/class-wc-xr-settings.php:737
513+
#: includes/class-wc-xr-settings.php:745
514514
msgid "Cannot request the access token, please connect your application again!"
515515
msgstr ""
516516

517-
#: includes/class-wc-xr-settings.php:741 includes/class-wc-xr-settings.php:754
517+
#: includes/class-wc-xr-settings.php:749 includes/class-wc-xr-settings.php:762
518518
msgid ""
519519
"For more information check the documentation page: <a "
520520
"href=\"https://woocommerce.com/document/xero/#setup-and-configuration\""
521521
">WooCommerce and Xero setup</a>"
522522
msgstr ""
523523

524-
#: includes/class-wc-xr-settings.php:750
524+
#: includes/class-wc-xr-settings.php:758
525525
msgid ""
526526
"Authentication failed: It appears the client credentials are incorrect. "
527527
"Please verify them and try again."
528528
msgstr ""
529529

530-
#: includes/class-wc-xr-settings.php:763
530+
#: includes/class-wc-xr-settings.php:771
531531
msgid "Application not authorized with Xero! Please click Sign in with Xero button."
532532
msgstr ""
533533

534-
#: includes/class-wc-xr-settings.php:822
534+
#: includes/class-wc-xr-settings.php:830
535535
msgid "Xero authentication using keys is deprecated and no longer works."
536536
msgstr ""
537537

538-
#: includes/class-wc-xr-settings.php:823
538+
#: includes/class-wc-xr-settings.php:831
539539
msgid ""
540540
"Please use new flow and the button available in Xero settings to authorize "
541541
"your application."
542542
msgstr ""
543543

544-
#: includes/class-wc-xr-settings.php:825
544+
#: includes/class-wc-xr-settings.php:833
545545
msgid "Go to Xero settings page"
546546
msgstr ""
547547

548-
#: includes/class-wc-xr-settings.php:842
548+
#: includes/class-wc-xr-settings.php:850
549549
msgid ""
550550
"Unable to fetch the Branding Theme details. Please ensure your Xero "
551551
"connection is properly authenticated."
552552
msgstr ""
553553

554-
#: includes/class-wc-xr-settings.php:862
554+
#: includes/class-wc-xr-settings.php:870
555555
msgid ""
556556
"Xero account was disconnected because authentication keys were changed. "
557557
"Please connect again."

lib/packages/firebase/php-jwt/src/BeforeValidException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

lib/packages/firebase/php-jwt/src/CachedKeySet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

lib/packages/firebase/php-jwt/src/ExpiredException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

lib/packages/firebase/php-jwt/src/JWK.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

lib/packages/firebase/php-jwt/src/JWT.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

lib/packages/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88
namespace Automattic\WooCommerce\Xero\Vendor\Firebase\JWT;

lib/packages/firebase/php-jwt/src/Key.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* @license BSD-3-Clause
44
*
5-
* Modified by woocommerce on 04-November-2024 using Strauss.
5+
* Modified by woocommerce on 09-December-2024 using Strauss.
66
* @see https://github.com/BrianHenryIE/strauss
77
*/
88

0 commit comments

Comments
 (0)