Skip to content

Fix line item option condition params #6233

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+32 −2
Draft

Fix line item option condition params #6233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40fb63c
Promotions: Set line_item_option_value product-picker multiple false
manleyac May 12, 2025
25285b3
Promotions: Pass product-picker to option-value-picker
manleyac May 12, 2025
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
7 changes: 6 additions & 1 deletion promotions/app/javascript/backend/solidus_promotions/web_components/option_value_picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ $.fn.optionValueAutocomplete = function (options) {

class OptionValuePicker extends HTMLInputElement {
connectedCallback() {
$(this).optionValueAutocomplete();
const container = this.closest(".promo-condition-option-value");
const productPicker = container.querySelector('input[is="product-picker"]');

$(this).optionValueAutocomplete({
productSelect: productPicker,
});
}
}

Expand Down
3 changes: 2 additions & 1 deletion promotions/app/javascript/backend/solidus_promotions/web_components/product_picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class ProductPicker extends HTMLInputElement {
connectedCallback() {
$(this).productAutocomplete();
const multiple = this.dataset.multiple !== "false";
$(this).productAutocomplete({ multiple });
}
}

Expand Down
1 change: 1 addition & 0 deletions ...us_promotions/admin/condition_fields/line_item_option_value/_option_value_fields.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
is="product-picker"
class="w-100"
data-action="select2Change->product-option-values#propagate_product_id_to_value_input"
data-multiple="false"
type="hidden"
value="<%= product_option_values[0] %>"
>
Expand Down
23 changes: 23 additions & 0 deletions promotions/spec/system/solidus_promotions/backend/promotions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,27 @@
expect(page).to have_content("Benefit has been successfully removed!")
end
end

describe "Adding a benefit condition" do
let!(:promotion_with_benefit) { create(:solidus_promotion, :with_adjustable_benefit) }
let!(:product) { create(:product) }
let!(:option_value) { create(:option_value) }
let!(:variant) { create(:variant, product: product, option_values: [option_value]) }

it "allows adding a line_item_with_options condition", :js do

Check failure on line 171 in promotions/spec/system/solidus_promotions/backend/promotions_spec.rb

View workflow job for this annotation

GitHub Actions / solidus_promotions / Rails 7.0, Ruby 3.1, postgres, paperclip 

Promotions admin Adding a benefit condition allows adding a line_item_with_options condition

Failure/Error: @condition.assign_attributes(condition_params)

TypeError:
  Hash expected got [""]

Check failure on line 171 in promotions/spec/system/solidus_promotions/backend/promotions_spec.rb

View workflow job for this annotation

GitHub Actions / solidus_promotions / Rails 8.0, Ruby 3.4, sqlite, activestorage 

Promotions admin Adding a benefit condition allows adding a line_item_with_options condition

Failure/Error: @condition.assign_attributes(condition_params)

TypeError:
  Hash expected got [""]

Check failure on line 171 in promotions/spec/system/solidus_promotions/backend/promotions_spec.rb

View workflow job for this annotation

GitHub Actions / solidus_promotions / Rails 7.1, Ruby 3.2, mysql, activestorage 

Promotions admin Adding a benefit condition allows adding a line_item_with_options condition

Failure/Error: @condition.assign_attributes(condition_params)

TypeError:
  Hash expected got [""]

Check failure on line 171 in promotions/spec/system/solidus_promotions/backend/promotions_spec.rb

View workflow job for this annotation

GitHub Actions / solidus_promotions / Rails 7.2, Ruby 3.3, postgres, activestorage 

Promotions admin Adding a benefit condition allows adding a line_item_with_options condition

Failure/Error: @condition.assign_attributes(condition_params)

TypeError:
  Hash expected got [""]
visit solidus_promotions.edit_admin_promotion_path(promotion_with_benefit)
click_link "Add Condition"
select("Line Item Option Value(s)", from: "Condition Type")
click_button "Add"
expect(page).to have_content("Line Item Option Value(s)")
click_link "Add product"
within(".promo-condition-option-value") do
# find('.select2-focusser').set(product.name)
# find('.select2-input').set(option_value.name)
end
within("#benefits_adjust_line_item_#{promotion_with_benefit.benefits.first.id}_conditions") do
find('input[type="submit"]', wait: 5).click
end
end
end
end
Loading