From 9ff312247734da8d9e3db54d6f267f9ba396ac2a Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Wed, 3 Mar 2021 12:25:24 -0400 Subject: [PATCH 01/20] add group api test to run all api tests --- tests/e2e/core-tests/specs/api/grouped-product.test.js | 2 +- tests/e2e/core-tests/specs/index.js | 1 + .../rest-api/{grouped-product.test.js => grouped-product.js} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename tests/e2e/specs/rest-api/{grouped-product.test.js => grouped-product.js} (100%) diff --git a/tests/e2e/core-tests/specs/api/grouped-product.test.js b/tests/e2e/core-tests/specs/api/grouped-product.test.js index 11dea1ba7a8..369f2d65feb 100644 --- a/tests/e2e/core-tests/specs/api/grouped-product.test.js +++ b/tests/e2e/core-tests/specs/api/grouped-product.test.js @@ -71,7 +71,7 @@ const runGroupedProductAPITest = () => { expect( response.data ).toEqual( expect.objectContaining( rawProperties ) ); }); - it('can retrieve a transformed external product', async () => { + it('can retrieve a transformed grouped product', async () => { // Read product via the repository. const transformed = await repository.read( product.id ); expect( transformed ).toEqual( expect.objectContaining( baseGroupedProduct ) ); diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js index c35be68e428..e2ab39da8f5 100644 --- a/tests/e2e/core-tests/specs/index.js +++ b/tests/e2e/core-tests/specs/index.js @@ -74,6 +74,7 @@ const runMerchantTests = () => { const runApiTests = () => { runExternalProductAPITest(); + runGroupedProductAPITest(); runVariableProductAPITest(); runCouponApiTest(); } diff --git a/tests/e2e/specs/rest-api/grouped-product.test.js b/tests/e2e/specs/rest-api/grouped-product.js similarity index 100% rename from tests/e2e/specs/rest-api/grouped-product.test.js rename to tests/e2e/specs/rest-api/grouped-product.js From afac2aefab4c3c84c49994a9ace465f32e37ff86 Mon Sep 17 00:00:00 2001 From: zhongruige Date: Wed, 3 Mar 2021 09:45:16 -0700 Subject: [PATCH 02/20] Added etests around merchant email flows --- tests/e2e/core-tests/specs/index.js | 3 + .../merchant/wp-admin-order-emails.test.js | 73 +++++++++++++++++++ tests/e2e/docker/initialize.sh | 3 + tests/e2e/specs/wp-admin/test-order-emails.js | 6 ++ tests/e2e/utils/src/components.js | 38 +++++++++- tests/e2e/utils/src/flows/merchant.js | 6 ++ tests/e2e/utils/src/page-utils.js | 16 ++++ 7 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js create mode 100644 tests/e2e/specs/wp-admin/test-order-emails.js diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js index 19d00828394..e793947a483 100644 --- a/tests/e2e/core-tests/specs/index.js +++ b/tests/e2e/core-tests/specs/index.js @@ -31,6 +31,7 @@ const runOrderApplyCouponTest = require( './merchant/wp-admin-order-apply-coupon const runProductEditDetailsTest = require( './merchant/wp-admin-product-edit-details.test' ); const runProductSearchTest = require( './merchant/wp-admin-product-search.test' ); const runMerchantOrdersCustomerPaymentPage = require( './merchant/wp-admin-order-customer-payment-page.test' ); +const runMerchantOrderEmailsTest = require( './merchant/wp-admin-order-emails.test' ); // REST API tests const runExternalProductAPITest = require( './api/external-product.test' ); @@ -69,6 +70,7 @@ const runMerchantTests = () => { runProductEditDetailsTest(); runProductSearchTest(); runMerchantOrdersCustomerPaymentPage(); + runMerchantOrderEmailsTest(); } const runApiTests = () => { @@ -107,6 +109,7 @@ module.exports = { runProductEditDetailsTest, runProductSearchTest, runMerchantOrdersCustomerPaymentPage, + runMerchantOrderEmailsTest, runMerchantTests, runApiTests, }; diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js new file mode 100644 index 00000000000..d2d29076808 --- /dev/null +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js @@ -0,0 +1,73 @@ +/* eslint-disable jest/no-export, jest/no-disabled-tests, jest/no-standalone-expect */ +/** + * Internal dependencies + */ +const { + merchant, + updateOrder, + createSimpleOrder, + selectOrderAction, + deleteAllEmailLogs, +} = require( '@woocommerce/e2e-utils' ); + +const config = require( 'config' ); +const simpleProductName = config.get( 'products.simple.name' ); +const customerEmail = config.get( 'addresses.customer.billing.email' ); +const adminEmail = 'admin@woocommercecoree2etestsuite.com'; +const storeName = 'WooCommerce Core E2E Test Suite'; + +let orderId; + +const runMerchantOrderEmailsTest = () => { + + describe('Merchant > Order Action emails received', () => { + beforeAll( async () => { + await merchant.login(); + + // Clear out the existing email logs if any + await deleteAllEmailLogs(); + + orderId = await createSimpleOrder( 'Processing' ); + + await Promise.all( [ + // Select the billing email address field and add the customer billing email from the config + await page.click( 'div.order_data_column:nth-child(2) > h3:nth-child(1) > a:nth-child(1)' ), + await expect( page ).toFill( '#_billing_email', customerEmail ), + await updateOrder( 'Order updated.' ), + ] ); + } ); + + afterEach( async () => { + // Clear out any emails after each test + await deleteAllEmailLogs(); + } ); + + // New order emails are sent automatically when we create the simple order above, so let's verify we get these emails + it('can receive new order email', async () => { + await merchant.openEmailLog(); + await expect( page ).toMatchElement( '.column-receiver', { text: adminEmail } ); + await expect( page ).toMatchElement( '.column-subject', { text: `[${storeName}]: New order #${orderId}` } ); + } ); + + it('can resend new order notification', async () => { + await merchant.goToOrder( orderId ); + await selectOrderAction( 'send_order_details_admin' ); + + await merchant.openEmailLog(); + await expect( page ).toMatchElement( '.column-receiver', { text: adminEmail } ); + await expect( page ).toMatchElement( '.column-subject', { text: `[${storeName}]: New order #${orderId}` } ); + } ); + + it('can email invoice/order details to customer', async () => { + await merchant.goToOrder( orderId ); + await selectOrderAction( 'send_order_details' ); + + await merchant.openEmailLog(); + await expect( page ).toMatchElement( '.column-receiver', { text: customerEmail } ); + await expect( page ).toMatchElement( '.column-subject', { text: `Invoice for order #${orderId} on ${storeName}` } ); + } ); + + } ); +} + +module.exports = runMerchantOrderEmailsTest; diff --git a/tests/e2e/docker/initialize.sh b/tests/e2e/docker/initialize.sh index c5cbea47181..0a9592f5379 100755 --- a/tests/e2e/docker/initialize.sh +++ b/tests/e2e/docker/initialize.sh @@ -8,3 +8,6 @@ wp user create customer customer@woocommercecoree2etestsuite.com --user_pass=pas # we cannot create API keys for the API, so we using basic auth, this plugin allows that. wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate + +# install the WP Mail Logging plugin to test emails +wp plugin install wp-mail-logging --activate diff --git a/tests/e2e/specs/wp-admin/test-order-emails.js b/tests/e2e/specs/wp-admin/test-order-emails.js new file mode 100644 index 00000000000..e0597074bda --- /dev/null +++ b/tests/e2e/specs/wp-admin/test-order-emails.js @@ -0,0 +1,6 @@ +/* + * Internal dependencies + */ +const { runMerchantOrderEmailsTest } = require( '@woocommerce/e2e-core-tests' ); + +runMerchantOrderEmailsTest(); diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js index 04a7b4a3e02..dbc96765ac1 100644 --- a/tests/e2e/utils/src/components.js +++ b/tests/e2e/utils/src/components.js @@ -6,7 +6,7 @@ * Internal dependencies */ import { merchant } from './flows'; -import { clickTab, uiUnblocked, verifyCheckboxIsUnset, evalAndClick, selectOptionInSelect2 } from './page-utils'; +import { clickTab, uiUnblocked, verifyCheckboxIsUnset, evalAndClick, selectOptionInSelect2, setCheckbox } from './page-utils'; import factories from './factories'; const config = require( 'config' ); @@ -435,6 +435,40 @@ const createCoupon = async ( couponAmount = '5', discountType = 'Fixed cart disc return couponCode; }; +/** + * Update an order. + * + * @param noticeText The text that appears in the notice after updating the order. + */ +const updateOrder = async ( noticeText ) => { + // Wait for auto save + await page.waitFor( 2000 ); + + // PUpdate order + await expect( page ).toClick( 'button.save_order' ); + await page.waitForSelector( '.updated.notice' ); + + // Verify + await expect( page ).toMatchElement( '.updated.notice', { text: noticeText } ); +}; + +/** + * Delete all email logs in the WP Mail Logging plugin page. + */ +const deleteAllEmailLogs = async () => { + await merchant.openEmailLog(); + + // Make sure we have emails to delete. If we don't, this selector will return null. + if ( await page.$( '#bulk-action-selector-top' ) !== null ) { + await setCheckbox( '#cb-select-all-1' ); + await expect( page ).toSelect( '#bulk-action-selector-top', 'Delete' ); + await Promise.all( [ + page.click( '#doaction' ), + page.waitForNavigation( { waitUntil: 'networkidle0' } ), + ] ); + } +}; + export { completeOnboardingWizard, createSimpleProduct, @@ -444,4 +478,6 @@ export { verifyAndPublish, addProductToOrder, createCoupon, + updateOrder, + deleteAllEmailLogs, }; diff --git a/tests/e2e/utils/src/flows/merchant.js b/tests/e2e/utils/src/flows/merchant.js index df4fae99d68..242a42c171d 100644 --- a/tests/e2e/utils/src/flows/merchant.js +++ b/tests/e2e/utils/src/flows/merchant.js @@ -169,6 +169,12 @@ const merchant = { await expect( page ).toMatchElement( 'label[for="customer_user"] a[href*=user-edit]', { text: 'Profile' } ); } }, + + openEmailLog: async () => { + await page.goto( `${baseUrl}wp-admin/tools.php?page=wpml_plugin_log`, { + waitUntil: 'networkidle0', + } ); + } }; module.exports = merchant; diff --git a/tests/e2e/utils/src/page-utils.js b/tests/e2e/utils/src/page-utils.js index 7679c15f2b7..c96ab2f6010 100644 --- a/tests/e2e/utils/src/page-utils.js +++ b/tests/e2e/utils/src/page-utils.js @@ -209,6 +209,21 @@ const selectOptionInSelect2 = async ( value, selector = 'input.select2-search__f await page.keyboard.press('Enter'); }; +/** + * + * Select and perform an order action in the `Order actions` postbox. + * + * @param {string} action The action to take on the order. + */ +const selectOrderAction = async ( action ) => { + await page.select( 'select[name=wc_order_action]', action ); + await Promise.all( [ + page.click( '.wc-reload' ), + page.waitForNavigation( { waitUntil: 'networkidle0' } ), + ] ); +} + + export { clearAndFillInput, clickTab, @@ -225,4 +240,5 @@ export { moveAllItemsToTrash, evalAndClick, selectOptionInSelect2, + selectOrderAction, }; From 4610d5cf162734662e2244f018e00cbadcb4bf8d Mon Sep 17 00:00:00 2001 From: zhongruige Date: Wed, 3 Mar 2021 09:57:11 -0700 Subject: [PATCH 03/20] Updated READMEs and CHANGELOGs --- tests/e2e/core-tests/CHANGELOG.md | 1 + tests/e2e/core-tests/README.md | 1 + tests/e2e/env/CHANGELOG.md | 1 + tests/e2e/utils/CHANGELOG.md | 4 ++++ tests/e2e/utils/README.md | 4 +++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/e2e/core-tests/CHANGELOG.md b/tests/e2e/core-tests/CHANGELOG.md index 9923b9a3111..348fb4c4371 100644 --- a/tests/e2e/core-tests/CHANGELOG.md +++ b/tests/e2e/core-tests/CHANGELOG.md @@ -16,6 +16,7 @@ - Merchant Orders Customer Checkout Page - Shopper Cart Apply Coupon - Shopper Variable product info updates on different variations +- Merchant order emails flow ## Fixed diff --git a/tests/e2e/core-tests/README.md b/tests/e2e/core-tests/README.md index cb16278e222..d744426dbca 100644 --- a/tests/e2e/core-tests/README.md +++ b/tests/e2e/core-tests/README.md @@ -58,6 +58,7 @@ The functions to access the core tests are: - `runProductEditDetailsTest` - Merchant can edit an existing product - `runProductSearchTest` - Merchant can search for a product and view it - `runMerchantOrdersCustomerPaymentPage` - Merchant can visit the customer payment page + - `runMerchantOrderEmailsTest` - Merchant can receive order emails and resend emails by Order Actions ### Shopper diff --git a/tests/e2e/env/CHANGELOG.md b/tests/e2e/env/CHANGELOG.md index 94be2bfd1f8..8e6272ba44b 100644 --- a/tests/e2e/env/CHANGELOG.md +++ b/tests/e2e/env/CHANGELOG.md @@ -11,6 +11,7 @@ - support for custom container name - Insert a 12 hour delay in using new docker image tags - Package `bin` script `wc-e2e` +- WP Mail Log plugin as part of container initialization ## Fixed diff --git a/tests/e2e/utils/CHANGELOG.md b/tests/e2e/utils/CHANGELOG.md index 3bb027f92f7..2457b00d649 100644 --- a/tests/e2e/utils/CHANGELOG.md +++ b/tests/e2e/utils/CHANGELOG.md @@ -17,6 +17,10 @@ - `createCoupon( couponAmount )` component which accepts a coupon amount string (it defaults to 5) and creates a basic coupon. Returns the generated coupon code. - `evalAndClick( selector )` use Puppeteer page.$eval to select and click and element. - `selectOptionInSelect2( selector, value )` util helper method that search and select in any select2 type field +- `selectOrderAction( action )` util helper method to selcct and initiate an order action in the Order Action postbox +- `merchant.openEmailLog()` go to the WP Mail Log page +- `deleteAllEmailLogs` delete all email logs in the WP Mail Log plugin +- `updateOrder()` util helper that clicks the `Update` button on an order ## Changes diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md index 12f814aa992..540e2f8591d 100644 --- a/tests/e2e/utils/README.md +++ b/tests/e2e/utils/README.md @@ -54,6 +54,7 @@ describe( 'Cart page', () => { | `openSettings` | | Go to WooCommerce -> Settings | | `runSetupWizard` | | Open the onboarding profiler | | `updateOrderStatus` | `orderId, status` | Update the status of an order | +| `openEmailLog` | | Open the WP Mail Log page | ### Shopper `shopper` @@ -101,7 +102,8 @@ describe( 'Cart page', () => { | `clickFilter` | `selector` | Click on a list page filter | | `moveAllItemsToTrash` | | Moves all items in a list view to the Trash | | `verifyAndPublish` | `noticeText` | Verify that an item can be published | -| `selectOptionInSelect2` | `selector, value` | helper method that searchs for select2 type fields and select plus insert value inside +| `selectOptionInSelect2` | `selector, value` | helper method that searches for select2 type fields and select plus insert value inside | +| `selectOrderAction` | `action` | Helper method to select an order action in the `Order Actions` postbox | ### Test Utilities From d6b2a6caddc662f88e7410510b42e8cc5c272044 Mon Sep 17 00:00:00 2001 From: zhongruige Date: Wed, 3 Mar 2021 10:01:31 -0700 Subject: [PATCH 04/20] Fix minor type in changelog --- tests/e2e/utils/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/utils/CHANGELOG.md b/tests/e2e/utils/CHANGELOG.md index 2457b00d649..77ce1b1a3f7 100644 --- a/tests/e2e/utils/CHANGELOG.md +++ b/tests/e2e/utils/CHANGELOG.md @@ -17,7 +17,7 @@ - `createCoupon( couponAmount )` component which accepts a coupon amount string (it defaults to 5) and creates a basic coupon. Returns the generated coupon code. - `evalAndClick( selector )` use Puppeteer page.$eval to select and click and element. - `selectOptionInSelect2( selector, value )` util helper method that search and select in any select2 type field -- `selectOrderAction( action )` util helper method to selcct and initiate an order action in the Order Action postbox +- `selectOrderAction( action )` util helper method to select and initiate an order action in the Order Action postbox - `merchant.openEmailLog()` go to the WP Mail Log page - `deleteAllEmailLogs` delete all email logs in the WP Mail Log plugin - `updateOrder()` util helper that clicks the `Update` button on an order From c960edb786f577ad8b0e66308d24fce14f54c8f5 Mon Sep 17 00:00:00 2001 From: zhongruige Date: Wed, 3 Mar 2021 10:49:06 -0700 Subject: [PATCH 05/20] Code review feedback --- .../core-tests/specs/merchant/wp-admin-order-emails.test.js | 4 ++-- tests/e2e/utils/CHANGELOG.md | 2 +- tests/e2e/utils/README.md | 1 + tests/e2e/utils/src/components.js | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js index d2d29076808..ad18a8de6d1 100644 --- a/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js +++ b/tests/e2e/core-tests/specs/merchant/wp-admin-order-emails.test.js @@ -4,7 +4,7 @@ */ const { merchant, - updateOrder, + clickUpdateOrder, createSimpleOrder, selectOrderAction, deleteAllEmailLogs, @@ -33,7 +33,7 @@ const runMerchantOrderEmailsTest = () => { // Select the billing email address field and add the customer billing email from the config await page.click( 'div.order_data_column:nth-child(2) > h3:nth-child(1) > a:nth-child(1)' ), await expect( page ).toFill( '#_billing_email', customerEmail ), - await updateOrder( 'Order updated.' ), + await clickUpdateOrder( 'Order updated.' ), ] ); } ); diff --git a/tests/e2e/utils/CHANGELOG.md b/tests/e2e/utils/CHANGELOG.md index 77ce1b1a3f7..70d1b5e95c4 100644 --- a/tests/e2e/utils/CHANGELOG.md +++ b/tests/e2e/utils/CHANGELOG.md @@ -20,7 +20,7 @@ - `selectOrderAction( action )` util helper method to select and initiate an order action in the Order Action postbox - `merchant.openEmailLog()` go to the WP Mail Log page - `deleteAllEmailLogs` delete all email logs in the WP Mail Log plugin -- `updateOrder()` util helper that clicks the `Update` button on an order +- `clickUpdateOrder()` util helper that clicks the `Update` button on an order ## Changes diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md index 540e2f8591d..ec21657a7e8 100644 --- a/tests/e2e/utils/README.md +++ b/tests/e2e/utils/README.md @@ -104,6 +104,7 @@ describe( 'Cart page', () => { | `verifyAndPublish` | `noticeText` | Verify that an item can be published | | `selectOptionInSelect2` | `selector, value` | helper method that searches for select2 type fields and select plus insert value inside | | `selectOrderAction` | `action` | Helper method to select an order action in the `Order Actions` postbox | +| `clickUpdateOrder` | | Helper method to click the Update button on the order details page ### Test Utilities diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js index dbc96765ac1..57dff726b28 100644 --- a/tests/e2e/utils/src/components.js +++ b/tests/e2e/utils/src/components.js @@ -436,11 +436,11 @@ const createCoupon = async ( couponAmount = '5', discountType = 'Fixed cart disc }; /** - * Update an order. + * Click the Update button on the order details page. * * @param noticeText The text that appears in the notice after updating the order. */ -const updateOrder = async ( noticeText ) => { +const clickUpdateOrder = async ( noticeText ) => { // Wait for auto save await page.waitFor( 2000 ); @@ -478,6 +478,6 @@ export { verifyAndPublish, addProductToOrder, createCoupon, - updateOrder, + clickUpdateOrder, deleteAllEmailLogs, }; From be47060e86e7a403582e4d4022c389519e8d018f Mon Sep 17 00:00:00 2001 From: zhongruige Date: Wed, 3 Mar 2021 10:52:50 -0700 Subject: [PATCH 06/20] Add flag for clicking to update an order --- tests/e2e/utils/CHANGELOG.md | 2 +- tests/e2e/utils/README.md | 2 +- tests/e2e/utils/src/components.js | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/e2e/utils/CHANGELOG.md b/tests/e2e/utils/CHANGELOG.md index 70d1b5e95c4..09af6a5f851 100644 --- a/tests/e2e/utils/CHANGELOG.md +++ b/tests/e2e/utils/CHANGELOG.md @@ -20,7 +20,7 @@ - `selectOrderAction( action )` util helper method to select and initiate an order action in the Order Action postbox - `merchant.openEmailLog()` go to the WP Mail Log page - `deleteAllEmailLogs` delete all email logs in the WP Mail Log plugin -- `clickUpdateOrder()` util helper that clicks the `Update` button on an order +- `clickUpdateOrder( noticeText, waitForSave )` util helper that clicks the `Update` button on an order ## Changes diff --git a/tests/e2e/utils/README.md b/tests/e2e/utils/README.md index ec21657a7e8..7871a416ea8 100644 --- a/tests/e2e/utils/README.md +++ b/tests/e2e/utils/README.md @@ -104,7 +104,7 @@ describe( 'Cart page', () => { | `verifyAndPublish` | `noticeText` | Verify that an item can be published | | `selectOptionInSelect2` | `selector, value` | helper method that searches for select2 type fields and select plus insert value inside | | `selectOrderAction` | `action` | Helper method to select an order action in the `Order Actions` postbox | -| `clickUpdateOrder` | | Helper method to click the Update button on the order details page +| `clickUpdateOrder` | `noticeText`, `waitForSave` | Helper method to click the Update button on the order details page ### Test Utilities diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js index 57dff726b28..8076ad0bd70 100644 --- a/tests/e2e/utils/src/components.js +++ b/tests/e2e/utils/src/components.js @@ -439,10 +439,12 @@ const createCoupon = async ( couponAmount = '5', discountType = 'Fixed cart disc * Click the Update button on the order details page. * * @param noticeText The text that appears in the notice after updating the order. + * @param waitForSave Optionally wait for auto save. */ -const clickUpdateOrder = async ( noticeText ) => { - // Wait for auto save - await page.waitFor( 2000 ); +const clickUpdateOrder = async ( noticeText, waitForSave = false ) => { + if ( waitForSave ) { + await page.waitFor( 2000 ); + } // PUpdate order await expect( page ).toClick( 'button.save_order' ); From cb0b92750ba4a292ec8afa530c7033e9179d1a37 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Mar 2021 09:06:03 -0800 Subject: [PATCH 07/20] Extract recount terms logic into own function closes #25375 --- .../settings/class-wc-settings-products.php | 6 +++++ ...rest-system-status-tools-v2-controller.php | 17 +------------ includes/wc-term-functions.php | 25 +++++++++++++++++++ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/includes/admin/settings/class-wc-settings-products.php b/includes/admin/settings/class-wc-settings-products.php index 8346e63c3ec..5bf11bde2dd 100644 --- a/includes/admin/settings/class-wc-settings-products.php +++ b/includes/admin/settings/class-wc-settings-products.php @@ -64,6 +64,12 @@ class WC_Settings_Products extends WC_Settings_Page { $settings = $this->get_settings( $current_section ); WC_Admin_Settings::save_fields( $settings ); + /* + * Product->Inventory has a setting `Out of stock visibility`. + * Because of this, we need to recount the terms to keep them in-sync. + */ + wc_recount_all_terms(); + if ( $current_section ) { do_action( 'woocommerce_update_options_' . $this->id . '_' . $current_section ); } diff --git a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php index 06838eb5469..19f212da2b6 100644 --- a/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php +++ b/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php @@ -504,22 +504,7 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller { break; case 'recount_terms': - $product_cats = get_terms( - 'product_cat', - array( - 'hide_empty' => false, - 'fields' => 'id=>parent', - ) - ); - _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), true, false ); - $product_tags = get_terms( - 'product_tag', - array( - 'hide_empty' => false, - 'fields' => 'id=>parent', - ) - ); - _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), true, false ); + wc_recount_all_terms(); $message = __( 'Terms successfully recounted', 'woocommerce' ); break; diff --git a/includes/wc-term-functions.php b/includes/wc-term-functions.php index f40a89fb6b8..50e9c6f821d 100644 --- a/includes/wc-term-functions.php +++ b/includes/wc-term-functions.php @@ -636,3 +636,28 @@ function wc_get_product_visibility_term_ids() { ) ); } + +/** + * Recounts all terms. + * + * @since 5.2 + * @return void + */ +function wc_recount_all_terms() { + $product_cats = get_terms( + 'product_cat', + array( + 'hide_empty' => false, + 'fields' => 'id=>parent', + ) + ); + _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), true, false ); + $product_tags = get_terms( + 'product_tag', + array( + 'hide_empty' => false, + 'fields' => 'id=>parent', + ) + ); + _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), true, false ); +} From 6fac4ab6d5e64ccad7879c2116ce35ad89d41e4f Mon Sep 17 00:00:00 2001 From: zhongruige Date: Thu, 4 Mar 2021 11:43:15 -0700 Subject: [PATCH 08/20] Added delete step to product tests --- tests/e2e/core-tests/specs/api/coupon.test.js | 4 ++-- tests/e2e/core-tests/specs/api/external-product.test.js | 5 +++++ tests/e2e/core-tests/specs/api/grouped-product.test.js | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/e2e/core-tests/specs/api/coupon.test.js b/tests/e2e/core-tests/specs/api/coupon.test.js index ec5200afa2b..6ba22bb4d3e 100644 --- a/tests/e2e/core-tests/specs/api/coupon.test.js +++ b/tests/e2e/core-tests/specs/api/coupon.test.js @@ -74,10 +74,10 @@ const runCouponApiTest = () => { it('can delete a coupon', async () => { // Delete the coupon - const deletedCoupon = await repository.delete( coupon.id ); + const status = await repository.delete( coupon.id ); // If the delete is successful, the response comes back truthy - expect( deletedCoupon ).toBeTruthy(); + expect( status ).toBeTruthy(); }); }); }; diff --git a/tests/e2e/core-tests/specs/api/external-product.test.js b/tests/e2e/core-tests/specs/api/external-product.test.js index 674cbdbae25..463f248b726 100644 --- a/tests/e2e/core-tests/specs/api/external-product.test.js +++ b/tests/e2e/core-tests/specs/api/external-product.test.js @@ -69,6 +69,11 @@ const runExternalProductAPITest = () => { const transformed = await repository.read( product.id ); expect( transformed ).toEqual( expect.objectContaining( transformedProperties ) ); }); + + it('can delete an external product', async () => { + const status = repository.delete( product.id ); + expect( status ).toBeTruthy(); + }); }); }; diff --git a/tests/e2e/core-tests/specs/api/grouped-product.test.js b/tests/e2e/core-tests/specs/api/grouped-product.test.js index 11dea1ba7a8..d1f12567305 100644 --- a/tests/e2e/core-tests/specs/api/grouped-product.test.js +++ b/tests/e2e/core-tests/specs/api/grouped-product.test.js @@ -71,11 +71,16 @@ const runGroupedProductAPITest = () => { expect( response.data ).toEqual( expect.objectContaining( rawProperties ) ); }); - it('can retrieve a transformed external product', async () => { + it('can retrieve a transformed grouped product', async () => { // Read product via the repository. const transformed = await repository.read( product.id ); expect( transformed ).toEqual( expect.objectContaining( baseGroupedProduct ) ); }); + + it('can delete a grouped product', async () => { + const status = repository.delete( product.id ); + expect( status ).toBeTruthy(); + }); }); }; From 5bf3e8ed9868762cd84c6cd990352dc1666bbc6c Mon Sep 17 00:00:00 2001 From: zhongruige Date: Thu, 4 Mar 2021 14:17:43 -0700 Subject: [PATCH 09/20] Code review feedback --- tests/e2e/core-tests/specs/index.js | 1 - .../wp-admin/{test-order-emails.js => order-emails.test.js} | 0 2 files changed, 1 deletion(-) rename tests/e2e/specs/wp-admin/{test-order-emails.js => order-emails.test.js} (100%) diff --git a/tests/e2e/core-tests/specs/index.js b/tests/e2e/core-tests/specs/index.js index dc9db031d4c..2a59fed2696 100644 --- a/tests/e2e/core-tests/specs/index.js +++ b/tests/e2e/core-tests/specs/index.js @@ -73,7 +73,6 @@ const runMerchantTests = () => { runProductEditDetailsTest(); runProductSearchTest(); runMerchantOrdersCustomerPaymentPage(); - runMerchantOrderEmailsTest(); } const runApiTests = () => { diff --git a/tests/e2e/specs/wp-admin/test-order-emails.js b/tests/e2e/specs/wp-admin/order-emails.test.js similarity index 100% rename from tests/e2e/specs/wp-admin/test-order-emails.js rename to tests/e2e/specs/wp-admin/order-emails.test.js From 71d8f760b09b6786e6da2d908baa00662d9d5f8b Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 4 Mar 2021 13:54:09 -0800 Subject: [PATCH 10/20] Apply recount term per product with filter to product data store --- .../class-wc-product-data-store-cpt.php | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/includes/data-stores/class-wc-product-data-store-cpt.php b/includes/data-stores/class-wc-product-data-store-cpt.php index ed626f9a9b3..782e6b31037 100644 --- a/includes/data-stores/class-wc-product-data-store-cpt.php +++ b/includes/data-stores/class-wc-product-data-store-cpt.php @@ -710,6 +710,41 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da if ( $force || array_key_exists( 'shipping_class_id', $changes ) ) { wp_set_post_terms( $product->get_id(), array( $product->get_shipping_class_id( 'edit' ) ), 'product_shipping_class', false ); } + + /** + * Filter to allow/prevent recounting of terms as it could be expensive. + * A likely scenario for this is when bulk importing products. We could + * then prevent it from recounting per product but instead recount it once + * when import is done. Of course this means the import logic has to support this. + * + * @since 5.2 + * @param bool + */ + if ( apply_filters( 'woocommerce_product_update_recount_terms', '__return_true' ) ) { + $product_terms = get_the_terms( $product->get_id(), 'product_cat' ); + + if ( $product_terms ) { + $product_cats = array(); + + foreach ( $product_terms as $term ) { + $product_cats[ $term->term_id ] = $term->parent; + } + + _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), false, false ); + } + + $product_terms = get_the_terms( $product->get_id(), 'product_tag' ); + + if ( $product_terms ) { + $product_tags = array(); + + foreach ( $product_terms as $term ) { + $product_tags[ $term->term_id ] = $term->parent; + } + + _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), false, false ); + } + } } /** From 24167a5eedb3719f5c25a06018a725292fc50b96 Mon Sep 17 00:00:00 2001 From: Saggre Date: Fri, 5 Mar 2021 11:19:58 +0200 Subject: [PATCH 11/20] Fix typos in docs --- includes/abstracts/abstract-wc-payment-token.php | 2 +- includes/class-wc-order.php | 4 ++-- tests/legacy/unit-tests/checkout/checkout.php | 2 +- .../unit-tests/widgets/class-dummy-widget.php | 2 +- tests/php/includes/wc-stock-functions-tests.php | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/abstracts/abstract-wc-payment-token.php b/includes/abstracts/abstract-wc-payment-token.php index ad958991981..6fc6f634d29 100644 --- a/includes/abstracts/abstract-wc-payment-token.php +++ b/includes/abstracts/abstract-wc-payment-token.php @@ -2,7 +2,7 @@ /** * Abstract payment tokens * - * Generic payment tokens functionality which can be extended by idividual types of payment tokens. + * Generic payment tokens functionality which can be extended by individual types of payment tokens. * * @class WC_Payment_Token * @package WooCommerce\Abstracts diff --git a/includes/class-wc-order.php b/includes/class-wc-order.php index f33c5db1b36..516f905b10b 100644 --- a/includes/class-wc-order.php +++ b/includes/class-wc-order.php @@ -907,7 +907,7 @@ class WC_Order extends WC_Abstract_Order { $address = WC()->countries->get_formatted_address( $raw_address ); /** - * Filter orders formatterd billing address. + * Filter orders formatted billing address. * * @since 3.8.0 * @param string $address Formatted billing address string. @@ -933,7 +933,7 @@ class WC_Order extends WC_Abstract_Order { } /** - * Filter orders formatterd shipping address. + * Filter orders formatted shipping address. * * @since 3.8.0 * @param string $address Formatted billing address string. diff --git a/tests/legacy/unit-tests/checkout/checkout.php b/tests/legacy/unit-tests/checkout/checkout.php index 73586cab609..953351a9350 100644 --- a/tests/legacy/unit-tests/checkout/checkout.php +++ b/tests/legacy/unit-tests/checkout/checkout.php @@ -141,7 +141,7 @@ class WC_Tests_Checkout extends WC_Unit_Test_Case { } /** - * Test usage limit for guest users uasge limit per user is set. + * Test usage limit for guest users usage limit per user is set. * * @throws Exception When unable to create order. */ diff --git a/tests/legacy/unit-tests/widgets/class-dummy-widget.php b/tests/legacy/unit-tests/widgets/class-dummy-widget.php index f8aa56223d6..67ea55bfccb 100644 --- a/tests/legacy/unit-tests/widgets/class-dummy-widget.php +++ b/tests/legacy/unit-tests/widgets/class-dummy-widget.php @@ -18,7 +18,7 @@ class Dummy_Widget extends WC_Widget { * Output widget. * * @param mixed $args Arguments. - * @param WP_Widget $instance Intance of WP_Widget. + * @param WP_Widget $instance Instance of WP_Widget. * @return void */ public function widget( $args, $instance ) { diff --git a/tests/php/includes/wc-stock-functions-tests.php b/tests/php/includes/wc-stock-functions-tests.php index 56d2d0eeb13..d815eeee5d8 100644 --- a/tests/php/includes/wc-stock-functions-tests.php +++ b/tests/php/includes/wc-stock-functions-tests.php @@ -85,7 +85,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which reduces stock to another status which also reduces stock. + * Test inventory count after order status transitions which reduces stock to another status which also reduces stock. * Stock should have reduced once already, and should not reduce again. */ public function test_status_transition_stock_reduce_to_stock_reduce() { @@ -97,7 +97,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which reduces stock to another status which restores stock. + * Test inventory count after order status transitions which reduces stock to another status which restores stock. * Should should have already reduced once, and will increase again after transitioning. */ public function test_status_transition_stock_reduce_to_stock_restore() { @@ -109,7 +109,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which reduces stock to another status which don't affect inventory. + * Test inventory count after order status transitions which reduces stock to another status which don't affect inventory. * Stock should have already reduced, and will not change on transitioning. */ public function test_status_transition_stock_reduce_to_stock_no_effect() { @@ -133,7 +133,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which restores stock to another status which also restores stock. + * Test inventory count after order status transitions which restores stock to another status which also restores stock. * Stock should not have reduced, and will remain the same even after transition (i.e. should not be restocked again). */ public function test_status_transition_stock_restore_to_stock_restore() { @@ -145,7 +145,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which restores stock to another status which don't affect inventory. + * Test inventory count after order status transitions which restores stock to another status which don't affect inventory. * Stock should not have reduced, and will remain the same even after transition. */ public function test_status_transition_stock_restore_to_stock_no_effect() { @@ -157,7 +157,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which don't affect inventory stock to another status which reduces stock. + * Test inventory count after order status transitions which don't affect inventory stock to another status which reduces stock. * Stock would not have been affected, but will reduce after transition. */ public function test_status_transition_stock_no_effect_to_stock_reduce() { @@ -169,7 +169,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which don't affect inventory stock to another status which restores stock. + * Test inventory count after order status transitions which don't affect inventory stock to another status which restores stock. * Stock would not have been affected, and will not be restored after transition (since it was not reduced to begin with). */ public function test_status_transition_stock_no_effect_to_stock_restore() { @@ -181,7 +181,7 @@ class WC_Stock_Functions_Tests extends \WC_Unit_Test_Case { } /** - * Test inventory count after order status transtions which don't affect inventory stock to another status which also don't affect inventory. + * Test inventory count after order status transitions which don't affect inventory stock to another status which also don't affect inventory. * Stock levels will not change before or after the transition. */ public function test_status_transition_stock_no_effect_to_stock_no_effect() { From e472c99a5c6e213a91c79961769995999f626315 Mon Sep 17 00:00:00 2001 From: Jonathan Sadowski Date: Mon, 8 Mar 2021 11:38:41 -0600 Subject: [PATCH 12/20] Fix E2E shorthand script to allow for directories with spaces --- tests/e2e/env/bin/wc-e2e.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/env/bin/wc-e2e.sh b/tests/e2e/env/bin/wc-e2e.sh index 0f5eee0d23e..d5fee2dc478 100755 --- a/tests/e2e/env/bin/wc-e2e.sh +++ b/tests/e2e/env/bin/wc-e2e.sh @@ -30,8 +30,8 @@ TESTRESULT=0 # Use the script symlink to find and change directory to the root of the package SCRIPTPATH=$(dirname "$0") -REALPATH=$(readlink $0) -cd $SCRIPTPATH/$(dirname "$REALPATH")/.. +REALPATH=$(readlink "$0") +cd "$SCRIPTPATH/$(dirname "$REALPATH")/.." # Run scripts case $1 in @@ -65,6 +65,6 @@ case $1 in esac # Restore working path -cd $OLDPATH +cd "$OLDPATH" exit $TESTRESULT From 4a5c6b86b3b94f868b0b20ea03f8a6a6ea139881 Mon Sep 17 00:00:00 2001 From: Jonathan Sadowski Date: Mon, 8 Mar 2021 14:06:14 -0600 Subject: [PATCH 13/20] Update e2e/env CHANGELOG for wc-e2e space fix --- tests/e2e/env/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/e2e/env/CHANGELOG.md b/tests/e2e/env/CHANGELOG.md index 8e6272ba44b..0207623e55b 100644 --- a/tests/e2e/env/CHANGELOG.md +++ b/tests/e2e/env/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +## Fixed + +- Update `wc-e2e` script to fix an issue with directories with a space in their name + # 0.2.0 ## Fixed From c42e2db28070e1eb2340a299c3895860da7b0834 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Mon, 8 Mar 2021 22:39:30 -0400 Subject: [PATCH 14/20] use api to create products for search test --- tests/e2e/utils/src/components.js | 38 +++++++++---------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/tests/e2e/utils/src/components.js b/tests/e2e/utils/src/components.js index 1776478cecf..25b67f7605b 100644 --- a/tests/e2e/utils/src/components.js +++ b/tests/e2e/utils/src/components.js @@ -192,34 +192,18 @@ const createSimpleProduct = async () => { * @param categoryName Product's category which can be changed when writing a test */ const createSimpleProductWithCategory = async ( productName, productPrice, categoryName ) => { - // Go to "add product" page - await merchant.openNewProduct(); + const product = await factories.products.simple.create( { + name: productName, + regularPrice: productPrice, + categories: [ + { + name: categoryName, + } + ], + isVirtual: true, + } ); - // Add title and regular price - await expect(page).toFill('#title', productName); - await expect(page).toClick('#_virtual'); - await clickTab('General'); - await expect(page).toFill('#_regular_price', productPrice); - - // Try to select the existing category if present already, otherwise add a new and select it - try { - const [checkbox] = await page.$x('//label[contains(text(), "'+categoryName+'")]'); - await checkbox.click(); - } catch (error) { - await expect(page).toClick('#product_cat-add-toggle'); - await expect(page).toFill('#newproduct_cat', categoryName); - await expect(page).toClick('#product_cat-add-submit'); - } - - // Publish the product - await expect(page).toClick('#publish'); - await uiUnblocked(); - await page.waitForSelector('.updated.notice', {text:'Product published.'}); - - // Get the product ID - const variablePostId = await page.$('#post_ID'); - let variablePostIdValue = (await(await variablePostId.getProperty('value')).jsonValue()); - return variablePostIdValue; + return product.id; }; /** From add5d73df2b49272ce6550ba2506ad023cef3cde Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Tue, 9 Mar 2021 08:49:52 -0400 Subject: [PATCH 15/20] update browse,search,sort test to be more reliable --- ...ront-end-product-browse-search-sort.test.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/e2e/core-tests/specs/shopper/front-end-product-browse-search-sort.test.js b/tests/e2e/core-tests/specs/shopper/front-end-product-browse-search-sort.test.js index c852cf1996e..1b0535bd76d 100644 --- a/tests/e2e/core-tests/specs/shopper/front-end-product-browse-search-sort.test.js +++ b/tests/e2e/core-tests/specs/shopper/front-end-product-browse-search-sort.test.js @@ -21,8 +21,8 @@ const { const config = require( 'config' ); const simpleProductName = config.get( 'products.simple.name' ); const singleProductPrice = config.has('products.simple.price') ? config.get('products.simple.price') : '9.99'; -const singleProductPrice2 = config.has('products.simple.price') ? config.get('products.simple.price') : '19.99'; -const singleProductPrice3 = config.has('products.simple.price') ? config.get('products.simple.price') : '29.99'; +const singleProductPrice2 = config.has('products.simple.price') ? '1' + singleProductPrice : '19.99'; +const singleProductPrice3 = config.has('products.simple.price') ? '2' + singleProductPrice : '29.99'; const clothing = 'Clothing'; const audio = 'Audio'; const hardware = 'Hardware'; @@ -31,34 +31,32 @@ const productTitle = 'li.first > a > h2.woocommerce-loop-product__title'; const runProductBrowseSearchSortTest = () => { describe('Search, browse by categories and sort items in the shop', () => { beforeAll(async () => { - await merchant.login(); - // Create 1st product with Clothing category + // Create 1st product with Clothing category await createSimpleProductWithCategory(simpleProductName + ' 1', singleProductPrice, clothing); - // Create 2nd product with Audio category + // Create 2nd product with Audio category await createSimpleProductWithCategory(simpleProductName + ' 2', singleProductPrice2, audio); - // Create 3rd product with Hardware category + // Create 3rd product with Hardware category await createSimpleProductWithCategory(simpleProductName + ' 3', singleProductPrice3, hardware); - await merchant.logout(); }); it('should let user search the store', async () => { await shopper.goToShop(); await shopper.searchForProduct(simpleProductName + ' 1'); + page.waitForNavigation({waitUntil: 'networkidle0'}); }); it('should let user browse products by categories', async () => { // Browse through Clothing category link await Promise.all([ - page.waitForNavigation({waitUntil: 'networkidle0'}), page.click('span.posted_in > a', {text: clothing}), + page.waitForNavigation({waitUntil: 'networkidle0'}), ]); - await uiUnblocked(); // Verify Clothing category page await page.waitForSelector(productTitle); await expect(page).toMatchElement(productTitle, {text: simpleProductName + ' 1'}); await expect(page).toClick(productTitle, {text: simpleProductName + ' 1'}); - await uiUnblocked(); + page.waitForNavigation({waitUntil: 'networkidle0'}); await page.waitForSelector('h1.entry-title'); await expect(page).toMatchElement('h1.entry-title', simpleProductName + ' 1'); }); From cf634987b41a0673863b9787a5809ad6fb0b8b50 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 9 Mar 2021 06:11:41 -0800 Subject: [PATCH 16/20] Prepare default branch --- changelog.txt | 107 +++++++++++++++++++++++++++++++++ includes/class-woocommerce.php | 2 +- readme.txt | 2 +- 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index a0491ef9f77..edcc1e00bbd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,112 @@ == Changelog == += 5.1.0 2021-03-09 = + +**WooCommerce** + +* Update - WooCommerce Admin package 2.0.2. #29111 +* Update - WooCommerce Blocks package 4.4.3. #29016 +* Fix - Error in notice message of reports when WC Admin is disabled via a filter. #29095 +* Fix - Error when calculating orders with tax option rounding at subtotal level in PHP 8. #29089 +* Fix - price filtering not working properly with variable products whose variations have different prices. #29043 +* Fix - Removed extra closing brace from the Zone regions help text. #29036 +* Fix - Tax name/label is not being updated in the order when it is changed. #28983 +* Fix - Additional protection after wc_get_product to account for invalid ID. #28962 +* Fix - orders list from returning false values if orders are missing. #28927 +* Fix - Terms and Policy checkbox wording settings not shown in customizer. #28735 +* Fix - Admin notices sometimes were persisting even after dismissing. #28500 +* Fix - Calculate discount based on order location in the admin view. #26983 +* Fix - SASS variables not being compile correctly due to recent SASS version. #29120 +* Fix - Placeholder image height in cart. #29139 +* Dev - Updated admin bar icons to use SVG and Dashicons instead of custom font. #29094 +* Dev - Admin menu modification has been moved from admin_head hooks to admin_menu hooks. #29088 +* Dev - status report generation time to the Status Report. #28980 +* Dev - Add the 'woocommerce_exporter_product_types' filter to allow third-parties to filter the product types which can be imported and exported. #28950 +* Dev - Filter added to allow 'woocommerce_hold_stock_minutes' to be customized. #28933 +* Dev - Add optional semicolon to JS code for better compatibility. #28880 +* Dev - Added Guatemala states. #28755 +* Dev - jQuery 3 deprecated functions update. #28753 +* Dev - Add Woo Version as global prop in track events. #28627 +* Dev - Added orders count by payment method to Tracker data and replaced direct DB calls with CRUD. #28584 +* Dev - WC_Tax::get_tax_rate_classes() is now public. #27671 +* Dev - "Store management insights" option now is turned off by default. #29105 +* Tweak - Updated WooCommerce logo color. #29054 +* Tweak - Correctly aligns content in the checkout with Twenty Twenty-One. #28951 +* Tweak - Use assigned variable for $post_thumbnail_id instead of calling function more than once. #28919 +* Tweak - Ensure that all tracker values collected for orders are of string type. #28893 +* Tweak - Adjust CSS font size and spacing for Twenty Twenty One. #28827 + +**WooCommerce Admin - 2.0.0 & 2.0.1 & 2.0.2** + +* Tweak - Bump minimum supported version of PHP to 7.0. #6046 +* Tweak - update the content and timing of the NeedSomeInspiration note. #6076 +* Tweak - Adjust the Marketing note not to show until store is at least 5 days. #6083 +* Tweak - Refactored extended task list. #6081 +* Fix - Add support for a floating-point number as a SummaryNumber's delta. #5926 +* Fix - allow for more terms to be shown for product attributes in the Analytics orders report. #5868 +* Fix - Fixed the Add First Product email note checks. #6260 +* Fix - Onboarding - Fixed "Business Details" error. #6271 +* Fix - Show management links when only main task list is hidden. #6291 +* Fix - Correct the Klarna slug. #6440 +* Add - new inbox message - Getting started in Ecommerce - watch this webinar. #6086 +* Add - Remote inbox notifications contains comparison and fix product rule. #6073 +* Add - Task list payments - include Mollie as an option. #6257 +* Update - store deprecation welcome modal support doc link #6094 +* Update - Homescreen layout, moving Inbox panel for better interaction. #6122 +* Enhancement - Allowing users to create products by selecting a template. #5892 +* Enhancement - Use the new Paypal payments plugin for onboarding. #6261 +* Dev - Add wait script for mysql to be ready for phpunit tests in docker. #6185 +* Dev - Remove old debug code for connecting to Calypso / Wordpress.com. #6097 +* Dev - Allow highlight tooltip to use body tag as parent. #6309 + +**WooCommerce Blocks - 4.1.0 & 4.2.0 & 4.3.0 & 4.4.0 & 4.4.1 & 4.4.2 & 4.4.3** + +* Update - Jetpack Autoloader to 2.9.1. +* Update - Update package for WooCommerce core inclusion. +* Enhancements - Design tweaks to the cart page which move the quantity picker below each cart item and improve usability on mobile. ([3734](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3734)) +* Enhancements - Store API - Fix selected rate in cart shipping rates response. ([3680](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3680)) +* Enhancements - Create get_item_responses_from_schema abstraction. ([3679](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3679)) +* Enhancements - Show itemized fee rows in the cart/checkout blocks. ([3678](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3678)) +* Enhancements - Extensibility: Show item data in Cart and Checkout blocks and update the variation data styles. ([3665](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3665)) +* Enhancements - Introduce SlotFill for Sidebar. ([3361](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3361)) +* Enhancements - Add the ability to directly upload an image in Featured Category and Featured Product blocks. ([3579](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3579)) +* Enhancements - Fix coupon code button height not adapting to the font size. ([3575](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3575)) +* Enhancements - Fixed Coupon Code panel not expanding/contracting in some themes. ([3569](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3569)) +* Enhancements - Fix: Added fallback styling for screen reader text. ([3557](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3557)) +* Fix - Ensure empty categories are correctly hidden in the product categories block. ([3765](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3765)) +* Fix - Added missing wrapper div within FeaturedCategory and FeatureProduct blocks. ([3746](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3746)) +* Fix - Set correct text color in BlockErrorBoundry notices. ([3738](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3738)) +* Fix - Hidden cart item meta data will not be rendered in the Cart and Checkout blocks. ([3732](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3732)) +* Fix - Improved accessibility of product image links in the products block by using correct aria tags and hiding empty image placeholders. ([3722](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3722)) +* Fix - Add missing aria-label for stars image in the review-list-item component. ([3706](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3706)) +* Fix - Prevent "X-WC-Store-API-Nonce is invalid" error when going back to a page with the products block using the browser back button. ([3770](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3770)) +* Fix - Adds a default "features" array for payment methods which do not define supported features. Fixes conflicts with 3rd Party payment method integrations. +* Fix - Fix an error that was blocking checkout with some user saved payment methods. ([3627](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3627)) +* Fix - Fix nonce issues when adding product to cart from All Products. ([3598](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3598)) +* Fix - Fix bug inside Product Search in the editor. ([3578](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3578)) +* Fix - Fix console warnings in WordPress 5.6. ([3577](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3577)) +* Fix - Fixed text visibility in select inputs when using Twenty Twenty-One theme's dark mode. ([3554](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3554)) +* Fix - Fix product list images skewed in Widgets editor. ([3553](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3553)) +* Add address validation to values posted to the Checkout via StoreApi. ([3552](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3552)) +* Fix - Fix Fees not visible in Cart & Checkout blocks when order doesn't need shipping. ([3521](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3521)) +* Fix - Fix All Products block edit screen. ([3547](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3547)) +* Fix - Checkout block: Prevent `Create an account` from creating up a user account if the order fails coupon validation. ([3423](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3423)) +* Fix - Make sure cart is initialized before the CartItems route is used in the Store API. ([3488](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3488)) +* Fix - Fix notice close button color in Twenty Twenty One dark mode. ([3472](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3472)) +* Fix - Remove held stock for a draft order if an item is removed from the cart. ([3468](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3468)) +* Fix - Ensure correct alignment of checkout notice's dismiss button. ([3455](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3455)) +* Fix - Fixed a bug in Checkout block (Store API) causing checkout to fail when using an invalid coupon and creating an account. +* Fix - Checkout block: Correctly handle cases where the order fails with an error (e.g. invalid coupon) and a new user account is created. ([3429](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3429)) +* Update - Hide the All Products Block from the new Gutenberg Widget Areas until full support is achieved. ([3737](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3737)) +* Update - Legacy `star-rating` class name has been removed from Product rating block (inside All Products block). That element is still selectable with the `.wc-block-components-product-rating` class name. ([3717](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3717)) +* Update - Update input colors and alignment. ([3597](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3597)) +* Update - Removed compatibility with packages in WordPress 5.3. ([3541](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3541)) +* Update - Bumped the minimum WP required version to 5.4. ([3537](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3537)) +* Dev - Change register_endpoint_data to use an array of params instead of individual params. ([3478](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3478)) +* Dev - Expose store/cart via ExtendRestApi to extensions. ([3445](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3445)) +* Dev - Added formatting classes to the Store API for extensions to consume. +* Dev - Refactored and reordered Store API checkout processing to handle various edge cases and better support future extensibility. ([3454](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/3454)) + = 5.0.0 - 2021-02-09 = **WooCommerce** diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php index 85a7c5bad71..715c05883cb 100644 --- a/includes/class-woocommerce.php +++ b/includes/class-woocommerce.php @@ -23,7 +23,7 @@ final class WooCommerce { * * @var string */ - public $version = '5.1.0'; + public $version = '5.2.0'; /** * WooCommerce Schema version. diff --git a/readme.txt b/readme.txt index eab39a7fb1f..52f2d26062f 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: e-commerce, store, sales, sell, woo, shop, cart, checkout, downloadable, d Requires at least: 5.4 Tested up to: 5.6 Requires PHP: 7.0 -Stable tag: 5.0.0 +Stable tag: 5.1.0 License: GPLv3 License URI: https://www.gnu.org/licenses/gpl-3.0.html From 954f19817f6a060abfd8a0e1a5256b4c0ae3df5f Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 9 Mar 2021 06:45:14 -0800 Subject: [PATCH 17/20] Update WP tested up to --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 52f2d26062f..e29b492dfc0 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, mikejolley, jameskoster, claudiosanches, rodrigosprimo, peterfabian1000, vedjain, jamosova, obliviousharmony, konamiman, sadowski, wpmuguru, royho Tags: e-commerce, store, sales, sell, woo, shop, cart, checkout, downloadable, downloads, payments, paypal, storefront, stripe, woo commerce Requires at least: 5.4 -Tested up to: 5.6 +Tested up to: 5.7 Requires PHP: 7.0 Stable tag: 5.1.0 License: GPLv3 From 1f32c1f8401ec97e697e97bcbcc54b451bcc52a9 Mon Sep 17 00:00:00 2001 From: roykho Date: Tue, 9 Mar 2021 10:04:15 -0800 Subject: [PATCH 18/20] Update changelog --- changelog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index edcc1e00bbd..0c69319d959 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,7 +4,7 @@ **WooCommerce** -* Update - WooCommerce Admin package 2.0.2. #29111 +* Update - WooCommerce Admin package 2.0.2. #29229 * Update - WooCommerce Blocks package 4.4.3. #29016 * Fix - Error in notice message of reports when WC Admin is disabled via a filter. #29095 * Fix - Error when calculating orders with tax option rounding at subtotal level in PHP 8. #29089 @@ -30,6 +30,7 @@ * Dev - Added orders count by payment method to Tracker data and replaced direct DB calls with CRUD. #28584 * Dev - WC_Tax::get_tax_rate_classes() is now public. #27671 * Dev - "Store management insights" option now is turned off by default. #29105 +* Dev - Update the woo widget stock links to the new analytics page. #29093 * Tweak - Updated WooCommerce logo color. #29054 * Tweak - Correctly aligns content in the checkout with Twenty Twenty-One. #28951 * Tweak - Use assigned variable for $post_thumbnail_id instead of calling function more than once. #28919 From 98764aa0d181134592f332595a697bd6760920d7 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Wed, 10 Mar 2021 08:10:06 -0800 Subject: [PATCH 19/20] Update woocommerce-admin to 2.0.3 --- bin/composer/mozart/composer.lock | 89 ++++++++++++++---------------- bin/composer/phpcs/composer.lock | 19 +++---- bin/composer/phpunit/composer.lock | 88 ----------------------------- bin/composer/wp/composer.lock | 28 ++++------ composer.json | 2 +- composer.lock | 55 +++--------------- 6 files changed, 65 insertions(+), 216 deletions(-) diff --git a/bin/composer/mozart/composer.lock b/bin/composer/mozart/composer.lock index 1a3ce3075fe..1a6fcb7090b 100644 --- a/bin/composer/mozart/composer.lock +++ b/bin/composer/mozart/composer.lock @@ -206,27 +206,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -239,7 +234,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -251,24 +246,20 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" - }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "symfony/console", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a" + "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a", - "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a", + "url": "https://api.github.com/repos/symfony/console/zipball/d6d0cc30d8c0fda4e7b213c20509b0159a8f4556", + "reference": "d6d0cc30d8c0fda4e7b213c20509b0159a8f4556", "shasum": "" }, "require": { @@ -349,20 +340,20 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-02-23T10:08:49+00:00" }, { "name": "symfony/finder", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4adc8d172d602008c204c2e16956f99257248e03" + "reference": "0d639a0943822626290d169965804f79400e6a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03", - "reference": "4adc8d172d602008c204c2e16956f99257248e03", + "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04", + "reference": "0d639a0943822626290d169965804f79400e6a04", "shasum": "" }, "require": { @@ -407,11 +398,11 @@ "type": "tidelift" } ], - "time": "2021-01-28T22:06:19+00:00" + "time": "2021-02-15T18:55:04+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -487,16 +478,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "267a9adeb8ecb8071040a740930e077cdfb987af" + "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/267a9adeb8ecb8071040a740930e077cdfb987af", - "reference": "267a9adeb8ecb8071040a740930e077cdfb987af", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", + "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", "shasum": "" }, "require": { @@ -561,20 +552,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "6e971c891537eb617a00bb07a43d182a6915faba" + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba", - "reference": "6e971c891537eb617a00bb07a43d182a6915faba", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", "shasum": "" }, "require": { @@ -642,20 +633,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T17:09:11+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", "shasum": "" }, "require": { @@ -719,11 +710,11 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -799,7 +790,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -955,16 +946,16 @@ }, { "name": "symfony/string", - "version": "v5.2.3", + "version": "v5.2.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "c95468897f408dd0aca2ff582074423dd0455122" + "reference": "4e78d7d47061fa183639927ec40d607973699609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122", - "reference": "c95468897f408dd0aca2ff582074423dd0455122", + "url": "https://api.github.com/repos/symfony/string/zipball/4e78d7d47061fa183639927ec40d607973699609", + "reference": "4e78d7d47061fa183639927ec40d607973699609", "shasum": "" }, "require": { @@ -1031,7 +1022,7 @@ "type": "tidelift" } ], - "time": "2021-01-25T15:14:59+00:00" + "time": "2021-02-16T10:20:28+00:00" } ], "aliases": [], diff --git a/bin/composer/phpcs/composer.lock b/bin/composer/phpcs/composer.lock index 5a70d30ff7e..10aedae9334 100644 --- a/bin/composer/phpcs/composer.lock +++ b/bin/composer/phpcs/composer.lock @@ -133,28 +133,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "b862bc32f7e860d0b164b199bd995e690b4b191c" + "reference": "ddabec839cc003651f2ce695c938686d1086cf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/b862bc32f7e860d0b164b199bd995e690b4b191c", - "reference": "b862bc32f7e860d0b164b199bd995e690b4b191c", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/ddabec839cc003651f2ce695c938686d1086cf43", + "reference": "ddabec839cc003651f2ce695c938686d1086cf43", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -181,7 +181,7 @@ "polyfill", "standards" ], - "time": "2019-11-04T15:17:54+00:00" + "time": "2021-02-15T10:24:51+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", @@ -282,11 +282,6 @@ "phpcs", "standards" ], - "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" - }, "time": "2020-10-23T02:01:07+00:00" }, { diff --git a/bin/composer/phpunit/composer.lock b/bin/composer/phpunit/composer.lock index d1c92edd290..efc67dcf121 100644 --- a/bin/composer/phpunit/composer.lock +++ b/bin/composer/phpunit/composer.lock @@ -59,10 +59,6 @@ "constructor", "instantiate" ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/master" - }, "time": "2015-06-14T21:17:01+00:00" }, { @@ -108,10 +104,6 @@ "object", "object graph" ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.x" - }, "time": "2017-10-19T19:58:43+00:00" }, { @@ -167,10 +159,6 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" - }, "time": "2017-03-05T18:14:27+00:00" }, { @@ -218,10 +206,6 @@ } ], "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/master" - }, "time": "2017-03-05T17:38:23+00:00" }, { @@ -276,10 +260,6 @@ "reflection", "static analysis" ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/master" - }, "time": "2017-09-11T18:02:19+00:00" }, { @@ -377,10 +357,6 @@ "email": "me@mikevanriel.com" } ], - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/master" - }, "time": "2017-12-30T13:23:38+00:00" }, { @@ -507,10 +483,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/5.3" - }, "time": "2018-04-06T15:36:58+00:00" }, { @@ -558,11 +530,6 @@ "filesystem", "iterator" ], - "support": { - "irc": "irc://irc.freenode.net/phpunit", - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5" - }, "time": "2017-11-27T13:52:08+00:00" }, { @@ -653,10 +620,6 @@ "keywords": [ "timer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/master" - }, "time": "2017-02-26T11:10:40+00:00" }, { @@ -706,10 +669,6 @@ "keywords": [ "tokenizer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" - }, "abandoned": true, "time": "2017-11-27T05:48:46+00:00" }, @@ -795,10 +754,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/6.5.14" - }, "time": "2019-02-01T05:22:47+00:00" }, { @@ -858,10 +813,6 @@ "mock", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues", - "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/5.0.10" - }, "abandoned": true, "time": "2018-08-09T05:50:03+00:00" }, @@ -908,10 +859,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -982,10 +929,6 @@ "compare", "equality" ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/master" - }, "time": "2018-02-01T13:46:46+00:00" }, { @@ -1038,10 +981,6 @@ "keywords": [ "diff" ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/master" - }, "time": "2017-08-03T08:09:46+00:00" }, { @@ -1092,10 +1031,6 @@ "environment", "hhvm" ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/master" - }, "time": "2017-07-01T08:51:00+00:00" }, { @@ -1163,10 +1098,6 @@ "export", "exporter" ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1271,10 +1202,6 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1326,10 +1253,6 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1389,10 +1312,6 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" - }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -1441,10 +1360,6 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/master" - }, "time": "2015-07-28T20:34:47+00:00" }, { @@ -1550,9 +1465,6 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0" - }, "funding": [ { "url": "https://symfony.com/sponsor", diff --git a/bin/composer/wp/composer.lock b/bin/composer/wp/composer.lock index 24fdbbf28cb..f0f61f98695 100644 --- a/bin/composer/wp/composer.lock +++ b/bin/composer/wp/composer.lock @@ -67,11 +67,6 @@ "po", "translation" ], - "support": { - "email": "oom@oscarotero.com", - "issues": "https://github.com/oscarotero/Gettext/issues", - "source": "https://github.com/php-gettext/Gettext/tree/v4.8.3" - }, "time": "2020-11-18T22:35:49+00:00" }, { @@ -322,9 +317,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/3.3" - }, "time": "2017-06-01T21:01:25+00:00" }, { @@ -434,16 +426,16 @@ }, { "name": "wp-cli/php-cli-tools", - "version": "v0.11.11", + "version": "v0.11.12", "source": { "type": "git", "url": "https://github.com/wp-cli/php-cli-tools.git", - "reference": "fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f" + "reference": "e472e08489f7504d9e8c5c5a057e1419cd1b2b3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f", - "reference": "fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f", + "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/e472e08489f7504d9e8c5c5a057e1419cd1b2b3e", + "reference": "e472e08489f7504d9e8c5c5a057e1419cd1b2b3e", "shasum": "" }, "require": { @@ -463,15 +455,15 @@ "MIT" ], "authors": [ - { - "name": "James Logsdon", - "email": "jlogsdon@php.net", - "role": "Developer" - }, { "name": "Daniel Bachhuber", "email": "daniel@handbuilt.co", "role": "Maintainer" + }, + { + "name": "James Logsdon", + "email": "jlogsdon@php.net", + "role": "Developer" } ], "description": "Console utilities for PHP", @@ -480,7 +472,7 @@ "cli", "console" ], - "time": "2018-09-04T13:28:00+00:00" + "time": "2021-03-03T12:43:49+00:00" }, { "name": "wp-cli/wp-cli", diff --git a/composer.json b/composer.json index 33cecfc6758..448c83aa0ea 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "pelago/emogrifier": "3.1.0", "psr/container": "1.0.0", "woocommerce/action-scheduler": "3.1.6", - "woocommerce/woocommerce-admin": "2.0.2", + "woocommerce/woocommerce-admin": "2.0.3", "woocommerce/woocommerce-blocks": "4.4.3" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 24b5bc27a02..81a61a3b15b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f24a600ea103061d766dd7b06c13e8f2", + "content-hash": "d60ef90fa87857445878bb83ba4c592c", "packages": [ { "name": "automattic/jetpack-autoloader", @@ -44,9 +44,6 @@ "GPL-2.0-or-later" ], "description": "Creates a custom autoloader for a plugin or theme.", - "support": { - "source": "https://github.com/Automattic/jetpack-autoloader/tree/v2.9.1" - }, "time": "2021-02-05T19:07:06+00:00" }, { @@ -78,9 +75,6 @@ "GPL-2.0-or-later" ], "description": "A wrapper for defining constants in a more testable way.", - "support": { - "source": "https://github.com/Automattic/jetpack-constants/tree/v1.5.1" - }, "time": "2020-10-28T19:00:31+00:00" }, { @@ -211,10 +205,6 @@ "zend", "zikula" ], - "support": { - "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v1.10.0" - }, "funding": [ { "url": "https://packagist.com", @@ -289,10 +279,6 @@ "geolocation", "maxmind" ], - "support": { - "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues", - "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.6.0" - }, "time": "2019-12-19T22:59:03+00:00" }, { @@ -367,10 +353,6 @@ "email", "pre-processing" ], - "support": { - "issues": "https://github.com/MyIntervals/emogrifier/issues", - "source": "https://github.com/MyIntervals/emogrifier" - }, "time": "2019-12-26T19:37:31+00:00" }, { @@ -420,10 +402,6 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" - }, "time": "2017-02-14T16:28:37+00:00" }, { @@ -477,9 +455,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/css-selector/tree/master" - }, "time": "2017-05-01T15:01:29+00:00" }, { @@ -515,24 +490,20 @@ ], "description": "Action Scheduler for WordPress and WooCommerce", "homepage": "https://actionscheduler.org/", - "support": { - "issues": "https://github.com/woocommerce/action-scheduler/issues", - "source": "https://github.com/woocommerce/action-scheduler/tree/master" - }, "time": "2020-05-12T16:22:33+00:00" }, { "name": "woocommerce/woocommerce-admin", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/woocommerce/woocommerce-admin.git", - "reference": "c4ffd90ebc72652f9d1bc8943a56d7723acc5bf4" + "reference": "15f43c9a1e81258c245ff50ba416a36a2cba7e0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/c4ffd90ebc72652f9d1bc8943a56d7723acc5bf4", - "reference": "c4ffd90ebc72652f9d1bc8943a56d7723acc5bf4", + "url": "https://api.github.com/repos/woocommerce/woocommerce-admin/zipball/15f43c9a1e81258c245ff50ba416a36a2cba7e0b", + "reference": "15f43c9a1e81258c245ff50ba416a36a2cba7e0b", "shasum": "" }, "require": { @@ -564,11 +535,7 @@ ], "description": "A modern, javascript-driven WooCommerce Admin experience.", "homepage": "https://github.com/woocommerce/woocommerce-admin", - "support": { - "issues": "https://github.com/woocommerce/woocommerce-admin/issues", - "source": "https://github.com/woocommerce/woocommerce-admin/tree/v2.0.2" - }, - "time": "2021-02-25T07:29:24+00:00" + "time": "2021-03-10T02:58:43+00:00" }, { "name": "woocommerce/woocommerce-blocks", @@ -615,10 +582,6 @@ "gutenberg", "woocommerce" ], - "support": { - "issues": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues", - "source": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/tree/v4.4.3" - }, "time": "2021-02-11T18:07:48+00:00" } ], @@ -667,10 +630,6 @@ "isolation", "tool" ], - "support": { - "issues": "https://github.com/bamarni/composer-bin-plugin/issues", - "source": "https://github.com/bamarni/composer-bin-plugin/tree/master" - }, "time": "2020-05-03T08:27:20+00:00" } ], @@ -686,5 +645,5 @@ "platform-overrides": { "php": "7.0" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "1.1.0" } From 1df38c2f6b747188274d76ba6e794cb00d3dc40c Mon Sep 17 00:00:00 2001 From: roykho Date: Wed, 10 Mar 2021 12:33:46 -0800 Subject: [PATCH 20/20] Refactor and moved filter to _wc_recount_terms function --- .../class-wc-product-data-store-cpt.php | 35 +-------- includes/wc-term-functions.php | 74 +++++++++++++------ 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/includes/data-stores/class-wc-product-data-store-cpt.php b/includes/data-stores/class-wc-product-data-store-cpt.php index 782e6b31037..8a71ed6de96 100644 --- a/includes/data-stores/class-wc-product-data-store-cpt.php +++ b/includes/data-stores/class-wc-product-data-store-cpt.php @@ -711,40 +711,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da wp_set_post_terms( $product->get_id(), array( $product->get_shipping_class_id( 'edit' ) ), 'product_shipping_class', false ); } - /** - * Filter to allow/prevent recounting of terms as it could be expensive. - * A likely scenario for this is when bulk importing products. We could - * then prevent it from recounting per product but instead recount it once - * when import is done. Of course this means the import logic has to support this. - * - * @since 5.2 - * @param bool - */ - if ( apply_filters( 'woocommerce_product_update_recount_terms', '__return_true' ) ) { - $product_terms = get_the_terms( $product->get_id(), 'product_cat' ); - - if ( $product_terms ) { - $product_cats = array(); - - foreach ( $product_terms as $term ) { - $product_cats[ $term->term_id ] = $term->parent; - } - - _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), false, false ); - } - - $product_terms = get_the_terms( $product->get_id(), 'product_tag' ); - - if ( $product_terms ) { - $product_tags = array(); - - foreach ( $product_terms as $term ) { - $product_tags[ $term->term_id ] = $term->parent; - } - - _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), false, false ); - } - } + _wc_recount_terms_by_product( $product->get_id() ); } /** diff --git a/includes/wc-term-functions.php b/includes/wc-term-functions.php index 50e9c6f821d..c6fd42ab966 100644 --- a/includes/wc-term-functions.php +++ b/includes/wc-term-functions.php @@ -392,6 +392,19 @@ function wc_set_term_order( $term_id, $index, $taxonomy, $recursive = false ) { function _wc_term_recount( $terms, $taxonomy, $callback = true, $terms_are_term_taxonomy_ids = true ) { global $wpdb; + /** + * Filter to allow/prevent recounting of terms as it could be expensive. + * A likely scenario for this is when bulk importing products. We could + * then prevent it from recounting per product but instead recount it once + * when import is done. Of course this means the import logic has to support this. + * + * @since 5.2 + * @param bool + */ + if ( ! apply_filters( 'woocommerce_product_recount_terms', '__return_true' ) ) { + return; + } + // Standard callback. if ( $callback ) { _update_post_term_count( $terms, $taxonomy ); @@ -492,29 +505,7 @@ function wc_recount_after_stock_change( $product_id ) { return; } - $product_terms = get_the_terms( $product_id, 'product_cat' ); - - if ( $product_terms ) { - $product_cats = array(); - - foreach ( $product_terms as $term ) { - $product_cats[ $term->term_id ] = $term->parent; - } - - _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), false, false ); - } - - $product_terms = get_the_terms( $product_id, 'product_tag' ); - - if ( $product_terms ) { - $product_tags = array(); - - foreach ( $product_terms as $term ) { - $product_tags[ $term->term_id ] = $term->parent; - } - - _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), false, false ); - } + _wc_recount_terms_by_product( $product_id ); } add_action( 'woocommerce_product_set_stock_status', 'wc_recount_after_stock_change' ); @@ -661,3 +652,40 @@ function wc_recount_all_terms() { ); _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), true, false ); } + +/** + * Recounts terms by product. + * + * @since 5.2 + * @param int $product_id The ID of the product. + * @return void + */ +function _wc_recount_terms_by_product( $product_id = '' ) { + if ( empty( $product_id ) ) { + return; + } + + $product_terms = get_the_terms( $product_id, 'product_cat' ); + + if ( $product_terms ) { + $product_cats = array(); + + foreach ( $product_terms as $term ) { + $product_cats[ $term->term_id ] = $term->parent; + } + + _wc_term_recount( $product_cats, get_taxonomy( 'product_cat' ), false, false ); + } + + $product_terms = get_the_terms( $product_id, 'product_tag' ); + + if ( $product_terms ) { + $product_tags = array(); + + foreach ( $product_terms as $term ) { + $product_tags[ $term->term_id ] = $term->parent; + } + + _wc_term_recount( $product_tags, get_taxonomy( 'product_tag' ), false, false ); + } +}