Upgrade to PHPUnit 10, add PHPCS with WPCS compliance, add phpcs CI job

- Upgrade PHPUnit 9.6 → 10, update phpunit.xml.dist schema - Add PHPCS 3.13 with WordPress-Extra + PHPCompatibilityWP standards - PHPCBF auto-fix + manual fixes for full WPCS compliance - Add phpcs job to release workflow (parallel with lint) - Pin composer platform to PHP 8.3 to prevent incompatible dep locks Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add PHPUnit test suite, PSR-4 refactor, lint+test CI jobs (v1.3.1)
2026-03-01 13:25:02 +01:00 · 2026-03-01 13:08:22 +01:00 · 2026-03-01 12:35:02 +01:00 · 2026-03-01 12:23:01 +01:00 · 2026-03-01 12:17:04 +01:00 · 2026-03-01 12:14:07 +01:00
50 changed files with 7420 additions and 1967 deletions
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -0,0 +1,273 @@
 name: Create Release Package
 on:
  push:
    tags:
      - 'v*'
 jobs:
  lint:
    name: PHP Lint
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
        with:
          submodules: recursive
          fetch-depth: 0
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          extensions: mbstring, xml, zip
          tools: composer:v2
      - name: PHP Syntax Check
        run: |
          find includes -name "*.php" -print0 | xargs -0 -n1 php -l
          find tests -name "*.php" -print0 | xargs -0 -n1 php -l
  phpcs:
    name: PHP CodeSniffer
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          extensions: mbstring, xml
          tools: composer:v2
      - name: Install Composer dependencies
        run: |
          composer config platform.php 8.3.0
          composer install --optimize-autoloader --no-interaction
      - name: Run PHPCS
        run: vendor/bin/phpcs
  test:
    name: PHP Unit
    runs-on: ubuntu-latest
    needs: lint
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          extensions: mbstring, xml
          tools: composer:v2
      - name: Install Composer dependencies
        run: |
          composer config platform.php 8.3.0
          composer install --optimize-autoloader --no-interaction
      - name: Run PHPUnit tests
        run: vendor/bin/phpunit --testdox
  build-release:
    needs: [test, phpcs]
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          extensions: mbstring, xml, zip, intl, gettext
          tools: composer:v2
      - name: Get version from tag
        id: version
        run: |
          VERSION=${GITHUB_REF_NAME#v}
          echo "version=$VERSION" >> $GITHUB_OUTPUT
          echo "Building version: $VERSION"
      - name: Validate composer.json
        run: composer validate --strict
      - name: Install Composer dependencies (production)
        run: |
          composer config platform.php 8.3.0
          composer install --no-dev --optimize-autoloader --no-interaction
      - name: Install gettext
        run: apt-get update && apt-get install -y gettext
      - name: Compile translations
        run: |
          for po in languages/*.po; do
            if [ -f "$po" ]; then
              mo="${po%.po}.mo"
              echo "Compiling $po to $mo"
              msgfmt -o "$mo" "$po"
            fi
          done
      - name: Verify plugin version matches tag
        run: |
          PLUGIN_VERSION=$(grep -oP "Version:\s*\K[0-9]+\.[0-9]+\.[0-9]+" wc-composable-product.php | head -1)
          TAG_VERSION=${{ steps.version.outputs.version }}
          if [ "$PLUGIN_VERSION" != "$TAG_VERSION" ]; then
            echo "Error: Plugin version ($PLUGIN_VERSION) does not match tag version ($TAG_VERSION)"
            exit 1
          fi
          echo "Version verified: $PLUGIN_VERSION"
      - name: Create release directory
        run: mkdir -p releases
      - name: Build release package
        run: |
          VERSION=${{ steps.version.outputs.version }}
          PLUGIN_NAME="wc-composable-product"
          RELEASE_FILE="releases/${PLUGIN_NAME}-${VERSION}.zip"
          # Move to parent directory for proper zip structure
          cd ..
          # Create zip with proper WordPress plugin structure
          zip -r "${PLUGIN_NAME}/${RELEASE_FILE}" "${PLUGIN_NAME}" \
            -x "${PLUGIN_NAME}/.git/*" \
            -x "${PLUGIN_NAME}/.gitea/*" \
            -x "${PLUGIN_NAME}/.github/*" \
            -x "${PLUGIN_NAME}/.vscode/*" \
            -x "${PLUGIN_NAME}/.claude/*" \
            -x "${PLUGIN_NAME}/CLAUDE.md" \
            -x "${PLUGIN_NAME}/wp-core" \
            -x "${PLUGIN_NAME}/wp-core/*" \
            -x "${PLUGIN_NAME}/wp-plugins" \
            -x "${PLUGIN_NAME}/wp-plugins/*" \
            -x "${PLUGIN_NAME}/releases/*" \
            -x "${PLUGIN_NAME}/cache/*" \
            -x "${PLUGIN_NAME}/composer.lock" \
            -x "${PLUGIN_NAME}/*.log" \
            -x "${PLUGIN_NAME}/.gitignore" \
            -x "${PLUGIN_NAME}/.editorconfig" \
            -x "${PLUGIN_NAME}/phpcs.xml*" \
            -x "${PLUGIN_NAME}/phpunit.xml*" \
            -x "${PLUGIN_NAME}/tests/*" \
            -x "${PLUGIN_NAME}/*.po~" \
            -x "${PLUGIN_NAME}/*.bak" \
            -x "*.DS_Store"
          cd "${PLUGIN_NAME}"
          echo "Created: ${RELEASE_FILE}"
      - name: Generate checksums
        run: |
          VERSION=${{ steps.version.outputs.version }}
          cd releases
          sha256sum "wc-composable-product-${VERSION}.zip" > "wc-composable-product-${VERSION}.zip.sha256"
          echo "SHA256:"
          cat "wc-composable-product-${VERSION}.zip.sha256"
      - name: Verify package structure
        run: |
          set +o pipefail
          VERSION=${{ steps.version.outputs.version }}
          echo "Package contents:"
          unzip -l "releases/wc-composable-product-${VERSION}.zip" | head -50 || true
          # Verify main file is at correct location
          if unzip -l "releases/wc-composable-product-${VERSION}.zip" | grep -q "wc-composable-product/wc-composable-product.php"; then
            echo "✓ Main plugin file at correct location"
          else
            echo "✗ Error: Main plugin file not found at wc-composable-product/wc-composable-product.php"
            exit 1
          fi
          # Verify vendor directory is included
          if unzip -l "releases/wc-composable-product-${VERSION}.zip" | grep -q "wc-composable-product/vendor/"; then
            echo "✓ Vendor directory included"
          else
            echo "✗ Error: Vendor directory not found"
            exit 1
          fi
      - name: Extract changelog for release notes
        id: changelog
        run: |
          VERSION=${{ steps.version.outputs.version }}
          # Extract changelog section for this version
          NOTES=$(sed -n "/^## \[${VERSION}\]/,/^## \[/p" CHANGELOG.md | sed '$ d' | tail -n +2)
          if [ -z "$NOTES" ]; then
            NOTES="Release version ${VERSION}"
          fi
          # Save to file for multi-line output
          echo "$NOTES" > release_notes.txt
          echo "Release notes extracted"
      - name: Create Gitea Release
        env:
          GITEA_TOKEN: ${{ secrets.SRC_GITEA_TOKEN }}
        run: |
          VERSION=${{ steps.version.outputs.version }}
          TAG_NAME=${{ github.ref_name }}
          PRERELEASE="false"
          if [[ "$TAG_NAME" == *-* ]]; then
            PRERELEASE="true"
          fi
          # Read release notes
          BODY=$(cat release_notes.txt)
          # Check if release already exists for this tag and delete it
          EXISTING_RELEASE=$(curl -s \
            -H "Authorization: token ${GITEA_TOKEN}" \
            "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases/tags/${TAG_NAME}")
          EXISTING_ID=$(echo "$EXISTING_RELEASE" | jq -r '.id // empty')
          if [ -n "$EXISTING_ID" ] && [ "$EXISTING_ID" != "null" ]; then
            echo "Deleting existing release ID: $EXISTING_ID"
            curl -s -X DELETE \
              -H "Authorization: token ${GITEA_TOKEN}" \
              "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${EXISTING_ID}"
          fi
          # Create release via Gitea API
          RELEASE_RESPONSE=$(curl -s -X POST \
            -H "Authorization: token ${GITEA_TOKEN}" \
            -H "Content-Type: application/json" \
            -d "{\"tag_name\": \"${TAG_NAME}\", \"name\": \"Release ${VERSION}\", \"body\": $(echo "$BODY" | jq -Rs .), \"draft\": false, \"prerelease\": ${PRERELEASE}}" \
            "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases")
          RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
          if [ "$RELEASE_ID" == "null" ] || [ -z "$RELEASE_ID" ]; then
            echo "Failed to create release:"
            echo "$RELEASE_RESPONSE"
            exit 1
          fi
          echo "Created release ID: $RELEASE_ID"
          # Upload attachments
          for file in "releases/wc-composable-product-${VERSION}.zip" "releases/wc-composable-product-${VERSION}.zip.sha256"; do
            if [ -f "$file" ]; then
              FILENAME=$(basename "$file")
              echo "Uploading $FILENAME..."
              curl -s -X POST \
                -H "Authorization: token ${GITEA_TOKEN}" \
                -H "Content-Type: application/octet-stream" \
                --data-binary "@$file" \
                "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${FILENAME}"
              echo "Uploaded $FILENAME"
            fi
          done
          echo "Release created successfully: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/tag/${TAG_NAME}"
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,8 @@
 # Linked sources
 wp-core
 wp-plugins
 # Editor swap files
 *.*swp
 # Composer
 vendor/
 composer.lock
 # Cache
 cache/
@@ -15,12 +10,19 @@ cache/
 # Development files
 .vscode/
 .idea/
 logs/
 *.log
 # OS files
 .DS_Store
 Thumbs.db
 .directory
-# Release files
+# PHPUnit local overrides
-*.zip
+phpunit.xml
-releases/
+
 # Binary files
 languages/*.mo
 .phpunit.result.cache
 .phpunit.cache/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,483 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [1.3.1] - 2026-03-01
 ### Added
 - **PHPUnit test suite**: 57 unit tests covering all 6 core classes (ProductType, StockManager, CartHandler, Plugin, Admin/ProductData, Admin/Settings)
 - **Brain Monkey + Mockery** for WordPress/WooCommerce function mocking without a full WP installation
 - **WooCommerce class stubs** in `tests/stubs/` for classes extended by the plugin (WC_Product, WC_Settings_Page, etc.)
 - **PHPCS** with WordPress-Extra and PHPCompatibilityWP coding standards (`phpcs.xml.dist`)
 - **PHPCS job** in release workflow — coding standards must pass before release is built
 - **PHP lint job** in release workflow — syntax-checks all PHP files before testing
 - **Test job** in release workflow — tests must pass before release package is built
 - Testing and linting sections in README and CLAUDE.md
 ### Changed
 - **PSR-4 refactored**: Renamed files to PascalCase (Product_Type → ProductType, etc.) and changed namespace from `WC_Composable_Product` to `Magdev\WcComposableProduct`
 - Updated all cross-references in PHP files, main plugin file, composer.json, CSS/JS doc comments, and translation file source comments
 - **PHPUnit upgraded** from 9.6 to 10 (Brain Monkey 2.7 supports both)
 - **WPCS formatting** applied to all source files (tabs, Yoda conditions, strict `in_array`, `wp_json_encode`, long array syntax)
 - Release workflow now has four stages: lint + phpcs (parallel) → test → build-release
 - Composer platform pinned to PHP 8.3 to prevent incompatible dependency locks
 ## [1.3.0] - 2026-03-01
 ### Added
 - **Include Non-Public Products**: New option to include draft and private products in composable product selections
  - Global setting under WooCommerce > Settings > Composable Products
  - Per-product override in the Composable Options tab (Use global default / Yes / No)
  - Useful when products should only be sold as part of a composition, not individually
 - Translations for the new setting in all 6 locales (de_DE, de_CH, fr_CH, it_CH + informal variants)
 ## [1.2.1] - 2026-03-01
 ### Changed
 - Consolidated documentation: merged INSTALL.md into README.md, merged IMPLEMENTATION.md into CLAUDE.md
 - Condensed CLAUDE.md from ~1960 lines to ~160 lines, keeping only essential architecture and lessons learned
 - README.md now includes full installation guide, usage tutorial, and troubleshooting section
 - Cleaned up .gitignore
 ### Removed
 - INSTALL.md (content merged into README.md)
 - IMPLEMENTATION.md (content merged into CLAUDE.md)
 ## [1.2.0] - 2026-03-01
 ### Fixed
 - **CRITICAL**: Product selection always empty regardless of configuration (categories, tags, or SKUs)
  - Root cause: Product query used a `meta_query` checking `_product_type` in `wp_postmeta`, but WooCommerce stores product types in the `product_type` **taxonomy** — the `!=` comparison with a non-existent meta key caused an INNER JOIN returning zero results
  - Fix: Replaced broken `meta_query` with correct `tax_query` using `product_type` taxonomy to exclude composable products
 - **CRITICAL**: Cart price always 0.00 despite correct frontend price calculation
  - Root cause: `composable_price_calculated` flag was persisted to the cart session, preventing price recalculation on subsequent page loads — but `set_price()` only modifies the in-memory product object and is lost between requests
  - Fix: Removed per-item session flag; the existing static `$already_calculated` flag already prevents duplicate calculation within a single request
 - **Admin tab rendering**: Both General and Composable Options panels visible on initial page load
  - Root cause: JavaScript manually showed `#composable_product_data` via `.show()` without hiding the General panel
  - Fix: Trigger WooCommerce's native tab click instead, so the tab system handles panel visibility correctly
 ### Added
 - **Gitea CI/CD release workflow** (`.gitea/workflows/release.yml`)
  - Triggered on `v*` tags
  - Installs PHP 8.3 with production Composer dependencies
  - Compiles `.po` → `.mo` translations
  - Verifies plugin version matches tag
  - Builds release ZIP with proper WordPress directory structure
  - Generates SHA-256 checksums
  - Verifies package contains main plugin file and vendor directory
  - Extracts changelog for release notes
  - Creates Gitea release with attachments via API
 ### Removed
 - Debug logging from v1.1.14 (no longer needed after root cause identified)
 ### Technical
 - Modified files: includes/Product_Type.php, includes/Cart_Handler.php, assets/js/admin.js
 - New file: .gitea/workflows/release.yml
 - Product query now correctly uses `tax_query` with `product_type` taxonomy (`NOT IN` operator)
 - Cart price recalculated on every request via `woocommerce_before_calculate_totals` hook
 - Admin JS uses `$('ul.product_data_tabs li.composable_options a').trigger('click')` for native WooCommerce tab handling
 ## [1.1.14] - 2025-12-31
 ### Added
 - **DEBUG**: Comprehensive debug logging to troubleshoot product retrieval issues
 - Error log output shows selection criteria, query arguments, and results
 - Logs each product/variation being added to help identify filtering issues
 - Enable by setting WP_DEBUG to true in wp-config.php
 ### Technical
 - Modified file: includes/Product_Type.php (added error_log statements throughout get_available_products())
 - Logs criteria array (categories, tags, SKUs)
 - Logs WP_Query arguments before execution
 - Logs number of posts found by query
 - Logs each variable product's variation count
 - Logs each variation/simple product being added with name
 - Logs total products available at end
 - All logging wrapped in WP_DEBUG checks (no performance impact in production)
 ### Notes
 - This is a debug release to help diagnose why products aren't showing
 - No functional changes from v1.1.13
 - User should enable WP_DEBUG and check debug.log or error.log
 - Log output will show exactly where products are being filtered out
 - All translation files remain at 100% completion (57/57 strings)
 ## [1.1.13] - 2025-12-31
 ### Fixed
 - **CRITICAL**: "No products available for selection" message showing even when products are configured
 - Removed overly strict `is_in_stock()` requirement that was filtering out all products
 - Products now show regardless of stock status (out-of-stock items are displayed but disabled)
 - Added `'relation' => 'AND'` to meta_query for proper handling of multiple meta conditions
 ### Changed
 - Product retrieval now shows all purchasable products, not just in-stock ones
 - Stock status still displayed on frontend with appropriate styling
 - Out-of-stock items shown but disabled via checkbox and visual indicators
 - Frontend stock management from v1.1.0 still fully functional
 ### Technical
 - Modified file: includes/Product_Type.php (lines 117-124, 177, 181)
 - Changed from `$variation->is_in_stock() && $variation->is_purchasable()` to just `$variation->is_purchasable()`
 - Changed from `$product->is_in_stock() && $product->is_purchasable()` to just `$product->is_purchasable()`
 - Added `'relation' => 'AND'` to meta_query array for WordPress query compatibility
 ### Notes
 - This fixes the issue where NO products were showing in the selector
 - Stock validation still occurs at add-to-cart time (Stock_Manager class)
 - Frontend still displays stock badges (in stock, low stock, out of stock)
 - Out-of-stock items remain non-selectable via disabled checkboxes
 - All translation files remain at 100% completion (57/57 strings)
 ## [1.1.12] - 2025-12-31
 ### Fixed
 - **CRITICAL**: Variable product variations still not appearing in product selector after v1.1.11 release
 - Changed variation retrieval method from `get_available_variations()` to `get_children()` for more reliable variation ID retrieval
 - `get_available_variations()` returns complex data arrays which may not work in all contexts
 - `get_children()` returns simple array of variation IDs directly, ensuring consistent results
 ### Technical
 - Modified file: includes/Product_Type.php (lines 171-184)
 - Changed from `$product->get_available_variations()` to `$product->get_children()`
 - More direct and reliable method for retrieving variation IDs
 - Each variation ID passed to `wc_get_product()` for full product object
 - Maintains all stock and purchasability checks from v1.1.11
 ### Notes
 - This is a patch release fixing the variable product support introduced in v1.1.11
 - User reported "nope, still no product selectable" after v1.1.11
 - Root cause: `get_available_variations()` returns variation data arrays instead of clean IDs
 - `get_children()` is the standard WooCommerce method for retrieving variation IDs
 - All translation files remain at 100% completion (57/57 strings - no changes needed)
 ## [1.1.11] - 2025-12-31
 ### Added
 - **FEATURE**: Variable product support - composable products can now include variable products and their variations
 - Variable products automatically expand to show all available variations as selectable items
 - Each variation displays with full attribute information (e.g., "Product - Color: Red, Size: Large")
 ### Fixed
 - Products not showing in selector when all available products were variable products
 - Variable products were being filtered out because parent products aren't directly purchasable
 ### Changed
 - Modified `get_available_products()` to detect and handle variable products
 - Variable products now expand into their individual variations
 - Each variation checked individually for stock status and purchasability
 - Simple products continue to work exactly as before
 ### Technical
 - Modified file: includes/Product_Type.php (lines 160-188)
 - Added logic to detect `is_type('variable')` products
 - Uses `get_available_variations()` to retrieve all variations
 - Each variation validated with `is_in_stock()` and `is_purchasable()`
 - Maintains backward compatibility with simple products
 ### Notes
 - This is a feature enhancement release, not a bug fix
 - Resolves the issue where categories containing only variable products showed no selections
 - Variations display with their parent product name plus selected attributes
 - Stock management works correctly for both simple products and variations
 - All translation files remain at 100% completion (57/57 strings - no new strings added)
 ## [1.1.10] - 2025-12-31
 ### Fixed
 - **CRITICAL**: Admin panel - Both General and Composable tabs visible simultaneously on initial page load
 - **CRITICAL**: Frontend - No products showing in product selector, only cart button and pricing visible
 - Empty product grid now shows helpful message instead of blank space
 ### Changed
 - Added explicit `display: none` to `#composable_product_data` panel for proper initial hiding
 - Panel now only shows when `body.product-type-composable` class is present
 - Added empty state message in product selector template when no products are configured
 - Cleared Twig cache to ensure template changes take effect
 ### Added
 - Empty state message: "No products available for selection. Please configure the product criteria in the admin panel."
 - Translations for empty state message in all 6 supported locales (de_DE, de_DE_informal, de_CH, de_CH_informal, fr_CH, it_CH)
 - Recompiled .mo translation files
 ### Technical
 - Modified files: assets/css/admin.css (lines 7-16), templates/product-selector.twig (lines 12-15)
 - Root cause (admin): Panel lacked explicit CSS hiding rule, relied only on `hidden` class
 - Root cause (frontend): No feedback when products array is empty
 - Solution: CSS specificity + empty state conditional in Twig template
 ### Notes
 - This release fixes two critical bugs discovered immediately after v1.1.9
 - Admin interface now correctly hides composable panel until product type is selected
 - Frontend provides clear user feedback when product selection is unavailable
 - All translation files now 100% complete (57/57 strings)
 ## [1.1.9] - 2025-12-31
 ### Fixed
 - **CRITICAL**: Admin rendering completely broken - tabs disappeared and fields appeared out of context after v1.1.8 release
 - CSS selectors were too broad, hiding tab navigation along with field groups
 - Removed `!important` flags that caused overly aggressive hiding
 ### Changed
 - Made CSS selectors more specific: `.options_group.show_if_composable` for field groups only
 - Added separate rule for tab links: `.product_data_tabs li.composable_options`
 - Tab navigation now works correctly without hiding itself
 ### Technical
 - Modified files: assets/css/admin.css (lines 22-40)
 - Root cause: `.show_if_composable` class used by WooCommerce for both tab links AND field groups
 - Solution: Separate selectors for each use case to prevent unintended hiding
 ### Notes
 - This release fixes critical regression introduced in v1.1.8
 - Admin interface now renders correctly with visible tabs and properly positioned fields
 - No `!important` flags needed with specific selectors
 ## [1.1.8] - 2025-12-31
 ### Fixed
 - **CRITICAL**: Admin rendering bug where both General and Composable Options tabs showed simultaneously on initial page load
 - **CRITICAL**: Frontend product selector not appearing on product pages - WooCommerce's default add-to-cart button now hidden for composable products
 - **CRITICAL**: Price formatting not localized - prices now display with proper currency symbols, decimal separators, and thousand separators for all locales
 ### Added
 - `wc_price()` Twig function for proper price formatting in templates
 - `formatPrice()` JavaScript method with full WooCommerce locale support
 - Price format localization data passed to frontend JavaScript (decimal/thousand separators, currency position, number of decimals)
 - `hide_default_add_to_cart()` method to prevent WooCommerce's default purchase UI for composable products
 ### Changed
 - Enhanced CSS specificity with `!important` flags for proper tab visibility control
 - Template now uses `{{ fixed_price_html|raw }}` instead of raw currency concatenation
 - Product selector passes pre-formatted price HTML from `wc_price()` function
 - Frontend JavaScript updates prices dynamically using WooCommerce format settings
 ### Technical
 - Modified files: assets/css/admin.css (+24 lines), includes/Cart_Handler.php (+14 lines), includes/Plugin.php (+7 lines), includes/Product_Selector.php (+2 lines), templates/product-selector.twig, assets/js/frontend.js (+28 lines)
 - All PHP files pass syntax validation
 - Supports Swiss format (CHF 50.-), European format (50,00 €), US format ($50.00), and all other WooCommerce locales
 - Thousand separator support: comma (1,000), dot (1.000), apostrophe (1'000), space (1 000)
 ### Notes
 - This release fixes all three critical UI bugs reported in CLAUDE.md
 - Admin tabs now display correctly on initial page load without JavaScript flicker
 - Frontend product selector is now the only purchase interface (no WooCommerce default button)
 - All prices maintain proper locale formatting during dynamic updates
 ## [1.1.7] - 2025-12-31
 ### Added
 - Compiled .mo translation files for all 6 supported locales (de_DE, de_DE_informal, de_CH, de_CH_informal, fr_CH, it_CH)
 - WordPress can now load translations in admin and frontend areas
 ### Fixed
 - **CRITICAL**: Missing translations in WordPress admin when using non-English locales
 - Settings page ("Composable Products", "Default Selection Limit", etc.) now properly translated
 - Product settings ("Composable Options", "Selection Criteria", etc.) now properly translated
 ### Technical
 - Compiled .mo files from .po sources using msgfmt
 - All 6 locales now have complete translation coverage (56/56 strings translated and compiled)
 - .mo files required for WordPress i18n system to display translations
 ### Notes
 - Previous versions included .po translation files but WordPress requires compiled .mo files
 - This release makes all existing translations actually visible to users
 ## [1.1.6] - 2025-12-31
 ### Added
 - Complete translations for all admin area strings across all 6 supported locales
 - "Fixed Price" field label and description translations
 ### Changed
 - Updated translation template (.pot) to version 1.1.6
 - Simplified "How to calculate the price" description text
 ### Technical
 - All .po files now include translations for v1.1.4 admin strings
 - 100% translation coverage maintained across all locales (56/56 strings)
 - German formal/informal variants properly differentiated (Sie vs. du)
 ## [1.1.5] - 2025-12-31
 ### Fixed
 - **CRITICAL**: Fixed Twig template error "Unknown 'esc_attr' filter" when rendering product selector
 - Template compatibility issue when other plugins (e.g., WooCommerce Tier and Package Prices) use Twig
 - WordPress escaping functions now properly registered as both Twig functions AND filters
 ### Technical
 - Added `TwigFilter` registrations for `esc_html`, `esc_attr`, and `esc_url` in `Plugin::init_twig()`
 - Template can now use both syntax styles: `{{ value|esc_attr }}` (filter) and `{{ esc_attr(value) }}` (function)
 - Prevents conflicts when multiple plugins bundle their own Twig installations
 ### Notes
 - Previous versions only registered escaping functions as Twig functions, not filters
 - Template used filter syntax (`|esc_attr`) which failed when parsed by external Twig instances
 - Fix ensures compatibility regardless of which Twig instance processes the template
 ## [1.1.4] - 2025-12-31
 ### Added
 - Fixed price field in Composable Options tab for easier price configuration
 - JavaScript toggle to show/hide fixed price field based on selected pricing mode
 ### Changed
 - Simplified pricing mode description text in admin interface
 - Fixed price field now appears dynamically when "Fixed" pricing mode is selected
 ### Technical
 - Added `_regular_price` field with `composable_fixed_price_field` CSS class in `Product_Data.php`
 - Implemented `toggleFixedPriceField()` JavaScript function in `assets/js/admin.js`
 - Progressive disclosure pattern improves admin UX by showing relevant fields only
 ## [1.1.3] - 2024-12-31
 ### Added
 - WooCommerce HPOS (High-Performance Order Storage) compatibility declaration
 - Prevents duplicate price calculations to avoid conflicts with other pricing plugins
 ### Fixed
 - WooCommerce compatibility warnings with Analytics and other WooCommerce extensions
 - Price calculation conflicts with third-party pricing plugins
 ### Technical
 - Added `before_woocommerce_init` hook to declare HPOS compatibility
 - Implemented static flag in `Cart_Handler::calculate_cart_item_price()` to prevent multiple executions
 - Added `composable_price_calculated` flag to cart items to prevent re-calculation by other plugins
 - Ensures composable products work with WooCommerce's modern order storage system
 ## [1.1.2] - 2024-12-31
 ### Fixed
 - **CRITICAL**: Fixed persistent "Class WC_Settings_Page not found" error that continued in v1.1.1
 - Root cause: Settings.php was being included too early (during plugin init) before WC_Settings_Page was loaded
 - Solution: Delayed Settings.php inclusion until `woocommerce_get_settings_pages` filter when class is guaranteed to exist
 ### Technical
 - Removed `require_once Settings.php` from `Plugin::includes()` (line 93)
 - Added `require_once Settings.php` to `Plugin::add_settings_page()` (line 196)
 - Settings file now loads on-demand when WooCommerce requests settings pages
 - Previous hook change (woocommerce_init) was insufficient - class loading order was the real issue
 ### Notes
 - v1.1.1 attempted to fix this with hook change but the error persisted
 - This version addresses the actual root cause: premature class extension
 ## [1.1.1] - 2024-12-31
 ### Fixed
 - Settings page initialization timing issue causing "Class WC_Settings_Page not found" error
 - Changed hook from `woocommerce_loaded` to `woocommerce_init` to ensure WC_Settings_Page class is available
 - Plugin now initializes after all WooCommerce core classes are loaded
 ### Technical
 - Hook changed from `woocommerce_loaded` to `woocommerce_init` in wc-composable-product.php:65
 - `woocommerce_init` fires after WooCommerce has finished loading all its core classes including settings
 ## [1.1.0] - 2024-12-31
 ### Added
 - **Stock Management Integration**: Complete inventory tracking system for composable products
  - Stock validation during product selection and add-to-cart
  - Automatic stock deduction when orders are completed/processed
  - Automatic stock restoration on order cancellation/refund
  - Stock status indicators in product selector (In stock, Low stock, Out of stock)
  - Visual feedback for out-of-stock items (disabled checkboxes, reduced opacity)
  - Low stock warnings when 5 or fewer items remain
  - Prevention of out-of-stock item selection
  - Order notes documenting stock changes
 ### Technical
 - New `Stock_Manager` class handling all stock operations
 - Integration with WooCommerce order status hooks
 - Stock information passed to frontend via Twig template
 - Enhanced CSS styling for stock status badges
 - Stock data stored in order item meta for accurate tracking
 - Backorder support detection and handling
 ### Translation
 - Added 8 new translatable strings for stock messages
 - Updated Italian (Switzerland) translation with stock-related terms
 - Updated translation template (.pot file)
 ## [1.0.1] - 2024-12-31
 ### Fixed
 - Fatal error "Class WC_Settings_Page not found" during plugin activation
 - Changed initialization hook from `plugins_loaded` to `woocommerce_loaded` to ensure WooCommerce classes are available before plugin initialization
 - Settings page now correctly integrates as a tab in WooCommerce > Settings
 ### Technical
 - Plugin now waits for `woocommerce_loaded` action before initializing
 - Prevents race condition where WooCommerce classes weren't loaded yet
 - Settings tab appears correctly in WooCommerce settings interface
 ## [1.0.0] - 2024-12-31
 ### Added
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,299 +1,205 @@
-# WooCommerce plugin for user composable products - AI Context Document
+# WooCommerce Composable Products - AI Context Document
 **Author:** Marco Graetsch
 ## Project Overview
-This plugin implements a special product type, for which users can select a limited number of product from a configurable set of simple or variable products. The limit of selectable products should be a global and per-product setting, for which global is the fallback. The set of selectable products can be defined per category, tag or SKU. The price is either a fixed price or the sum of the prices of the selected products. Think of a package of stickers as composable product, where each package can contain $limit number of stickers.
+This plugin implements a custom WooCommerce product type where customers select a limited number of products from a configurable set of simple or variable products. The limit is configurable globally and per-product. The selectable products are defined by category, tag, or SKU. Pricing is either fixed or the sum of selected products. Think of a sticker pack where each package contains N stickers chosen by the customer.
-### Key Fact: 100% AI-Generated
+This project is 100% AI-generated ("vibe-coded") using Claude.AI.
 This project is proudly **"vibe-coded"** using Claude.AI - the entire codebase was created through AI assistance.
 ## Technical Stack
 - **Language:** PHP 8.3+
- **Framework:** Latest WordPress Plugin API
+- **Framework:** WordPress Plugin API
 - **E-commerce:** WooCommerce 10.0+
 - **Template Engine:** Twig 3.0 (via Composer)
 - **Frontend:** Vanilla JavaScript + jQuery
 - **Styling:** Custom CSS
- **Dependency Management:** Composer
+- **Dependencies:** Composer
- **Internationalization:** WordPress i18n (.pot/.po/.mo files)
+- **i18n:** WordPress i18n (.pot/.po/.mo), text domain: `wc-composable-product`
-
+- **Testing:** PHPUnit 10 + Brain Monkey 2.7 + Mockery 1.6
-## Implementation Details
+- **Linting:** PHPCS 3.13 with WordPress-Extra + PHPCompatibilityWP
-
+- **CI/CD:** Gitea Actions (`.gitea/workflows/release.yml`)
 ### Security Best Practices
 - All user inputs are sanitized (integers for quantities/prices)
 - Nonce verification on form submissions
 - Output escaping in templates (`esc_attr`, `esc_html`, `esc_js`)
 - Direct file access prevention via `ABSPATH` check
 ### Translation Ready
 All user-facing strings use:
 ```php
 __('Text to translate', 'wc-composable-product')
 _e('Text to translate', 'wc-composable-product')
 ```
 Text domain: `wc-composable-product`
 **Translation Template:**
 - Base `.pot` file created: `languages/wc-composable-product.pot`
 - Ready for translation to any locale
 - All translatable strings properly marked with text domain
 **Planned Translations:**
 - `en_US` - English (United States) [base language]
 - `de_DE` - German (Germany, formal)
 - `de_DE_informal` - German (Germany, informal "du")
 - `de_CH` - German (Switzerland, formal "Sie")
 - `de_CH_informal` - German (Switzerland, informal "du")
 - `fr_CH` - French (Switzerland)
 - `it_CH` - Italian (Switzerland)
 Note: Swiss locales should use CHF currency formatting in examples (e.g., "CHF 50.-")
 ### Create releases
 - The `vendor/` directory MUST be included in releases (Twig dependency required for runtime)
 - Running zip from wrong directory creates empty or malformed archives
 - Exclusion patterns must match the relative path structure used in zip command
 - Always verify the package with `unzip -l` and test extraction before committing
 - The `wp-core/` and `wp-plugins/` directories MUST NOT be included in releases
 - Releases are stored in `releases/` including checksums
 **Important Git Notes:**
 - Always commit from `dev` branch first
 - Tags should use format `vX.X.X` (e.g., `v1.1.22`)
 - Use annotated tags (`-a`) not lightweight tags
 - Commit messages should follow the established format with Claude Code attribution
 - `.claude/settings.local.json` changes are typically local-only (stash before rebasing)
 #### What Gets Released
 - All plugin source files
 - Compiled vendor dependencies
 - Translation files (.mo compiled from .po)
 - Assets (CSS, JS)
 - Documentation (README, CHANGELOG, etc.)
 #### What's Excluded
 - Git metadata (`.git/`)
 - Development files (`.vscode/`, `.claude/`, `CLAUDE.md`)
 - Logs and cache files
 - Previous releases
 - `composer.lock` (but `vendor/` is included)
 ## Project Structure
 ```txt
 wc-composable-product/
 ├── .gitea/workflows/
 │   └── release.yml            # CI/CD release workflow
 ├── assets/
 │   ├── css/
 │   │   ├── admin.css          # Admin panel styling
-│   │   └── frontend.css       # Customer-facing styles
+│   │   └── frontend.css       # Customer-facing styles (with stock indicators)
 │   └── js/
 │       ├── admin.js           # Product edit interface logic
 │       └── frontend.js        # AJAX cart & selection UI
-├── cache/                     # Twig template cache (writable)
+├── cache/                     # Twig template cache (writable, gitignored)
 ├── includes/
 │   ├── Admin/
-│   │   ├── Product_Data.php   # Product data tab & meta boxes
+│   │   ├── ProductData.php    # Product data tab & meta boxes
 │   │   └── Settings.php       # WooCommerce settings integration
-│   ├── Cart_Handler.php       # Add-to-cart & cart display logic
+│   ├── CartHandler.php        # Add-to-cart & cart display logic (with stock validation)
 │   ├── Plugin.php             # Main plugin class (Singleton)
-│   ├── Product_Selector.php   # Frontend product selector renderer
+│   ├── ProductSelector.php    # Frontend product selector renderer (with stock info)
-│   └── Product_Type.php       # Custom WC_Product extension
+│   ├── ProductType.php        # Custom WC_Product extension
-├── languages/
+│   └── StockManager.php       # Stock management & inventory tracking
-│   └── wc-composable-product.pot  # Translation template
+├── languages/                 # Translation files (.pot, .po, .mo)
 ├── releases/                  # Release packages (gitignored)
 ├── tests/
 │   ├── bootstrap.php          # Test environment setup (constants, stubs)
 │   ├── TestCase.php           # Base test case with Brain Monkey
 │   ├── stubs/                 # Minimal WooCommerce class stubs
 │   └── Unit/                  # PHPUnit unit tests
 ├── templates/
 │   └── product-selector.twig  # Frontend selection interface
-├── vendor/                    # Composer dependencies (gitignored)
+├── vendor/                    # Composer dependencies (gitignored, included in releases)
-├── composer.json              # Dependency configuration
+├── composer.json
-├── wc-composable-product.php  # Main plugin file
+├── phpcs.xml.dist             # PHPCS configuration (WordPress-Extra + PHPCompatibilityWP)
-└── [Documentation files]      # README, INSTALL, IMPLEMENTATION, etc.
+├── phpunit.xml.dist           # PHPUnit configuration
 └── wc-composable-product.php  # Main plugin file
 ```
-## Architecture Overview
+## Architecture
 ### Core Classes
-1. **Plugin.php** - Main singleton class
+1. **Plugin.php** — Main singleton class
-   - Initializes Twig template engine
+   - Initializes Twig with WordPress functions registered as both Twig functions AND filters
-   - Registers hooks and filters
+   - Registers hooks, manages asset enqueuing, provides template rendering API
-   - Manages asset enqueuing
+   - Settings.php is lazy-loaded via `woocommerce_get_settings_pages` filter (not in `includes()`) to avoid "Class WC_Settings_Page not found" errors
   - Provides template rendering API
-2. **Product_Type.php** - Custom WooCommerce product type
+2. **ProductType.php** — Custom WooCommerce product type (`composable`)
   - Extends `WC_Product`
-   - Handles selection criteria (category/tag/SKU)
+   - Queries available products via `get_available_products()` using `WP_Query`
-   - Manages pricing modes (fixed/sum)
+   - **Critical**: Uses `tax_query` with `product_type` taxonomy to exclude composable products (NOT `meta_query` — WooCommerce stores product types as taxonomy terms)
-   - Queries available products dynamically
+   - Handles variable products by expanding them into individual variations via `get_children()`
   - Products are filtered by `is_purchasable()` only (not `is_in_stock()` — stock is shown visually and validated at add-to-cart)
-3. **Cart_Handler.php** - Cart integration
+3. **CartHandler.php** — Cart integration
-   - Validates product selections
+   - Validates selections, stores selected products in cart meta, calculates pricing
-   - Stores selected products in cart meta
+   - Uses `woocommerce_is_purchasable` filter to hide default add-to-cart button for composable products
-   - Calculates dynamic pricing
+   - Price recalculation uses a static `$already_calculated` flag per request (no persistent session flags — `set_price()` is in-memory only)
   - Displays selections in cart/checkout
-4. **Product_Selector.php** - Frontend renderer
+4. **ProductSelector.php** — Frontend renderer
-   - Renders Twig template with product data
+   - Renders Twig template with product data, stock info, and pre-formatted price HTML via `wc_price()`
   - Applies display settings (images/prices/total)
-5. **Admin/Product_Data.php** - Product edit interface
+5. **Admin/ProductData.php** — Product edit interface
-   - Adds "Composable Options" tab
+   - Adds "Composable Options" tab with category/tag/SKU selection fields
-   - Category/tag/SKU selection fields
+   - Saved meta: `_composable_selection_limit`, `_composable_pricing_mode`, `_composable_criteria_type`, `_composable_categories`, `_composable_tags`, `_composable_skus`
   - Saves product metadata
-6. **Admin/Settings.php** - Global settings
+6. **Admin/Settings.php** — Global settings (extends `WC_Settings_Page`)
-   - WooCommerce settings tab integration
+   - Default selection limit, pricing mode, display preferences
-   - Default limits and pricing mode
+
-   - Display preferences
+7. **StockManager.php** — Inventory management
   - Stock validation, automatic deduction on order completion, restoration on cancellation
   - Prevents WooCommerce double-deduction via `woocommerce_can_reduce_order_stock`
 ### Data Flow
-**Product Creation:**
+**Product Creation:** Admin selects "Composable product" type → configures criteria/limits/pricing → metadata saved as `_composable_*` fields
-1. Admin selects "Composable product" type
+**Frontend Display:** `CartHandler::render_product_selector()` → `ProductType::get_available_products()` queries products via taxonomy/SKU → `ProductSelector::render()` passes data to Twig template → JavaScript handles selection UI
 2. Configures criteria, limits, pricing in product data tab
 3. Metadata saved: `_composable_*` fields
-**Frontend Display:**
+**Add to Cart:** Customer selects products → JS validates limit → AJAX request with `composable_products[]` → server-side validation (selection + stock) → selections stored in cart item data → price calculated per pricing mode
-1. `Cart_Handler::render_product_selector()` called on product page
+**Order Processing:** Order completed → `StockManager` deducts inventory → order notes added for audit → on cancellation/refund: stock restored
 2. `Product_Type::get_available_products()` queries matching products
 3. `Product_Selector::render()` passes data to Twig template
 4. JavaScript handles selection UI and AJAX
-**Add to Cart:**
+### Key Hooks
-1. Customer selects products (JS validates limit)
+- `woocommerce_add_to_cart_validation` — validate selections
-2. AJAX request with `composable_products[]` array
+- `woocommerce_add_cart_item_data` — store selections
-3. `Cart_Handler::validate_add_to_cart()` server-side validation
+- `woocommerce_before_calculate_totals` — update prices
-4. `Cart_Handler::add_cart_item_data()` stores selections
+- `woocommerce_get_item_data` — display in cart
-5. `Cart_Handler::calculate_cart_item_price()` applies pricing
+- `woocommerce_order_status_completed/processing` — deduct stock
 - `woocommerce_order_status_cancelled/refunded` — restore stock
-## Development Workflow
+### Security
-### Initial Setup
+- Input: `absint()` for IDs/limits, `sanitize_text_field()` for modes, `sanitize_textarea_field()` for SKUs
 - Output: `esc_html()`, `esc_attr()`, `esc_url()` (registered as both Twig functions and filters)
 - Nonce verification via WooCommerce
-```bash
+### Developer API
-composer install
+
 ```php
 $product = wc_get_product($product_id);
 if ($product->get_type() === 'composable') {
    $products = $product->get_available_products();
    $limit = $product->get_selection_limit();
    $price = $product->calculate_composed_price($selected_ids);
 }
 ```
-### Making Changes
+## Translations
-1. **PHP Classes:** Edit files in `includes/` or `includes/Admin/`
+All strings use text domain `wc-composable-product`. Available locales:
 2. **Templates:** Modify `templates/*.twig` (cache clears on auto-reload)
 3. **Styles:** Update `assets/css/*.css`
 4. **JavaScript:** Edit `assets/js/*.js`
 5. **Translations:** Update `.pot` file, create `.po` translations
-### Testing Checklist
+- `en_US` (base), `de_DE`, `de_DE_informal`, `de_CH`, `de_CH_informal`, `fr_CH`, `it_CH`
- [ ] Create composable product in admin
+Compile .po to .mo: `for po in languages/*.po; do msgfmt -o "${po%.po}.mo" "$po"; done`
 - [ ] Test each selection criteria type (category/tag/SKU)
 - [ ] Verify selection limit enforcement
 - [ ] Test both pricing modes (fixed/sum)
 - [ ] Check AJAX add-to-cart functionality
 - [ ] Verify cart display shows selected products
 - [ ] Test checkout process
 - [ ] Check responsive design on mobile
 - [ ] Validate all strings are translatable
-### Creating Releases
+WordPress requires compiled .mo files — .po files alone are insufficient.
 ## Testing & Linting
 Run unit tests: `vendor/bin/phpunit --testdox`
 Run coding standards check: `vendor/bin/phpcs`
 Auto-fix coding standard violations: `vendor/bin/phpcbf`
 Tests use **Brain Monkey** to mock WordPress/WooCommerce functions without a full WP installation. WooCommerce classes (`WC_Product`, `WC_Settings_Page`, etc.) are provided as minimal stubs in `tests/stubs/` so PHP can parse `extends` declarations. PHPCS uses the **WordPress-Extra** standard plus **PHPCompatibilityWP** for PHP version checks. The release workflow runs lint, phpcs, and tests before building — any failure blocks the release.
 ## Release Workflow
 ### Automated (Gitea CI/CD)
 Push an annotated tag (`v*`) to trigger the workflow. It first runs the PHPUnit test suite, then installs PHP 8.3, production Composer deps, compiles translations, verifies version matches tag, creates ZIP with checksums, and publishes a Gitea release. Tests must pass before the release package is built.
 ### Manual
 ```bash
 # From project root
-zip -r wc-composable-product-vX.X.X.zip . \
+zip -r releases/wc-composable-product-vX.X.X.zip . \
  -x "*.git*" "*.vscode*" "*.claude*" "CLAUDE.md" \
-  "wp-core" "wp-plugins" "*.log" "composer.lock" \
+  "wp-core/*" "wp-plugins/*" "*.log" "composer.lock" \
-  "cache/*" "releases/*" "*.zip"
+  "cache/*" "releases/*" "*.zip" "logs/*"
 # Verify contents
 unzip -l wc-composable-product-vX.X.X.zip
 # IMPORTANT: Ensure vendor/ is included!
 ```
-## Session History
+The `vendor/` directory MUST be included in releases (Twig dependency required at runtime).
-### v1.0.0 - Initial Implementation (2024-12-31)
+### Git Workflow
-**What was built:**
+- Develop on `dev` branch, merge to `main` for releases
 - Tags: annotated, format `vX.X.X` (e.g., `v1.2.0`)
 - Commit messages include `Co-Authored-By: Claude` attribution
- Complete plugin implementation from scratch
+## Critical Lessons Learned
 - All 6 core PHP classes with PSR-4 autoloading
 - Twig template system integration
 - Responsive frontend with AJAX functionality
 - Admin interface with WooCommerce integration
 - Full i18n support with .pot template
 - Comprehensive documentation (README, INSTALL, IMPLEMENTATION)
-**Key decisions made:**
+1. **WooCommerce stores product types as taxonomy terms** (`product_type` taxonomy), NOT as postmeta. Using `meta_query` on `_product_type` silently returns zero results because the meta key doesn't exist.
- Used Singleton pattern for main Plugin class
+2. **`WC_Product::set_price()` is in-memory only** — changes are lost between HTTP requests. Never persist a "price already calculated" flag to cart session; use a static per-request flag instead.
 - Twig for templating (per requirements)
 - Vanilla JS + jQuery for frontend (WooCommerce standard)
 - Grid layout for product selector (responsive)
 - AJAX add-to-cart for better UX
 - Meta-based configuration storage
-**Files created:** 21 files, 2,628 lines of code
+3. **Settings.php must be lazy-loaded** — `require_once` in `Plugin::includes()` causes "Class WC_Settings_Page not found" because WooCommerce hasn't loaded that class yet. Load it inside the `woocommerce_get_settings_pages` filter callback instead.
-**Git workflow:**
+4. **Register WordPress functions as both Twig functions AND filters** — other plugins may bundle their own Twig instance that parses our templates. Both `{{ esc_attr(value) }}` and `{{ value|esc_attr }}` syntax must work.
- Initial commit to `main` branch
+5. **HPOS compatibility declaration is required** — without it, WooCommerce shows incompatibility warnings.
 - Created `dev` branch from `main`
 - Both branches in sync at v1.0.0
-**What works:**
+6. **WordPress i18n requires compiled .mo files** — .po files are source only; WordPress cannot use them directly.
- Product type registration ✓
+7. **Don't filter by `is_in_stock()` during product retrieval** — it's too strict (excludes backorder-enabled products, products without stock management). Show all purchasable products; let the frontend display stock status and validate at add-to-cart time.
 - Admin product data tab ✓
 - Category/tag/SKU selection ✓
 - Frontend product selector ✓
 - AJAX add-to-cart ✓
 - Cart integration ✓
 - Pricing calculation (both modes) ✓
-**Known limitations:**
+## For AI Assistants
- Currently only simple products in selection (not variable)
+When starting a new session:
 - No grouped product support
 - No automatic stock deduction for selected items
 - Template cache requires manual clearing after updates
-**Future enhancements to consider:**
+1. Read this CLAUDE.md first
-
+2. Check git log for recent changes
- Variable product support
+3. Verify you're on the `dev` branch before making changes
- Quantity selection per item
+4. Run `composer install` if vendor/ is missing
- Visual bundle preview
+5. Test changes before committing
- Product recommendations
+6. Follow commit message format with Claude Code attribution
- Stock management integration
+7. Always use `tax_query` (not `meta_query`) for product type filtering
 - Selection presets/templates
 ---
 **For AI Assistants:**
 When starting a new session on this project:
 1. Read this CLAUDE.md file first
 2. Review IMPLEMENTATION.md for technical details
 3. Check git log for recent changes
 4. Verify you're on the `dev` branch before making changes
 5. Run `composer install` if vendor/ is missing
 6. Test changes before committing
 7. Follow commit message format with Claude Code attribution
 8. Update this session history section with learnings
 Always refer to this document when starting work on this project. Good luck!
--- a/IMPLEMENTATION.md
+++ b/IMPLEMENTATION.md
@@ -1,406 +0,0 @@
 # WooCommerce Composable Products - Implementation Summary
 ## Overview
 This document provides a technical overview of the WooCommerce Composable Products plugin implementation.
 **Version:** 1.0.0
 **Created:** 2024-12-31
 **AI-Generated:** 100% created with Claude.AI assistance
 ## Architecture
 ### Plugin Structure
 ```
 wc-composable-product/
 ├── assets/                  # Frontend assets
 │   ├── css/
 │   │   ├── admin.css       # Admin styles
 │   │   └── frontend.css    # Frontend styles
 │   └── js/
 │       ├── admin.js        # Admin JavaScript
 │       └── frontend.js     # Frontend JavaScript
 ├── cache/                  # Twig template cache
 ├── includes/               # PHP classes
 │   ├── Admin/
 │   │   ├── Product_Data.php    # Product data tab
 │   │   └── Settings.php        # Settings page
 │   ├── Cart_Handler.php        # Cart integration
 │   ├── Plugin.php              # Main plugin class
 │   ├── Product_Selector.php    # Frontend selector
 │   └── Product_Type.php        # Custom product type
 ├── languages/              # Translation files
 │   └── wc-composable-product.pot
 ├── templates/              # Twig templates
 │   └── product-selector.twig
 └── wc-composable-product.php   # Main plugin file
 ```
 ## Core Components
 ### 1. Main Plugin Class (`Plugin.php`)
 **Responsibilities:**
 - Singleton pattern implementation
 - Twig template engine initialization
 - Hook registration
 - Component initialization
 - Asset enqueuing
 **Key Methods:**
 - `instance()`: Get singleton instance
 - `init_twig()`: Initialize Twig with WordPress functions
 - `render_template()`: Render Twig templates
 - `add_product_type()`: Register composable product type
 ### 2. Product Type (`Product_Type.php`)
 **Extends:** `WC_Product`
 **Key Features:**
 - Custom product type: `composable`
 - Selection limit management (per-product or global)
 - Pricing mode (fixed or sum)
 - Product selection criteria (category/tag/SKU)
 - Dynamic product availability
 - Price calculation
 **Key Methods:**
 - `get_selection_limit()`: Get max selectable items
 - `get_pricing_mode()`: Get pricing calculation mode
 - `get_available_products()`: Query available products
 - `calculate_composed_price()`: Calculate final price
 ### 3. Admin Settings (`Admin/Settings.php`)
 **Extends:** `WC_Settings_Page`
 **Global Settings:**
 - Default selection limit
 - Default pricing mode
 - Display options (images, prices, total)
 **Integration:** Adds tab to WooCommerce Settings
 ### 4. Product Data Tab (`Admin/Product_Data.php`)
 **Responsibilities:**
 - Add "Composable Options" tab to product edit page
 - Render selection criteria fields
 - Save product meta data
 - Dynamic field visibility based on criteria type
 **Saved Meta:**
 - `_composable_selection_limit`: Item limit
 - `_composable_pricing_mode`: Pricing calculation
 - `_composable_criteria_type`: Selection method
 - `_composable_categories`: Selected categories
 - `_composable_tags`: Selected tags
 - `_composable_skus`: SKU list
 ### 5. Product Selector (`Product_Selector.php`)
 **Responsibilities:**
 - Render frontend product selection interface
 - Prepare data for Twig template
 - Apply display settings
 **Template Variables:**
 - `products`: Available products array
 - `selection_limit`: Max selections
 - `pricing_mode`: Pricing calculation
 - `show_images/prices/total`: Display flags
 ### 6. Cart Handler (`Cart_Handler.php`)
 **Responsibilities:**
 - Validate product selection
 - Add selected products to cart data
 - Calculate dynamic pricing
 - Display selected products in cart
 **Hooks:**
 - `woocommerce_add_to_cart_validation`: Validate selections
 - `woocommerce_add_cart_item_data`: Store selections
 - `woocommerce_before_calculate_totals`: Update prices
 - `woocommerce_get_item_data`: Display in cart
 ## Frontend Implementation
 ### Product Selector Template (`product-selector.twig`)
 **Features:**
 - Responsive grid layout
 - Checkbox-based selection
 - Product images and prices
 - Real-time total calculation
 - AJAX add-to-cart
 **Data Attributes:**
 - `data-product-id`: Composable product ID
 - `data-selection-limit`: Max selections
 - `data-pricing-mode`: Pricing mode
 - `data-price`: Individual product prices
 ### JavaScript (`frontend.js`)
 **Functionality:**
 - Selection limit enforcement
 - Visual feedback on selection
 - Real-time price updates (sum mode)
 - AJAX cart operations
 - Error/success messages
 **Key Functions:**
 - `handleCheckboxChange()`: Selection logic
 - `updateTotalPrice()`: Calculate total
 - `addToCart()`: AJAX add-to-cart
 - `showMessage()`: User feedback
 ### CSS Styling
 **Approach:**
 - Grid-based layout (responsive)
 - Card-style product items
 - Visual selection states
 - Mobile-first design
 - Breakpoints: 768px, 480px
 ## Data Flow
 ### Creating a Composable Product
 1. Admin selects "Composable product" type
 2. Configure selection limit and pricing mode
 3. Choose selection criteria (category/tag/SKU)
 4. Save product metadata
 5. WooCommerce registers product with custom type
 ### Frontend Display
 1. Customer visits product page
 2. `Cart_Handler` renders `Product_Selector`
 3. `Product_Type::get_available_products()` queries products
 4. Twig template renders grid with products
 5. JavaScript handles interactions
 ### Adding to Cart
 1. Customer selects products (JavaScript validation)
 2. Click "Add to Cart" button
 3. AJAX request with selected product IDs
 4. `Cart_Handler::validate_add_to_cart()` validates
 5. `Cart_Handler::add_cart_item_data()` stores selections
 6. `Cart_Handler::calculate_cart_item_price()` updates price
 7. Product added to cart with custom data
 ### Cart Display
 1. WooCommerce loads cart
 2. `Cart_Handler::get_cart_item_from_session()` restores data
 3. `Cart_Handler::display_cart_item_data()` shows selections
 4. Price calculated dynamically on each cart load
 ## Security Implementation
 ### Input Sanitization
 - **Integers:** `absint()` for IDs and limits
 - **Text:** `sanitize_text_field()` for modes and types
 - **Textarea:** `sanitize_textarea_field()` for SKUs
 - **Arrays:** `array_map()` with sanitization functions
 ### Output Escaping
 - **HTML:** `esc_html()`, `esc_html_e()`
 - **Attributes:** `esc_attr()`
 - **URLs:** `esc_url()`
 - **JavaScript:** Localized scripts with escaped data
 ### Validation
 - Selection limit enforcement
 - Product availability verification
 - Cart data validation
 - Nonce verification (via WooCommerce)
 ## Internationalization
 ### Text Domain
 `wc-composable-product`
 ### Translation Functions
 - `__()`: Return translated string
 - `_e()`: Echo translated string
 - `sprintf()` with `__()`: Variable substitution
 ### POT File
 Generated template: `languages/wc-composable-product.pot`
 **Supported Locales (per CLAUDE.md):**
 - en_US (English)
 - de_DE, de_DE_informal (German - Germany)
 - de_CH, de_CH_informal (German - Switzerland)
 - fr_CH (French - Switzerland)
 - it_CH (Italian - Switzerland)
 ## Performance Considerations
 ### Caching
 - Twig templates cached in `cache/` directory
 - Auto-reload enabled in debug mode
 - Optimized Composer autoloader
 ### Database Queries
 - Efficient `WP_Query` for product selection
 - Meta queries for SKU filtering
 - Taxonomy queries for category/tag filtering
 ### Asset Loading
 - Scripts only on relevant pages
 - Minification ready (use build tools)
 - Conditional enqueuing
 ## Extensibility
 ### Hooks & Filters
 **Available Filters:**
 - `wc_composable_settings`: Modify settings array
 - `woocommerce_product_class`: Custom product class
 - `product_type_selector`: Product type registration
 **Customization Points:**
 - Twig templates (override in theme)
 - CSS styling (enqueue custom styles)
 - JavaScript behavior (extend object)
 ### Developer API
 ```php
 // Get composable product
 $product = wc_get_product($product_id);
 // Check if composable
 if ($product->get_type() === 'composable') {
    // Get available products
    $products = $product->get_available_products();
    // Get selection limit
    $limit = $product->get_selection_limit();
    // Calculate price
    $price = $product->calculate_composed_price($selected_ids);
 }
 ```
 ## Testing Checklist
 ### Admin Testing
 - [ ] Product type appears in dropdown
 - [ ] Composable Options tab displays
 - [ ] Selection criteria toggle works
 - [ ] Meta data saves correctly
 - [ ] Settings page accessible
 - [ ] Global defaults apply
 ### Frontend Testing
 - [ ] Product selector renders
 - [ ] Selection limit enforced
 - [ ] Price calculation accurate (both modes)
 - [ ] AJAX add-to-cart works
 - [ ] Cart displays selections
 - [ ] Checkout processes correctly
 ### Edge Cases
 - [ ] Empty criteria (no products)
 - [ ] Out of stock products excluded
 - [ ] Invalid product selections rejected
 - [ ] Multiple cart items unique
 - [ ] Session persistence
 ## Known Limitations
 1. **Variable Products:** Currently supports simple products in selection
 2. **Grouped Products:** Cannot be used as selectable items
 3. **Stock Management:** No automatic stock reduction for selected items
 4. **Caching:** Template cache needs manual clearing after updates
 ## Future Enhancements
 Potential features for future versions:
 - Variable product support in selection
 - Quantity selection per item (not just presence)
 - Visual bundle previews
 - Advanced pricing rules
 - Stock management integration
 - Product recommendations
 - Selection templates/presets
 - Multi-currency support enhancements
 ## Dependencies
 ### Runtime
 - PHP 8.3+
 - WordPress 6.0+
 - WooCommerce 8.0+
 - Twig 3.0 (via Composer)
 ### Development
 - Composer for dependency management
 - WP-CLI for i18n operations (optional)
 ## Deployment
 ### Production Checklist
 1. Run `composer install --no-dev --optimize-autoloader`
 2. Ensure `vendor/` directory is included
 3. Ensure `cache/` directory is writable
 4. Test on staging environment
 5. Clear all caches after activation
 6. Verify WooCommerce compatibility
 ### Release Package
 Must include:
 - All PHP files
 - `vendor/` directory
 - Assets (CSS, JS)
 - Templates
 - Language files
 - Documentation
 Must exclude:
 - `.git/` directory
 - `composer.lock`
 - Development files
 - `wp-core/`, `wp-plugins/` symlinks
 ## Support & Maintenance
 ### Code Standards
 - WordPress Coding Standards
 - WooCommerce best practices
 - PSR-4 autoloading
 - Inline documentation
 ### Version Control
 - Semantic versioning (MAJOR.MINOR.PATCH)
 - Changelog maintained
 - Annotated git tags
 - Development on `dev` branch
 ---
 **Last Updated:** 2024-12-31
 **Maintainer:** Marco Graetsch
 **AI Assistant:** Claude.AI (Anthropic)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,150 +0,0 @@
 # Installation Guide
 ## Requirements
 Before installing the WooCommerce Composable Products plugin, ensure your system meets these requirements:
 - **PHP**: 8.3 or higher
 - **WordPress**: 6.0 or higher
 - **WooCommerce**: 8.0 or higher
 - **Composer**: For dependency management
 ## Installation Steps
 ### 1. Upload Plugin Files
 Upload the plugin directory to your WordPress installation:
 ```bash
 /wp-content/plugins/wc-composable-product/
 ```
 ### 2. Install Dependencies
 Navigate to the plugin directory and install dependencies:
 ```bash
 cd /wp-content/plugins/wc-composable-product/
 composer install --no-dev --optimize-autoloader
 ```
 ### 3. Activate Plugin
 1. Log in to your WordPress admin panel
 2. Navigate to **Plugins > Installed Plugins**
 3. Find "WooCommerce Composable Products"
 4. Click **Activate**
 ### 4. Configure Settings
 After activation, configure the plugin:
 1. Navigate to **WooCommerce > Settings**
 2. Click on the **Composable Products** tab
 3. Configure default settings:
   - **Default Selection Limit**: Number of items customers can select (default: 5)
   - **Default Pricing Mode**: Choose between "Sum of selected products" or "Fixed price"
   - **Display Options**: Toggle product images, prices, and totals
 ## Creating Your First Composable Product
 ### Step 1: Create a New Product
 1. Go to **Products > Add New**
 2. Enter a product name (e.g., "Custom Sticker Pack")
 ### Step 2: Set Product Type
 1. In the **Product Data** panel, select **Composable product** from the dropdown
 ### Step 3: Configure General Settings
 In the **General** tab:
 - Set a **Regular price** (used if pricing mode is "Fixed")
 - Configure **Selection Limit** (leave empty to use global default)
 - Choose **Pricing Mode** (leave empty to use global default)
 ### Step 4: Configure Composable Options
 Click on the **Composable Options** tab:
 1. **Selection Criteria**: Choose how to select available products
   - **By Category**: Select product categories
   - **By Tag**: Select product tags
   - **By SKU**: Enter comma-separated SKUs
 2. Based on your selection:
   - **Categories**: Select one or more categories from the dropdown
   - **Tags**: Select one or more tags from the dropdown
   - **SKUs**: Enter SKUs like: `STICKER-01, STICKER-02, STICKER-03`
 ### Step 5: Publish
 Click **Publish** to make your composable product live.
 ## Frontend Usage
 When customers visit your composable product:
 1. They see a grid of available products based on your criteria
 2. They can select up to the configured limit
 3. The total price updates in real-time (if using sum pricing mode)
 4. Click "Add to Cart" to add the composition to their cart
 5. Selected products are displayed in the cart
 ## Troubleshooting
 ### Plugin Won't Activate
 - Ensure WooCommerce is installed and activated first
 - Check PHP version (must be 8.3+)
 - Verify Composer dependencies are installed
 ### Products Not Showing in Selector
 - Check that products are published and in stock
 - Verify the selection criteria (category/tag/SKU) is correct
 - Ensure products match the criteria you configured
 ### Twig Template Errors
 - Ensure the `vendor/` directory exists and contains Twig
 - Run `composer install` again
 - Check that the `cache/` directory is writable
 ### JavaScript Not Working
 - Clear browser cache
 - Check browser console for errors
 - Ensure jQuery is loaded (WooCommerce includes it)
 ## Updating
 When updating the plugin:
 1. Deactivate the plugin
 2. Replace plugin files
 3. Run `composer install --no-dev --optimize-autoloader`
 4. Reactivate the plugin
 5. Clear all caches (WordPress, browser, CDN)
 ## Uninstallation
 To completely remove the plugin:
 1. Deactivate the plugin
 2. Delete the plugin from the Plugins page
 3. Optionally clean up database entries (WooCommerce will handle this automatically)
 ## Support
 For issues and feature requests:
 - GitHub: https://github.com/magdev/wc-composable-product/issues
 - Documentation: See README.md
 ## Next Steps
 - Customize the template by editing `templates/product-selector.twig`
 - Modify styles in `assets/css/frontend.css`
 - Translate the plugin using the provided `.pot` file
 - Create categories/tags for easier product organization
--- a/README.md
+++ b/README.md
@@ -1,51 +1,113 @@
 # WooCommerce Composable Products
-Create composable products where customers can select a limited number of items from a configurable set of products.
+Create composable products where customers can select a limited number of items from a configurable set of products. Think of it as a "build your own gift box" or "create your sticker pack" feature.
-## Description
+## Key Features
 This plugin adds a new product type to WooCommerce that allows customers to build their own product bundles by selecting from a predefined set of simple or variable products. Think of it as a "build your own gift box" or "create your sticker pack" feature.
 ### Key Features
 - **Custom Product Type**: New "Composable Product" type in WooCommerce
 - **Flexible Selection**: Define available products by category, tag, or SKU
 - **Variable Product Support**: Automatically expands variable products into selectable variations
 - **Stock Management**: Real-time stock validation, visual indicators, and automatic inventory tracking
 - **Configurable Limits**: Set global or per-product selection limits
- **Pricing Options**: Fixed price or sum of selected products
+- **Pricing Options**: Fixed price or sum of selected products with full locale-aware formatting
- **Multi-language Support**: Fully translatable with i18n support
+- **Multi-language Support**: Fully translated in 6 locales (de_DE, de_CH, fr_CH, it_CH + informal variants)
 - **Modern UI**: Clean interface built with Twig templates and vanilla JavaScript
 - **Tested**: 57 unit tests with PHPUnit, Brain Monkey, and Mockery
 - **CI/CD**: Automated release workflow with test gate for Gitea
 ## Requirements
 - PHP 8.3 or higher
 - WordPress 6.0 or higher
 - WooCommerce 8.0 or higher
 - Composer (for dependency management)
 ## Installation
-1. Upload the plugin files to `/wp-content/plugins/wc-composable-product/`
+### From Release Package
-2. Run `composer install --no-dev` in the plugin directory
+
-3. Activate the plugin through the 'Plugins' menu in WordPress
+1. Download the latest release ZIP from the releases page
-4. Configure global settings under WooCommerce > Settings > Composable Products
+2. In WordPress admin, go to **Plugins > Add New > Upload Plugin**
 3. Upload the ZIP file and click **Install Now**
 4. Activate the plugin through the **Plugins** menu
 5. Configure global settings under **WooCommerce > Settings > Composable Products**
 ### From Source
 1. Upload the plugin directory to `/wp-content/plugins/wc-composable-product/`
 2. Install dependencies:
   ```bash
   cd /wp-content/plugins/wc-composable-product/
   composer install --no-dev --optimize-autoloader
   ```
 3. Activate the plugin through the **Plugins** menu in WordPress
 4. Configure global settings under **WooCommerce > Settings > Composable Products**
 ## Usage
 ### Creating a Composable Product
 1. Go to Products > Add New
 2. Select "Composable Product" as the product type
 3. Configure product details:
   - Set the selection limit (or use global default)
   - Choose pricing mode (fixed or sum)
   - Define available products by category, tag, or SKU
 4. Publish the product
 ### Global Settings
-Navigate to WooCommerce > Settings > Composable Products to configure:
+Navigate to **WooCommerce > Settings > Composable Products** to configure:
- Default selection limit
+
- Default pricing mode
+- **Default Selection Limit**: Number of items customers can select (default: 5)
- Display options
+- **Default Pricing Mode**: Choose between "Sum of selected products" or "Fixed price"
 - **Display Options**: Toggle product images, prices, and totals
 ### Creating a Composable Product
 1. Go to **Products > Add New**
 2. Select **Composable product** from the Product Data dropdown
 3. In the **General** tab:
   - Set a **Regular price** (used when pricing mode is "Fixed")
   - Configure **Selection Limit** (leave empty to use global default)
   - Choose **Pricing Mode** (leave empty to use global default)
 4. Click the **Composable Options** tab:
   - **Selection Criteria**: Choose how to define available products
     - **By Category**: Select one or more product categories
     - **By Tag**: Select one or more product tags
     - **By SKU**: Enter comma-separated SKUs (e.g., `STICKER-01, STICKER-02`)
 5. Click **Publish**
 ### Frontend Behavior
 When customers visit a composable product page:
 1. A grid of available products is displayed based on configured criteria
 2. Customers select up to the configured limit via checkboxes
 3. Total price updates in real-time (in sum pricing mode)
 4. Stock indicators show availability (green/orange/red badges)
 5. Click "Add to Cart" to add the composition to cart
 6. Selected products are listed in the cart and checkout
 ## Troubleshooting
 ### Plugin Won't Activate
 - Ensure WooCommerce is installed and activated first
 - Check PHP version (must be 8.3+)
 - Verify Composer dependencies are installed (`vendor/` directory exists)
 ### Products Not Showing in Selector
 - Check that products are published
 - Verify the selection criteria (category/tag/SKU) matches existing products
 - Ensure the criteria type and values are saved in the Composable Options tab
 ### Twig Template Errors
 - Ensure the `vendor/` directory exists and contains Twig
 - Run `composer install` again
 - Check that the `cache/` directory is writable
 ### Updating
 1. Deactivate the plugin
 2. Replace plugin files (or upload new release ZIP)
 3. If installed from source: run `composer install --no-dev --optimize-autoloader`
 4. Reactivate the plugin
 5. Clear all caches (WordPress, browser, CDN)
 ## Development
@@ -57,13 +119,41 @@ This project was created with AI assistance (Claude.AI) and follows WordPress an
 composer install
 ```
 ### Running Tests
 The plugin includes a PHPUnit test suite with Brain Monkey for WordPress function mocking:
 ```bash
 vendor/bin/phpunit --testdox
 ```
 Tests run without a WordPress installation. WooCommerce classes are provided as minimal stubs in `tests/stubs/`.
 ### Translation
 Generate POT file:
 ```bash
 wp i18n make-pot . languages/wc-composable-product.pot
 ```
 Compile translations:
 ```bash
 for po in languages/*.po; do msgfmt -o "${po%.po}.mo" "$po"; done
 ```
 ### Creating Releases
 Releases are automated via Gitea CI/CD. Push an annotated tag to trigger:
 ```bash
 git tag -a v1.2.0 -m "Release v1.2.0"
 git push origin v1.2.0
 ```
 The workflow builds the release ZIP, compiles translations, generates checksums, and creates a Gitea release with attachments.
 ## License
 GPL v3 or later - see LICENSE file for details
@@ -74,4 +164,4 @@ Marco Graetsch
 ## Support
-For issues and feature requests, please use the GitHub issue tracker.
+For issues and feature requests, please use the issue tracker.
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -1,13 +1,20 @@
 /**
 * Admin Styles for Composable Products
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
 /* Hide composable panel by default */
 #composable_product_data {
    display: none;
    padding: 12px;
 }
 /* Show composable panel when composable type is selected */
 body.product-type-composable #composable_product_data {
    display: block;
 }
 .composable_criteria_group {
    border-top: 1px solid #eee;
    padding-top: 12px;
@@ -19,11 +26,23 @@
    min-height: 150px;
 }
-.show_if_composable {
+/* Hide composable-specific elements by default (but not tabs) */
 .options_group.show_if_composable {
    display: none;
 }
-.product-type-composable .show_if_composable {
+/* Show composable elements when composable product type is selected */
 body.product-type-composable .options_group.show_if_composable {
    display: block;
 }
 /* Hide the Composable Options tab link by default */
 .product_data_tabs li.composable_options {
    display: none;
 }
 /* Show the Composable Options tab when composable type selected */
 body.product-type-composable .product_data_tabs li.composable_options {
    display: block;
 }
--- a/assets/css/frontend.css
+++ b/assets/css/frontend.css
@@ -1,7 +1,7 @@
 /**
 * Frontend Styles for Composable Products
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
 .wc-composable-product-selector {
@@ -54,6 +54,20 @@
    background: #f0f8ff;
 }
 .composable-product-item.out-of-stock {
    opacity: 0.6;
    cursor: not-allowed;
 }
 .composable-product-item.out-of-stock:hover {
    border-color: #e0e0e0;
    box-shadow: none;
 }
 .composable-product-item.out-of-stock .product-item-label {
    cursor: not-allowed;
 }
 .product-item-label {
    display: block;
    padding: 1rem;
@@ -94,6 +108,33 @@
    font-size: 0.9rem;
 }
 .product-item-stock {
    margin-top: 0.5rem;
    font-size: 0.85rem;
 }
 .stock-status {
    display: inline-block;
    padding: 0.25rem 0.5rem;
    border-radius: 3px;
    font-weight: 500;
 }
 .stock-status.in-stock {
    color: #2e7d32;
    background: #e8f5e9;
 }
 .stock-status.low-stock {
    color: #f57c00;
    background: #fff3e0;
 }
 .stock-status.out-of-stock {
    color: #c62828;
    background: #ffebee;
 }
 .product-item-checkmark {
    position: absolute;
    top: 0.5rem;
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -1,7 +1,7 @@
 /**
 * Admin JavaScript for Composable Products
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
 (function($) {
@@ -17,12 +17,14 @@
            if (productType === 'composable') {
                $('.show_if_composable').show();
                $('.hide_if_composable').hide();
-                $('#composable_product_data').show();
+                // Show the composable tab, then click it so WooCommerce's
-                $('.product_data_tabs .composable_options a').show();
+                // native tab system hides all other panels properly
                $('.product_data_tabs li.composable_options').show();
                $('ul.product_data_tabs li.composable_options a').trigger('click');
            } else {
                $('.show_if_composable').hide();
                $('.product_data_tabs li.composable_options').hide();
                $('#composable_product_data').hide();
                $('.product_data_tabs .composable_options a').hide();
            }
        }).trigger('change');
@@ -36,6 +38,23 @@
            $('#composable_criteria_' + criteriaType).show();
        }).trigger('change');
        /**
         * Toggle fixed price field based on pricing mode
         */
        function toggleFixedPriceField() {
            const pricingMode = $('#_composable_pricing_mode').val();
            const $fixedPriceField = $('.composable_fixed_price_field');
            if (pricingMode === 'fixed') {
                $fixedPriceField.show();
            } else {
                $fixedPriceField.hide();
            }
        }
        $('#_composable_pricing_mode').on('change', toggleFixedPriceField);
        toggleFixedPriceField();
        /**
         * Initialize enhanced select for categories and tags
         */
--- a/assets/js/frontend.js
+++ b/assets/js/frontend.js
@@ -1,7 +1,7 @@
 /**
 * Frontend JavaScript for Composable Products
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
 (function($) {
@@ -63,6 +63,36 @@
            this.clearMessages($container);
        },
        /**
         * Format price using WooCommerce settings
         *
         * @param {number} price Price amount
         * @return {string} Formatted price HTML
         */
        formatPrice: function(price) {
            if (typeof wcComposableProduct === 'undefined' || !wcComposableProduct.price_format) {
                return price.toFixed(2);
            }
            const format = wcComposableProduct.price_format;
            const decimals = parseInt(format.decimals, 10);
            const decimalSep = format.decimal_separator;
            const thousandSep = format.thousand_separator;
            // Format number
            let priceStr = price.toFixed(decimals);
            const parts = priceStr.split('.');
            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, thousandSep);
            priceStr = parts.join(decimalSep);
            // Apply price format (e.g., "%1$s%2$s" for symbol+price or "%2$s%1$s" for price+symbol)
            let formatted = format.price_format
                .replace('%1$s', '<span class="woocommerce-Price-currencySymbol">' + format.currency_symbol + '</span>')
                .replace('%2$s', priceStr);
            return '<span class="woocommerce-Price-amount amount">' + formatted + '</span>';
        },
        /**
         * Update total price
         *
@@ -79,8 +109,8 @@
                }
            });
-            const currencySymbol = $container.find('.total-price').data('currency');
+            const formattedPrice = this.formatPrice(total);
-            $container.find('.calculated-total').text(currencySymbol + total.toFixed(2));
+            $container.find('.calculated-total').html(formattedPrice);
        },
        /**
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
    "authors": [
        {
            "name": "Marco Graetsch",
-            "email": "marco@example.com"
+            "email": "magdev3.0@gmail.com"
        }
    ],
    "require": {
@@ -15,11 +15,31 @@
    },
    "autoload": {
        "psr-4": {
-            "WC_Composable_Product\\": "includes/"
+            "Magdev\\WcComposableProduct\\": "includes/"
        }
    },
    "require-dev": {
        "brain/monkey": "^2.7",
        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
        "mockery/mockery": "^1.6",
        "phpcompatibility/phpcompatibility-wp": "*",
        "phpunit/phpunit": "^10.0",
        "squizlabs/php_codesniffer": "^3.7",
        "wp-coding-standards/wpcs": "^3.0"
    },
    "autoload-dev": {
        "psr-4": {
            "Magdev\\WcComposableProduct\\Tests\\": "tests/"
        }
    },
    "config": {
        "optimize-autoloader": true,
-        "sort-packages": true
+        "sort-packages": true,
        "allow-plugins": {
            "dealerdirect/phpcodesniffer-composer-installer": true
        },
        "platform": {
            "php": "8.3.0"
        }
    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/includes/Admin/ProductData.php
+++ b/includes/Admin/ProductData.php
@@ -0,0 +1,245 @@
 <?php
 /**
 * Product Data Tab
 *
 * @package Magdev\WcComposableProduct
 */
 namespace Magdev\WcComposableProduct\Admin;
 defined( 'ABSPATH' ) || exit;
 /**
 * Product Data Tab Class
 */
 class ProductData {
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
 		add_filter( 'woocommerce_product_data_tabs', array( $this, 'add_product_data_tab' ) );
 		add_action( 'woocommerce_product_data_panels', array( $this, 'add_product_data_panel' ) );
 		add_action( 'woocommerce_process_product_meta_composable', array( $this, 'save_product_data' ) );
 		add_action( 'woocommerce_product_options_general_product_data', array( $this, 'add_general_fields' ) );
 	}
 	/**
 	 * Add composable products tab
 	 *
 	 * @param array $tabs Product data tabs
 	 * @return array
 	 */
 	public function add_product_data_tab( $tabs ) {
 		$tabs['composable'] = array(
 			'label'    => __( 'Composable Options', 'wc-composable-product' ),
 			'target'   => 'composable_product_data',
 			'class'    => array( 'show_if_composable' ),
 			'priority' => 21,
 		);
 		return $tabs;
 	}
 	/**
 	 * Add fields to general tab
 	 */
 	public function add_general_fields() {
 		global $product_object;
 		if ( $product_object && $product_object->get_type() === 'composable' ) {
 			echo '<div class="options_group show_if_composable">';
 			woocommerce_wp_text_input(
 				array(
 					'id'                => '_composable_selection_limit',
 					'label'             => __( 'Selection Limit', 'wc-composable-product' ),
 					'description'       => __( 'Maximum number of items customers can select. Leave empty to use global default.', 'wc-composable-product' ),
 					'desc_tip'          => true,
 					'type'              => 'number',
 					'custom_attributes' => array(
 						'min'  => '1',
 						'step' => '1',
 					),
 				)
 			);
 			woocommerce_wp_select(
 				array(
 					'id'          => '_composable_pricing_mode',
 					'label'       => __( 'Pricing Mode', 'wc-composable-product' ),
 					'description' => __( 'How to calculate the price.', 'wc-composable-product' ),
 					'desc_tip'    => true,
 					'options'     => array(
 						''      => __( 'Use global default', 'wc-composable-product' ),
 						'sum'   => __( 'Sum of selected products', 'wc-composable-product' ),
 						'fixed' => __( 'Fixed price', 'wc-composable-product' ),
 					),
 				)
 			);
 			woocommerce_wp_text_input(
 				array(
 					'id'            => '_regular_price',
 					'label'         => __( 'Fixed Price', 'wc-composable-product' ) . ' (' . get_woocommerce_currency_symbol() . ')',
 					'description'   => __( 'Enter the fixed price for this composable product.', 'wc-composable-product' ),
 					'desc_tip'      => true,
 					'type'          => 'text',
 					'data_type'     => 'price',
 					'wrapper_class' => 'composable_fixed_price_field',
 				)
 			);
 			echo '</div>';
 		}
 	}
 	/**
 	 * Add product data panel
 	 */
 	public function add_product_data_panel() {
 		global $post;
 		?>
 		<div id="composable_product_data" class="panel woocommerce_options_panel hidden">
 			<div class="options_group">
 				<?php
 				woocommerce_wp_select(
 					array(
 						'id'          => '_composable_include_unpublished',
 						'label'       => __( 'Include Non-Public Products', 'wc-composable-product' ),
 						'description' => __( 'Allow draft and private products in the selection. Useful when products should only be sold as part of a composition.', 'wc-composable-product' ),
 						'desc_tip'    => true,
 						'options'     => array(
 							''    => __( 'Use global default', 'wc-composable-product' ),
 							'yes' => __( 'Yes', 'wc-composable-product' ),
 							'no'  => __( 'No', 'wc-composable-product' ),
 						),
 						'value'       => get_post_meta( $post->ID, '_composable_include_unpublished', true ) ? get_post_meta( $post->ID, '_composable_include_unpublished', true ) : '',
 					)
 				);
 				woocommerce_wp_select(
 					array(
 						'id'          => '_composable_criteria_type',
 						'label'       => __( 'Selection Criteria', 'wc-composable-product' ),
 						'description' => __( 'How to select available products.', 'wc-composable-product' ),
 						'desc_tip'    => true,
 						'options'     => array(
 							'category' => __( 'By Category', 'wc-composable-product' ),
 							'tag'      => __( 'By Tag', 'wc-composable-product' ),
 							'sku'      => __( 'By SKU', 'wc-composable-product' ),
 						),
 						'value'       => get_post_meta( $post->ID, '_composable_criteria_type', true ) ? get_post_meta( $post->ID, '_composable_criteria_type', true ) : 'category',
 					)
 				);
 				?>
 			</div>
 			<div class="options_group composable_criteria_group" id="composable_criteria_category">
 				<p class="form-field">
 					<label for="_composable_categories"><?php esc_html_e( 'Select Categories', 'wc-composable-product' ); ?></label>
 					<select id="_composable_categories" name="_composable_categories[]" class="wc-enhanced-select" multiple="multiple" style="width: 50%;">
 						<?php
 						$selected_categories = get_post_meta( $post->ID, '_composable_categories', true );
 						$selected_categories = $selected_categories ? $selected_categories : array();
 						$categories          = get_terms(
 							array(
 								'taxonomy'   => 'product_cat',
 								'hide_empty' => false,
 							)
 						);
 						foreach ( $categories as $category ) {
 							printf(
 								'<option value="%s" %s>%s</option>',
 								esc_attr( $category->term_id ),
 								selected( in_array( $category->term_id, (array) $selected_categories, true ), true, false ),
 								esc_html( $category->name )
 							);
 						}
 						?>
 					</select>
 					<span class="description"><?php esc_html_e( 'Select product categories to include.', 'wc-composable-product' ); ?></span>
 				</p>
 			</div>
 			<div class="options_group composable_criteria_group" id="composable_criteria_tag" style="display: none;">
 				<p class="form-field">
 					<label for="_composable_tags"><?php esc_html_e( 'Select Tags', 'wc-composable-product' ); ?></label>
 					<select id="_composable_tags" name="_composable_tags[]" class="wc-enhanced-select" multiple="multiple" style="width: 50%;">
 						<?php
 						$selected_tags = get_post_meta( $post->ID, '_composable_tags', true );
 						$selected_tags = $selected_tags ? $selected_tags : array();
 						$tags          = get_terms(
 							array(
 								'taxonomy'   => 'product_tag',
 								'hide_empty' => false,
 							)
 						);
 						foreach ( $tags as $tag ) {
 							printf(
 								'<option value="%s" %s>%s</option>',
 								esc_attr( $tag->term_id ),
 								selected( in_array( $tag->term_id, (array) $selected_tags, true ), true, false ),
 								esc_html( $tag->name )
 							);
 						}
 						?>
 					</select>
 					<span class="description"><?php esc_html_e( 'Select product tags to include.', 'wc-composable-product' ); ?></span>
 				</p>
 			</div>
 			<div class="options_group composable_criteria_group" id="composable_criteria_sku" style="display: none;">
 				<?php
 				woocommerce_wp_textarea_input(
 					array(
 						'id'          => '_composable_skus',
 						'label'       => __( 'Product SKUs', 'wc-composable-product' ),
 						'description' => __( 'Enter product SKUs separated by commas.', 'wc-composable-product' ),
 						'desc_tip'    => true,
 						'placeholder' => __( 'SKU-1, SKU-2, SKU-3', 'wc-composable-product' ),
 					)
 				);
 				?>
 			</div>
 		</div>
 		<?php
 	}
 	/**
 	 * Save product data
 	 *
 	 * @param int $post_id Post ID
 	 */
 	public function save_product_data( $post_id ) {
 		// phpcs:disable WordPress.Security.NonceVerification.Missing -- nonce verified by WooCommerce in woocommerce_process_product_meta.
 		// Save selection limit.
 		$selection_limit = isset( $_POST['_composable_selection_limit'] ) ? absint( $_POST['_composable_selection_limit'] ) : '';
 		update_post_meta( $post_id, '_composable_selection_limit', $selection_limit );
 		// Save pricing mode.
 		$pricing_mode = isset( $_POST['_composable_pricing_mode'] ) ? sanitize_text_field( $_POST['_composable_pricing_mode'] ) : '';
 		update_post_meta( $post_id, '_composable_pricing_mode', $pricing_mode );
 		// Save include unpublished.
 		$include_unpublished = isset( $_POST['_composable_include_unpublished'] ) ? sanitize_text_field( $_POST['_composable_include_unpublished'] ) : '';
 		update_post_meta( $post_id, '_composable_include_unpublished', $include_unpublished );
 		// Save criteria type.
 		$criteria_type = isset( $_POST['_composable_criteria_type'] ) ? sanitize_text_field( $_POST['_composable_criteria_type'] ) : 'category';
 		update_post_meta( $post_id, '_composable_criteria_type', $criteria_type );
 		// Save categories.
 		$categories = isset( $_POST['_composable_categories'] ) ? array_map( 'absint', $_POST['_composable_categories'] ) : array();
 		update_post_meta( $post_id, '_composable_categories', $categories );
 		// Save tags.
 		$tags = isset( $_POST['_composable_tags'] ) ? array_map( 'absint', $_POST['_composable_tags'] ) : array();
 		update_post_meta( $post_id, '_composable_tags', $tags );
 		// Save SKUs.
 		$skus = isset( $_POST['_composable_skus'] ) ? sanitize_textarea_field( $_POST['_composable_skus'] ) : '';
 		update_post_meta( $post_id, '_composable_skus', $skus );
 		// phpcs:enable WordPress.Security.NonceVerification.Missing
 	}
 }
--- a/includes/Admin/Product_Data.php
+++ b/includes/Admin/Product_Data.php
@@ -1,190 +0,0 @@
 <?php
 /**
 * Product Data Tab
 *
 * @package WC_Composable_Product
 */
 namespace WC_Composable_Product\Admin;
 defined('ABSPATH') || exit;
 /**
 * Product Data Tab Class
 */
 class Product_Data {
    /**
     * Constructor
     */
    public function __construct() {
        add_filter('woocommerce_product_data_tabs', [$this, 'add_product_data_tab']);
        add_action('woocommerce_product_data_panels', [$this, 'add_product_data_panel']);
        add_action('woocommerce_process_product_meta_composable', [$this, 'save_product_data']);
        add_action('woocommerce_product_options_general_product_data', [$this, 'add_general_fields']);
    }
    /**
     * Add composable products tab
     *
     * @param array $tabs Product data tabs
     * @return array
     */
    public function add_product_data_tab($tabs) {
        $tabs['composable'] = [
            'label' => __('Composable Options', 'wc-composable-product'),
            'target' => 'composable_product_data',
            'class' => ['show_if_composable'],
            'priority' => 21,
        ];
        return $tabs;
    }
    /**
     * Add fields to general tab
     */
    public function add_general_fields() {
        global $product_object;
        if ($product_object && $product_object->get_type() === 'composable') {
            echo '<div class="options_group show_if_composable">';
            woocommerce_wp_text_input([
                'id' => '_composable_selection_limit',
                'label' => __('Selection Limit', 'wc-composable-product'),
                'description' => __('Maximum number of items customers can select. Leave empty to use global default.', 'wc-composable-product'),
                'desc_tip' => true,
                'type' => 'number',
                'custom_attributes' => [
                    'min' => '1',
                    'step' => '1',
                ],
            ]);
            woocommerce_wp_select([
                'id' => '_composable_pricing_mode',
                'label' => __('Pricing Mode', 'wc-composable-product'),
                'description' => __('How to calculate the price. Leave empty to use global default.', 'wc-composable-product'),
                'desc_tip' => true,
                'options' => [
                    '' => __('Use global default', 'wc-composable-product'),
                    'sum' => __('Sum of selected products', 'wc-composable-product'),
                    'fixed' => __('Fixed price', 'wc-composable-product'),
                ],
            ]);
            echo '</div>';
        }
    }
    /**
     * Add product data panel
     */
    public function add_product_data_panel() {
        global $post;
        ?>
        <div id="composable_product_data" class="panel woocommerce_options_panel hidden">
            <div class="options_group">
                <?php
                woocommerce_wp_select([
                    'id' => '_composable_criteria_type',
                    'label' => __('Selection Criteria', 'wc-composable-product'),
                    'description' => __('How to select available products.', 'wc-composable-product'),
                    'desc_tip' => true,
                    'options' => [
                        'category' => __('By Category', 'wc-composable-product'),
                        'tag' => __('By Tag', 'wc-composable-product'),
                        'sku' => __('By SKU', 'wc-composable-product'),
                    ],
                    'value' => get_post_meta($post->ID, '_composable_criteria_type', true) ?: 'category',
                ]);
                ?>
            </div>
            <div class="options_group composable_criteria_group" id="composable_criteria_category">
                <p class="form-field">
                    <label for="_composable_categories"><?php esc_html_e('Select Categories', 'wc-composable-product'); ?></label>
                    <select id="_composable_categories" name="_composable_categories[]" class="wc-enhanced-select" multiple="multiple" style="width: 50%;">
                        <?php
                        $selected_categories = get_post_meta($post->ID, '_composable_categories', true) ?: [];
                        $categories = get_terms(['taxonomy' => 'product_cat', 'hide_empty' => false]);
                        foreach ($categories as $category) {
                            printf(
                                '<option value="%s" %s>%s</option>',
                                esc_attr($category->term_id),
                                selected(in_array($category->term_id, (array) $selected_categories), true, false),
                                esc_html($category->name)
                            );
                        }
                        ?>
                    </select>
                    <span class="description"><?php esc_html_e('Select product categories to include.', 'wc-composable-product'); ?></span>
                </p>
            </div>
            <div class="options_group composable_criteria_group" id="composable_criteria_tag" style="display: none;">
                <p class="form-field">
                    <label for="_composable_tags"><?php esc_html_e('Select Tags', 'wc-composable-product'); ?></label>
                    <select id="_composable_tags" name="_composable_tags[]" class="wc-enhanced-select" multiple="multiple" style="width: 50%;">
                        <?php
                        $selected_tags = get_post_meta($post->ID, '_composable_tags', true) ?: [];
                        $tags = get_terms(['taxonomy' => 'product_tag', 'hide_empty' => false]);
                        foreach ($tags as $tag) {
                            printf(
                                '<option value="%s" %s>%s</option>',
                                esc_attr($tag->term_id),
                                selected(in_array($tag->term_id, (array) $selected_tags), true, false),
                                esc_html($tag->name)
                            );
                        }
                        ?>
                    </select>
                    <span class="description"><?php esc_html_e('Select product tags to include.', 'wc-composable-product'); ?></span>
                </p>
            </div>
            <div class="options_group composable_criteria_group" id="composable_criteria_sku" style="display: none;">
                <?php
                woocommerce_wp_textarea_input([
                    'id' => '_composable_skus',
                    'label' => __('Product SKUs', 'wc-composable-product'),
                    'description' => __('Enter product SKUs separated by commas.', 'wc-composable-product'),
                    'desc_tip' => true,
                    'placeholder' => __('SKU-1, SKU-2, SKU-3', 'wc-composable-product'),
                ]);
                ?>
            </div>
        </div>
        <?php
    }
    /**
     * Save product data
     *
     * @param int $post_id Post ID
     */
    public function save_product_data($post_id) {
        // Save selection limit
        $selection_limit = isset($_POST['_composable_selection_limit']) ? absint($_POST['_composable_selection_limit']) : '';
        update_post_meta($post_id, '_composable_selection_limit', $selection_limit);
        // Save pricing mode
        $pricing_mode = isset($_POST['_composable_pricing_mode']) ? sanitize_text_field($_POST['_composable_pricing_mode']) : '';
        update_post_meta($post_id, '_composable_pricing_mode', $pricing_mode);
        // Save criteria type
        $criteria_type = isset($_POST['_composable_criteria_type']) ? sanitize_text_field($_POST['_composable_criteria_type']) : 'category';
        update_post_meta($post_id, '_composable_criteria_type', $criteria_type);
        // Save categories
        $categories = isset($_POST['_composable_categories']) ? array_map('absint', $_POST['_composable_categories']) : [];
        update_post_meta($post_id, '_composable_categories', $categories);
        // Save tags
        $tags = isset($_POST['_composable_tags']) ? array_map('absint', $_POST['_composable_tags']) : [];
        update_post_meta($post_id, '_composable_tags', $tags);
        // Save SKUs
        $skus = isset($_POST['_composable_skus']) ? sanitize_textarea_field($_POST['_composable_skus']) : '';
        update_post_meta($post_id, '_composable_skus', $skus);
    }
 }
--- a/includes/Admin/Settings.php
+++ b/includes/Admin/Settings.php
@@ -2,10 +2,10 @@
 /**
 * Admin Settings
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
-namespace WC_Composable_Product\Admin;
+namespace Magdev\WcComposableProduct\Admin;
 defined( 'ABSPATH' ) || exit;
@@ -29,63 +29,70 @@ class Settings extends \WC_Settings_Page {
 	 * @return array
 	 */
 	public function get_settings() {
-        $settings = [
+		$settings = array(
-            [
+			array(
 				'title' => __( 'Composable Products Settings', 'wc-composable-product' ),
 				'type'  => 'title',
 				'desc'  => __( 'Configure default settings for composable products.', 'wc-composable-product' ),
 				'id'    => 'wc_composable_settings',
-            ],
+			),
-            [
+			array(
 				'title'             => __( 'Default Selection Limit', 'wc-composable-product' ),
 				'desc'              => __( 'Default number of items customers can select.', 'wc-composable-product' ),
 				'id'                => 'wc_composable_default_limit',
 				'type'              => 'number',
 				'default'           => '5',
-                'custom_attributes' => [
+				'custom_attributes' => array(
 					'min'  => '1',
 					'step' => '1',
-                ],
+				),
 				'desc_tip'          => true,
-            ],
+			),
-            [
+			array(
 				'title'    => __( 'Default Pricing Mode', 'wc-composable-product' ),
 				'desc'     => __( 'How to calculate the price of composable products.', 'wc-composable-product' ),
 				'id'       => 'wc_composable_default_pricing',
 				'type'     => 'select',
 				'default'  => 'sum',
-                'options' => [
+				'options'  => array(
 					'sum'   => __( 'Sum of selected products', 'wc-composable-product' ),
 					'fixed' => __( 'Fixed price', 'wc-composable-product' ),
-                ],
+				),
 				'desc_tip' => true,
-            ],
+			),
-            [
+			array(
 				'title'   => __( 'Include Non-Public Products', 'wc-composable-product' ),
 				'desc'    => __( 'Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually.', 'wc-composable-product' ),
 				'id'      => 'wc_composable_include_unpublished',
 				'type'    => 'checkbox',
 				'default' => 'no',
 			),
 			array(
 				'title'   => __( 'Show Product Images', 'wc-composable-product' ),
 				'desc'    => __( 'Display product images in the selection interface.', 'wc-composable-product' ),
 				'id'      => 'wc_composable_show_images',
 				'type'    => 'checkbox',
 				'default' => 'yes',
-            ],
+			),
-            [
+			array(
 				'title'   => __( 'Show Product Prices', 'wc-composable-product' ),
 				'desc'    => __( 'Display individual product prices in the selection interface.', 'wc-composable-product' ),
 				'id'      => 'wc_composable_show_prices',
 				'type'    => 'checkbox',
 				'default' => 'yes',
-            ],
+			),
-            [
+			array(
 				'title'   => __( 'Show Total Price', 'wc-composable-product' ),
 				'desc'    => __( 'Display the total price as customers make selections.', 'wc-composable-product' ),
 				'id'      => 'wc_composable_show_total',
 				'type'    => 'checkbox',
 				'default' => 'yes',
-            ],
+			),
-            [
+			array(
 				'type' => 'sectionend',
 				'id'   => 'wc_composable_settings',
-            ],
+			),
-        ];
+		);
 		return apply_filters( 'wc_composable_settings', $settings );
 	}
--- a/includes/CartHandler.php
+++ b/includes/CartHandler.php
@@ -0,0 +1,228 @@
 <?php
 /**
 * Cart Handler
 *
 * @package Magdev\WcComposableProduct
 */
 namespace Magdev\WcComposableProduct;
 defined( 'ABSPATH' ) || exit;
 /**
 * Cart Handler Class
 *
 * Handles adding composable products to cart and calculating prices
 */
 class CartHandler {
 	/**
 	 * Stock manager instance
 	 *
 	 * @var StockManager
 	 */
 	private $stock_manager;
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
 		$this->stock_manager = new StockManager();
 		add_filter( 'woocommerce_add_to_cart_validation', array( $this, 'validate_add_to_cart' ), 10, 3 );
 		add_filter( 'woocommerce_add_cart_item_data', array( $this, 'add_cart_item_data' ), 10, 2 );
 		add_filter( 'woocommerce_get_cart_item_from_session', array( $this, 'get_cart_item_from_session' ), 10, 2 );
 		add_filter( 'woocommerce_get_item_data', array( $this, 'display_cart_item_data' ), 10, 2 );
 		add_action( 'woocommerce_before_calculate_totals', array( $this, 'calculate_cart_item_price' ) );
 		add_action( 'woocommerce_single_product_summary', array( $this, 'render_product_selector' ), 25 );
 		add_action( 'woocommerce_checkout_create_order_line_item', array( $this->stock_manager, 'store_selected_products_in_order' ), 10, 3 );
 		add_filter( 'woocommerce_is_purchasable', array( $this, 'hide_default_add_to_cart' ), 10, 2 );
 	}
 	/**
 	 * Hide default WooCommerce add to cart button for composable products
 	 *
 	 * @param bool $is_purchasable Is purchasable status
 	 * @param \WC_Product $product Product object
 	 * @return bool
 	 */
 	public function hide_default_add_to_cart( $is_purchasable, $product ) {
 		if ( $product && $product->get_type() === 'composable' ) {
 			return false;
 		}
 		return $is_purchasable;
 	}
 	/**
 	 * Render product selector on product page
 	 */
 	public function render_product_selector() {
 		global $product;
 		if ( $product && $product->get_type() === 'composable' ) {
 			ProductSelector::render( $product );
 		}
 	}
 	/**
 	 * Validate add to cart
 	 *
 	 * @param bool $passed Validation status
 	 * @param int $product_id Product ID
 	 * @param int $quantity Quantity
 	 * @return bool
 	 */
 	public function validate_add_to_cart( $passed, $product_id, $quantity ) {
 		$product = wc_get_product( $product_id );
 		if ( ! $product || $product->get_type() !== 'composable' ) {
 			return $passed;
 		}
 		// Check if selected products are provided.
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce verified by WooCommerce add-to-cart handler.
 		if ( ! isset( $_POST['composable_products'] ) || empty( $_POST['composable_products'] ) ) {
 			wc_add_notice( __( 'Please select at least one product.', 'wc-composable-product' ), 'error' );
 			return false;
 		}
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce verified by WooCommerce add-to-cart handler.
 		$selected_products = array_map( 'absint', $_POST['composable_products'] );
 		$selection_limit   = $product->get_selection_limit();
 		// Validate selection limit
 		if ( count( $selected_products ) > $selection_limit ) {
 			/* translators: %d: selection limit */
 			wc_add_notice( sprintf( __( 'You can select a maximum of %d products.', 'wc-composable-product' ), $selection_limit ), 'error' );
 			return false;
 		}
 		if ( count( $selected_products ) === 0 ) {
 			wc_add_notice( __( 'Please select at least one product.', 'wc-composable-product' ), 'error' );
 			return false;
 		}
 		// Validate that selected products are valid
 		$available_products = $product->get_available_products();
 		$available_ids      = array_map(
 			function ( $p ) {
 				return $p->get_id();
 			},
 			$available_products
 		);
 		foreach ( $selected_products as $selected_id ) {
 			if ( ! in_array( $selected_id, $available_ids, true ) ) {
 				wc_add_notice( __( 'One or more selected products are not available.', 'wc-composable-product' ), 'error' );
 				return false;
 			}
 		}
 		// Validate stock availability
 		$stock_validation = $this->stock_manager->validate_stock_availability( $selected_products, $quantity );
 		if ( true !== $stock_validation ) {
 			wc_add_notice( $stock_validation, 'error' );
 			return false;
 		}
 		return $passed;
 	}
 	/**
 	 * Add cart item data
 	 *
 	 * @param array $cart_item_data Cart item data
 	 * @param int $product_id Product ID
 	 * @return array
 	 */
 	public function add_cart_item_data( $cart_item_data, $product_id ) {
 		$product = wc_get_product( $product_id );
 		if ( ! $product || $product->get_type() !== 'composable' ) {
 			return $cart_item_data;
 		}
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce verified by WooCommerce add-to-cart handler.
 		if ( isset( $_POST['composable_products'] ) && ! empty( $_POST['composable_products'] ) ) {
 			// phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce verified by WooCommerce add-to-cart handler.
 			$selected_products                     = array_map( 'absint', $_POST['composable_products'] );
 			$cart_item_data['composable_products'] = $selected_products;
 			// Make cart item unique.
 			$cart_item_data['unique_key'] = md5( wp_json_encode( $selected_products ) . time() );
 		}
 		return $cart_item_data;
 	}
 	/**
 	 * Get cart item from session
 	 *
 	 * @param array $cart_item Cart item
 	 * @param array $values Values from session
 	 * @return array
 	 */
 	public function get_cart_item_from_session( $cart_item, $values ) {
 		if ( isset( $values['composable_products'] ) ) {
 			$cart_item['composable_products'] = $values['composable_products'];
 		}
 		return $cart_item;
 	}
 	/**
 	 * Display cart item data
 	 *
 	 * @param array $item_data Item data
 	 * @param array $cart_item Cart item
 	 * @return array
 	 */
 	public function display_cart_item_data( $item_data, $cart_item ) {
 		if ( isset( $cart_item['composable_products'] ) && ! empty( $cart_item['composable_products'] ) ) {
 			$product_names = array();
 			foreach ( $cart_item['composable_products'] as $product_id ) {
 				$product = wc_get_product( $product_id );
 				if ( $product ) {
 					$product_names[] = $product->get_name();
 				}
 			}
 			if ( ! empty( $product_names ) ) {
 				$item_data[] = array(
 					'key'   => __( 'Selected Products', 'wc-composable-product' ),
 					'value' => implode( ', ', $product_names ),
 				);
 			}
 		}
 		return $item_data;
 	}
 	/**
 	 * Calculate cart item price
 	 *
 	 * @param \WC_Cart $cart Cart object
 	 */
 	public function calculate_cart_item_price( $cart ) {
 		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
 			return;
 		}
 		// Use static flag to prevent multiple executions within the same request
 		static $already_calculated = false;
 		if ( $already_calculated ) {
 			return;
 		}
 		foreach ( $cart->get_cart() as $cart_item_key => $cart_item ) {
 			if ( isset( $cart_item['data'] ) && $cart_item['data']->get_type() === 'composable' ) {
 				if ( isset( $cart_item['composable_products'] ) ) {
 					$product = $cart_item['data'];
 					$price   = $product->calculate_composed_price( $cart_item['composable_products'] );
 					$cart_item['data']->set_price( $price );
 				}
 			}
 		}
 		$already_calculated = true;
 	}
 }
--- a/includes/Cart_Handler.php
+++ b/includes/Cart_Handler.php
@@ -1,181 +0,0 @@
 <?php
 /**
 * Cart Handler
 *
 * @package WC_Composable_Product
 */
 namespace WC_Composable_Product;
 defined('ABSPATH') || exit;
 /**
 * Cart Handler Class
 *
 * Handles adding composable products to cart and calculating prices
 */
 class Cart_Handler {
    /**
     * Constructor
     */
    public function __construct() {
        add_filter('woocommerce_add_to_cart_validation', [$this, 'validate_add_to_cart'], 10, 3);
        add_filter('woocommerce_add_cart_item_data', [$this, 'add_cart_item_data'], 10, 2);
        add_filter('woocommerce_get_cart_item_from_session', [$this, 'get_cart_item_from_session'], 10, 2);
        add_filter('woocommerce_get_item_data', [$this, 'display_cart_item_data'], 10, 2);
        add_action('woocommerce_before_calculate_totals', [$this, 'calculate_cart_item_price']);
        add_action('woocommerce_single_product_summary', [$this, 'render_product_selector'], 25);
    }
    /**
     * Render product selector on product page
     */
    public function render_product_selector() {
        global $product;
        if ($product && $product->get_type() === 'composable') {
            Product_Selector::render($product);
        }
    }
    /**
     * Validate add to cart
     *
     * @param bool $passed Validation status
     * @param int $product_id Product ID
     * @param int $quantity Quantity
     * @return bool
     */
    public function validate_add_to_cart($passed, $product_id, $quantity) {
        $product = wc_get_product($product_id);
        if (!$product || $product->get_type() !== 'composable') {
            return $passed;
        }
        // Check if selected products are provided
        if (!isset($_POST['composable_products']) || empty($_POST['composable_products'])) {
            wc_add_notice(__('Please select at least one product.', 'wc-composable-product'), 'error');
            return false;
        }
        $selected_products = array_map('absint', $_POST['composable_products']);
        $selection_limit = $product->get_selection_limit();
        // Validate selection limit
        if (count($selected_products) > $selection_limit) {
            /* translators: %d: selection limit */
            wc_add_notice(sprintf(__('You can select a maximum of %d products.', 'wc-composable-product'), $selection_limit), 'error');
            return false;
        }
        if (count($selected_products) === 0) {
            wc_add_notice(__('Please select at least one product.', 'wc-composable-product'), 'error');
            return false;
        }
        // Validate that selected products are valid
        $available_products = $product->get_available_products();
        $available_ids = array_map(function($p) {
            return $p->get_id();
        }, $available_products);
        foreach ($selected_products as $selected_id) {
            if (!in_array($selected_id, $available_ids)) {
                wc_add_notice(__('One or more selected products are not available.', 'wc-composable-product'), 'error');
                return false;
            }
        }
        return $passed;
    }
    /**
     * Add cart item data
     *
     * @param array $cart_item_data Cart item data
     * @param int $product_id Product ID
     * @return array
     */
    public function add_cart_item_data($cart_item_data, $product_id) {
        $product = wc_get_product($product_id);
        if (!$product || $product->get_type() !== 'composable') {
            return $cart_item_data;
        }
        if (isset($_POST['composable_products']) && !empty($_POST['composable_products'])) {
            $selected_products = array_map('absint', $_POST['composable_products']);
            $cart_item_data['composable_products'] = $selected_products;
            // Make cart item unique
            $cart_item_data['unique_key'] = md5(json_encode($selected_products) . time());
        }
        return $cart_item_data;
    }
    /**
     * Get cart item from session
     *
     * @param array $cart_item Cart item
     * @param array $values Values from session
     * @return array
     */
    public function get_cart_item_from_session($cart_item, $values) {
        if (isset($values['composable_products'])) {
            $cart_item['composable_products'] = $values['composable_products'];
        }
        return $cart_item;
    }
    /**
     * Display cart item data
     *
     * @param array $item_data Item data
     * @param array $cart_item Cart item
     * @return array
     */
    public function display_cart_item_data($item_data, $cart_item) {
        if (isset($cart_item['composable_products']) && !empty($cart_item['composable_products'])) {
            $product_names = [];
            foreach ($cart_item['composable_products'] as $product_id) {
                $product = wc_get_product($product_id);
                if ($product) {
                    $product_names[] = $product->get_name();
                }
            }
            if (!empty($product_names)) {
                $item_data[] = [
                    'key' => __('Selected Products', 'wc-composable-product'),
                    'value' => implode(', ', $product_names),
                ];
            }
        }
        return $item_data;
    }
    /**
     * Calculate cart item price
     *
     * @param \WC_Cart $cart Cart object
     */
    public function calculate_cart_item_price($cart) {
        if (is_admin() && !defined('DOING_AJAX')) {
            return;
        }
        foreach ($cart->get_cart() as $cart_item_key => $cart_item) {
            if (isset($cart_item['data']) && $cart_item['data']->get_type() === 'composable') {
                if (isset($cart_item['composable_products'])) {
                    $product = $cart_item['data'];
                    $price = $product->calculate_composed_price($cart_item['composable_products']);
                    $cart_item['data']->set_price($price);
                }
            }
        }
    }
 }
--- a/includes/Plugin.php
+++ b/includes/Plugin.php
@@ -2,10 +2,10 @@
 /**
 * Main Plugin Class
 *
- * @package WC_Composable_Product
+ * @package Magdev\WcComposableProduct
 */
-namespace WC_Composable_Product;
+namespace Magdev\WcComposableProduct;
 defined( 'ABSPATH' ) || exit;
@@ -55,15 +55,15 @@ class Plugin {
 	 */
 	private function init_hooks() {
 		// Register product type
-        add_filter('product_type_selector', [$this, 'add_product_type']);
+		add_filter( 'product_type_selector', array( $this, 'add_product_type' ) );
-        add_filter('woocommerce_product_class', [$this, 'product_class'], 10, 2);
+		add_filter( 'woocommerce_product_class', array( $this, 'product_class' ), 10, 2 );
 		// Enqueue scripts and styles
-        add_action('wp_enqueue_scripts', [$this, 'enqueue_frontend_scripts']);
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_scripts' ) );
-        add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_scripts']);
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
 		// Admin settings
-        add_filter('woocommerce_get_settings_pages', [$this, 'add_settings_page']);
+		add_filter( 'woocommerce_get_settings_pages', array( $this, 'add_settings_page' ) );
 	}
 	/**
@@ -71,34 +71,51 @@ class Plugin {
 	 */
 	private function init_twig() {
 		$loader     = new \Twig\Loader\FilesystemLoader( WC_COMPOSABLE_PRODUCT_PATH . 'templates' );
-        $this->twig = new \Twig\Environment($loader, [
+		$this->twig = new \Twig\Environment(
 			$loader,
 			array(
 				'cache'       => WC_COMPOSABLE_PRODUCT_PATH . 'cache',
 				'auto_reload' => true,
 				'debug'       => defined( 'WP_DEBUG' ) && WP_DEBUG,
-        ]);
+			)
 		);
 		// Add WordPress functions to Twig
-        $this->twig->addFunction(new \Twig\TwigFunction('__', function($text) {
+		$this->twig->addFunction(
 			new \Twig\TwigFunction(
 				'__',
 				function ( $text ) {
 					// phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText -- dynamic Twig template strings.
 					return __( $text, 'wc-composable-product' );
-        }));
+				}
 			)
 		);
 		$this->twig->addFunction( new \Twig\TwigFunction( 'esc_html', 'esc_html' ) );
 		$this->twig->addFunction( new \Twig\TwigFunction( 'esc_attr', 'esc_attr' ) );
 		$this->twig->addFunction( new \Twig\TwigFunction( 'esc_url', 'esc_url' ) );
 		$this->twig->addFunction( new \Twig\TwigFunction( 'wc_price', 'wc_price' ) );
 		// Add WordPress escaping functions as Twig filters
 		$this->twig->addFilter( new \Twig\TwigFilter( 'esc_html', 'esc_html' ) );
 		$this->twig->addFilter( new \Twig\TwigFilter( 'esc_attr', 'esc_attr' ) );
 		$this->twig->addFilter( new \Twig\TwigFilter( 'esc_url', 'esc_url' ) );
 	}
 	/**
 	 * Include required files
 	 */
 	private function includes() {
-        require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Admin/Settings.php';
+		// Note: Settings.php is NOT included here because it extends WC_Settings_Page
-        require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Admin/Product_Data.php';
+		// which isn't loaded until later. It's included in add_settings_page() instead.
-        require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Product_Type.php';
+		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Admin/ProductData.php';
-        require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Cart_Handler.php';
+		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/ProductType.php';
-        require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Product_Selector.php';
+		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/StockManager.php';
 		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/CartHandler.php';
 		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/ProductSelector.php';
 		// Initialize components
-        new Admin\Product_Data();
+		new Admin\ProductData();
-        new Cart_Handler();
+		new CartHandler();
 	}
 	/**
@@ -120,8 +137,8 @@ class Plugin {
 	 * @return string
 	 */
 	public function product_class( $classname, $product_type ) {
-        if ($product_type === 'composable') {
+		if ( 'composable' === $product_type ) {
-            $classname = 'WC_Composable_Product\Product_Type';
+			$classname = 'Magdev\WcComposableProduct\ProductType';
 		}
 		return $classname;
 	}
@@ -134,27 +151,38 @@ class Plugin {
 			wp_enqueue_style(
 				'wc-composable-product',
 				WC_COMPOSABLE_PRODUCT_URL . 'assets/css/frontend.css',
-                [],
+				array(),
 				WC_COMPOSABLE_PRODUCT_VERSION
 			);
 			wp_enqueue_script(
 				'wc-composable-product',
 				WC_COMPOSABLE_PRODUCT_URL . 'assets/js/frontend.js',
-                ['jquery'],
+				array( 'jquery' ),
 				WC_COMPOSABLE_PRODUCT_VERSION,
 				true
 			);
-            wp_localize_script('wc-composable-product', 'wcComposableProduct', [
+			wp_localize_script(
 				'wc-composable-product',
 				'wcComposableProduct',
 				array(
 					'ajax_url'     => admin_url( 'admin-ajax.php' ),
 					'nonce'        => wp_create_nonce( 'wc_composable_product_nonce' ),
-                'i18n' => [
+					'i18n'         => array(
 						'select_items' => __( 'Please select items', 'wc-composable-product' ),
 						'max_items'    => __( 'Maximum items selected', 'wc-composable-product' ),
 						'min_items'    => __( 'Please select at least one item', 'wc-composable-product' ),
-                ],
+					),
-            ]);
+					'price_format' => array(
 						'currency_symbol'    => get_woocommerce_currency_symbol(),
 						'decimal_separator'  => wc_get_price_decimal_separator(),
 						'thousand_separator' => wc_get_price_thousand_separator(),
 						'decimals'           => wc_get_price_decimals(),
 						'price_format'       => get_woocommerce_price_format(),
 					),
 				)
 			);
 		}
 	}
@@ -168,14 +196,14 @@ class Plugin {
 				wp_enqueue_style(
 					'wc-composable-product-admin',
 					WC_COMPOSABLE_PRODUCT_URL . 'assets/css/admin.css',
-                    [],
+					array(),
 					WC_COMPOSABLE_PRODUCT_VERSION
 				);
 				wp_enqueue_script(
 					'wc-composable-product-admin',
 					WC_COMPOSABLE_PRODUCT_URL . 'assets/js/admin.js',
-                    ['jquery', 'wc-admin-product-meta-boxes'],
+					array( 'jquery', 'wc-admin-product-meta-boxes' ),
 					WC_COMPOSABLE_PRODUCT_VERSION,
 					true
 				);
@@ -190,6 +218,8 @@ class Plugin {
 	 * @return array
 	 */
 	public function add_settings_page( $settings ) {
 		// Include Settings.php here, when WC_Settings_Page is guaranteed to be loaded
 		require_once WC_COMPOSABLE_PRODUCT_PATH . 'includes/Admin/Settings.php';
 		$settings[] = new Admin\Settings();
 		return $settings;
 	}
@@ -210,7 +240,7 @@ class Plugin {
 	 * @param array $context Template variables
 	 * @return string
 	 */
-    public function render_template($template, $context = []) {
+	public function render_template( $template, $context = array() ) {
 		return $this->twig->render( $template, $context );
 	}
 }
--- a/includes/ProductSelector.php
+++ b/includes/ProductSelector.php
@@ -0,0 +1,78 @@
 <?php
 /**
 * Product Selector
 *
 * @package Magdev\WcComposableProduct
 */
 namespace Magdev\WcComposableProduct;
 defined( 'ABSPATH' ) || exit;
 /**
 * Product Selector Class
 *
 * Handles rendering the product selection interface
 */
 class ProductSelector {
 	/**
 	 * Render product selector
 	 *
 	 * @param ProductType $product Composable product
 	 */
 	public static function render( $product ) {
 		if ( ! $product || $product->get_type() !== 'composable' ) {
 			return;
 		}
 		$available_products = $product->get_available_products();
 		$selection_limit    = $product->get_selection_limit();
 		$pricing_mode       = $product->get_pricing_mode();
 		$show_images = get_option( 'wc_composable_show_images', 'yes' ) === 'yes';
 		$show_prices = get_option( 'wc_composable_show_prices', 'yes' ) === 'yes';
 		$show_total  = get_option( 'wc_composable_show_total', 'yes' ) === 'yes';
 		// Get stock manager for stock information
 		$stock_manager = new StockManager();
 		// Prepare product data for template
 		$products_data = array();
 		foreach ( $available_products as $available_product ) {
 			$stock_info = $stock_manager->get_product_stock_info( $available_product->get_id() );
 			$products_data[] = array(
 				'id'                 => $available_product->get_id(),
 				'name'               => $available_product->get_name(),
 				'price'              => $available_product->get_price(),
 				'price_html'         => $available_product->get_price_html(),
 				'image_url'          => wp_get_attachment_image_url( $available_product->get_image_id(), 'thumbnail' ),
 				'permalink'          => $available_product->get_permalink(),
 				'stock_status'       => $stock_info['stock_status'],
 				'in_stock'           => $stock_info['in_stock'],
 				'stock_quantity'     => $stock_info['stock_quantity'],
 				'managing_stock'     => $stock_info['managing_stock'],
 				'backorders_allowed' => $stock_info['backorders_allowed'],
 			);
 		}
 		$context = array(
 			'product_id'       => $product->get_id(),
 			'products'         => $products_data,
 			'selection_limit'  => $selection_limit,
 			'pricing_mode'     => $pricing_mode,
 			'show_images'      => $show_images,
 			'show_prices'      => $show_prices,
 			'show_total'       => $show_total,
 			'fixed_price'      => $product->get_price(),
 			'fixed_price_html' => wc_price( $product->get_price() ),
 			'zero_price_html'  => wc_price( 0 ),
 			'currency_symbol'  => get_woocommerce_currency_symbol(),
 		);
 		// Render template — Twig handles escaping via registered esc_html/esc_attr/esc_url functions.
 		$plugin = Plugin::instance();
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- output escaped by Twig template.
 		echo $plugin->render_template( 'product-selector.twig', $context );
 	}
 }
--- a/includes/ProductType.php
+++ b/includes/ProductType.php
@@ -0,0 +1,254 @@
 <?php
 /**
 * Composable Product Type
 *
 * @package Magdev\WcComposableProduct
 */
 namespace Magdev\WcComposableProduct;
 defined( 'ABSPATH' ) || exit;
 /**
 * Composable Product Type Class
 */
 class ProductType extends \WC_Product {
 	/**
 	 * Product type
 	 *
 	 * @var string
 	 */
 	protected $product_type = 'composable';
 	/**
 	 * Constructor
 	 *
 	 * @param mixed $product Product ID or object
 	 */
 	public function __construct( $product = 0 ) {
 		$this->supports[] = 'ajax_add_to_cart';
 		parent::__construct( $product );
 	}
 	/**
 	 * Get product type
 	 *
 	 * @return string
 	 */
 	public function get_type() {
 		return 'composable';
 	}
 	/**
 	 * Get selection limit
 	 *
 	 * @return int
 	 */
 	public function get_selection_limit() {
 		$limit = $this->get_meta( '_composable_selection_limit', true );
 		if ( empty( $limit ) ) {
 			$limit = get_option( 'wc_composable_default_limit', 5 );
 		}
 		return absint( $limit );
 	}
 	/**
 	 * Get pricing mode
 	 *
 	 * @return string 'fixed' or 'sum'
 	 */
 	public function get_pricing_mode() {
 		$mode = $this->get_meta( '_composable_pricing_mode', true );
 		if ( empty( $mode ) ) {
 			$mode = get_option( 'wc_composable_default_pricing', 'sum' );
 		}
 		return $mode;
 	}
 	/**
 	 * Get product selection criteria
 	 *
 	 * @return array
 	 */
 	public function get_selection_criteria() {
 		$type       = $this->get_meta( '_composable_criteria_type', true );
 		$categories = $this->get_meta( '_composable_categories', true );
 		$tags       = $this->get_meta( '_composable_tags', true );
 		$skus       = $this->get_meta( '_composable_skus', true );
 		return array(
 			'type'       => $type ? $type : 'category',
 			'categories' => $categories ? $categories : array(),
 			'tags'       => $tags ? $tags : array(),
 			'skus'       => $skus ? $skus : '',
 		);
 	}
 	/**
 	 * Check if product is purchasable
 	 *
 	 * @return bool
 	 */
 	public function is_purchasable() {
 		return true;
 	}
 	/**
 	 * Check if product is sold individually
 	 *
 	 * @return bool
 	 */
 	public function is_sold_individually() {
 		return true;
 	}
 	/**
 	 * Check if non-public products should be included
 	 *
 	 * @return bool
 	 */
 	public function should_include_unpublished() {
 		$per_product = $this->get_meta( '_composable_include_unpublished', true );
 		if ( 'yes' === $per_product ) {
 			return true;
 		}
 		if ( 'no' === $per_product ) {
 			return false;
 		}
 		return 'yes' === get_option( 'wc_composable_include_unpublished', 'no' );
 	}
 	/**
 	 * Get available products based on criteria
 	 *
 	 * @return array Array of WC_Product objects
 	 */
 	public function get_available_products() {
 		$criteria            = $this->get_selection_criteria();
 		$include_unpublished = $this->should_include_unpublished();
 		$args                = array(
 			'post_type'      => 'product',
 			'posts_per_page' => -1,
 			'post_status'    => $include_unpublished ? array( 'publish', 'draft', 'private' ) : 'publish',
 			'orderby'        => 'title',
 			'order'          => 'ASC',
 		);
 		// Exclude composable products using the product_type taxonomy
 		// (WooCommerce stores product types as taxonomy terms, NOT as postmeta)
 		$args['tax_query'] = array(
 			'relation' => 'AND',
 			array(
 				'taxonomy' => 'product_type',
 				'field'    => 'slug',
 				'terms'    => array( 'composable' ),
 				'operator' => 'NOT IN',
 			),
 		);
 		switch ( $criteria['type'] ) {
 			case 'category':
 				if ( ! empty( $criteria['categories'] ) ) {
 					$args['tax_query'][] = array(
 						'taxonomy' => 'product_cat',
 						'field'    => 'term_id',
 						'terms'    => $criteria['categories'],
 						'operator' => 'IN',
 					);
 				}
 				break;
 			case 'tag':
 				if ( ! empty( $criteria['tags'] ) ) {
 					$args['tax_query'][] = array(
 						'taxonomy' => 'product_tag',
 						'field'    => 'term_id',
 						'terms'    => $criteria['tags'],
 						'operator' => 'IN',
 					);
 				}
 				break;
 			case 'sku':
 				if ( ! empty( $criteria['skus'] ) ) {
 					$skus               = array_map( 'trim', explode( ',', $criteria['skus'] ) );
 					$args['meta_query'] = array(
 						array(
 							'key'     => '_sku',
 							'value'   => $skus,
 							'compare' => 'IN',
 						),
 					);
 				}
 				break;
 		}
 		$query    = new \WP_Query( $args );
 		$products = array();
 		if ( $query->have_posts() ) {
 			foreach ( $query->posts as $post ) {
 				$product = wc_get_product( $post->ID );
 				if ( ! $product ) {
 					continue;
 				}
 				// Handle variable products by including their variations
 				if ( $product->is_type( 'variable' ) ) {
 					$variation_ids = $product->get_children();
 					foreach ( $variation_ids as $variation_id ) {
 						$variation = wc_get_product( $variation_id );
 						if ( $variation && ( $include_unpublished || $variation->is_purchasable() ) ) {
 							$products[] = $variation;
 						}
 					}
 				} elseif ( $include_unpublished || $product->is_purchasable() ) {
 					$products[] = $product;
 				}
 			}
 		}
 		wp_reset_postdata();
 		return $products;
 	}
 	/**
 	 * Calculate price based on selected products
 	 *
 	 * @param array $selected_products Array of product IDs
 	 * @return float
 	 */
 	public function calculate_composed_price( $selected_products ) {
 		$pricing_mode = $this->get_pricing_mode();
 		if ( 'fixed' === $pricing_mode ) {
 			return floatval( $this->get_regular_price() );
 		}
 		$total = 0;
 		foreach ( $selected_products as $product_id ) {
 			$product = wc_get_product( $product_id );
 			if ( $product ) {
 				$total += floatval( $product->get_price() );
 			}
 		}
 		return $total;
 	}
 	/**
 	 * Add to cart validation
 	 *
 	 * @param int $product_id Product ID
 	 * @param int $quantity Quantity
 	 * @param int $variation_id Variation ID
 	 * @param array $variations Variations
 	 * @param array $cart_item_data Cart item data
 	 * @return bool
 	 */
 	public function add_to_cart_validation( $product_id, $quantity, $variation_id = 0, $variations = array(), $cart_item_data = array() ) {
 		return true;
 	}
 }
--- a/includes/Product_Selector.php
+++ b/includes/Product_Selector.php
@@ -1,65 +0,0 @@
 <?php
 /**
 * Product Selector
 *
 * @package WC_Composable_Product
 */
 namespace WC_Composable_Product;
 defined('ABSPATH') || exit;
 /**
 * Product Selector Class
 *
 * Handles rendering the product selection interface
 */
 class Product_Selector {
    /**
     * Render product selector
     *
     * @param Product_Type $product Composable product
     */
    public static function render($product) {
        if (!$product || $product->get_type() !== 'composable') {
            return;
        }
        $available_products = $product->get_available_products();
        $selection_limit = $product->get_selection_limit();
        $pricing_mode = $product->get_pricing_mode();
        $show_images = get_option('wc_composable_show_images', 'yes') === 'yes';
        $show_prices = get_option('wc_composable_show_prices', 'yes') === 'yes';
        $show_total = get_option('wc_composable_show_total', 'yes') === 'yes';
        // Prepare product data for template
        $products_data = [];
        foreach ($available_products as $available_product) {
            $products_data[] = [
                'id' => $available_product->get_id(),
                'name' => $available_product->get_name(),
                'price' => $available_product->get_price(),
                'price_html' => $available_product->get_price_html(),
                'image_url' => wp_get_attachment_image_url($available_product->get_image_id(), 'thumbnail'),
                'permalink' => $available_product->get_permalink(),
            ];
        }
        $context = [
            'product_id' => $product->get_id(),
            'products' => $products_data,
            'selection_limit' => $selection_limit,
            'pricing_mode' => $pricing_mode,
            'show_images' => $show_images,
            'show_prices' => $show_prices,
            'show_total' => $show_total,
            'fixed_price' => $product->get_price(),
            'currency_symbol' => get_woocommerce_currency_symbol(),
        ];
        // Render template
        $plugin = Plugin::instance();
        echo $plugin->render_template('product-selector.twig', $context);
    }
 }
--- a/includes/Product_Type.php
+++ b/includes/Product_Type.php
@@ -1,213 +0,0 @@
 <?php
 /**
 * Composable Product Type
 *
 * @package WC_Composable_Product
 */
 namespace WC_Composable_Product;
 defined('ABSPATH') || exit;
 /**
 * Composable Product Type Class
 */
 class Product_Type extends \WC_Product {
    /**
     * Product type
     *
     * @var string
     */
    protected $product_type = 'composable';
    /**
     * Constructor
     *
     * @param mixed $product Product ID or object
     */
    public function __construct($product = 0) {
        $this->supports[] = 'ajax_add_to_cart';
        parent::__construct($product);
    }
    /**
     * Get product type
     *
     * @return string
     */
    public function get_type() {
        return 'composable';
    }
    /**
     * Get selection limit
     *
     * @return int
     */
    public function get_selection_limit() {
        $limit = $this->get_meta('_composable_selection_limit', true);
        if (empty($limit)) {
            $limit = get_option('wc_composable_default_limit', 5);
        }
        return absint($limit);
    }
    /**
     * Get pricing mode
     *
     * @return string 'fixed' or 'sum'
     */
    public function get_pricing_mode() {
        $mode = $this->get_meta('_composable_pricing_mode', true);
        if (empty($mode)) {
            $mode = get_option('wc_composable_default_pricing', 'sum');
        }
        return $mode;
    }
    /**
     * Get product selection criteria
     *
     * @return array
     */
    public function get_selection_criteria() {
        return [
            'type' => $this->get_meta('_composable_criteria_type', true) ?: 'category',
            'categories' => $this->get_meta('_composable_categories', true) ?: [],
            'tags' => $this->get_meta('_composable_tags', true) ?: [],
            'skus' => $this->get_meta('_composable_skus', true) ?: '',
        ];
    }
    /**
     * Check if product is purchasable
     *
     * @return bool
     */
    public function is_purchasable() {
        return true;
    }
    /**
     * Check if product is sold individually
     *
     * @return bool
     */
    public function is_sold_individually() {
        return true;
    }
    /**
     * Get available products based on criteria
     *
     * @return array Array of WC_Product objects
     */
    public function get_available_products() {
        $criteria = $this->get_selection_criteria();
        $args = [
            'post_type' => 'product',
            'posts_per_page' => -1,
            'post_status' => 'publish',
            'orderby' => 'title',
            'order' => 'ASC',
            'tax_query' => [],
        ];
        // Exclude composable products from selection
        $args['meta_query'] = [
            [
                'key' => '_product_type',
                'value' => 'composable',
                'compare' => '!=',
            ],
        ];
        switch ($criteria['type']) {
            case 'category':
                if (!empty($criteria['categories'])) {
                    $args['tax_query'][] = [
                        'taxonomy' => 'product_cat',
                        'field' => 'term_id',
                        'terms' => $criteria['categories'],
                        'operator' => 'IN',
                    ];
                }
                break;
            case 'tag':
                if (!empty($criteria['tags'])) {
                    $args['tax_query'][] = [
                        'taxonomy' => 'product_tag',
                        'field' => 'term_id',
                        'terms' => $criteria['tags'],
                        'operator' => 'IN',
                    ];
                }
                break;
            case 'sku':
                if (!empty($criteria['skus'])) {
                    $skus = array_map('trim', explode(',', $criteria['skus']));
                    $args['meta_query'][] = [
                        'key' => '_sku',
                        'value' => $skus,
                        'compare' => 'IN',
                    ];
                }
                break;
        }
        $query = new \WP_Query($args);
        $products = [];
        if ($query->have_posts()) {
            foreach ($query->posts as $post) {
                $product = wc_get_product($post->ID);
                if ($product && $product->is_in_stock() && $product->is_purchasable()) {
                    $products[] = $product;
                }
            }
        }
        wp_reset_postdata();
        return $products;
    }
    /**
     * Calculate price based on selected products
     *
     * @param array $selected_products Array of product IDs
     * @return float
     */
    public function calculate_composed_price($selected_products) {
        $pricing_mode = $this->get_pricing_mode();
        if ($pricing_mode === 'fixed') {
            return floatval($this->get_regular_price());
        }
        $total = 0;
        foreach ($selected_products as $product_id) {
            $product = wc_get_product($product_id);
            if ($product) {
                $total += floatval($product->get_price());
            }
        }
        return $total;
    }
    /**
     * Add to cart validation
     *
     * @param int $product_id Product ID
     * @param int $quantity Quantity
     * @param int $variation_id Variation ID
     * @param array $variations Variations
     * @param array $cart_item_data Cart item data
     * @return bool
     */
    public function add_to_cart_validation($product_id, $quantity, $variation_id = 0, $variations = [], $cart_item_data = []) {
        return true;
    }
 }
--- a/includes/StockManager.php
+++ b/includes/StockManager.php
@@ -0,0 +1,283 @@
 <?php
 /**
 * Stock Manager
 *
 * @package Magdev\WcComposableProduct
 */
 namespace Magdev\WcComposableProduct;
 defined( 'ABSPATH' ) || exit;
 /**
 * Stock Manager Class
 *
 * Handles stock management for composable products
 */
 class StockManager {
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
 		// Hook into order completion to reduce stock
 		add_action( 'woocommerce_order_status_completed', array( $this, 'reduce_stock_on_order_complete' ), 10, 1 );
 		add_action( 'woocommerce_order_status_processing', array( $this, 'reduce_stock_on_order_complete' ), 10, 1 );
 		// Hook into order cancellation/refund to restore stock
 		add_action( 'woocommerce_order_status_cancelled', array( $this, 'restore_stock_on_order_cancel' ), 10, 1 );
 		add_action( 'woocommerce_order_status_refunded', array( $this, 'restore_stock_on_order_cancel' ), 10, 1 );
 		// Prevent double stock reduction
 		add_filter( 'woocommerce_can_reduce_order_stock', array( $this, 'prevent_composable_stock_reduction' ), 10, 2 );
 	}
 	/**
 	 * Validate stock availability for selected products
 	 *
 	 * @param array $selected_product_ids Array of product IDs
 	 * @param int $quantity Quantity of composable product being added
 	 * @return bool|string True if in stock, error message otherwise
 	 */
 	public function validate_stock_availability( $selected_product_ids, $quantity = 1 ) {
 		foreach ( $selected_product_ids as $product_id ) {
 			$product = wc_get_product( $product_id );
 			if ( ! $product ) {
 				continue;
 			}
 			// Skip stock check if stock management is disabled for this product
 			if ( ! $product->managing_stock() ) {
 				continue;
 			}
 			$stock_quantity = $product->get_stock_quantity();
 			// Check if product is in stock
 			if ( ! $product->is_in_stock() ) {
 				return sprintf(
 					/* translators: %s: product name */
 					__( '"%s" is out of stock and cannot be selected.', 'wc-composable-product' ),
 					$product->get_name()
 				);
 			}
 			// Check if enough stock is available
 			if ( null !== $stock_quantity && $stock_quantity < $quantity ) {
 				return sprintf(
 					/* translators: 1: product name, 2: stock quantity */
 					__( 'Only %2$d of "%1$s" are available in stock.', 'wc-composable-product' ),
 					$product->get_name(),
 					$stock_quantity
 				);
 			}
 			// Check for backorders
 			if ( $product->backorders_allowed() ) {
 				continue;
 			}
 		}
 		return true;
 	}
 	/**
 	 * Check if a product has sufficient stock
 	 *
 	 * @param int $product_id Product ID
 	 * @param int $required_quantity Required quantity
 	 * @return array Stock information [in_stock, stock_quantity, backorders_allowed]
 	 */
 	public function get_product_stock_info( $product_id, $required_quantity = 1 ) {
 		$product = wc_get_product( $product_id );
 		if ( ! $product ) {
 			return array(
 				'in_stock'           => false,
 				'stock_quantity'     => 0,
 				'backorders_allowed' => false,
 				'stock_status'       => 'outofstock',
 			);
 		}
 		$stock_quantity = $product->get_stock_quantity();
 		$managing_stock = $product->managing_stock();
 		return array(
 			'in_stock'           => $product->is_in_stock(),
 			'stock_quantity'     => $stock_quantity,
 			'backorders_allowed' => $product->backorders_allowed(),
 			'stock_status'       => $product->get_stock_status(),
 			'managing_stock'     => $managing_stock,
 			'has_enough_stock'   => ! $managing_stock || null === $stock_quantity || $stock_quantity >= $required_quantity,
 		);
 	}
 	/**
 	 * Reduce stock for composable products when order is completed
 	 *
 	 * @param int $order_id Order ID
 	 */
 	public function reduce_stock_on_order_complete( $order_id ) {
 		$order = wc_get_order( $order_id );
 		if ( ! $order ) {
 			return;
 		}
 		// Check if stock has already been reduced
 		if ( $order->get_meta( '_composable_stock_reduced', true ) ) {
 			return;
 		}
 		foreach ( $order->get_items() as $item ) {
 			$product = $item->get_product();
 			if ( ! $product || $product->get_type() !== 'composable' ) {
 				continue;
 			}
 			// Get selected products from order item meta
 			$selected_products = $item->get_meta( '_composable_products', true );
 			if ( empty( $selected_products ) || ! is_array( $selected_products ) ) {
 				continue;
 			}
 			$quantity = $item->get_quantity();
 			// Reduce stock for each selected product
 			foreach ( $selected_products as $product_id ) {
 				$selected_product = wc_get_product( $product_id );
 				if ( ! $selected_product || ! $selected_product->managing_stock() ) {
 					continue;
 				}
 				$stock_quantity = $selected_product->get_stock_quantity();
 				if ( null !== $stock_quantity ) {
 					$new_stock = $stock_quantity - $quantity;
 					$selected_product->set_stock_quantity( $new_stock );
 					$selected_product->save();
 					// Add order note
 					$order->add_order_note(
 						sprintf(
 							/* translators: 1: product name, 2: quantity, 3: remaining stock */
 							__( 'Stock reduced for "%1$s": -%2$d (remaining: %3$d)', 'wc-composable-product' ),
 							$selected_product->get_name(),
 							$quantity,
 							$new_stock
 						)
 					);
 				}
 			}
 		}
 		// Mark stock as reduced
 		$order->update_meta_data( '_composable_stock_reduced', true );
 		$order->save();
 	}
 	/**
 	 * Restore stock when order is cancelled or refunded
 	 *
 	 * @param int $order_id Order ID
 	 */
 	public function restore_stock_on_order_cancel( $order_id ) {
 		$order = wc_get_order( $order_id );
 		if ( ! $order ) {
 			return;
 		}
 		// Check if stock was reduced
 		if ( ! $order->get_meta( '_composable_stock_reduced', true ) ) {
 			return;
 		}
 		foreach ( $order->get_items() as $item ) {
 			$product = $item->get_product();
 			if ( ! $product || $product->get_type() !== 'composable' ) {
 				continue;
 			}
 			// Get selected products from order item meta
 			$selected_products = $item->get_meta( '_composable_products', true );
 			if ( empty( $selected_products ) || ! is_array( $selected_products ) ) {
 				continue;
 			}
 			$quantity = $item->get_quantity();
 			// Restore stock for each selected product
 			foreach ( $selected_products as $product_id ) {
 				$selected_product = wc_get_product( $product_id );
 				if ( ! $selected_product || ! $selected_product->managing_stock() ) {
 					continue;
 				}
 				$stock_quantity = $selected_product->get_stock_quantity();
 				if ( null !== $stock_quantity ) {
 					$new_stock = $stock_quantity + $quantity;
 					$selected_product->set_stock_quantity( $new_stock );
 					$selected_product->save();
 					// Add order note
 					$order->add_order_note(
 						sprintf(
 							/* translators: 1: product name, 2: quantity, 3: new stock */
 							__( 'Stock restored for "%1$s": +%2$d (total: %3$d)', 'wc-composable-product' ),
 							$selected_product->get_name(),
 							$quantity,
 							$new_stock
 						)
 					);
 				}
 			}
 		}
 		// Mark stock as restored
 		$order->update_meta_data( '_composable_stock_reduced', false );
 		$order->save();
 	}
 	/**
 	 * Prevent WooCommerce from reducing stock for composable products
 	 * We handle stock reduction manually for selected products
 	 *
 	 * @param bool $reduce_stock Whether to reduce stock
 	 * @param \WC_Order $order Order object
 	 * @return bool
 	 */
 	public function prevent_composable_stock_reduction( $reduce_stock, $order ) {
 		foreach ( $order->get_items() as $item ) {
 			$product = $item->get_product();
 			if ( $product && $product->get_type() === 'composable' ) {
 				// We'll handle stock reduction manually
 				return false;
 			}
 		}
 		return $reduce_stock;
 	}
 	/**
 	 * Store selected products in order item meta
 	 *
 	 * @param \WC_Order_Item_Product $item Order item
 	 * @param string $cart_item_key Cart item key
 	 * @param array $values Cart item values
 	 */
 	public function store_selected_products_in_order( $item, $cart_item_key, $values ) {
 		if ( isset( $values['composable_products'] ) && ! empty( $values['composable_products'] ) ) {
 			$item->add_meta_data( '_composable_products', $values['composable_products'], true );
 		}
 	}
 }
--- a/languages/wc-composable-product-de_CH.po
+++ b/languages/wc-composable-product-de_CH.po
@@ -91,7 +91,7 @@ msgstr "Den Gesamtpreis anzeigen, während Kunden Auswahlen treffen."
 msgid "Composable product"
 msgstr "Zusammenstellbares Produkt"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Wählen Sie Ihre Produkte"
@@ -111,90 +111,154 @@ msgstr "Gesamtpreis:"
 msgid "Add to Cart"
 msgstr "In den Warenkorb"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Bitte wählen Sie mindestens ein Produkt aus."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Sie können maximal %d Produkte auswählen."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Ein oder mehrere ausgewählte Produkte sind nicht verfügbar."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Ausgewählte Produkte"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Zusammenstellungsoptionen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Auswahllimit"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Maximale Anzahl der Artikel, die Kunden auswählen können. Leer lassen, um den globalen Standard zu verwenden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Preismodus"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Wie der Preis berechnet wird. Leer lassen, um den globalen Standard zu verwenden."
+msgstr "Wie der Preis berechnet wird."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Festpreis"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Geben Sie den Festpreis für dieses zusammenstellbare Produkt ein."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Globalen Standard verwenden"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Auswahlkriterien"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Wie verfügbare Produkte ausgewählt werden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Nach Kategorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Nach Schlagwort"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Nach Artikelnummer"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Kategorien auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Produktkategorien auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Schlagwörter auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Produkt-Schlagwörter auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Produkt-Artikelnummern"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Geben Sie Produkt-Artikelnummern durch Kommas getrennt ein."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "ART-1, ART-2, ART-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" ist nicht an Lager und kann nicht ausgewählt werden."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Nur %2$d von \"%1$s\" sind an Lager verfügbar."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Lagerbestand reduziert für \"%1$s\": -%2$d (verbleibend: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Lagerbestand wiederhergestellt für \"%1$s\": +%2$d (gesamt: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Nicht an Lager"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Nur"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "übrig"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "An Lager"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Keine Produkte zur Auswahl verfügbar. Bitte konfigurieren Sie die Produktkriterien im Admin-Bereich."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Nicht-öffentliche Produkte einbeziehen"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Entwürfe und private Produkte in der Auswahl zusammenstellbarer Produkte anzeigen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen, nicht einzeln."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Entwürfe und private Produkte in der Auswahl zulassen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Ja"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "Nein"
--- a/languages/wc-composable-product-de_CH_informal.po
+++ b/languages/wc-composable-product-de_CH_informal.po
@@ -91,7 +91,7 @@ msgstr "Den Gesamtpreis anzeigen, während Kunden Auswahlen treffen."
 msgid "Composable product"
 msgstr "Zusammenstellbares Produkt"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Wähle deine Produkte"
@@ -111,90 +111,154 @@ msgstr "Gesamtpreis:"
 msgid "Add to Cart"
 msgstr "In den Warenkorb"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Bitte wähle mindestens ein Produkt aus."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Du kannst maximal %d Produkte auswählen."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Ein oder mehrere ausgewählte Produkte sind nicht verfügbar."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Ausgewählte Produkte"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Zusammenstellungsoptionen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Auswahllimit"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Maximale Anzahl der Artikel, die Kunden auswählen können. Leer lassen, um den globalen Standard zu verwenden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Preismodus"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Wie der Preis berechnet wird. Leer lassen, um den globalen Standard zu verwenden."
+msgstr "Wie der Preis berechnet wird."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Festpreis"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Gib den Festpreis für dieses zusammenstellbare Produkt ein."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Globalen Standard verwenden"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Auswahlkriterien"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Wie verfügbare Produkte ausgewählt werden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Nach Kategorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Nach Schlagwort"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Nach Artikelnummer"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Kategorien auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Produktkategorien auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Schlagwörter auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Produkt-Schlagwörter auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Produkt-Artikelnummern"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Gib Produkt-Artikelnummern durch Kommas getrennt ein."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "ART-1, ART-2, ART-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" ist nicht an Lager und kann nicht ausgewählt werden."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Nur %2$d von \"%1$s\" sind an Lager verfügbar."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Lagerbestand reduziert für \"%1$s\": -%2$d (verbleibend: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Lagerbestand wiederhergestellt für \"%1$s\": +%2$d (gesamt: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Nicht an Lager"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Nur"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "übrig"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "An Lager"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Keine Produkte zur Auswahl verfügbar. Bitte konfiguriere die Produktkriterien im Admin-Bereich."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Nicht-öffentliche Produkte einbeziehen"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Entwürfe und private Produkte in der Auswahl zusammenstellbarer Produkte anzeigen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen, nicht einzeln."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Entwürfe und private Produkte in der Auswahl zulassen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Ja"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "Nein"
--- a/languages/wc-composable-product-de_DE.po
+++ b/languages/wc-composable-product-de_DE.po
@@ -91,7 +91,7 @@ msgstr "Den Gesamtpreis anzeigen, während Kunden Auswahlen treffen."
 msgid "Composable product"
 msgstr "Zusammenstellbares Produkt"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Wählen Sie Ihre Produkte"
@@ -111,90 +111,154 @@ msgstr "Gesamtpreis:"
 msgid "Add to Cart"
 msgstr "In den Warenkorb"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Bitte wählen Sie mindestens ein Produkt aus."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Sie können maximal %d Produkte auswählen."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Ein oder mehrere ausgewählte Produkte sind nicht verfügbar."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Ausgewählte Produkte"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Zusammenstellungsoptionen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Auswahllimit"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Maximale Anzahl der Artikel, die Kunden auswählen können. Leer lassen, um den globalen Standard zu verwenden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Preismodus"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Wie der Preis berechnet wird. Leer lassen, um den globalen Standard zu verwenden."
+msgstr "Wie der Preis berechnet wird."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Festpreis"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Geben Sie den Festpreis für dieses zusammenstellbare Produkt ein."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Globalen Standard verwenden"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Auswahlkriterien"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Wie verfügbare Produkte ausgewählt werden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Nach Kategorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Nach Schlagwort"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Nach Artikelnummer"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Kategorien auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Produktkategorien auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Schlagwörter auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Produkt-Schlagwörter auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Produkt-Artikelnummern"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Geben Sie Produkt-Artikelnummern durch Kommas getrennt ein."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "ART-1, ART-2, ART-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" ist nicht auf Lager und kann nicht ausgewählt werden."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Nur %2$d von \"%1$s\" sind auf Lager verfügbar."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Lagerbestand reduziert für \"%1$s\": -%2$d (verbleibend: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Lagerbestand wiederhergestellt für \"%1$s\": +%2$d (gesamt: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Nicht auf Lager"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Nur"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "übrig"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "Auf Lager"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Keine Produkte zur Auswahl verfügbar. Bitte konfigurieren Sie die Produktkriterien im Admin-Bereich."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Nicht-öffentliche Produkte einbeziehen"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Entwürfe und private Produkte in der Auswahl zusammenstellbarer Produkte anzeigen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen, nicht einzeln."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Entwürfe und private Produkte in der Auswahl zulassen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Ja"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "Nein"
--- a/languages/wc-composable-product-de_DE_informal.po
+++ b/languages/wc-composable-product-de_DE_informal.po
@@ -91,7 +91,7 @@ msgstr "Den Gesamtpreis anzeigen, während Kunden Auswahlen treffen."
 msgid "Composable product"
 msgstr "Zusammenstellbares Produkt"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Wähle deine Produkte"
@@ -111,90 +111,154 @@ msgstr "Gesamtpreis:"
 msgid "Add to Cart"
 msgstr "In den Warenkorb"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Bitte wähle mindestens ein Produkt aus."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Du kannst maximal %d Produkte auswählen."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Ein oder mehrere ausgewählte Produkte sind nicht verfügbar."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Ausgewählte Produkte"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Zusammenstellungsoptionen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Auswahllimit"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Maximale Anzahl der Artikel, die Kunden auswählen können. Leer lassen, um den globalen Standard zu verwenden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Preismodus"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Wie der Preis berechnet wird. Leer lassen, um den globalen Standard zu verwenden."
+msgstr "Wie der Preis berechnet wird."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Festpreis"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Gib den Festpreis für dieses zusammenstellbare Produkt ein."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Globalen Standard verwenden"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Auswahlkriterien"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Wie verfügbare Produkte ausgewählt werden."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Nach Kategorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Nach Schlagwort"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Nach Artikelnummer"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Kategorien auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Produktkategorien auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Schlagwörter auswählen"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Produkt-Schlagwörter auswählen, die einbezogen werden sollen."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Produkt-Artikelnummern"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Gib Produkt-Artikelnummern durch Kommas getrennt ein."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "ART-1, ART-2, ART-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" ist nicht auf Lager und kann nicht ausgewählt werden."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Nur %2$d von \"%1$s\" sind auf Lager verfügbar."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Lagerbestand reduziert für \"%1$s\": -%2$d (verbleibend: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Lagerbestand wiederhergestellt für \"%1$s\": +%2$d (gesamt: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Nicht auf Lager"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Nur"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "übrig"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "Auf Lager"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Keine Produkte zur Auswahl verfügbar. Bitte konfiguriere die Produktkriterien im Admin-Bereich."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Nicht-öffentliche Produkte einbeziehen"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Entwürfe und private Produkte in der Auswahl zusammenstellbarer Produkte anzeigen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen, nicht einzeln."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Entwürfe und private Produkte in der Auswahl zulassen. Nützlich, wenn Produkte nur als Teil einer Zusammenstellung verkauft werden sollen."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Ja"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "Nein"
--- a/languages/wc-composable-product-fr_CH.po
+++ b/languages/wc-composable-product-fr_CH.po
@@ -91,7 +91,7 @@ msgstr "Afficher le prix total pendant que les clients font leurs sélections."
 msgid "Composable product"
 msgstr "Produit composable"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Sélectionnez vos produits"
@@ -111,90 +111,154 @@ msgstr "Prix total :"
 msgid "Add to Cart"
 msgstr "Ajouter au panier"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Veuillez sélectionner au moins un produit."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Vous pouvez sélectionner un maximum de %d produits."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Un ou plusieurs produits sélectionnés ne sont pas disponibles."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Produits sélectionnés"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Options de composition"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Limite de sélection"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Nombre maximum d'articles que les clients peuvent sélectionner. Laisser vide pour utiliser la valeur par défaut globale."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Mode de tarification"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Comment calculer le prix. Laisser vide pour utiliser la valeur par défaut globale."
+msgstr "Comment calculer le prix."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Prix fixe"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Entrez le prix fixe pour ce produit composable."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Utiliser la valeur par défaut globale"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Critères de sélection"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Comment sélectionner les produits disponibles."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Par catégorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Par étiquette"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Par référence"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Sélectionner les catégories"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Sélectionner les catégories de produits à inclure."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Sélectionner les étiquettes"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Sélectionner les étiquettes de produits à inclure."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Références des produits"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Entrez les références des produits séparées par des virgules."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "REF-1, REF-2, REF-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" est en rupture de stock et ne peut pas être sélectionné."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Seulement %2$d de \"%1$s\" sont disponibles en stock."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Stock réduit pour \"%1$s\": -%2$d (restant: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Stock restauré pour \"%1$s\": +%2$d (total: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Rupture de stock"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Seulement"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "restant"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "En stock"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Aucun produit disponible pour la sélection. Veuillez configurer les critères de produit dans le panneau d'administration."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Inclure les produits non publics"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Autoriser les brouillons et les produits privés dans les sélections de produits composables. Utile lorsque les produits ne doivent être vendus que dans le cadre d'une composition, pas individuellement."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Autoriser les brouillons et les produits privés dans la sélection. Utile lorsque les produits ne doivent être vendus que dans le cadre d'une composition."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Oui"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "Non"
--- a/languages/wc-composable-product-it_CH.po
+++ b/languages/wc-composable-product-it_CH.po
@@ -91,7 +91,7 @@ msgstr "Visualizzare il prezzo totale mentre i clienti effettuano le selezioni."
 msgid "Composable product"
 msgstr "Prodotto componibile"
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr "Seleziona i tuoi prodotti"
@@ -111,90 +111,154 @@ msgstr "Prezzo totale:"
 msgid "Add to Cart"
 msgstr "Aggiungi al carrello"
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr "Seleziona almeno un prodotto."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr "Puoi selezionare un massimo di %d prodotti."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr "Uno o più prodotti selezionati non sono disponibili."
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr "Prodotti selezionati"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr "Opzioni di composizione"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr "Limite di selezione"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr "Numero massimo di articoli che i clienti possono selezionare. Lasciare vuoto per utilizzare il valore predefinito globale."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr "Modalità di prezzo"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
-msgstr "Come calcolare il prezzo. Lasciare vuoto per utilizzare il valore predefinito globale."
+msgstr "Come calcolare il prezzo."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr "Prezzo fisso"
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr "Inserisci il prezzo fisso per questo prodotto componibile."
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr "Usa predefinito globale"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr "Criteri di selezione"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr "Come selezionare i prodotti disponibili."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr "Per categoria"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr "Per etichetta"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr "Per codice articolo"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr "Seleziona categorie"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr "Selezionare le categorie di prodotti da includere."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr "Seleziona etichette"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr "Selezionare le etichette dei prodotti da includere."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr "Codici articolo prodotti"
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr "Inserire i codici articolo dei prodotti separati da virgole."
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr "COD-1, COD-2, COD-3"
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr "\"%s\" è esaurito e non può essere selezionato."
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr "Solo %2$d di \"%1$s\" sono disponibili in magazzino."
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr "Giacenza ridotta per \"%1$s\": -%2$d (rimanenti: %3$d)"
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr "Giacenza ripristinata per \"%1$s\": +%2$d (totale: %3$d)"
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr "Esaurito"
 #: templates/product-selector.twig
 msgid "Only"
 msgstr "Solo"
 #: templates/product-selector.twig
 msgid "left"
 msgstr "rimasti"
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr "Disponibile"
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr "Nessun prodotto disponibile per la selezione. Si prega di configurare i criteri del prodotto nel pannello di amministrazione."
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr "Includi prodotti non pubblici"
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr "Consenti la visualizzazione di bozze e prodotti privati nelle selezioni dei prodotti componibili. Utile quando i prodotti devono essere venduti solo come parte di una composizione, non singolarmente."
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr "Consenti bozze e prodotti privati nella selezione. Utile quando i prodotti devono essere venduti solo come parte di una composizione."
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr "Sì"
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr "No"
--- a/languages/wc-composable-product.pot
+++ b/languages/wc-composable-product.pot
@@ -2,7 +2,7 @@
 # This file is distributed under the GPL v3 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Composable Products 1.0.0\n"
+"Project-Id-Version: WooCommerce Composable Products 1.1.6\n"
 "Report-Msgid-Bugs-To: https://github.com/magdev/wc-composable-product/issues\n"
 "POT-Creation-Date: 2024-12-31 00:00+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -90,7 +90,7 @@ msgstr ""
 msgid "Composable product"
 msgstr ""
-#: includes/Product_Selector.php, templates/product-selector.twig
+#: includes/ProductSelector.php, templates/product-selector.twig
 msgid "Select Your Products"
 msgstr ""
@@ -110,90 +110,154 @@ msgstr ""
 msgid "Add to Cart"
 msgstr ""
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Please select at least one product."
 msgstr ""
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "You can select a maximum of %d products."
 msgstr ""
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "One or more selected products are not available."
 msgstr ""
-#: includes/Cart_Handler.php
+#: includes/CartHandler.php
 msgid "Selected Products"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Composable Options"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Limit"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Maximum number of items customers can select. Leave empty to use global default."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Pricing Mode"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
-msgid "How to calculate the price. Leave empty to use global default."
+msgid "How to calculate the price."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Fixed Price"
 msgstr ""
 #: includes/Admin/ProductData.php
 msgid "Enter the fixed price for this composable product."
 msgstr ""
 #: includes/Admin/ProductData.php
 msgid "Use global default"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Selection Criteria"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "How to select available products."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Category"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By Tag"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "By SKU"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Categories"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product categories to include."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select Tags"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Select product tags to include."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Product SKUs"
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "Enter product SKUs separated by commas."
 msgstr ""
-#: includes/Admin/Product_Data.php
+#: includes/Admin/ProductData.php
 msgid "SKU-1, SKU-2, SKU-3"
 msgstr ""
 #: includes/StockManager.php
 msgid "\"%s\" is out of stock and cannot be selected."
 msgstr ""
 #: includes/StockManager.php
 msgid "Only %2$d of \"%1$s\" are available in stock."
 msgstr ""
 #: includes/StockManager.php
 msgid "Stock reduced for \"%1$s\": -%2$d (remaining: %3$d)"
 msgstr ""
 #: includes/StockManager.php
 msgid "Stock restored for \"%1$s\": +%2$d (total: %3$d)"
 msgstr ""
 #: templates/product-selector.twig
 msgid "Out of stock"
 msgstr ""
 #: templates/product-selector.twig
 msgid "Only"
 msgstr ""
 #: templates/product-selector.twig
 msgid "left"
 msgstr ""
 #: templates/product-selector.twig
 msgid "In stock"
 msgstr ""
 #: templates/product-selector.twig
 msgid "No products available for selection. Please configure the product criteria in the admin panel."
 msgstr ""
 #: includes/Admin/Settings.php, includes/Admin/ProductData.php
 msgid "Include Non-Public Products"
 msgstr ""
 #: includes/Admin/Settings.php
 msgid "Allow draft and private products to appear in composable product selections. Useful when products should only be sold as part of a composition, not individually."
 msgstr ""
 #: includes/Admin/ProductData.php
 msgid "Allow draft and private products in the selection. Useful when products should only be sold as part of a composition."
 msgstr ""
 #: includes/Admin/ProductData.php
 msgid "Yes"
 msgstr ""
 #: includes/Admin/ProductData.php
 msgid "No"
 msgstr ""
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -0,0 +1,34 @@
 <?xml version="1.0"?>
 <ruleset name="WC Composable Product">
    <description>PHPCS rules for WooCommerce Composable Products plugin</description>
    <!-- Scan plugin source -->
    <file>includes</file>
    <file>wc-composable-product.php</file>
    <!-- Show progress and use colors -->
    <arg value="ps"/>
    <arg name="colors"/>
    <!-- Use WordPress Extra standard (Core + Extra, without Docs) -->
    <rule ref="WordPress-Extra">
        <!-- Allow PSR-4 PascalCase file naming -->
        <exclude name="WordPress.Files.FileName"/>
    </rule>
    <!-- Check PHP 8.3+ compatibility -->
    <rule ref="PHPCompatibilityWP"/>
    <config name="testVersion" value="8.3-"/>
    <!-- WordPress minimum version -->
    <config name="minimum_wp_version" value="6.0"/>
    <!-- Enforce text domain -->
    <rule ref="WordPress.WP.I18n">
        <properties>
            <property name="text_domain" type="array">
                <element value="wc-composable-product"/>
            </property>
        </properties>
    </rule>
 </ruleset>
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -0,0 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
    bootstrap="tests/bootstrap.php"
    colors="true"
    failOnWarning="true"
    cacheDirectory=".phpunit.cache"
 >
    <testsuites>
        <testsuite name="Unit">
            <directory suffix="Test.php">tests/Unit</directory>
        </testsuite>
    </testsuites>
    <source>
        <include>
            <directory suffix=".php">includes</directory>
        </include>
    </source>
 </phpunit>
--- a/templates/product-selector.twig
+++ b/templates/product-selector.twig
@@ -9,8 +9,13 @@
    </div>
    <div class="composable-products-grid">
        {% if products is empty %}
        <div class="composable-no-products">
            <p>{{ __('No products available for selection. Please configure the product criteria in the admin panel.') }}</p>
        </div>
        {% else %}
        {% for product in products %}
-        <div class="composable-product-item" data-product-id="{{ product.id }}" data-price="{{ product.price }}">
+        <div class="composable-product-item{% if not product.in_stock %} out-of-stock{% endif %}" data-product-id="{{ product.id }}" data-price="{{ product.price }}" data-stock-status="{{ product.stock_status }}">
            <div class="product-item-inner">
                <label class="product-item-label">
                    <input type="checkbox"
@@ -18,7 +23,8 @@
                           value="{{ product.id }}"
                           class="composable-product-checkbox"
                           data-product-id="{{ product.id }}"
-                           data-price="{{ product.price }}">
+                           data-price="{{ product.price }}"
                           {% if not product.in_stock %}disabled{% endif %}>
                    {% if show_images and product.image_url %}
                    <div class="product-item-image">
@@ -34,6 +40,16 @@
                            {{ product.price_html|raw }}
                        </div>
                        {% endif %}
                        <div class="product-item-stock">
                            {% if not product.in_stock %}
                                <span class="stock-status out-of-stock">{{ __('Out of stock') }}</span>
                            {% elseif product.managing_stock and product.stock_quantity is not null and product.stock_quantity <= 5 %}
                                <span class="stock-status low-stock">{{ __('Only') }} {{ product.stock_quantity }} {{ __('left') }}</span>
                            {% elseif product.in_stock %}
                                <span class="stock-status in-stock">{{ __('In stock') }}</span>
                            {% endif %}
                        </div>
                    </div>
                    <span class="product-item-checkmark"></span>
@@ -41,16 +57,17 @@
            </div>
        </div>
        {% endfor %}
        {% endif %}
    </div>
    {% if show_total %}
    <div class="composable-total">
        <div class="total-label">{{ __('Total Price:') }}</div>
-        <div class="total-price" data-currency="{{ currency_symbol }}">
+        <div class="total-price" data-currency="{{ currency_symbol }}" data-fixed-price="{{ fixed_price }}">
            {% if pricing_mode == 'fixed' %}
-                {{ currency_symbol }}{{ fixed_price }}
+                {{ fixed_price_html|raw }}
            {% else %}
-                <span class="calculated-total">{{ currency_symbol }}0.00</span>
+                <span class="calculated-total">{{ zero_price_html|raw }}</span>
            {% endif %}
        </div>
    </div>
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -0,0 +1,75 @@
 <?php
 /**
 * Base Test Case
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Brain\Monkey;
 /**
 * Base test case with Brain Monkey and Mockery integration.
 *
 * All test classes should extend this instead of PHPUnit\Framework\TestCase.
 */
 abstract class TestCase extends PHPUnitTestCase
 {
    use MockeryPHPUnitIntegration;
    protected function setUp(): void
    {
        parent::setUp();
        Monkey\setUp();
        // Stub common WordPress translation functions (__(), _e(), esc_html__(), etc.)
        Monkey\Functions\stubTranslationFunctions();
        // Stub common WordPress escaping functions (esc_html(), esc_attr(), etc.)
        Monkey\Functions\stubEscapeFunctions();
    }
    protected function tearDown(): void
    {
        Monkey\tearDown();
        parent::tearDown();
    }
    /**
     * Create a Mockery mock of WC_Product with sensible defaults.
     *
     * @param array $overrides Method return value overrides
     * @return \Mockery\MockInterface
     */
    protected function createProductMock(array $overrides = []): \Mockery\MockInterface
    {
        $defaults = [
            'get_id' => 100,
            'get_name' => 'Test Product',
            'get_type' => 'simple',
            'get_price' => '10.00',
            'get_regular_price' => '10.00',
            'get_price_html' => '<span>$10.00</span>',
            'get_permalink' => 'https://example.com/product/test',
            'get_image_id' => 1,
            'get_stock_quantity' => null,
            'get_stock_status' => 'instock',
            'is_purchasable' => true,
            'is_in_stock' => true,
            'managing_stock' => false,
            'backorders_allowed' => false,
        ];
        $config = array_merge($defaults, $overrides);
        $mock = \Mockery::mock('WC_Product');
        foreach ($config as $method => $return) {
            $mock->shouldReceive($method)->andReturn($return)->byDefault();
        }
        return $mock;
    }
 }
--- a/tests/Unit/Admin/ProductDataTest.php
+++ b/tests/Unit/Admin/ProductDataTest.php
@@ -0,0 +1,108 @@
 <?php
 /**
 * Admin ProductData Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit\Admin;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\Admin\ProductData;
 use Brain\Monkey\Functions;
 class ProductDataTest extends TestCase
 {
    protected function setUp(): void
    {
        parent::setUp();
        $_POST = [];
    }
    protected function tearDown(): void
    {
        $_POST = [];
        parent::tearDown();
    }
    public function testConstructor_RegistersExpectedHooks(): void
    {
        $productData = new ProductData();
        self::assertNotFalse(has_filter('woocommerce_product_data_tabs', 'Magdev\WcComposableProduct\Admin\ProductData->add_product_data_tab()'));
        self::assertNotFalse(has_action('woocommerce_product_data_panels', 'Magdev\WcComposableProduct\Admin\ProductData->add_product_data_panel()'));
        self::assertNotFalse(has_action('woocommerce_process_product_meta_composable', 'Magdev\WcComposableProduct\Admin\ProductData->save_product_data()'));
        self::assertNotFalse(has_action('woocommerce_product_options_general_product_data', 'Magdev\WcComposableProduct\Admin\ProductData->add_general_fields()'));
    }
    public function testAddProductDataTab_AddsComposableTab(): void
    {
        $productData = new ProductData();
        $tabs = $productData->add_product_data_tab([]);
        $this->assertArrayHasKey('composable', $tabs);
        $this->assertSame('composable_product_data', $tabs['composable']['target']);
        $this->assertContains('show_if_composable', $tabs['composable']['class']);
        $this->assertSame(21, $tabs['composable']['priority']);
    }
    public function testSaveProductData_SavesAllFields(): void
    {
        $_POST = [
            '_composable_selection_limit' => '5',
            '_composable_pricing_mode' => 'fixed',
            '_composable_include_unpublished' => 'yes',
            '_composable_criteria_type' => 'tag',
            '_composable_categories' => ['1', '2'],
            '_composable_tags' => ['3', '4'],
            '_composable_skus' => 'SKU-1, SKU-2',
        ];
        Functions\expect('absint')->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        Functions\expect('sanitize_text_field')->andReturnUsing(function ($val) {
            return $val;
        });
        Functions\expect('sanitize_textarea_field')->andReturnUsing(function ($val) {
            return $val;
        });
        Functions\expect('update_post_meta')->times(7);
        $productData = new ProductData();
        $productData->save_product_data(42);
    }
    public function testSaveProductData_DefaultsWhenPostEmpty(): void
    {
        // No POST data at all
        Functions\expect('absint')->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        Functions\expect('sanitize_text_field')->andReturnUsing(function ($val) {
            return $val;
        });
        Functions\expect('sanitize_textarea_field')->andReturnUsing(function ($val) {
            return $val;
        });
        Functions\expect('update_post_meta')
            ->with(42, '_composable_selection_limit', \Mockery::any())->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_pricing_mode', '')->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_include_unpublished', '')->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_criteria_type', 'category')->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_categories', [])->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_tags', [])->once();
        Functions\expect('update_post_meta')
            ->with(42, '_composable_skus', '')->once();
        $productData = new ProductData();
        $productData->save_product_data(42);
    }
 }
--- a/tests/Unit/Admin/SettingsTest.php
+++ b/tests/Unit/Admin/SettingsTest.php
@@ -0,0 +1,84 @@
 <?php
 /**
 * Admin Settings Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit\Admin;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\Admin\Settings;
 use Brain\Monkey\Functions;
 class SettingsTest extends TestCase
 {
    public function testConstructor_SetsIdAndLabel(): void
    {
        $settings = new Settings();
        $this->assertSame('composable_products', $settings->get_id());
    }
    public function testGetSettings_ReturnsExpectedFieldIds(): void
    {
        Functions\expect('apply_filters')
            ->once()
            ->with('wc_composable_settings', \Mockery::type('array'))
            ->andReturnUsing(function ($hook, $settings) {
                return $settings;
            });
        $settings = new Settings();
        $fields = $settings->get_settings();
        // Extract all field IDs
        $ids = array_column($fields, 'id');
        $this->assertContains('wc_composable_settings', $ids);
        $this->assertContains('wc_composable_default_limit', $ids);
        $this->assertContains('wc_composable_default_pricing', $ids);
        $this->assertContains('wc_composable_include_unpublished', $ids);
        $this->assertContains('wc_composable_show_images', $ids);
        $this->assertContains('wc_composable_show_prices', $ids);
        $this->assertContains('wc_composable_show_total', $ids);
    }
    public function testGetSettings_HasCorrectFieldTypes(): void
    {
        Functions\expect('apply_filters')
            ->once()
            ->andReturnUsing(function ($hook, $settings) {
                return $settings;
            });
        $settings = new Settings();
        $fields = $settings->get_settings();
        // Index fields by ID for easy lookup
        $indexed = [];
        foreach ($fields as $field) {
            if (isset($field['id'])) {
                $indexed[$field['id']] = $field;
            }
        }
        $this->assertSame('number', $indexed['wc_composable_default_limit']['type']);
        $this->assertSame('select', $indexed['wc_composable_default_pricing']['type']);
        $this->assertSame('checkbox', $indexed['wc_composable_include_unpublished']['type']);
        $this->assertSame('checkbox', $indexed['wc_composable_show_images']['type']);
    }
    public function testGetSettings_AppliesFilter(): void
    {
        Functions\expect('apply_filters')
            ->once()
            ->with('wc_composable_settings', \Mockery::type('array'))
            ->andReturnUsing(function ($hook, $settings) {
                return $settings;
            });
        $settings = new Settings();
        $settings->get_settings();
    }
 }
--- a/tests/Unit/CartHandlerTest.php
+++ b/tests/Unit/CartHandlerTest.php
@@ -0,0 +1,184 @@
 <?php
 /**
 * CartHandler Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\CartHandler;
 use Brain\Monkey\Functions;
 use Brain\Monkey\Actions;
 use Brain\Monkey\Filters;
 class CartHandlerTest extends TestCase
 {
    protected function setUp(): void
    {
        parent::setUp();
        // Clean up POST superglobal between tests
        $_POST = [];
    }
    protected function tearDown(): void
    {
        $_POST = [];
        parent::tearDown();
    }
    public function testConstructor_RegistersExpectedHooks(): void
    {
        $handler = new CartHandler();
        self::assertNotFalse(has_filter('woocommerce_add_to_cart_validation', 'Magdev\WcComposableProduct\CartHandler->validate_add_to_cart()'));
        self::assertNotFalse(has_filter('woocommerce_add_cart_item_data', 'Magdev\WcComposableProduct\CartHandler->add_cart_item_data()'));
        self::assertNotFalse(has_filter('woocommerce_get_cart_item_from_session', 'Magdev\WcComposableProduct\CartHandler->get_cart_item_from_session()'));
        self::assertNotFalse(has_filter('woocommerce_get_item_data', 'Magdev\WcComposableProduct\CartHandler->display_cart_item_data()'));
        self::assertNotFalse(has_action('woocommerce_before_calculate_totals', 'Magdev\WcComposableProduct\CartHandler->calculate_cart_item_price()'));
        self::assertNotFalse(has_action('woocommerce_single_product_summary', 'Magdev\WcComposableProduct\CartHandler->render_product_selector()'));
        self::assertNotFalse(has_filter('woocommerce_is_purchasable', 'Magdev\WcComposableProduct\CartHandler->hide_default_add_to_cart()'));
    }
    public function testHideDefaultAddToCart_ReturnsFalseForComposable(): void
    {
        $handler = new CartHandler();
        $product = $this->createProductMock(['get_type' => 'composable']);
        $result = $handler->hide_default_add_to_cart(true, $product);
        $this->assertFalse($result);
    }
    public function testHideDefaultAddToCart_PassesThroughForSimple(): void
    {
        $handler = new CartHandler();
        $product = $this->createProductMock(['get_type' => 'simple']);
        $result = $handler->hide_default_add_to_cart(true, $product);
        $this->assertTrue($result);
    }
    public function testValidateAddToCart_PassesThroughForNonComposable(): void
    {
        $product = $this->createProductMock(['get_type' => 'simple']);
        Functions\expect('wc_get_product')->with(1)->andReturn($product);
        $handler = new CartHandler();
        $result = $handler->validate_add_to_cart(true, 1, 1);
        $this->assertTrue($result);
    }
    public function testValidateAddToCart_ReturnsFalseWhenNoProductsSelected(): void
    {
        $product = $this->createProductMock(['get_type' => 'composable']);
        Functions\expect('wc_get_product')->with(1)->andReturn($product);
        Functions\expect('wc_add_notice')->once();
        $_POST['composable_products'] = [];
        $handler = new CartHandler();
        $result = $handler->validate_add_to_cart(true, 1, 1);
        $this->assertFalse($result);
    }
    public function testValidateAddToCart_ReturnsFalseWhenNoPostData(): void
    {
        $product = $this->createProductMock(['get_type' => 'composable']);
        Functions\expect('wc_get_product')->with(1)->andReturn($product);
        Functions\expect('wc_add_notice')->once();
        // No $_POST['composable_products'] at all
        $handler = new CartHandler();
        $result = $handler->validate_add_to_cart(true, 1, 1);
        $this->assertFalse($result);
    }
    public function testAddCartItemData_AddsSelectionsForComposable(): void
    {
        $product = $this->createProductMock(['get_type' => 'composable']);
        Functions\expect('wc_get_product')->with(1)->andReturn($product);
        Functions\expect('absint')->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        $_POST['composable_products'] = ['101', '102'];
        $handler = new CartHandler();
        $result = $handler->add_cart_item_data([], 1);
        $this->assertArrayHasKey('composable_products', $result);
        $this->assertSame([101, 102], $result['composable_products']);
        $this->assertArrayHasKey('unique_key', $result);
    }
    public function testAddCartItemData_PassesThroughForNonComposable(): void
    {
        $product = $this->createProductMock(['get_type' => 'simple']);
        Functions\expect('wc_get_product')->with(1)->andReturn($product);
        $handler = new CartHandler();
        $result = $handler->add_cart_item_data(['existing' => 'data'], 1);
        $this->assertSame(['existing' => 'data'], $result);
    }
    public function testGetCartItemFromSession_RestoresComposableProducts(): void
    {
        $handler = new CartHandler();
        $result = $handler->get_cart_item_from_session(
            ['data' => 'test'],
            ['composable_products' => [101, 102]]
        );
        $this->assertSame([101, 102], $result['composable_products']);
    }
    public function testGetCartItemFromSession_PassesThroughWithoutComposableData(): void
    {
        $handler = new CartHandler();
        $result = $handler->get_cart_item_from_session(
            ['data' => 'test'],
            []
        );
        $this->assertArrayNotHasKey('composable_products', $result);
    }
    public function testDisplayCartItemData_FormatsProductNames(): void
    {
        $mock1 = $this->createProductMock(['get_name' => 'Product A']);
        $mock2 = $this->createProductMock(['get_name' => 'Product B']);
        Functions\expect('wc_get_product')
            ->andReturnUsing(function ($id) use ($mock1, $mock2) {
                return match ($id) {
                    101 => $mock1,
                    102 => $mock2,
                    default => false,
                };
            });
        $handler = new CartHandler();
        $result = $handler->display_cart_item_data(
            [],
            ['composable_products' => [101, 102]]
        );
        $this->assertCount(1, $result);
        $this->assertStringContainsString('Product A', $result[0]['value']);
        $this->assertStringContainsString('Product B', $result[0]['value']);
    }
    public function testDisplayCartItemData_ReturnsEmptyForNonComposable(): void
    {
        $handler = new CartHandler();
        $result = $handler->display_cart_item_data([], []);
        $this->assertSame([], $result);
    }
 }
--- a/tests/Unit/PluginTest.php
+++ b/tests/Unit/PluginTest.php
@@ -0,0 +1,72 @@
 <?php
 /**
 * Plugin Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\Plugin;
 use Brain\Monkey\Functions;
 class PluginTest extends TestCase
 {
    protected function setUp(): void
    {
        parent::setUp();
        // Reset the singleton instance between tests
        $reflection = new \ReflectionClass(Plugin::class);
        $property = $reflection->getProperty('instance');
        $property->setAccessible(true);
        $property->setValue(null, null);
    }
    public function testInstance_ReturnsSingleton(): void
    {
        $instance1 = Plugin::instance();
        $instance2 = Plugin::instance();
        $this->assertSame($instance1, $instance2);
    }
    public function testInstance_ReturnsPluginClass(): void
    {
        $instance = Plugin::instance();
        $this->assertInstanceOf(Plugin::class, $instance);
    }
    public function testAddProductType_AddsComposableToTypes(): void
    {
        $plugin = Plugin::instance();
        $types = $plugin->add_product_type([]);
        $this->assertArrayHasKey('composable', $types);
    }
    public function testProductClass_ReturnsCustomClassForComposable(): void
    {
        $plugin = Plugin::instance();
        $class = $plugin->product_class('WC_Product', 'composable');
        $this->assertSame('Magdev\WcComposableProduct\ProductType', $class);
    }
    public function testProductClass_PassesThroughForOtherTypes(): void
    {
        $plugin = Plugin::instance();
        $class = $plugin->product_class('WC_Product', 'simple');
        $this->assertSame('WC_Product', $class);
    }
    public function testGetTwig_ReturnsTwigEnvironment(): void
    {
        $plugin = Plugin::instance();
        $this->assertInstanceOf(\Twig\Environment::class, $plugin->get_twig());
    }
 }
--- a/tests/Unit/ProductTypeTest.php
+++ b/tests/Unit/ProductTypeTest.php
@@ -0,0 +1,218 @@
 <?php
 /**
 * ProductType Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\ProductType;
 use Brain\Monkey\Functions;
 class ProductTypeTest extends TestCase
 {
    private function createProductType(array $meta = []): ProductType
    {
        $product = new ProductType();
        foreach ($meta as $key => $value) {
            $product->update_meta_data($key, $value);
        }
        return $product;
    }
    public function testGetType_ReturnsComposable(): void
    {
        $product = $this->createProductType();
        $this->assertSame('composable', $product->get_type());
    }
    public function testIsPurchasable_ReturnsTrue(): void
    {
        $product = $this->createProductType();
        $this->assertTrue($product->is_purchasable());
    }
    public function testIsSoldIndividually_ReturnsTrue(): void
    {
        $product = $this->createProductType();
        $this->assertTrue($product->is_sold_individually());
    }
    public function testGetSelectionLimit_UsesProductMeta(): void
    {
        Functions\expect('absint')->once()->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        $product = $this->createProductType(['_composable_selection_limit' => '3']);
        $this->assertSame(3, $product->get_selection_limit());
    }
    public function testGetSelectionLimit_FallsBackToGlobalDefault(): void
    {
        Functions\expect('get_option')
            ->once()
            ->with('wc_composable_default_limit', 5)
            ->andReturn(7);
        Functions\expect('absint')->once()->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        $product = $this->createProductType();
        $this->assertSame(7, $product->get_selection_limit());
    }
    public function testGetSelectionLimit_FallsBackToHardDefault(): void
    {
        Functions\expect('get_option')
            ->once()
            ->with('wc_composable_default_limit', 5)
            ->andReturn(5);
        Functions\expect('absint')->once()->andReturnUsing(function ($val) {
            return abs((int) $val);
        });
        $product = $this->createProductType();
        $this->assertSame(5, $product->get_selection_limit());
    }
    public function testGetPricingMode_UsesProductMeta(): void
    {
        $product = $this->createProductType(['_composable_pricing_mode' => 'fixed']);
        $this->assertSame('fixed', $product->get_pricing_mode());
    }
    public function testGetPricingMode_FallsBackToGlobalDefault(): void
    {
        Functions\expect('get_option')
            ->once()
            ->with('wc_composable_default_pricing', 'sum')
            ->andReturn('sum');
        $product = $this->createProductType();
        $this->assertSame('sum', $product->get_pricing_mode());
    }
    public function testShouldIncludeUnpublished_PerProductYes(): void
    {
        $product = $this->createProductType(['_composable_include_unpublished' => 'yes']);
        $this->assertTrue($product->should_include_unpublished());
    }
    public function testShouldIncludeUnpublished_PerProductNo(): void
    {
        $product = $this->createProductType(['_composable_include_unpublished' => 'no']);
        $this->assertFalse($product->should_include_unpublished());
    }
    public function testShouldIncludeUnpublished_FallsBackToGlobalYes(): void
    {
        Functions\expect('get_option')
            ->once()
            ->with('wc_composable_include_unpublished', 'no')
            ->andReturn('yes');
        $product = $this->createProductType();
        $this->assertTrue($product->should_include_unpublished());
    }
    public function testShouldIncludeUnpublished_FallsBackToGlobalNo(): void
    {
        Functions\expect('get_option')
            ->once()
            ->with('wc_composable_include_unpublished', 'no')
            ->andReturn('no');
        $product = $this->createProductType();
        $this->assertFalse($product->should_include_unpublished());
    }
    public function testGetSelectionCriteria_DefaultsToCategory(): void
    {
        $product = $this->createProductType();
        $criteria = $product->get_selection_criteria();
        $this->assertSame('category', $criteria['type']);
        $this->assertSame([], $criteria['categories']);
        $this->assertSame([], $criteria['tags']);
        $this->assertSame('', $criteria['skus']);
    }
    public function testGetSelectionCriteria_UsesProductMeta(): void
    {
        $product = $this->createProductType([
            '_composable_criteria_type' => 'tag',
            '_composable_tags' => [5, 10],
        ]);
        $criteria = $product->get_selection_criteria();
        $this->assertSame('tag', $criteria['type']);
        $this->assertSame([5, 10], $criteria['tags']);
    }
    public function testCalculateComposedPrice_FixedMode(): void
    {
        $product = $this->createProductType(['_composable_pricing_mode' => 'fixed']);
        // Set regular price via the stub's data property
        $reflection = new \ReflectionClass($product);
        $dataProp = $reflection->getProperty('data');
        $dataProp->setAccessible(true);
        $data = $dataProp->getValue($product);
        $data['regular_price'] = '25.00';
        $dataProp->setValue($product, $data);
        $price = $product->calculate_composed_price([101, 102]);
        $this->assertSame(25.0, $price);
    }
    public function testCalculateComposedPrice_SumMode(): void
    {
        Functions\expect('get_option')
            ->with('wc_composable_default_pricing', 'sum')
            ->andReturn('sum');
        $mock1 = $this->createProductMock(['get_price' => '5.00']);
        $mock2 = $this->createProductMock(['get_price' => '7.50']);
        Functions\expect('wc_get_product')
            ->andReturnUsing(function ($id) use ($mock1, $mock2) {
                return match ($id) {
                    101 => $mock1,
                    102 => $mock2,
                    default => false,
                };
            });
        $product = $this->createProductType();
        $price = $product->calculate_composed_price([101, 102]);
        $this->assertSame(12.5, $price);
    }
    public function testCalculateComposedPrice_SumMode_SkipsInvalidProducts(): void
    {
        Functions\expect('get_option')
            ->with('wc_composable_default_pricing', 'sum')
            ->andReturn('sum');
        $mock1 = $this->createProductMock(['get_price' => '5.00']);
        Functions\expect('wc_get_product')
            ->andReturnUsing(function ($id) use ($mock1) {
                return match ($id) {
                    101 => $mock1,
                    default => false,
                };
            });
        $product = $this->createProductType();
        $price = $product->calculate_composed_price([101, 999]);
        $this->assertSame(5.0, $price);
    }
 }
--- a/tests/Unit/StockManagerTest.php
+++ b/tests/Unit/StockManagerTest.php
@@ -0,0 +1,226 @@
 <?php
 /**
 * StockManager Tests
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 namespace Magdev\WcComposableProduct\Tests\Unit;
 use Magdev\WcComposableProduct\Tests\TestCase;
 use Magdev\WcComposableProduct\StockManager;
 use Brain\Monkey\Functions;
 class StockManagerTest extends TestCase
 {
    private StockManager $manager;
    protected function setUp(): void
    {
        parent::setUp();
        $this->manager = new StockManager();
    }
    // --- validate_stock_availability ---
    public function testValidateStock_ReturnsTrueWhenAllInStock(): void
    {
        $mock = $this->createProductMock([
            'managing_stock' => false,
            'is_in_stock' => true,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        Functions\expect('wc_get_product')->with(2)->andReturn($mock);
        $result = $this->manager->validate_stock_availability([1, 2]);
        $this->assertTrue($result);
    }
    public function testValidateStock_ReturnsTrueWhenNotManagingStock(): void
    {
        $mock = $this->createProductMock(['managing_stock' => false]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $result = $this->manager->validate_stock_availability([1]);
        $this->assertTrue($result);
    }
    public function testValidateStock_ReturnsErrorForOutOfStock(): void
    {
        $mock = $this->createProductMock([
            'managing_stock' => true,
            'is_in_stock' => false,
            'get_name' => 'Widget',
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $result = $this->manager->validate_stock_availability([1]);
        $this->assertIsString($result);
        $this->assertStringContainsString('Widget', $result);
    }
    public function testValidateStock_ReturnsErrorForInsufficientQuantity(): void
    {
        $mock = $this->createProductMock([
            'managing_stock' => true,
            'is_in_stock' => true,
            'get_stock_quantity' => 1,
            'get_name' => 'Widget',
            'backorders_allowed' => false,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $result = $this->manager->validate_stock_availability([1], 5);
        $this->assertIsString($result);
        $this->assertStringContainsString('Widget', $result);
    }
    public function testValidateStock_PassesWhenBackordersAllowed(): void
    {
        // When stock_quantity is null the insufficient-stock check is skipped,
        // and the backorders_allowed() branch is reached.
        $mock = $this->createProductMock([
            'managing_stock' => true,
            'is_in_stock' => true,
            'get_stock_quantity' => null,
            'backorders_allowed' => true,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $result = $this->manager->validate_stock_availability([1], 5);
        $this->assertTrue($result);
    }
    public function testValidateStock_SkipsNullProducts(): void
    {
        Functions\expect('wc_get_product')->with(999)->andReturn(false);
        $result = $this->manager->validate_stock_availability([999]);
        $this->assertTrue($result);
    }
    // --- get_product_stock_info ---
    public function testGetProductStockInfo_ReturnsCorrectStructure(): void
    {
        $mock = $this->createProductMock([
            'is_in_stock' => true,
            'get_stock_quantity' => 10,
            'backorders_allowed' => false,
            'get_stock_status' => 'instock',
            'managing_stock' => true,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $info = $this->manager->get_product_stock_info(1);
        $this->assertTrue($info['in_stock']);
        $this->assertSame(10, $info['stock_quantity']);
        $this->assertFalse($info['backorders_allowed']);
        $this->assertSame('instock', $info['stock_status']);
        $this->assertTrue($info['managing_stock']);
        $this->assertTrue($info['has_enough_stock']);
    }
    public function testGetProductStockInfo_ReturnsFallbackForInvalidProduct(): void
    {
        Functions\expect('wc_get_product')->with(999)->andReturn(false);
        $info = $this->manager->get_product_stock_info(999);
        $this->assertFalse($info['in_stock']);
        $this->assertSame(0, $info['stock_quantity']);
        $this->assertFalse($info['backorders_allowed']);
        $this->assertSame('outofstock', $info['stock_status']);
    }
    public function testGetProductStockInfo_HasEnoughStockTrueWhenNotManaging(): void
    {
        $mock = $this->createProductMock([
            'managing_stock' => false,
            'get_stock_quantity' => null,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $info = $this->manager->get_product_stock_info(1, 100);
        $this->assertTrue($info['has_enough_stock']);
    }
    public function testGetProductStockInfo_HasEnoughStockFalseWhenInsufficient(): void
    {
        $mock = $this->createProductMock([
            'managing_stock' => true,
            'get_stock_quantity' => 2,
        ]);
        Functions\expect('wc_get_product')->with(1)->andReturn($mock);
        $info = $this->manager->get_product_stock_info(1, 5);
        $this->assertFalse($info['has_enough_stock']);
    }
    // --- prevent_composable_stock_reduction ---
    public function testPreventStockReduction_ReturnsFalseForComposableItem(): void
    {
        $productMock = $this->createProductMock(['get_type' => 'composable']);
        $itemMock = \Mockery::mock('WC_Order_Item_Product');
        $itemMock->shouldReceive('get_product')->andReturn($productMock);
        $orderMock = \Mockery::mock('WC_Order');
        $orderMock->shouldReceive('get_items')->andReturn([$itemMock]);
        $result = $this->manager->prevent_composable_stock_reduction(true, $orderMock);
        $this->assertFalse($result);
    }
    public function testPreventStockReduction_PassesThroughForNonComposable(): void
    {
        $productMock = $this->createProductMock(['get_type' => 'simple']);
        $itemMock = \Mockery::mock('WC_Order_Item_Product');
        $itemMock->shouldReceive('get_product')->andReturn($productMock);
        $orderMock = \Mockery::mock('WC_Order');
        $orderMock->shouldReceive('get_items')->andReturn([$itemMock]);
        $result = $this->manager->prevent_composable_stock_reduction(true, $orderMock);
        $this->assertTrue($result);
    }
    // --- store_selected_products_in_order ---
    public function testStoreSelectedProducts_AddsMetaWhenPresent(): void
    {
        $itemMock = \Mockery::mock('WC_Order_Item_Product');
        $itemMock->shouldReceive('add_meta_data')
            ->once()
            ->with('_composable_products', [1, 2], true);
        $this->manager->store_selected_products_in_order(
            $itemMock,
            'cart_key',
            ['composable_products' => [1, 2]]
        );
    }
    public function testStoreSelectedProducts_DoesNothingWithoutData(): void
    {
        $itemMock = \Mockery::mock('WC_Order_Item_Product');
        $itemMock->shouldNotReceive('add_meta_data');
        $this->manager->store_selected_products_in_order(
            $itemMock,
            'cart_key',
            []
        );
    }
 }
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -0,0 +1,33 @@
 <?php
 /**
 * PHPUnit Bootstrap
 *
 * Sets up WooCommerce stubs, plugin constants, and the Composer autoloader
 * for running unit tests without a full WordPress installation.
 *
 * @package Magdev\WcComposableProduct\Tests
 */
 // Composer autoloader (loads Brain Monkey, Mockery, plugin classes)
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 // Define WordPress constants that the plugin expects
 defined('ABSPATH') || define('ABSPATH', '/tmp/wordpress/');
 defined('WP_DEBUG') || define('WP_DEBUG', true);
 defined('DOING_AJAX') || define('DOING_AJAX', false);
 // Define plugin constants
 defined('WC_COMPOSABLE_PRODUCT_VERSION') || define('WC_COMPOSABLE_PRODUCT_VERSION', '1.3.1');
 defined('WC_COMPOSABLE_PRODUCT_FILE') || define('WC_COMPOSABLE_PRODUCT_FILE', dirname(__DIR__) . '/wc-composable-product.php');
 defined('WC_COMPOSABLE_PRODUCT_PATH') || define('WC_COMPOSABLE_PRODUCT_PATH', dirname(__DIR__) . '/');
 defined('WC_COMPOSABLE_PRODUCT_URL') || define('WC_COMPOSABLE_PRODUCT_URL', 'https://example.com/wp-content/plugins/wc-composable-product/');
 defined('WC_COMPOSABLE_PRODUCT_BASENAME') || define('WC_COMPOSABLE_PRODUCT_BASENAME', 'wc-composable-product/wc-composable-product.php');
 // Load WooCommerce class stubs (parent before child)
 require_once __DIR__ . '/stubs/class-wc-data.php';
 require_once __DIR__ . '/stubs/class-wc-product.php';
 require_once __DIR__ . '/stubs/class-wc-settings-page.php';
 require_once __DIR__ . '/stubs/class-wc-order.php';
 require_once __DIR__ . '/stubs/class-wc-order-item-product.php';
 require_once __DIR__ . '/stubs/class-wc-cart.php';
 require_once __DIR__ . '/stubs/class-wc-admin-settings.php';
--- a/tests/stubs/class-wc-admin-settings.php
+++ b/tests/stubs/class-wc-admin-settings.php
@@ -0,0 +1,11 @@
 <?php
 /**
 * Minimal WC_Admin_Settings stub for unit testing.
 */
 class WC_Admin_Settings {
    public static function output_fields($options) {
    }
    public static function save_fields($options) {
    }
 }
--- a/tests/stubs/class-wc-cart.php
+++ b/tests/stubs/class-wc-cart.php
@@ -0,0 +1,15 @@
 <?php
 /**
 * Minimal WC_Cart stub for unit testing.
 */
 class WC_Cart {
    protected $cart_contents = [];
    public function get_cart() {
        return $this->cart_contents;
    }
    public function set_cart_contents($contents) {
        $this->cart_contents = $contents;
    }
 }
--- a/tests/stubs/class-wc-data.php
+++ b/tests/stubs/class-wc-data.php
@@ -0,0 +1,35 @@
 <?php
 /**
 * Minimal WC_Data stub for unit testing.
 */
 class WC_Data {
    protected $id = 0;
    protected $data = [];
    protected $meta_data = [];
    public function __construct($id = 0) {
        if (is_numeric($id) && $id > 0) {
            $this->id = (int) $id;
        }
    }
    public function get_id() {
        return $this->id;
    }
    public function set_id($id) {
        $this->id = (int) $id;
    }
    public function get_meta($key, $single = true, $context = 'view') {
        return $this->meta_data[$key] ?? ($single ? '' : []);
    }
    public function update_meta_data($key, $value, $meta_id = 0) {
        $this->meta_data[$key] = $value;
    }
    public function save() {
        return $this->get_id();
    }
 }
--- a/tests/stubs/class-wc-order-item-product.php
+++ b/tests/stubs/class-wc-order-item-product.php
@@ -0,0 +1,28 @@
 <?php
 /**
 * Minimal WC_Order_Item_Product stub for unit testing.
 */
 class WC_Order_Item_Product extends WC_Data {
    protected $product = null;
    protected $quantity = 1;
    public function get_product() {
        return $this->product;
    }
    public function set_product($product) {
        $this->product = $product;
    }
    public function get_quantity() {
        return $this->quantity;
    }
    public function set_quantity($quantity) {
        $this->quantity = $quantity;
    }
    public function add_meta_data($key, $value, $unique = false) {
        $this->meta_data[$key] = $value;
    }
 }
--- a/tests/stubs/class-wc-order.php
+++ b/tests/stubs/class-wc-order.php
@@ -0,0 +1,24 @@
 <?php
 /**
 * Minimal WC_Order stub for unit testing.
 */
 class WC_Order extends WC_Data {
    protected $items = [];
    protected $order_notes = [];
    public function get_items($type = '') {
        return $this->items;
    }
    public function set_items($items) {
        $this->items = $items;
    }
    public function add_order_note($note) {
        $this->order_notes[] = $note;
    }
    public function get_order_notes() {
        return $this->order_notes;
    }
 }
--- a/tests/stubs/class-wc-product.php
+++ b/tests/stubs/class-wc-product.php
@@ -0,0 +1,88 @@
 <?php
 /**
 * Minimal WC_Product stub for unit testing.
 */
 class WC_Product extends WC_Data {
    protected $supports = [];
    protected $data = [
        'name' => '',
        'price' => '',
        'regular_price' => '',
        'status' => 'publish',
    ];
    public function get_type() {
        return 'simple';
    }
    public function get_name($context = 'view') {
        return $this->data['name'] ?? '';
    }
    public function get_price($context = 'view') {
        return $this->data['price'] ?? '';
    }
    public function get_regular_price($context = 'view') {
        return $this->data['regular_price'] ?? '';
    }
    public function get_price_html() {
        return '';
    }
    public function get_permalink() {
        return '';
    }
    public function get_image_id($context = 'view') {
        return 0;
    }
    public function get_stock_quantity($context = 'view') {
        return null;
    }
    public function get_stock_status($context = 'view') {
        return 'instock';
    }
    public function get_children() {
        return [];
    }
    public function is_type($type) {
        return $this->get_type() === $type;
    }
    public function is_purchasable() {
        return true;
    }
    public function is_in_stock() {
        return true;
    }
    public function managing_stock() {
        return false;
    }
    public function backorders_allowed() {
        return false;
    }
    public function is_sold_individually() {
        return false;
    }
    public function set_price($price) {
        $this->data['price'] = $price;
    }
    public function set_stock_quantity($quantity) {
    }
    public function supports($feature) {
        return in_array($feature, $this->supports, true);
    }
 }
--- a/tests/stubs/class-wc-settings-page.php
+++ b/tests/stubs/class-wc-settings-page.php
@@ -0,0 +1,29 @@
 <?php
 /**
 * Minimal WC_Settings_Page stub for unit testing.
 */
 class WC_Settings_Page {
    protected $id = '';
    protected $label = '';
    public function __construct() {
    }
    public function get_id() {
        return $this->id;
    }
    public function get_label() {
        return $this->label;
    }
    public function get_settings() {
        return [];
    }
    public function output() {
    }
    public function save() {
    }
 }
--- a/wc-composable-product.php
+++ b/wc-composable-product.php
@@ -1,11 +1,12 @@
 <?php
 /**
 * Plugin Name: WooCommerce Composable Products
- * Plugin URI: https://github.com/magdev/wc-composable-product
+ * Plugin URI: https://src.bundespruefstelle.ch/magdev/wc-composable-product
 * Description: Create composable products where customers select a limited number of items from a configurable set
- * Version: 1.0.0
+ * Version: 1.3.1
 * Author: Marco Graetsch
- * Author URI: https://example.com
+ * Author URI: https://src.bundespruefstelle.ch/magdev
 * License: GPL v3 or later
 * License URI: https://www.gnu.org/licenses/gpl-3.0.html
 * Text Domain: wc-composable-product
@@ -19,7 +20,7 @@
 defined( 'ABSPATH' ) || exit;
 // Define plugin constants
-define('WC_COMPOSABLE_PRODUCT_VERSION', '1.0.0');
+define( 'WC_COMPOSABLE_PRODUCT_VERSION', '1.3.1' );
 define( 'WC_COMPOSABLE_PRODUCT_FILE', __FILE__ );
 define( 'WC_COMPOSABLE_PRODUCT_PATH', plugin_dir_path( __FILE__ ) );
 define( 'WC_COMPOSABLE_PRODUCT_URL', plugin_dir_url( __FILE__ ) );
@@ -35,13 +36,16 @@ if (file_exists(WC_COMPOSABLE_PRODUCT_PATH . 'vendor/autoload.php')) {
 */
 function wc_composable_product_check_woocommerce() {
 	if ( ! class_exists( 'WooCommerce' ) ) {
-        add_action('admin_notices', function() {
+		add_action(
 			'admin_notices',
 			function () {
 				?>
 			<div class="notice notice-error">
 				<p><?php esc_html_e( 'WooCommerce Composable Products requires WooCommerce to be installed and active.', 'wc-composable-product' ); ?></p>
 			</div>
 				<?php
-        });
+			}
 		);
 		return false;
 	}
 	return true;
@@ -59,9 +63,22 @@ function wc_composable_product_init() {
 	load_plugin_textdomain( 'wc-composable-product', false, dirname( WC_COMPOSABLE_PRODUCT_BASENAME ) . '/languages' );
 	// Initialize main plugin class
-    WC_Composable_Product\Plugin::instance();
+	Magdev\WcComposableProduct\Plugin::instance();
 }
-add_action('plugins_loaded', 'wc_composable_product_init');
+// Use woocommerce_init to ensure all WooCommerce classes including settings are loaded
 add_action( 'woocommerce_init', 'wc_composable_product_init' );
 /**
 * Declare HPOS compatibility
 */
 add_action(
 	'before_woocommerce_init',
 	function () {
 		if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
 			\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
 		}
 	}
 );
 /**
 * Activation hook