Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better promotion menus #5934

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Conversation

mamhoff
Copy link
Contributor

@mamhoff mamhoff commented Nov 15, 2024

Summary

This PR, built on top of #5933 , allows viewing the configuration of both the legacy promotion system and the new promotion system side-by-side in the new admin, with pleasing menu items.

Instead of "Legacy Promotions", which looks a bit bad (why does the system come with "legacy" by default?), we call those just "Promotions", and the new Promotion system is termed "Promotions (new).

There's also fixes in here for always showing the promotions menu items in the same sequence below the products menu item.

Copy link

codecov bot commented Nov 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.81%. Comparing base (2632096) to head (0a69b6a).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5934      +/-   ##
==========================================
- Coverage   89.53%   87.81%   -1.73%     
==========================================
  Files         782      476     -306     
  Lines       17981    11656    -6325     
==========================================
- Hits        16100    10236    -5864     
+ Misses       1881     1420     -461     

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

This makes sure that the promotion menus are always below the product
menu item, in both new admin and the backend.

It also changes the nomenclature to be "Promotions" for the legacy
promotion system and "Promotions (new)" for the new promotion system.
Prior to this commit, the new promotion system would exchange the
promotion and promotion category index page components if the gem was
loaded. This made it impossible to actually see the old promotion
configuration when using the new admin.

This commit now only changes the orders/index component if the new
promotion system is activated. In any case, it will display new
promotion and promotion category records under "Promotions (new)".
@github-actions github-actions bot added changelog:solidus_legacy_promotions Changes to the solidus_legacy_promotions gem changelog:solidus_promotions Changes to the solidus_promotions gem and removed changelog:solidus_admin labels Nov 18, 2024
@tvdeyen tvdeyen merged commit 825fb6d into solidusio:main Nov 18, 2024
15 of 16 checks passed
@tvdeyen tvdeyen added the backport-v4.4 Backport this pull-request to v4.4 label Nov 18, 2024
@tvdeyen
Copy link
Member

tvdeyen commented Nov 18, 2024

💚 All backports created successfully

Status Branch Result
v4.4

Questions ?

Please refer to the Backport tool documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v4.4 Backport this pull-request to v4.4 changelog:solidus_legacy_promotions Changes to the solidus_legacy_promotions gem changelog:solidus_promotions Changes to the solidus_promotions gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants