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 #400

Merged
merged 14 commits into from
Mar 7, 2024
Merged

[pull] main from solidusio:main #400

merged 14 commits into from
Mar 7, 2024

Commits on Mar 2, 2024

  1. Add a promotion finder class for the classic promotion system

    This is intended to be used by the API Promotions Controller.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    255935d View commit details
    Browse the repository at this point in the history
  2. Add a Null Promotion Finder

    This configurable class finds a promotion by its code.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    1e1c0f8 View commit details
    Browse the repository at this point in the history
  3. Make the promotion finder class configurable

    The default has to be the Null promotion finder.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    d5039de View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9b49501 View commit details
    Browse the repository at this point in the history
  5. Use promotion finder in API promotions controller

    The API promotions controller is pretty straightforward, and the only
    touch point here is finding a promotion. With that added to the
    promotion configuration, we can now use it with no changes to our specs.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    eb76aae View commit details
    Browse the repository at this point in the history
  6. Promotions Request Spec: Stub Finder

    This allows us to change the promotion system with factories, because we
    stop using factories in this spec.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    2f29de0 View commit details
    Browse the repository at this point in the history
  7. Scaffold for solidus_legacy_promotions extension

    We want to extract the legacy promotion system from Solidus into its own
    gem to facilitate moving towards solidus_promotions.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    5b136ab View commit details
    Browse the repository at this point in the history
  8. Run legacy promotions on CI

    The new weights for the individual sub-projects are their duration in
    seconds.
    mamhoff committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3222e60 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Fix flash messages coloring

    Previously, all flash messages were showing with the same (black)
    background. Internally, the flash object converts and stores keys
    as strings [1].
    
    [1] https://github.com/rails/rails/blob/main/actionpack/lib/action_dispatch/middleware/flash.rb#L163
    spaghetticode committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    991a179 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #5678 from mamhoff/legacy-promotions-gem

    Add Legacy promotions gem
    kennyadsl authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    cb4ec7b View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5677 from mamhoff/promotion-finder

    Add extension point: Promotion finder
    kennyadsl authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    d5dd8b6 View commit details
    Browse the repository at this point in the history
  4. Fix JS locale data for release of Money 6.19

    The money gem in its latest iteration added a space between value and
    unit of the Swiss Franc. Our heuristic in `_js_locale_data.html.erb`
    can't deal with that, so we add a third branch to it: If the money gem
    has a format wish, we'll respect it, but replace its abbreviations with
    the one the `accounting.js` library prefers.
    mamhoff committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    f19e6fc View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge pull request #5683 from mamhoff/fix-money-6.19

    Fix JS locale data for release of Money 6.19
    spaghetticode authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    885a453 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #5681 from nebulab/spaghetticode/fix-admin-flash

    [ADMIN] Fix flash messages coloring
    spaghetticode authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    75d3196 View commit details
    Browse the repository at this point in the history