Skip to content

Conversation

@mamhoff
Copy link
Contributor

@mamhoff mamhoff commented Dec 5, 2025

Backport

This will backport the following commits from main to v4.6:

Questions ?

Please refer to the Backport tool documentation

manleyac and others added 3 commits December 5, 2025 15:15
This updates the product picker for the line_item_option_value form
to not allow selecting multiple products per entry.

(cherry picked from commit 36b8821)
This fixes an issue where the option-value-picker was not
receiving the id for the selected product. Therefore the correct
option values where not available and the params where malformed.

(cherry picked from commit 8947ff5)

# Conflicts:
#	promotions/spec/system/solidus_promotions/backend/promotions_spec.rb
When creating an option value condition, we only want to have option
values that fit the product in question. This commit makes it such that
the option value picker re-initializes when the selected product
changes.

(cherry picked from commit b45afe7)
@mamhoff mamhoff requested a review from a team as a code owner December 5, 2025 14:18
@mamhoff mamhoff added backport-v4.5 Backport this pull-request to v4.5 backport-v4.6 Backport this pull-request to v4.6 changelog:solidus_promotions Changes to the solidus_promotions gem labels Dec 5, 2025
@codecov
Copy link

codecov bot commented Dec 5, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.36%. Comparing base (3ef805b) to head (4109116).
⚠️ Report is 6 commits behind head on v4.6.

Additional details and impacted files
@@           Coverage Diff           @@
##             v4.6    #6396   +/-   ##
=======================================
  Coverage   89.36%   89.36%           
=======================================
  Files         963      963           
  Lines       20213    20213           
=======================================
  Hits        18064    18064           
  Misses       2149     2149           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mamhoff mamhoff force-pushed the backport/v4.6/pr-6233 branch from 0e67c62 to 4109116 Compare December 5, 2025 14:30
@tvdeyen tvdeyen merged commit 2f78d2b into solidusio:v4.6 Dec 5, 2025
37 checks passed
@solidus-bot
Copy link

solidus-bot bot commented Dec 5, 2025

💔 All backports failed

Status Branch Result
v4.5 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.5:
- Fix appearance and specs for option value condition
- Promotions: Pass product-picker to option-value-picker

Manual backport

To create the backport manually run:

backport --pr 6396

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-v4.5 Backport this pull-request to v4.5 backport-v4.6 Backport this pull-request to v4.6 changelog:solidus_promotions Changes to the solidus_promotions gem

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants