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

[pull] main from solidusio:main #410

Merged
merged 26 commits into from
Jun 3, 2024
Merged

[pull] main from solidusio:main #410

merged 26 commits into from
Jun 3, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented May 31, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

mamhoff and others added 21 commits May 22, 2024 09:10
This class will act as a stand-in for those classes that are currently
configurable via Solidus' `AppConfiguration` class, but are only used
from *within* the legacy promotion system. We have delegated these
extension points to `Spree::Config.promotions`, so the
`Spree::Core::NullPromotionConfiguration` needs to implement methods for
them, but I don't see a lot of sense in providing Null implementations
for things that aren't even needed.
We need to provide this accessor until people have either fully migrated
to using the legacy promotions gem or the upcoming `solidus_promotions`
gem. Those will supply their own configuration objects on which users
can set a promotion code batch mailer class.

This is only here to support deprecating
`Spree::Config.promotion_code_batch_mailer_class` calls.
This configuration option is only called from within the legacy promotion system.
Let's not create a `NullPromotionChooser`, but rather use the
DeprecatedConfigurableClass that just warns without doing anything.
GitHub deprecated actions not using Node 20.
…motion-configuration

Add missing methods to null promotion configuration
The previous implementation of `Spree::DeprecatedConfigurableClass`
could deal with instance methods, but not with class methods. This
creates a thing that issues deprecation warnings on instance methods and
class methods.
This spec wants to test that all promotion codes are in the CSV, but it
prescribes order, which is not guaranteed.
The `sort_link` helper only takes a single options hash since Ransack
3.0: activerecord-hackery/ransack#1289
When moving the legacy promotion system translations, I also moved the
translation for `spree.match_choices`. These are also used on the
backend products edit page, and need to stay in core.
…oller-spec

Fix flaky legacy promotion codes controller spec
…s-methods

Deprecated Configurable Class: Allow class methods
The Github action "labeler" changed the format of the `labeler.yml`
configuration file with labeler v5. I've used the format from the `Basic
Examples` section, and hope this does what it did previously.

See https://github.com/actions/labeler/blob/v5/README.md
Fix labeler configuration file for labeler@v5
mamhoff and others added 4 commits June 3, 2024 13:30
Revert "Temporarily use labeler configuration from PR, not from PR ta…
Without checking out, the labeler seems to not work anymore.
@pull pull bot merged commit 9a42910 into nebulab:main Jun 3, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants