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
Improve samples, sandbox generation and so on (#12481)
Damian Legawieccbca0bdf8824
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scssindex 57ad5bebf0..431fd6a2cb 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss@@ -6,7 +6,6 @@.options-creator {margin: 1rem;padding: 0.5rem;- margin-bottom: 0px;border: 1px solid $border-color;border-radius: $border-radius;diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rbindex f575345f5d..ae746f5287 100644--- a/common_spree_dependencies.rb+++ b/common_spree_dependencies.rb@@ -16,7 +16,7 @@ platforms :ruby doelsif ENV['DB'] == 'postgres'gem 'pg'else- gem 'sqlite3', '~> 1.4'+ gem 'sqlite3', '>= 2.0'endenddiff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rbindex d8a789492d..0ee0c750f2 100644--- a/core/lib/generators/spree/install/install_generator.rb+++ b/core/lib/generators/spree/install/install_generator.rb@@ -128,23 +128,10 @@ module Spreeendend- def create_database- say_status :creating, 'database'- silence_stream(STDOUT) do- silence_stream(STDERR) do- silence_warnings { rake 'db:create' }- end- end- end-def run_migrationsif @run_migrationssay_status :running, 'migrations'- silence_stream(STDOUT) do- silence_stream(STDERR) do- silence_warnings { rake 'db:migrate' }- end- end+ rake 'db:migrate'elsesay_status :skipping, "migrations (don't forget to run rake db:migrate)"end@@ -160,11 +147,7 @@ module Spreecmd = -> { rake("db:seed #{rake_options.join(' ')}") }if options[:auto_accept] || (options[:admin_email] && options[:admin_password])- silence_stream(STDOUT) do- silence_stream(STDERR) do- silence_warnings &cmd- end- end+ silence_warnings &cmdelsecmd.callend@@ -178,11 +161,7 @@ module Spreeif @load_sample_datasay_status :loading, 'sample data'- silence_stream(STDOUT) do- silence_stream(STDERR) do- silence_warnings { rake 'spree_sample:load' }- end- end+ rake 'spree_sample:load'elsesay_status :skipping, 'sample data (you can always run rake spree_sample:load)'enddiff --git a/docs/api-reference/storefront.yaml b/docs/api-reference/storefront.yamlindex fdfc1ba4dc..fb95a16e9d 100644--- a/docs/api-reference/storefront.yaml+++ b/docs/api-reference/storefront.yaml@@ -9082,75 +9082,75 @@ components:option_values:- id: 4name: black- presentation: '#000000'+ presentation: 'Black'position: 4- id: 11name: mint- presentation: '#AAF0D1'+ presentation: 'Mint'position: 11- id: 6name: green- presentation: '#228C22'+ presentation: 'Green'position: 6- id: 2name: purple- presentation: '#800080'+ presentation: 'Purple'position: 2- id: 10name: beige- presentation: '#E1C699'+ presentation: 'Beige'position: 10- id: 17name: pink- presentation: '#FFA6C9'+ presentation: 'Pink'position: 17- id: 7name: grey- presentation: '#808080'+ presentation: 'Grey'position: 7- id: 8name: orange- presentation: '#FF8800'+ presentation: 'Orange'position: 8- id: 15name: yellow- presentation: '#FFFF00'+ presentation: 'Yellow'position: 15- id: 1name: white- presentation: '#FFFFFF'+ presentation: 'White'position: 1- id: 13- name: dark_blue- presentation: '#00008b'+ name: 'dark-blue'+ presentation: 'Dark Blue'position: 13- id: 19name: ecru- presentation: '#F4F2D6'+ presentation: 'Ecru'position: 19- id: 3name: red- presentation: '#FF0000'+ presentation: 'Red'position: 3- id: 12name: blue- presentation: '#0000FF'+ presentation: 'Blue'position: 12- id: 16- name: light_blue- presentation: '#add8e6'+ name: light-blue+ presentation: 'Light Blue'position: 16- id: 9name: burgundy- presentation: '#A8003B'+ presentation: 'Burgundy'position: 9- id: 14name: khaki- presentation: '#BDB76B'+ presentation: 'Khaki'position: 14- id: 5name: brown- presentation: '#8B4513'+ presentation: 'Brown'position: 5- id: 2name: lengthdiff --git a/sample/db/samples/images/apache_baseball.png b/sample/db/samples/images/apache_baseball.pngdeleted file mode 100644index 40d68d1f24..0000000000Binary files a/sample/db/samples/images/apache_baseball.png and /dev/null differdiff --git a/sample/db/samples/images/ror_bag.jpeg b/sample/db/samples/images/ror_bag.jpegdeleted file mode 100644index 5c88aa7fb6..0000000000Binary files a/sample/db/samples/images/ror_bag.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball.jpeg b/sample/db/samples/images/ror_baseball.jpegdeleted file mode 100644index d76f979e9d..0000000000Binary files a/sample/db/samples/images/ror_baseball.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_back.jpeg b/sample/db/samples/images/ror_baseball_back.jpegdeleted file mode 100644index a05a14d2a5..0000000000Binary files a/sample/db/samples/images/ror_baseball_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_back_blue.png b/sample/db/samples/images/ror_baseball_jersey_back_blue.pngdeleted file mode 100644index 2f023f239f..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_back_blue.png and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_back_green.png b/sample/db/samples/images/ror_baseball_jersey_back_green.pngdeleted file mode 100644index c769e35129..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_back_green.png and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_back_red.png b/sample/db/samples/images/ror_baseball_jersey_back_red.pngdeleted file mode 100644index 2be2275f90..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_back_red.png and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_blue.png b/sample/db/samples/images/ror_baseball_jersey_blue.pngdeleted file mode 100644index ad15f9f0bd..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_blue.png and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_green.png b/sample/db/samples/images/ror_baseball_jersey_green.pngdeleted file mode 100644index 4bd8c0aea6..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_green.png and /dev/null differdiff --git a/sample/db/samples/images/ror_baseball_jersey_red.png b/sample/db/samples/images/ror_baseball_jersey_red.pngdeleted file mode 100644index 4deb99a1d5..0000000000Binary files a/sample/db/samples/images/ror_baseball_jersey_red.png and /dev/null differdiff --git a/sample/db/samples/images/ror_jr_spaghetti.jpeg b/sample/db/samples/images/ror_jr_spaghetti.jpegdeleted file mode 100644index 51712dd4ca..0000000000Binary files a/sample/db/samples/images/ror_jr_spaghetti.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_mug.jpeg b/sample/db/samples/images/ror_mug.jpegdeleted file mode 100644index 1569a3767b..0000000000Binary files a/sample/db/samples/images/ror_mug.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_mug_back.jpeg b/sample/db/samples/images/ror_mug_back.jpegdeleted file mode 100644index 688861c17e..0000000000Binary files a/sample/db/samples/images/ror_mug_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_ringer.jpeg b/sample/db/samples/images/ror_ringer.jpegdeleted file mode 100644index c26f9922b6..0000000000Binary files a/sample/db/samples/images/ror_ringer.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_ringer_back.jpeg b/sample/db/samples/images/ror_ringer_back.jpegdeleted file mode 100644index b8aa9d6cd6..0000000000Binary files a/sample/db/samples/images/ror_ringer_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_stein.jpeg b/sample/db/samples/images/ror_stein.jpegdeleted file mode 100644index 126072f4d7..0000000000Binary files a/sample/db/samples/images/ror_stein.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_stein_back.jpeg b/sample/db/samples/images/ror_stein_back.jpegdeleted file mode 100644index cba4f27faa..0000000000Binary files a/sample/db/samples/images/ror_stein_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_tote.jpeg b/sample/db/samples/images/ror_tote.jpegdeleted file mode 100644index 38eb0f54f6..0000000000Binary files a/sample/db/samples/images/ror_tote.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ror_tote_back.jpeg b/sample/db/samples/images/ror_tote_back.jpegdeleted file mode 100644index 0410ebbc67..0000000000Binary files a/sample/db/samples/images/ror_tote_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/ruby_baseball.png b/sample/db/samples/images/ruby_baseball.pngdeleted file mode 100644index 9801dcb348..0000000000Binary files a/sample/db/samples/images/ruby_baseball.png and /dev/null differdiff --git a/sample/db/samples/images/spree_bag.jpeg b/sample/db/samples/images/spree_bag.jpegdeleted file mode 100644index af60cee5bf..0000000000Binary files a/sample/db/samples/images/spree_bag.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_jersey.jpeg b/sample/db/samples/images/spree_jersey.jpegdeleted file mode 100644index f58ebb1c38..0000000000Binary files a/sample/db/samples/images/spree_jersey.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_jersey_back.jpeg b/sample/db/samples/images/spree_jersey_back.jpegdeleted file mode 100644index 3e48587dea..0000000000Binary files a/sample/db/samples/images/spree_jersey_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_mug.jpeg b/sample/db/samples/images/spree_mug.jpegdeleted file mode 100644index 478cd9f262..0000000000Binary files a/sample/db/samples/images/spree_mug.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_mug_back.jpeg b/sample/db/samples/images/spree_mug_back.jpegdeleted file mode 100644index 6c54d2a4f1..0000000000Binary files a/sample/db/samples/images/spree_mug_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_ringer_t.jpeg b/sample/db/samples/images/spree_ringer_t.jpegdeleted file mode 100644index 69c641ac69..0000000000Binary files a/sample/db/samples/images/spree_ringer_t.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_ringer_t_back.jpeg b/sample/db/samples/images/spree_ringer_t_back.jpegdeleted file mode 100644index 76f18a50e9..0000000000Binary files a/sample/db/samples/images/spree_ringer_t_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_spaghetti.jpeg b/sample/db/samples/images/spree_spaghetti.jpegdeleted file mode 100644index 64723e45e8..0000000000Binary files a/sample/db/samples/images/spree_spaghetti.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_stein.jpeg b/sample/db/samples/images/spree_stein.jpegdeleted file mode 100644index e5ebe3b2b7..0000000000Binary files a/sample/db/samples/images/spree_stein.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_stein_back.jpeg b/sample/db/samples/images/spree_stein_back.jpegdeleted file mode 100644index 7b1e941952..0000000000Binary files a/sample/db/samples/images/spree_stein_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_tote_back.jpeg b/sample/db/samples/images/spree_tote_back.jpegdeleted file mode 100644index 846adc8fd9..0000000000Binary files a/sample/db/samples/images/spree_tote_back.jpeg and /dev/null differdiff --git a/sample/db/samples/images/spree_tote_front.jpeg b/sample/db/samples/images/spree_tote_front.jpegdeleted file mode 100644index 5c56a066c8..0000000000Binary files a/sample/db/samples/images/spree_tote_front.jpeg and /dev/null differdiff --git a/sample/db/samples/option_types.rb b/sample/db/samples/option_types.rbindex 09cbd49a12..f0a57f3bc1 100644--- a/sample/db/samples/option_types.rb+++ b/sample/db/samples/option_types.rb@@ -1,19 +1,3 @@-option_types_attributes = [- {- name: 'color',- presentation: 'Color',- position: 1- },- {- name: 'length',- presentation: 'Length',- position: 2- },- {- name: 'size',- presentation: 'Size',- position: 3- },-]--Spree::OptionType.insert_all!(option_types_attributes)+['color', 'size'].each do |name|+ Spree::OptionType.find_or_create_by!(name: name, presentation: name.capitalize)+enddiff --git a/sample/db/samples/option_values.rb b/sample/db/samples/option_values.rbindex fb8e994dd3..8f287fe146 100644--- a/sample/db/samples/option_values.rb+++ b/sample/db/samples/option_values.rb@@ -1,64 +1,36 @@Spree::Sample.load_sample('option_types')color_option_type = Spree::OptionType.find_by!(name: 'color')-length_option_type = Spree::OptionType.find_by!(name: 'length')size_option_type = Spree::OptionType.find_by!(name: 'size')colors = {- white: '#FFFFFF',- purple: '#800080',- red: '#FF0000',- black: '#000000',- brown: '#8B4513',- green: '#228C22',- grey: '#808080',- orange: '#FF8800',- burgundy: '#A8003B',- beige: '#E1C699',- mint: '#AAF0D1',- blue: '#0000FF',- dark_blue: '#00008b',- khaki: '#BDB76B',- yellow: '#FFFF00',- light_blue: '#add8e6',- pink: '#FFA6C9',- lila: '#cf9de6',- ecru: '#F4F2D6'+ white: 'White',+ purple: 'Purple',+ red: 'Red',+ black: 'Black',+ brown: 'Brown',+ green: 'Green',+ grey: 'Grey',+ orange: 'Orange',+ burgundy: 'Burgundy',+ beige: 'Beige',+ mint: 'Mint',+ blue: 'Blue',+ 'dark-blue': 'Dark Blue',+ khaki: 'Khaki',+ yellow: 'Yellow',+ 'light-blue': 'Light Blue',+ pink: 'Pink',+ lila: 'Lila',+ ecru: 'Ecru'}-lengths = { mini: 'Mini', midi: 'Midi', maxi: 'Maxi' }-sizes = { xs: 'XS', s: 'S', m: 'M', l: 'L', xl: 'XL' }-color_option_type.option_values.insert_all!(- colors.each_with_index.map do |color, index|- {- name: color.first,- presentation: color.last,- position: index + 1,- option_type_id: color_option_type.id- }- end-)--length_option_type.option_values.insert_all!(- lengths.each_with_index.map do |length, index|- {- name: length.first,- presentation: length.last,- position: index + 1,- option_type_id: length_option_type.id- }- end-)+colors.each_with_index do |color, index|+ color_option_type.option_values.find_or_create_by!(name: color.first, presentation: color.last)+end-size_option_type.option_values.insert_all!(- sizes.each_with_index.map do |size, index|- {- name: size.first,- presentation: size.last,- position: index + 1,- option_type_id: size_option_type.id- }- end-)+sizes.each_with_index do |size, index|+ size_option_type.option_values.find_or_create_by!(name: size.first, presentation: size.last)+enddiff --git a/sample/db/samples/products.rb b/sample/db/samples/products.rbindex 8fc4b584f4..38aab3386b 100644--- a/sample/db/samples/products.rb+++ b/sample/db/samples/products.rb@@ -7,38 +7,38 @@ Spree::Sample.load_sample('taxons')default_shipping_category = Spree::ShippingCategory.find_or_create_by!(name: 'Default')clothing_tax_category = Spree::TaxCategory.find_or_create_by!(name: 'Clothing')-color = Spree::OptionType.find_by!(name: 'color')-length = Spree::OptionType.find_by!(name: 'length')-size = Spree::OptionType.find_by!(name: 'size')+color_option_type = Spree::OptionType.find_by!(name: 'color')+size_option_type = Spree::OptionType.find_by!(name: 'size')-PRODUCTS = CSV.read(File.join(__dir__, 'variants.csv')).map do |(parent_name, taxon_name, product_name, _color_name)|- [parent_name, taxon_name, product_name]-end.uniq+PRODUCTS = CSV.read(File.join(__dir__, 'variants.csv'))taxons = Spree::Taxon.includes(:children).all-stores = Spree::Store.all-PRODUCTS.each do |(parent_name, taxon_name, product_name)|+PRODUCTS.each do |(parent_name, taxon_name, product_name, color_name)|parent = taxons.find { |taxon| taxon.name == parent_name }taxon = parent.children.find { |child| child.name == taxon_name }- Spree::Product.create(name: product_name.titleize) do |product|+ sleep(0.1) # to avoid DB lock++ product = Spree::Product.find_or_initialize_by(name: product_name.titleize) do |product|product.price = rand(10...100) + 0.99product.description = FFaker::Lorem.paragraphproduct.available_on = Time.zone.now- product.make_active_at = Time.zone.nowproduct.status = 'active'- product.option_types =- if parent_name == 'Women' && %w[Dresses Skirts].include?(taxon_name)- [color, length, size]- else- [color, size]- end+ product.option_types = [color_option_type, size_option_type]product.shipping_category = default_shipping_categoryproduct.tax_category = clothing_tax_category- product.sku = [taxon_name.delete(' '), product_name.delete(' '), product.price].join('_')- product.taxons << parent unless product.taxons.include?(parent)- product.taxons << taxon unless product.taxons.include?(taxon)- product.stores = stores+ product.taxons = [taxon]end+ product.save!+end++store_ids = Spree::Store.ids+product_ids = Spree::Product.ids++store_ids.each do |store_id|+ Spree::StoreProduct.upsert_all(+ product_ids.map { |product_id| { store_id: store_id, product_id: product_id } },+ unique_by: [:store_id, :product_id]+ )enddiff --git a/sample/db/samples/stock.rb b/sample/db/samples/stock.rbindex 8aec79d670..f22c95faf7 100644--- a/sample/db/samples/stock.rb+++ b/sample/db/samples/stock.rb@@ -12,15 +12,4 @@ location.update()Spree::StockLocations::StockItems::Create.call(stock_location: location)--product_1 = Spree::Product.find_by!(name: 'Denim Shirt')-product_2 = Spree::Product.find_by!(name: 'Checked Shirt')--location.stock_item_or_create(product_1.master).update(count_on_hand: 1)-location.stock_item_or_create(product_2.master).update(count_on_hand: 1)--Spree::Variant.eligible.includes(:stock_items).each do |variant|- variant.stock_items.each do |stock_item|- Spree::StockMovement.create(quantity: rand(20..50), stock_item: stock_item)- end-end+Spree::StockItem.update_all(backorderable: true, count_on_hand: 100)diff --git a/sample/db/samples/variants.csv b/sample/db/samples/variants.csvindex b5a9f701d8..945e9dfe3b 100644--- a/sample/db/samples/variants.csv+++ b/sample/db/samples/variants.csv@@ -1,20 +1,20 @@Men,Shirts,denim shirt,blue-Men,Shirts,denim shirt,light_blue+Men,Shirts,denim shirt,light-blueMen,Shirts,checked shirt,red-Men,Shirts,covered placket shirt,dark_blue+Men,Shirts,covered placket shirt,dark-blueMen,Shirts,covered placket shirt,white-Men,Shirts,slim fit shirt,dark_blue-Men,Shirts,slim fit shirt,light_blue+Men,Shirts,slim fit shirt,dark-blue+Men,Shirts,slim fit shirt,light-blueMen,Shirts,slim fit shirt,burgundyMen,Shirts,short sleeve shirt,burgundyMen,Shirts,printed short sleeve shirt,brownMen,Shirts,regular shirt,blueMen,Shirts,checked slim fit shirt,blackMen,Shirts,dotted shirt,white-Men,Shirts,linen shirt,light_blue+Men,Shirts,linen shirt,light-blueMen,Shirts,linen shirt,pink-Men,Shirts,regular shirt with rolled up sleeves,light_blue-Men,T-shirts,polo t-shirt,light_blue+Men,Shirts,regular shirt with rolled up sleeves,light-blue+Men,T-shirts,polo t-shirt,light-blueMen,T-shirts,polo t-shirt,pinkMen,T-shirts,polo t-shirt,redMen,T-shirts,long sleeve t-shirt,grey@@ -33,20 +33,20 @@ Men,Sweaters,stripped jumper,brownMen,Sweaters,long sleeve jumper with pocket,ecruMen,Sweaters,jumper,greyMen,Sweaters,long sleeve sweatshirt,mint-Men,Sweaters,long sleeve sweatshirt,light_blue+Men,Sweaters,long sleeve sweatshirt,light-blueMen,Sweaters,long sleeve sweatshirt,pinkMen,Sweaters,long sleeve sweatshirt,orangeMen,Sweaters,hoodie,greyMen,Sweaters,zipped high neck sweater,green-Men,Sweaters,long sleeve jumper,dark_blue+Men,Sweaters,long sleeve jumper,dark-blueMen,Sweaters,long sleeve jumper,beigeMen,Jackets and Coats,suede biker jacket,brownMen,Jackets and Coats,hooded jacket,beigeMen,Jackets and Coats,anorak with hood,yellowMen,Jackets and Coats,anorak with hood,white-Men,Jackets and Coats,denim jacket,light_blue+Men,Jackets and Coats,denim jacket,light-blueMen,Jackets and Coats,wool-blend short coat,brown-Men,Jackets and Coats,down jacket with hood,dark_blue+Men,Jackets and Coats,down jacket with hood,dark-blueMen,Jackets and Coats,down jacket with hood,blueMen,Jackets and Coats,down jacket with hood,khakiMen,Jackets and Coats,down jacket with hood,yellow@@ -57,16 +57,16 @@ Women,Skirts,midi skirt with bottoms,greenWomen,Skirts,midi skirt with bottoms,blueWomen,Skirts,midi skirt with bottoms,greyWomen,Skirts,fitted skirt,orange-Women,Skirts,a-line suede skirt,dark_blue+Women,Skirts,a-line suede skirt,dark-blueWomen,Skirts,a-line suede skirt,purpleWomen,Skirts,leather skirt with lacing,blackWomen,Skirts,flared skirt,orangeWomen,Skirts,skater skirt,brownWomen,Skirts,skater short skirt,white-Women,Skirts,floral flared skirt,light_blue+Women,Skirts,floral flared skirt,light-blueWomen,Skirts,floral flared skirt,blackWomen,Skirts,pleated skirt 2,green-Women,Skirts,pleated skirt 2,light_blue+Women,Skirts,pleated skirt 2,light-blueWomen,Skirts,pleated skirt 2,pinkWomen,Skirts,pleated skirt 2,redWomen,Skirts,pleated skirt 2,black@@ -82,16 +82,16 @@ Women,Dresses,elegant flared dress,orangeWomen,Dresses,long sleeve knitted dress,greyWomen,Dresses,long sleeve knitted dress,beigeWomen,Dresses,long sleeve knitted dress,black-Women,Dresses,striped shirt dress,light_blue+Women,Dresses,striped shirt dress,light-blueWomen,Dresses,striped shirt dress,grey-Women,Dresses,printed dress,light_blue+Women,Dresses,printed dress,light-blueWomen,Dresses,printed dress,pink-Women,Dresses,printed slit-sleeves dress,light_blue+Women,Dresses,printed slit-sleeves dress,light-blueWomen,Dresses,printed slit-sleeves dress,greyWomen,Dresses,printed slit-sleeves dress,blackWomen,Dresses,dress with belt,redWomen,Dresses,dress with belt,burgundy-Women,Dresses,v-neck floral dress,light_blue+Women,Dresses,v-neck floral dress,light-blueWomen,Dresses,v-neck floral dress,greyWomen,Dresses,v-neck floral dress,blackWomen,Dresses,flounced dress,beige@@ -100,11 +100,11 @@ Women,Shirts and Blouses,semi-sheer shirt with floral cuffs,brownWomen,Shirts and Blouses,semi-sheer shirt with floral cuffs,whiteWomen,Shirts and Blouses,striped shirt,blueWomen,Shirts and Blouses,striped shirt,red-Women,Shirts and Blouses,v-neck wide shirt,dark_blue+Women,Shirts and Blouses,v-neck wide shirt,dark-blueWomen,Shirts and Blouses,v-neck wide shirt,whiteWomen,Shirts and Blouses,printed wrapped blouse,whiteWomen,Shirts and Blouses,pleated sleeve v-neck shirt,orange-Women,Shirts and Blouses,cotton shirt,light_blue+Women,Shirts and Blouses,cotton shirt,light-blueWomen,Shirts and Blouses,blouse with wide flounced sleeve,pinkWomen,Shirts and Blouses,elegant blouse with chocker,mintWomen,Shirts and Blouses,elegant blouse with chocker,pink@@ -150,13 +150,13 @@ Women,Tops and T-shirts,basic t-shirt,orangeWomen,Jackets and Coats,coat with pockets,pinkWomen,Jackets and Coats,coat with pockets,burgundyWomen,Jackets and Coats,coat with pockets,black-Women,Jackets and Coats,long wool-blend coat with belt,dark_blue+Women,Jackets and Coats,long wool-blend coat with belt,dark-blueWomen,Jackets and Coats,long wool-blend coat with belt,beigeWomen,Jackets and Coats,asymmetric coat,whiteWomen,Jackets and Coats,long coat with belt,beigeWomen,Jackets and Coats,down jacket,whiteWomen,Jackets and Coats,zipped jacket,blue-Women,Jackets and Coats,loose-fitted jacket,light_blue+Women,Jackets and Coats,loose-fitted jacket,light-blueWomen,Jackets and Coats,double-breasted jacket,whiteWomen,Jackets and Coats,leather biker jacket,blackWomen,Jackets and Coats,wool-blend coat with belt,burgundy@@ -166,7 +166,7 @@ Women,Jackets and Coats,bomber jacket,khakiSportswear,Tops,sports bra low support,greySportswear,Tops,sports bra low support,lilaSportswear,Tops,long sleeves yoga crop top,mint-Sportswear,Tops,long sleeves yoga crop top,light_blue+Sportswear,Tops,long sleeves yoga crop top,light-blueSportswear,Tops,long sleeves yoga crop top,pinkSportswear,Tops,oversize t-shirt wrapped on back,pinkSportswear,Tops,long sleeves crop top,black@@ -176,12 +176,12 @@ Sportswear,Tops,sports bra,greenSportswear,Tops,sports bra,blueSportswear,Tops,sports bra,burgundySportswear,Tops,sport cropp top,burgundy-Sportswear,Sweatshirts,running sweatshirt,light_blue+Sportswear,Sweatshirts,running sweatshirt,light-blueSportswear,Sweatshirts,lightweight running jacket,greySportswear,Sweatshirts,oversize sweatshirt,pinkSportswear,Sweatshirts,sport windproof jacket,blueSportswear,Sweatshirts,sport waistcoat,purple-Sportswear,Pants,shined pants,light_blue+Sportswear,Pants,shined pants,light-blueSportswear,Pants,shined pants,greySportswear,Pants,shined pants,blackSportswear,Pants,short pants,blackdiff --git a/sample/db/samples/variants.rb b/sample/db/samples/variants.rbindex 8517ee510b..7337c92d2a 100644--- a/sample/db/samples/variants.rb+++ b/sample/db/samples/variants.rb@@ -1,45 +1,34 @@require 'csv'-Spree::Sample.load_sample('option_values')-Spree::Sample.load_sample('products')Spree::Sample.load_sample('tax_categories')+Spree::Sample.load_sample('option_types')+Spree::Sample.load_sample('products')++color_option_type = Spree::OptionType.find_by!(name: 'color')+size_option_type = Spree::OptionType.find_by!(name: 'size')VARIANTS = CSV.read(File.join(__dir__, 'variants.csv'))-clothing_tax_category = Spree::TaxCategory.find_or_create_by!(name: 'Clothing')-color_option_values = Spree::OptionType.find_by!(name: 'color').option_values-length_option_values = Spree::OptionType.find_by!(name: 'length').option_values-size_option_values = Spree::OptionType.find_by!(name: 'size').option_values+color_option_values = color_option_type.option_values.to_a+size_option_values = size_option_type.option_values.to_a-taxons = Spree::Taxon.includes(:children).all-products = Spree::Product.all+clothing_tax_category = Spree::TaxCategory.find_or_create_by!(name: 'Clothing')VARIANTS.each do |(parent_name, taxon_name, product_name, color_name)|- parent = taxons.find { |t| t.name == parent_name }- taxon = taxons.find { |t| t.parent_id == parent.id && t.name == taxon_name }- product = products.find { |p| p.name == product_name.titleize }color = color_option_values.find { |c| c.name == color_name }+ product = Spree::Product.find_by!(name: product_name.titleize)+size_option_values.each do |size|- if parent_name == 'Women' and %w[Dresses Skirts].include?(taxon_name)- length_option_values.each do |length|- option_values = [color, length, size]- product.variants.first_or_create! do |variant|- variant.cost_price = product.price- variant.option_values = option_values- variant.sku = product.sku + '_' + option_values.map(&:name).join('_')- variant.tax_category = clothing_tax_category- end- end- else- option_values = [color, size]- product.variants.first_or_create! do |variant|- variant.cost_price = product.price- variant.option_values = option_values- variant.sku = product.sku + '_' + option_values.map(&:name).join('_')- variant.tax_category = clothing_tax_category-- end+ sku = "#{product.name.parameterize}-#{size.name.parameterize}-#{color.name.parameterize}".upcase++ variant = product.variants.find_or_initialize_by(sku: sku) do |variant|+ variant.cost_price = product.price+ variant.option_values = [color, size]+ variant.sku = sku+ variant.tax_category = clothing_tax_category+ variant.track_inventory = trueend+ variant.save!endenddiff --git a/sample/lib/spree_sample.rb b/sample/lib/spree_sample.rbindex 2112a308bd..a4ead882bd 100644--- a/sample/lib/spree_sample.rb+++ b/sample/lib/spree_sample.rb@@ -16,12 +16,12 @@ module SpreeSampleSpree::Sample.load_sample('tax_rates')Spree::Sample.load_sample('promotions')- Spree::Sample.load_sample('products')Spree::Sample.load_sample('taxons')Spree::Sample.load_sample('option_types')Spree::Sample.load_sample('option_values')- Spree::Sample.load_sample('product_properties')+ Spree::Sample.load_sample('products')Spree::Sample.load_sample('variants')+ Spree::Sample.load_sample('product_properties')Spree::Sample.load_sample('stock')Spree::Sample.load_sample('orders')