Merging Trunk into Develop branch #2850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update php-unit-tests.yml to install SVN (#2859) * Fix: get_global_unique_id function compatibility check (#2856) Summary: Fixed a bug that arose from our reliance on the plugin version compatibility tag for the public function get_global_unique_id. This function was actually introduced in WooCommerce version 9.2, but was incorrectly tagged as being available from version 9.1 onwards. To ensure correct functionality, we have replaced the use of Compatibility::is_wc_version_gte() with method_exists(), which checks for the availability of specific public methods rather than relying on version numbers Differential Revision: D68424348 * Update catalog link to navigate to correct tab in Commerce Manager (#2848) * Update catalog link to navigate to correct tab in Commerce Manager Co-authored-by: Marian Shymon <marian.shymon@gmail.com> --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> * Fixed product url links (#2852) * Fix - Removed the "Sell on Instagram" checkbox from UX and cleaned up the backend (#2854) * Removed the Sell on Instagram UX and cleane dup the backend. * Update php-unit-tests.yml to install SVN (#2859) --------- Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> * feat: Add custom fields to product data structure (#2836) * feat: Add custom fields to product data structure --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> * Fixed Category specific attributes related issues (#2860) * Start `release/3.3.2`. * updated the changelog and stable version * Updated the current version * Updated the WC supported version to 9.6 * Updated the stable version --------- Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Vahid Kaykhaei <vahidkay@meta.com> Co-authored-by: vahidkay-meta <117733236+vahidkay-meta@users.noreply.github.com>
vinkmeta
approved these changes
Jan 22, 2025
atuld123
pushed a commit
that referenced
this pull request
Feb 1, 2025
* Start `release/3.3.1`. * Updated the version number to 3.3.1 * Release 3.3.2 (#2861) * Update php-unit-tests.yml to install SVN (#2859) * Fix: get_global_unique_id function compatibility check (#2856) Summary: Fixed a bug that arose from our reliance on the plugin version compatibility tag for the public function get_global_unique_id. This function was actually introduced in WooCommerce version 9.2, but was incorrectly tagged as being available from version 9.1 onwards. To ensure correct functionality, we have replaced the use of Compatibility::is_wc_version_gte() with method_exists(), which checks for the availability of specific public methods rather than relying on version numbers Differential Revision: D68424348 * Update catalog link to navigate to correct tab in Commerce Manager (#2848) * Update catalog link to navigate to correct tab in Commerce Manager Co-authored-by: Marian Shymon <marian.shymon@gmail.com> --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> * Fixed product url links (#2852) * Fix - Removed the "Sell on Instagram" checkbox from UX and cleaned up the backend (#2854) * Removed the Sell on Instagram UX and cleane dup the backend. * Update php-unit-tests.yml to install SVN (#2859) --------- Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> * feat: Add custom fields to product data structure (#2836) * feat: Add custom fields to product data structure --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> * Fixed Category specific attributes related issues (#2860) * Start `release/3.3.2`. * updated the changelog and stable version * Updated the current version * Updated the WC supported version to 9.6 * Updated the stable version --------- Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Vahid Kaykhaei <vahidkay@meta.com> Co-authored-by: vahidkay-meta <117733236+vahidkay-meta@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com>
vahidkay-meta
added a commit
that referenced
this pull request
Feb 6, 2025
* Update php-unit-tests.yml to install SVN (#2859) * Fix: get_global_unique_id function compatibility check (#2856) Summary: Fixed a bug that arose from our reliance on the plugin version compatibility tag for the public function get_global_unique_id. This function was actually introduced in WooCommerce version 9.2, but was incorrectly tagged as being available from version 9.1 onwards. To ensure correct functionality, we have replaced the use of Compatibility::is_wc_version_gte() with method_exists(), which checks for the availability of specific public methods rather than relying on version numbers Differential Revision: D68424348 * Update catalog link to navigate to correct tab in Commerce Manager (#2848) * Update catalog link to navigate to correct tab in Commerce Manager Co-authored-by: Marian Shymon <marian.shymon@gmail.com> --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> * Fixed product url links (#2852) * Fix - Removed the "Sell on Instagram" checkbox from UX and cleaned up the backend (#2854) * Removed the Sell on Instagram UX and cleane dup the backend. * Update php-unit-tests.yml to install SVN (#2859) --------- Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> * feat: Add custom fields to product data structure (#2836) * feat: Add custom fields to product data structure --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> * Fixed Category specific attributes related issues (#2860) * Merging Trunk into Develop branch (#2850) * Start `release/3.3.1`. * Updated the version number to 3.3.1 * Release 3.3.2 (#2861) * Update php-unit-tests.yml to install SVN (#2859) * Fix: get_global_unique_id function compatibility check (#2856) Summary: Fixed a bug that arose from our reliance on the plugin version compatibility tag for the public function get_global_unique_id. This function was actually introduced in WooCommerce version 9.2, but was incorrectly tagged as being available from version 9.1 onwards. To ensure correct functionality, we have replaced the use of Compatibility::is_wc_version_gte() with method_exists(), which checks for the availability of specific public methods rather than relying on version numbers Differential Revision: D68424348 * Update catalog link to navigate to correct tab in Commerce Manager (#2848) * Update catalog link to navigate to correct tab in Commerce Manager Co-authored-by: Marian Shymon <marian.shymon@gmail.com> --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> * Fixed product url links (#2852) * Fix - Removed the "Sell on Instagram" checkbox from UX and cleaned up the backend (#2854) * Removed the Sell on Instagram UX and cleane dup the backend. * Update php-unit-tests.yml to install SVN (#2859) --------- Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> * feat: Add custom fields to product data structure (#2836) * feat: Add custom fields to product data structure --------- Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> * Fixed Category specific attributes related issues (#2860) * Start `release/3.3.2`. * updated the changelog and stable version * Updated the current version * Updated the WC supported version to 9.6 * Updated the stable version --------- Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Vahid Kaykhaei <vahidkay@meta.com> Co-authored-by: vahidkay-meta <117733236+vahidkay-meta@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com> * fbshipit-source-id: bbb876a59dc530f663c5972aee5f492130b356d5 * Fixed the formatting so it matches the internal repo * fbshipit-source-id: 01c48061456e * sync'ing the internal repo with GH main * Expose Brand & MPN to Woocommerce UI (#2842) Summary: Changes proposed in this Pull Request: This PR introduces a new feature to the Facebook WooCommerce Plugin, allowing users to add a brand field to their products. With this update, we can seamlessly synchronize the brand field with the Facebook Commerce Manager platform. <img width="679" alt="Screenshot 2025-01-10 at 18 57 18" src="https://github.com/user-attachments/assets/9d941a1f-48cb-4106-9672-1620aa926be6" /> <img width="527" alt="Screenshot 2024-10-30 at 18 08 36" src="https://github.com/user-attachments/assets/d0cf9ae0-293b-4685-a033-643dc6214a1f"> Pull Request resolved: #2842 Reviewed By: vinkmeta Differential Revision: D68720240 Pulled By: devbodaghe fbshipit-source-id: 0112d2063d9d9358c9f08efde51b6bf5d04b2d59 * FBE: Use of recommended delete connection endpoint over delete permission endpoint (#2844) Summary: ### Changes proposed in this Pull Request: **Problem:** 1. The Delete Permission User API only removed Meta connection assets from the WooCommerce database, leaving asset-related data enabled on Meta surfaces. 2. If a user disconnected the connection before uninstalling assets from Meta surfaces using Managed Connection; the UI for Managed Connection was also removed, making it difficult for users to uninstall this feature from Meta surface. **Solution:** 1. Replaced the Delete Permission User API with the recommended Delete FBE Connection endpoint, which uninstalls assets from Meta surfaces and removes their permissions. 2. Removed the Managed Connection UI button for uninstalling FBE from Meta surfaces, as the Delete Connection endpoint now handles this functionality. ### Screenshots: **Before:** <img width="784" alt="image" src="https://github.com/user-attachments/assets/76bf6364-2af8-4657-a043-8e79aaff99c6"> **After:** <img width="803" alt="image" src="https://github.com/user-attachments/assets/45e7ebc8-4a74-4589-a9e3-0e4fff1f4f20">  <img width="797" alt="image" src="https://github.com/user-attachments/assets/f4d215b0-0959-4ee8-8347-16c64afe3460"> ### Detailed test instructions: 1. Run new tests: `./vendor/bin/phpunit --filter test_delete_mbe_connection_deletes_user_permission_request` 2. Run all tests : `npm run test:php` 3. Lint: `./vendor/bin/phpcs` 4. Manual testing: I have tested new Disconnect UI flow; it uninstall FBE connection from WooCommerce as well as from Meta surface ### Changelog entry - **Removed:** Delete Permission User API - **Added:** Delete FBE Connection endpoint to uninstall assets from Meta surfaces and remove permissions - **Removed:** Managed Connection UI button for uninstalling FBE from Meta surfaces (now handled by Delete Connection endpoint) Pull Request resolved: #2844 Reviewed By: halilozanakgul Differential Revision: D68972713 Pulled By: atuld123 fbshipit-source-id: b19ee8351b4852c69192449f9af2644960a55307 * Start `release/3.3.3`. * Updated the plugin version to 3.3.3 * Updated the stable tag to 3.3.3 --------- Co-authored-by: Halil Ozan Akgül <hozanakgul@gmail.com> Co-authored-by: vinkmeta <vink@meta.com> Co-authored-by: David <david.evbodaghe@gmail.com> Co-authored-by: David Evbodaghe <davidevbodaghe@meta.com> Co-authored-by: Marian Shymon <marian.shymon@gmail.com> Co-authored-by: Marian Shymon <mshymon@fb.com> Co-authored-by: vahidkay-meta <117733236+vahidkay-meta@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Facebook Community Bot <facebook-github-bot@users.noreply.github.com> Co-authored-by: Vahid Kaykhaei <vahidkay@meta.com> Co-authored-by: Atul Dusane <atuldusane@fb.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.