Codecov Report

Merging #37844 (5ccec5f) into trunk (c5285ec) will decrease coverage by 0.2%.
The diff coverage is 100.0%.

❗ Current head 5ccec5f differs from pull request most recent head b558ef1. Consider uploading reports for the commit b558ef1 to get more accurate results

@@            Coverage Diff             @@
##             trunk   #37844     +/-   ##
==========================================
- Coverage     51.5%    51.3%   -0.2%     
- Complexity   17283    17409    +126     
==========================================
  Files          430      440     +10     
  Lines        80037    80587    +550     
==========================================
+ Hits         41216    41304     +88     
- Misses       38821    39283    +462     

@alishanvr Thanks for addressing my comment. That query was just an example, maybe not the best in term of performant.

Also could you take a took at those failing checks please. They are required to move forward.

https://github.com/woocommerce/woocommerce/actions/runs/4747662471/jobs/8434513966?pr=37844
https://github.com/woocommerce/woocommerce/actions/runs/4747662459/jobs/8434513655?pr=37844
https://github.com/woocommerce/woocommerce/actions/runs/4747662456/jobs/8434514244?pr=37844

@alishanvr Thanks for addressing my comment. That query was just an example, maybe not the best in term of performant.

Also could you take a took at those failing checks please. They are required to move forward.

https://github.com/woocommerce/woocommerce/actions/runs/4747662471/jobs/8434513966?pr=37844 https://github.com/woocommerce/woocommerce/actions/runs/4747662459/jobs/8434513655?pr=37844 https://github.com/woocommerce/woocommerce/actions/runs/4747662456/jobs/8434514244?pr=37844

Thank you @mdperez86

I did understand the two points. But didn't understand the following:
https://github.com/woocommerce/woocommerce/actions/runs/4747662471/jobs/8434513966?pr=37844

May you please guide me?

So, I will fix all these three in one go.

Thank You,

Hey @alishanvr to keep things going please pay attention only to the 2 required checks. I'll let you know about the non required one once I have an answer from the expert team.

Ok, @mdperez86!

I am a little busy today. But, I will fix those two by later tomorrow.

Kind Regards,

Hi @mdperez86!

I fixed the PHPCS and also touched the changelog.

It's my first time to contributing to WooCommerce. So, please let me know if I did something wrong.

Thank You,

Hi @alishanvr thank for your contribution here.
I just wanted to let you know that there are still some PHPCS problems

FILE: plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php
-----------------------------------------------------------------------------------------------
FOUND 1 ERROR AND 1 WARNING AFFECTING 2 LINES
-----------------------------------------------------------------------------------------------
 611 | WARNING | Incorrect number of replacements passed to $wpdb->prepare(). Found 2 replacement parameters, expected 1. (WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber)
 613 | ERROR | Unsupported placeholder used in $wpdb->prepare(). Found: "%i". (WordPress.DB.PreparedSQLPlaceholders.UnsupportedPlaceholder)

Also the changelog file you added here should be moved under plugins/woocommerce/changelog folder, that is because the file you touched with your changes plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php is under the plugins/woocommerce directory.

You can move the changelog file manually or by running the following command pnpm --filter=woocommerce run changelog add. Remember not to keep a copy of that file at the root level of the project which is currently located.

Your help is always appreciated!

Hi @mdperez86,

Thank you for updating.

I am not sure why there is an error in PHPCS, while the %i is also available in WordPress 6.2.
I request you to please check the following link https://make.wordpress.org/core/2022/10/08/escaping-table-and-field-names-with-wpdbprepare-in-wordpress-6-1/

And here is the screenshot as a reference:

If we still need to update (change) the %i, then please let me know and I will check it.

Hi @alishanvr I was able to run the PHPCS without any problems after changing the query to

$wpdb->prepare(
  "SELECT DISTINCT os.order_id FROM {$wpdb->prefix}wc_order_stats os
  INNER JOIN {$wpdb->prefix}wc_customer_lookup cl ON os.customer_id = cl.customer_id
  INNER JOIN {$wpdb->usermeta} um ON cl.user_id = um.user_id
  WHERE (um.meta_key = 'billing_phone' OR um.meta_key = 'shipping_phone')
  AND um.meta_value = %s",
  wc_clean( $term )
)

The error you seen could happened due to the string concatenation like "..." . '...'. Note that in the prev example I just used the multi line representation "..."

@mdperez86

Thank you for updating. I just updated both points.

Thanks @alishanvr
The %i placeholder is new in WP since v6.2 so it seems like the PHPCS does not have a rule for that yet. So please could you not use it for now and keep the query with the previous interpolation way.

Ok, I removed the %i and now used the older way.

Thank You,

Thank you so much for your contribution @alishanvr. This PR looks good to me!

Steps to test:

1. Create a customer and make sure that it has a phone number saved.
2. Create another customer and make sure that it has a different phone number saved.
3. Create a new order using the first customer.
4. Create another order using the second customer.
5. In WooCommerce > Orders, search using the first customer's phone number. Verify that the first customer's order shows up, but the second customer's does not.
6. In WooCommerce > Orders, search using the second customer's phone number. Verify that the second customer's order shows up, but the first customer's does not.