Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
fix: update variant options based on id (#12612)
Caio Câmarab247e4348756
diff --git a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js b/admin/app/javascript/spree/admin/controllers/variants_form_controller.jsindex a4e9f39ae8..b0e2cf6e56 100644--- a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js+++ b/admin/app/javascript/spree/admin/controllers/variants_form_controller.js@@ -587,6 +587,12 @@ export default class extends CheckboxSelectAll {}keys.forEach((key) => {+ const idInput = document.createElement('input')+ idInput.type = 'hidden'+ idInput.name = `product[variants_attributes][${i}][options][][id]`+ idInput.value = Object.entries(this.optionsValue).find((option) => option[1].name === key)?.[0]+ inputs.push(idInput)+const nameInput = document.createElement('input')nameInput.type = 'hidden'nameInput.name = `product[variants_attributes][${i}][options][][name]`diff --git a/admin/spec/controllers/spree/admin/products_controller_spec.rb b/admin/spec/controllers/spree/admin/products_controller_spec.rbindex b9be9880fe..4c2e0ef193 100644--- a/admin/spec/controllers/spree/admin/products_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/products_controller_spec.rb@@ -229,11 +229,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Red'},{+ id: nil,name: 'Not existing option',position: 2,value: 'Not existing value'@@ -253,11 +255,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Blue'},{+ id: nil,name: 'Not existing option',position: 2,value: 'Not existing value2'@@ -562,6 +566,8 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller docontext 'adding variants to existing product' dolet(:stock_location) { create(:stock_location) }let(:other_stock_location) { create(:stock_location) }+ let(:new_option_type) { create(:option_type, name: 'Material', presentation: 'Fabric') }+let(:product_params) do{name: 'Product',@@ -579,14 +585,22 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Red'},{+ id: nil,name: 'Not existing option',position: 2,value: 'Not existing value'+ },+ {+ id: new_option_type.id,+ name: 'Fabric',+ position: 3,+ value: 'Silk'}]},@@ -603,14 +617,22 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Blue'},{+ id: nil,name: 'Not existing option',position: 2,value: 'Not existing value2'+ },+ {+ id: new_option_type.id,+ name: 'Fabric',+ position: 3,+ value: 'Cotton'}]}@@ -626,17 +648,57 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller dovariant = product.variants.firstexpect(variant.price_in('PLN').amount).to eq 10expect(variant.price_in('USD').amount).to eq 20- expect(variant.options_text).to eq 'Color: Red, Not existing option: Not existing value'+ expect(variant.options_text).to eq 'Color: Red, Not existing option: Not existing value, and Fabric: Silk'expect(variant.stock_items.first.count_on_hand).to eq 10expect(variant.stock_items.first.stock_location).to eq stock_locationother_variant = product.variants.lastexpect(other_variant.price_in('PLN').amount).to eq 44expect(other_variant.price_in('USD').amount).to eq 55- expect(other_variant.options_text).to eq 'Color: Blue, Not existing option: Not existing value2'+ expect(other_variant.options_text).to eq 'Color: Blue, Not existing option: Not existing value2, and Fabric: Cotton'expect(other_variant.stock_items.first.count_on_hand).to eq 200expect(other_variant.stock_items.first.stock_location).to eq other_stock_locationend++ context "when option is missing id attribute" do+ let(:product_params) do+ {+ name: 'Product',+ variants_attributes: {+ '0' => {+ prices_attributes: {+ '0': { currency: 'PLN', amount: 10 },+ '1': { currency: 'USD', amount: 20 }+ },+ stock_items_attributes: {+ '0' => {+ count_on_hand: 10,+ stock_location_id: stock_location.id,+ }+ },+ options: [+ option_without_id_attribute+ ]+ }+ }+ }+ end++ let(:option_without_id_attribute) do+ {+ id: nil,+ name: 'Color',+ position: 1,+ value: 'Red'+ }.except(:id)+ end++ it 'raises an error' do+ expect {+ send_request+ }.to raise_error(ActionController::ParameterMissing, 'param is missing or the value is empty: id')+ end+ endendcontext 'updating existing variants' do@@ -678,11 +740,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Red'},{+ id: nil,name: 'Size',position: 2,value: 'Small'@@ -704,11 +768,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Blue'},{+ id: nil,name: 'Size',position: 2,value: 'Large'@@ -730,11 +796,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Color',position: 1,value: 'Red'},{+ id: nil,name: 'Size',position: 2,value: 'Large'@@ -784,11 +852,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Size',position: 1,value: 'S'},{+ id: nil,name: 'Color',position: 2,value: 'Red'@@ -803,11 +873,13 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Size',position: 1,value: 'M'},{+ id: nil,name: 'Color',position: 2,value: 'Blue'@@ -845,6 +917,7 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller doprice: { 'PLN' => 10, 'USD' => 20 },options: [{+ id: nil,name: 'Size',position: 1,value: 'S'@@ -870,6 +943,7 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do},options: [{+ id: nil,name: 'Size',position: 1,value: 'M'diff --git a/core/app/services/spree/products/prepare_nested_attributes.rb b/core/app/services/spree/products/prepare_nested_attributes.rbindex 4985af7d53..e6f341b503 100644--- a/core/app/services/spree/products/prepare_nested_attributes.rb+++ b/core/app/services/spree/products/prepare_nested_attributes.rb@@ -130,8 +130,10 @@ module Spreeoption_value_variant_params = {}option_value_params.each_with_index do |opt, index|- option_type = Spree::OptionType.where(name: opt[:name].parameterize).first_or_initialize do |o|+ option_type = Spree::OptionType.find_by(id: opt[:id]) if opt.fetch(:id)+ option_type ||= Spree::OptionType.where(name: opt[:name].parameterize).first_or_initialize do |o|o.name = o.presentation = opt[:name]+ o.position = opt[:position]o.save!endoption_value = option_type.option_values.where(name: opt[:value].parameterize).first_or_initialize do |o|