Skip to content

feat(Promotion): Make ordered lanes an array #6345

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.

Sign up for GitHub

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

Merged
tvdeyen merged 1 commit into from
Nov 1, 2025
Merged

feat(Promotion): Make ordered lanes an array #6345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion promotions/app/models/solidus_promotions/order_adjuster/discount_order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def initialize(order, promotions, dry_run: false)
def call
return order if order.shipped?

SolidusPromotions::Promotion.ordered_lanes.each_key do |lane|
SolidusPromotions::Promotion.ordered_lanes.each do |lane|
lane_promotions = promotions.select { |promotion| promotion.lane == lane }
lane_benefits = eligible_benefits_for_promotable(lane_promotions.flat_map(&:benefits), order)
perform_order_benefits(lane_benefits, lane) unless dry_run
Expand Down
6 changes: 3 additions & 3 deletions promotions/app/models/solidus_promotions/promotion.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ def self.human_enum_name(enum_name, enum_value)
end

def self.lane_options
ordered_lanes.map do |lane_name, _index|
[human_enum_name(:lane, lane_name), lane_name]
ordered_lanes.map do |lane|
[human_enum_name(:lane, lane), lane]
end
end

def self.ordered_lanes
lanes.sort_by(&:last).to_h
lanes.keys.sort_by { |lane| lanes[lane] }
end

def self.order_activatable?(order)
Expand Down
2 changes: 1 addition & 1 deletion promotions/spec/models/solidus_promotions/promotion_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
describe ".ordered_lanes" do
subject { described_class.ordered_lanes }

it { is_expected.to eq({ "pre" => 0, "default" => 1, "post" => 2 }) }
it { is_expected.to eq(%w[pre default post]) }
end

describe "validations" do
Expand Down