plugins/woocommerce/src/Internal/CLI/Migrator/Core/WooCommerceProductImporter.php:537

• The docblock comment line @param array $attributes_data Standardized attribute data from mapper. appears to be orphaned after the removal and doesn't match any actual parameter. This should be removed or corrected.

	private function handle_variable_product( WC_Product_Variable $product, array $product_data ): void {

plugins/woocommerce/src/Internal/CLI/Migrator/Platforms/Shopify/ShopifyMapper.php (1)

452-456: Guard for missing amount; preserve zero; cast to float.

Current check can read a missing property and drops valid zero values.

-			if ( property_exists( $variant_node, 'inventoryItem' ) && is_object( $variant_node->inventoryItem ) && 
-				property_exists( $variant_node->inventoryItem, 'unitCost' ) && is_object( $variant_node->inventoryItem->unitCost ) 
-			) {
-				$simple_data['cost_of_goods'] = $variant_node->inventoryItem->unitCost->amount;
-			}
+			if (
+				property_exists( $variant_node, 'inventoryItem' )
+				&& is_object( $variant_node->inventoryItem )
+				&& property_exists( $variant_node->inventoryItem, 'unitCost' )
+				&& is_object( $variant_node->inventoryItem->unitCost )
+				&& isset( $variant_node->inventoryItem->unitCost->amount )
+				&& is_numeric( $variant_node->inventoryItem->unitCost->amount )
+			) {
+				$simple_data['cost_of_goods'] = (float) $variant_node->inventoryItem->unitCost->amount;
+			}

plugins/woocommerce/src/Internal/CLI/Migrator/Core/WooCommerceProductImporter.php (1)

816-818: Variation COGS should mirror feature-aware handling and keep zero values.

Currently always writes post meta after save and skips 0.0. Align with the simple-product logic.

-				if ( ! empty( $var_data['cost_of_goods'] ) ) {
-					update_post_meta( $saved_variation_id, '_cogs_total_value', (float) $var_data['cost_of_goods'] );
-				}
+				if ( array_key_exists( 'cost_of_goods', $var_data ) ) {
+					$cogs = (float) $var_data['cost_of_goods'];
+					if ( FeaturesUtil::feature_is_enabled( 'cost_of_goods_sold' ) ) {
+						$variation->set_cogs_value( $cogs );
+						$variation->save(); // ensure persisted when feature enabled
+					} else {
+						update_post_meta( $saved_variation_id, '_cogs_total_value', $cogs );
+					}
+				}

plugins/woocommerce/changelog/add-cogs-support (1)

4-4: Clarify and standardize wording (“COGS”, mention migration).

Suggest tightening the entry and using “COGS” consistently.

-Added cogs support even if the feature is disabled
+Added COGS migration support even if the feature is disabled.

plugins/woocommerce/src/Internal/CLI/Migrator/Platforms/Shopify/ShopifyMapper.php (2)

543-547: Same fix for variations: check amount, allow 0, cast.

Mirrors the simple path.

-				if ( property_exists( $variant_node, 'inventoryItem' ) && is_object( $variant_node->inventoryItem ) && 
-					property_exists( $variant_node->inventoryItem, 'unitCost' ) && is_object( $variant_node->inventoryItem->unitCost ) 
-				) {
-					$variation_data['cost_of_goods'] = $variant_node->inventoryItem->unitCost->amount;
-				}
+				if (
+					property_exists( $variant_node, 'inventoryItem' )
+					&& is_object( $variant_node->inventoryItem )
+					&& property_exists( $variant_node->inventoryItem, 'unitCost' )
+					&& is_object( $variant_node->inventoryItem->unitCost )
+					&& isset( $variant_node->inventoryItem->unitCost->amount )
+					&& is_numeric( $variant_node->inventoryItem->unitCost->amount )
+				) {
+					$variation_data['cost_of_goods'] = (float) $variant_node->inventoryItem->unitCost->amount;
+				}

---

452-456: Currency is fetched upstream but ignored here; confirm strategy.

Shopify returns unitCost.amount + currencyCode. If store currency differs, migrating raw amounts can be wrong. Either convert to the WooCommerce store currency during mapping/import, or persist the currency alongside the amount and reconcile later.

Would you like a small helper that converts MoneyV2 to store currency (with fallback to storing the currency separately)?

Also applies to: 543-547

plugins/woocommerce/src/Internal/CLI/Migrator/Platforms/Shopify/ShopifyFetcher.php (1)

92-95: We fetch currencyCode but don’t use it.

Keep only needed fields or wire currency through the mapper/importer.

If we keep it, please add a follow-up to handle conversion or storage; otherwise remove currencyCode from the query to reduce payload.

plugins/woocommerce/src/Internal/CLI/Migrator/Core/WooCommerceProductImporter.php (1)

493-531: Add tests for COGS import paths (enabled/disabled, simple/variation, zero values).

Please cover:

• Simple product: feature disabled → meta persisted pre-save; enabled → set_cogs_value called.
• Variation: both branches; zero amounts retained.

I can scaffold PHPUnit tests for the importer and a CLI E2E exercising wp-cli flows; want me to push a test skeleton?

Also applies to: 694-828

Configuration used: Path: .coderabbit.yml

Review profile: CHILL

Plan: Pro

Learnt from: Aljullu
PR: woocommerce/woocommerce#60641
File: plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts:410-480
Timestamp: 2025-08-29T14:38:18.023Z
Learning: The "sold individually" variation functionality (where the Product Quantity block should hide when a variation is sold individually) mentioned in issue #59443 objectives is not implemented in PR #60641 and will be addressed in a future PR.

Learnt from: Aljullu
PR: woocommerce/woocommerce#60667
File: plugins/woocommerce/src/Blocks/BlockTypes/AddToCartForm.php:122-125
Timestamp: 2025-08-29T10:13:44.287Z
Learning: In WooCommerce, the ProductType class in plugins/woocommerce/src/Enums/ProductType.php contains string constants (not a PHP backed enum), so ProductType::VARIATION directly returns the string 'variation' and can be passed directly to methods like WC_Product::is_type() without needing ->value.

Learnt from: Aljullu
PR: woocommerce/woocommerce#60767
File: plugins/woocommerce/client/blocks/assets/js/blocks/add-to-cart-with-options/grouped-product-selector/frontend.ts:121-126
Timestamp: 2025-09-08T15:12:20.201Z
Learning: In WooCommerce, 'variation' is the product type used for variable products' children, while 'variable' is the type of the parent product. These are two distinct product types in the WooCommerce system.

plugins/woocommerce/src/Internal/CLI/Migrator/Core/WooCommerceProductImporter.php (1)

815-817: Variation COGS: don’t drop 0.0; align with feature detection used for simple products.

! empty(...) skips valid zero and ignores the feature‑enabled path. Apply the same logic as simple products. This also addresses past feedback.

-				if ( ! empty( $var_data['cost_of_goods'] ) ) {
-					update_post_meta( $saved_variation_id, '_cogs_total_value', (float) $var_data['cost_of_goods'] );
-				}
+				if ( array_key_exists( 'cost_of_goods', $var_data ) ) {
+					$raw_cogs = $var_data['cost_of_goods'];
+					if ( is_numeric( $raw_cogs ) ) {
+						$cogs = (float) $raw_cogs;
+						if ( FeaturesUtil::feature_is_enabled( 'cost_of_goods_sold' ) ) {
+							$variation->set_cogs_value( $cogs );
+							$variation->save();
+						} else {
+							update_post_meta( $saved_variation_id, '_cogs_total_value', $cogs );
+						}
+					}
+				}

plugins/woocommerce/src/Internal/CLI/Migrator/Core/WooCommerceProductImporter.php (1)

587-587: Doc nit: clarify parameter meaning.

Minor: tighten the description to reflect taxonomy/term creation and mapping.

-	 * @param array               $attributes_data              Standardized attribute data from mapper.
+	 * @param array               $attributes_data Standardized attribute data from the mapper (names/options); creates taxonomies/terms and updates current mapping.

Configuration used: Path: .coderabbit.yml

Review profile: CHILL

Plan: Pro

Learnt from: Aljullu
PR: woocommerce/woocommerce#60641
File: plugins/woocommerce/client/blocks/tests/e2e/tests/add-to-cart-with-options/add-to-cart-with-options.block_theme.spec.ts:410-480
Timestamp: 2025-08-29T14:38:18.023Z
Learning: The "sold individually" variation functionality (where the Product Quantity block should hide when a variation is sold individually) mentioned in issue #59443 objectives is not implemented in PR #60641 and will be addressed in a future PR.

Learnt from: Aljullu
PR: woocommerce/woocommerce#60667
File: plugins/woocommerce/src/Blocks/BlockTypes/AddToCartForm.php:122-125
Timestamp: 2025-08-29T10:13:44.287Z
Learning: In WooCommerce, the ProductType class in plugins/woocommerce/src/Enums/ProductType.php contains string constants (not a PHP backed enum), so ProductType::VARIATION directly returns the string 'variation' and can be passed directly to methods like WC_Product::is_type() without needing ->value.

Learnt from: Aljullu
PR: woocommerce/woocommerce#60767
File: plugins/woocommerce/client/blocks/assets/js/blocks/add-to-cart-with-options/grouped-product-selector/frontend.ts:121-126
Timestamp: 2025-09-08T15:12:20.201Z
Learning: In WooCommerce, 'variation' is the product type used for variable products' children, while 'variable' is the type of the parent product. These are two distinct product types in the WooCommerce system.