Skip to content

armgit / spree

Public Imported from GitHub
0

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.

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.scss
index 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.rb
index f575345f5d..ae746f5287 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -16,7 +16,7 @@ platforms :ruby do
elsif ENV['DB'] == 'postgres'
gem 'pg'
else
- gem 'sqlite3', '~> 1.4'
+ gem 'sqlite3', '>= 2.0'
end
end
diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb
index 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 Spree
end
end
- 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_migrations
if @run_migrations
say_status :running, 'migrations'
- silence_stream(STDOUT) do
- silence_stream(STDERR) do
- silence_warnings { rake 'db:migrate' }
- end
- end
+ rake 'db:migrate'
else
say_status :skipping, "migrations (don't forget to run rake db:migrate)"
end
@@ -160,11 +147,7 @@ module Spree
cmd = -> { 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 &cmd
else
cmd.call
end
@@ -178,11 +161,7 @@ module Spree
if @load_sample_data
say_status :loading, 'sample data'
- silence_stream(STDOUT) do
- silence_stream(STDERR) do
- silence_warnings { rake 'spree_sample:load' }
- end
- end
+ rake 'spree_sample:load'
else
say_status :skipping, 'sample data (you can always run rake spree_sample:load)'
end
diff --git a/docs/api-reference/storefront.yaml b/docs/api-reference/storefront.yaml
index fdfc1ba4dc..fb95a16e9d 100644
--- a/docs/api-reference/storefront.yaml
+++ b/docs/api-reference/storefront.yaml
@@ -9082,75 +9082,75 @@ components:
option_values:
- id: 4
name: black
- presentation: '#000000'
+ presentation: 'Black'
position: 4
- id: 11
name: mint
- presentation: '#AAF0D1'
+ presentation: 'Mint'
position: 11
- id: 6
name: green
- presentation: '#228C22'
+ presentation: 'Green'
position: 6
- id: 2
name: purple
- presentation: '#800080'
+ presentation: 'Purple'
position: 2
- id: 10
name: beige
- presentation: '#E1C699'
+ presentation: 'Beige'
position: 10
- id: 17
name: pink
- presentation: '#FFA6C9'
+ presentation: 'Pink'
position: 17
- id: 7
name: grey
- presentation: '#808080'
+ presentation: 'Grey'
position: 7
- id: 8
name: orange
- presentation: '#FF8800'
+ presentation: 'Orange'
position: 8
- id: 15
name: yellow
- presentation: '#FFFF00'
+ presentation: 'Yellow'
position: 15
- id: 1
name: white
- presentation: '#FFFFFF'
+ presentation: 'White'
position: 1
- id: 13
- name: dark_blue
- presentation: '#00008b'
+ name: 'dark-blue'
+ presentation: 'Dark Blue'
position: 13
- id: 19
name: ecru
- presentation: '#F4F2D6'
+ presentation: 'Ecru'
position: 19
- id: 3
name: red
- presentation: '#FF0000'
+ presentation: 'Red'
position: 3
- id: 12
name: blue
- presentation: '#0000FF'
+ presentation: 'Blue'
position: 12
- id: 16
- name: light_blue
- presentation: '#add8e6'
+ name: light-blue
+ presentation: 'Light Blue'
position: 16
- id: 9
name: burgundy
- presentation: '#A8003B'
+ presentation: 'Burgundy'
position: 9
- id: 14
name: khaki
- presentation: '#BDB76B'
+ presentation: 'Khaki'
position: 14
- id: 5
name: brown
- presentation: '#8B4513'
+ presentation: 'Brown'
position: 5
- id: 2
name: length
diff --git a/sample/db/samples/images/apache_baseball.png b/sample/db/samples/images/apache_baseball.png
deleted file mode 100644
index 40d68d1f24..0000000000
Binary files a/sample/db/samples/images/apache_baseball.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_bag.jpeg b/sample/db/samples/images/ror_bag.jpeg
deleted file mode 100644
index 5c88aa7fb6..0000000000
Binary files a/sample/db/samples/images/ror_bag.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball.jpeg b/sample/db/samples/images/ror_baseball.jpeg
deleted file mode 100644
index d76f979e9d..0000000000
Binary files a/sample/db/samples/images/ror_baseball.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_back.jpeg b/sample/db/samples/images/ror_baseball_back.jpeg
deleted file mode 100644
index a05a14d2a5..0000000000
Binary files a/sample/db/samples/images/ror_baseball_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_back_blue.png b/sample/db/samples/images/ror_baseball_jersey_back_blue.png
deleted file mode 100644
index 2f023f239f..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_back_blue.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_back_green.png b/sample/db/samples/images/ror_baseball_jersey_back_green.png
deleted file mode 100644
index c769e35129..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_back_green.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_back_red.png b/sample/db/samples/images/ror_baseball_jersey_back_red.png
deleted file mode 100644
index 2be2275f90..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_back_red.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_blue.png b/sample/db/samples/images/ror_baseball_jersey_blue.png
deleted file mode 100644
index ad15f9f0bd..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_blue.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_green.png b/sample/db/samples/images/ror_baseball_jersey_green.png
deleted file mode 100644
index 4bd8c0aea6..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_green.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_baseball_jersey_red.png b/sample/db/samples/images/ror_baseball_jersey_red.png
deleted file mode 100644
index 4deb99a1d5..0000000000
Binary files a/sample/db/samples/images/ror_baseball_jersey_red.png and /dev/null differ
diff --git a/sample/db/samples/images/ror_jr_spaghetti.jpeg b/sample/db/samples/images/ror_jr_spaghetti.jpeg
deleted file mode 100644
index 51712dd4ca..0000000000
Binary files a/sample/db/samples/images/ror_jr_spaghetti.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_mug.jpeg b/sample/db/samples/images/ror_mug.jpeg
deleted file mode 100644
index 1569a3767b..0000000000
Binary files a/sample/db/samples/images/ror_mug.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_mug_back.jpeg b/sample/db/samples/images/ror_mug_back.jpeg
deleted file mode 100644
index 688861c17e..0000000000
Binary files a/sample/db/samples/images/ror_mug_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_ringer.jpeg b/sample/db/samples/images/ror_ringer.jpeg
deleted file mode 100644
index c26f9922b6..0000000000
Binary files a/sample/db/samples/images/ror_ringer.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_ringer_back.jpeg b/sample/db/samples/images/ror_ringer_back.jpeg
deleted file mode 100644
index b8aa9d6cd6..0000000000
Binary files a/sample/db/samples/images/ror_ringer_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_stein.jpeg b/sample/db/samples/images/ror_stein.jpeg
deleted file mode 100644
index 126072f4d7..0000000000
Binary files a/sample/db/samples/images/ror_stein.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_stein_back.jpeg b/sample/db/samples/images/ror_stein_back.jpeg
deleted file mode 100644
index cba4f27faa..0000000000
Binary files a/sample/db/samples/images/ror_stein_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_tote.jpeg b/sample/db/samples/images/ror_tote.jpeg
deleted file mode 100644
index 38eb0f54f6..0000000000
Binary files a/sample/db/samples/images/ror_tote.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ror_tote_back.jpeg b/sample/db/samples/images/ror_tote_back.jpeg
deleted file mode 100644
index 0410ebbc67..0000000000
Binary files a/sample/db/samples/images/ror_tote_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/ruby_baseball.png b/sample/db/samples/images/ruby_baseball.png
deleted file mode 100644
index 9801dcb348..0000000000
Binary files a/sample/db/samples/images/ruby_baseball.png and /dev/null differ
diff --git a/sample/db/samples/images/spree_bag.jpeg b/sample/db/samples/images/spree_bag.jpeg
deleted file mode 100644
index af60cee5bf..0000000000
Binary files a/sample/db/samples/images/spree_bag.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_jersey.jpeg b/sample/db/samples/images/spree_jersey.jpeg
deleted file mode 100644
index f58ebb1c38..0000000000
Binary files a/sample/db/samples/images/spree_jersey.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_jersey_back.jpeg b/sample/db/samples/images/spree_jersey_back.jpeg
deleted file mode 100644
index 3e48587dea..0000000000
Binary files a/sample/db/samples/images/spree_jersey_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_mug.jpeg b/sample/db/samples/images/spree_mug.jpeg
deleted file mode 100644
index 478cd9f262..0000000000
Binary files a/sample/db/samples/images/spree_mug.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_mug_back.jpeg b/sample/db/samples/images/spree_mug_back.jpeg
deleted file mode 100644
index 6c54d2a4f1..0000000000
Binary files a/sample/db/samples/images/spree_mug_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_ringer_t.jpeg b/sample/db/samples/images/spree_ringer_t.jpeg
deleted file mode 100644
index 69c641ac69..0000000000
Binary files a/sample/db/samples/images/spree_ringer_t.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_ringer_t_back.jpeg b/sample/db/samples/images/spree_ringer_t_back.jpeg
deleted file mode 100644
index 76f18a50e9..0000000000
Binary files a/sample/db/samples/images/spree_ringer_t_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_spaghetti.jpeg b/sample/db/samples/images/spree_spaghetti.jpeg
deleted file mode 100644
index 64723e45e8..0000000000
Binary files a/sample/db/samples/images/spree_spaghetti.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_stein.jpeg b/sample/db/samples/images/spree_stein.jpeg
deleted file mode 100644
index e5ebe3b2b7..0000000000
Binary files a/sample/db/samples/images/spree_stein.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_stein_back.jpeg b/sample/db/samples/images/spree_stein_back.jpeg
deleted file mode 100644
index 7b1e941952..0000000000
Binary files a/sample/db/samples/images/spree_stein_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_tote_back.jpeg b/sample/db/samples/images/spree_tote_back.jpeg
deleted file mode 100644
index 846adc8fd9..0000000000
Binary files a/sample/db/samples/images/spree_tote_back.jpeg and /dev/null differ
diff --git a/sample/db/samples/images/spree_tote_front.jpeg b/sample/db/samples/images/spree_tote_front.jpeg
deleted file mode 100644
index 5c56a066c8..0000000000
Binary files a/sample/db/samples/images/spree_tote_front.jpeg and /dev/null differ
diff --git a/sample/db/samples/option_types.rb b/sample/db/samples/option_types.rb
index 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)
+end
diff --git a/sample/db/samples/option_values.rb b/sample/db/samples/option_values.rb
index 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)
+end
diff --git a/sample/db/samples/products.rb b/sample/db/samples/products.rb
index 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.99
product.description = FFaker::Lorem.paragraph
product.available_on = Time.zone.now
- product.make_active_at = Time.zone.now
product.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_category
product.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]
+ )
end
diff --git a/sample/db/samples/stock.rb b/sample/db/samples/stock.rb
index 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.csv
index 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-blue
Men,Shirts,checked shirt,red
-Men,Shirts,covered placket shirt,dark_blue
+Men,Shirts,covered placket shirt,dark-blue
Men,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-blue
Men,Shirts,slim fit shirt,burgundy
Men,Shirts,short sleeve shirt,burgundy
Men,Shirts,printed short sleeve shirt,brown
Men,Shirts,regular shirt,blue
Men,Shirts,checked slim fit shirt,black
Men,Shirts,dotted shirt,white
-Men,Shirts,linen shirt,light_blue
+Men,Shirts,linen shirt,light-blue
Men,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-blue
Men,T-shirts,polo t-shirt,pink
Men,T-shirts,polo t-shirt,red
Men,T-shirts,long sleeve t-shirt,grey
@@ -33,20 +33,20 @@ Men,Sweaters,stripped jumper,brown
Men,Sweaters,long sleeve jumper with pocket,ecru
Men,Sweaters,jumper,grey
Men,Sweaters,long sleeve sweatshirt,mint
-Men,Sweaters,long sleeve sweatshirt,light_blue
+Men,Sweaters,long sleeve sweatshirt,light-blue
Men,Sweaters,long sleeve sweatshirt,pink
Men,Sweaters,long sleeve sweatshirt,orange
Men,Sweaters,hoodie,grey
Men,Sweaters,zipped high neck sweater,green
-Men,Sweaters,long sleeve jumper,dark_blue
+Men,Sweaters,long sleeve jumper,dark-blue
Men,Sweaters,long sleeve jumper,beige
Men,Jackets and Coats,suede biker jacket,brown
Men,Jackets and Coats,hooded jacket,beige
Men,Jackets and Coats,anorak with hood,yellow
Men,Jackets and Coats,anorak with hood,white
-Men,Jackets and Coats,denim jacket,light_blue
+Men,Jackets and Coats,denim jacket,light-blue
Men,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-blue
Men,Jackets and Coats,down jacket with hood,blue
Men,Jackets and Coats,down jacket with hood,khaki
Men,Jackets and Coats,down jacket with hood,yellow
@@ -57,16 +57,16 @@ Women,Skirts,midi skirt with bottoms,green
Women,Skirts,midi skirt with bottoms,blue
Women,Skirts,midi skirt with bottoms,grey
Women,Skirts,fitted skirt,orange
-Women,Skirts,a-line suede skirt,dark_blue
+Women,Skirts,a-line suede skirt,dark-blue
Women,Skirts,a-line suede skirt,purple
Women,Skirts,leather skirt with lacing,black
Women,Skirts,flared skirt,orange
Women,Skirts,skater skirt,brown
Women,Skirts,skater short skirt,white
-Women,Skirts,floral flared skirt,light_blue
+Women,Skirts,floral flared skirt,light-blue
Women,Skirts,floral flared skirt,black
Women,Skirts,pleated skirt 2,green
-Women,Skirts,pleated skirt 2,light_blue
+Women,Skirts,pleated skirt 2,light-blue
Women,Skirts,pleated skirt 2,pink
Women,Skirts,pleated skirt 2,red
Women,Skirts,pleated skirt 2,black
@@ -82,16 +82,16 @@ Women,Dresses,elegant flared dress,orange
Women,Dresses,long sleeve knitted dress,grey
Women,Dresses,long sleeve knitted dress,beige
Women,Dresses,long sleeve knitted dress,black
-Women,Dresses,striped shirt dress,light_blue
+Women,Dresses,striped shirt dress,light-blue
Women,Dresses,striped shirt dress,grey
-Women,Dresses,printed dress,light_blue
+Women,Dresses,printed dress,light-blue
Women,Dresses,printed dress,pink
-Women,Dresses,printed slit-sleeves dress,light_blue
+Women,Dresses,printed slit-sleeves dress,light-blue
Women,Dresses,printed slit-sleeves dress,grey
Women,Dresses,printed slit-sleeves dress,black
Women,Dresses,dress with belt,red
Women,Dresses,dress with belt,burgundy
-Women,Dresses,v-neck floral dress,light_blue
+Women,Dresses,v-neck floral dress,light-blue
Women,Dresses,v-neck floral dress,grey
Women,Dresses,v-neck floral dress,black
Women,Dresses,flounced dress,beige
@@ -100,11 +100,11 @@ Women,Shirts and Blouses,semi-sheer shirt with floral cuffs,brown
Women,Shirts and Blouses,semi-sheer shirt with floral cuffs,white
Women,Shirts and Blouses,striped shirt,blue
Women,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-blue
Women,Shirts and Blouses,v-neck wide shirt,white
Women,Shirts and Blouses,printed wrapped blouse,white
Women,Shirts and Blouses,pleated sleeve v-neck shirt,orange
-Women,Shirts and Blouses,cotton shirt,light_blue
+Women,Shirts and Blouses,cotton shirt,light-blue
Women,Shirts and Blouses,blouse with wide flounced sleeve,pink
Women,Shirts and Blouses,elegant blouse with chocker,mint
Women,Shirts and Blouses,elegant blouse with chocker,pink
@@ -150,13 +150,13 @@ Women,Tops and T-shirts,basic t-shirt,orange
Women,Jackets and Coats,coat with pockets,pink
Women,Jackets and Coats,coat with pockets,burgundy
Women,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-blue
Women,Jackets and Coats,long wool-blend coat with belt,beige
Women,Jackets and Coats,asymmetric coat,white
Women,Jackets and Coats,long coat with belt,beige
Women,Jackets and Coats,down jacket,white
Women,Jackets and Coats,zipped jacket,blue
-Women,Jackets and Coats,loose-fitted jacket,light_blue
+Women,Jackets and Coats,loose-fitted jacket,light-blue
Women,Jackets and Coats,double-breasted jacket,white
Women,Jackets and Coats,leather biker jacket,black
Women,Jackets and Coats,wool-blend coat with belt,burgundy
@@ -166,7 +166,7 @@ Women,Jackets and Coats,bomber jacket,khaki
Sportswear,Tops,sports bra low support,grey
Sportswear,Tops,sports bra low support,lila
Sportswear,Tops,long sleeves yoga crop top,mint
-Sportswear,Tops,long sleeves yoga crop top,light_blue
+Sportswear,Tops,long sleeves yoga crop top,light-blue
Sportswear,Tops,long sleeves yoga crop top,pink
Sportswear,Tops,oversize t-shirt wrapped on back,pink
Sportswear,Tops,long sleeves crop top,black
@@ -176,12 +176,12 @@ Sportswear,Tops,sports bra,green
Sportswear,Tops,sports bra,blue
Sportswear,Tops,sports bra,burgundy
Sportswear,Tops,sport cropp top,burgundy
-Sportswear,Sweatshirts,running sweatshirt,light_blue
+Sportswear,Sweatshirts,running sweatshirt,light-blue
Sportswear,Sweatshirts,lightweight running jacket,grey
Sportswear,Sweatshirts,oversize sweatshirt,pink
Sportswear,Sweatshirts,sport windproof jacket,blue
Sportswear,Sweatshirts,sport waistcoat,purple
-Sportswear,Pants,shined pants,light_blue
+Sportswear,Pants,shined pants,light-blue
Sportswear,Pants,shined pants,grey
Sportswear,Pants,shined pants,black
Sportswear,Pants,short pants,black
diff --git a/sample/db/samples/variants.rb b/sample/db/samples/variants.rb
index 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 = true
end
+ variant.save!
end
end
diff --git a/sample/lib/spree_sample.rb b/sample/lib/spree_sample.rb
index 2112a308bd..a4ead882bd 100644
--- a/sample/lib/spree_sample.rb
+++ b/sample/lib/spree_sample.rb
@@ -16,12 +16,12 @@ module SpreeSample
Spree::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')