spree_core 4.3.0 → 4.5.1

data/db/migrate/20210915064321_add_metadata_to_spree_orders.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeOrders < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_orders do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_orders, :public_metadata, :jsonb
+        add_column :spree_orders, :private_metadata, :jsonb
+      else
+        add_column :spree_orders, :public_metadata, :json
+        add_column :spree_orders, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064322_add_metadata_to_spree_products.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_products do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_products, :public_metadata, :jsonb
+        add_column :spree_products, :private_metadata, :jsonb
+      else
+        add_column :spree_products, :public_metadata, :json
+        add_column :spree_products, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064323_add_metadata_to_spree_variants.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_variants do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_variants, :public_metadata, :jsonb
+        add_column :spree_variants, :private_metadata, :jsonb
+      else
+        add_column :spree_variants, :public_metadata, :json
+        add_column :spree_variants, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064324_add_metadata_to_spree_line_items.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeLineItems < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_line_items do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_line_items, :public_metadata, :jsonb
+        add_column :spree_line_items, :private_metadata, :jsonb
+      else
+        add_column :spree_line_items, :public_metadata, :json
+        add_column :spree_line_items, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064325_add_metadata_to_spree_shipments.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeShipments < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_shipments do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_shipments, :public_metadata, :jsonb
+        add_column :spree_shipments, :private_metadata, :jsonb
+      else
+        add_column :spree_shipments, :public_metadata, :json
+        add_column :spree_shipments, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064326_add_metadata_to_spree_payments.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreePayments < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_payments do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_payments, :public_metadata, :jsonb
+        add_column :spree_payments, :private_metadata, :jsonb
+      else
+        add_column :spree_payments, :public_metadata, :json
+        add_column :spree_payments, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064327_add_metadata_to_spree_taxons_and_taxonomies.rb

@@ -0,0 +1,18 @@
+class AddMetadataToSpreeTaxonsAndTaxonomies < ActiveRecord::Migration[5.2]
+  def change
+    %i[
+      spree_taxons
+      spree_taxonomies
+    ].each do |table_name|
+      change_table table_name do |t|
+        if t.respond_to? :jsonb
+          add_column table_name, :public_metadata, :jsonb
+          add_column table_name, :private_metadata, :jsonb
+        else
+          add_column table_name, :public_metadata, :json
+          add_column table_name, :private_metadata, :json
+        end
+      end
+    end
+  end
+end

data/db/migrate/20210915064328_add_metadata_to_spree_stock_transfers.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeStockTransfers < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_stock_transfers do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_stock_transfers, :public_metadata, :jsonb
+        add_column :spree_stock_transfers, :private_metadata, :jsonb
+      else
+        add_column :spree_stock_transfers, :public_metadata, :json
+        add_column :spree_stock_transfers, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064329_add_metadata_to_spree_multiple_tables.rb

@@ -0,0 +1,30 @@
+class AddMetadataToSpreeMultipleTables < ActiveRecord::Migration[5.2]
+  def change
+    %i[
+      spree_assets
+      spree_option_types
+      spree_option_values
+      spree_properties
+      spree_promotions
+      spree_payment_methods
+      spree_shipping_methods
+      spree_prototypes
+      spree_refunds
+      spree_customer_returns
+      spree_users
+      spree_addresses
+      spree_credit_cards
+      spree_store_credits
+    ].each do |table_name|
+      change_table table_name do |t|
+        if t.respond_to? :jsonb
+          add_column table_name, :public_metadata, :jsonb
+          add_column table_name, :private_metadata, :jsonb
+        else
+          add_column table_name, :public_metadata, :json
+          add_column table_name, :private_metadata, :json
+        end
+      end
+    end
+  end
+end

data/db/migrate/20210920090344_add_deleted_at_to_spree_stores.rb

@@ -0,0 +1,8 @@
+class AddDeletedAtToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    unless column_exists?(:spree_stores, :deleted_at)
+      add_column :spree_stores, :deleted_at, :datetime
+      add_index :spree_stores, :deleted_at
+    end
+  end
+end

data/db/migrate/20210921070812_rename_column_access_hash_to_token.rb

@@ -0,0 +1,8 @@
+class RenameColumnAccessHashToToken < ActiveRecord::Migration[5.2]
+  def change
+    if table_exists?(:spree_wishlists)
+      rename_column(:spree_wishlists, :access_hash, :token) if column_exists?(:spree_wishlists, :access_hash)
+      add_reference(:spree_wishlists, :store, index: true) unless column_exists?(:spree_wishlists, :store_id)
+    end
+  end
+end

data/db/migrate/20210921070813_create_spree_wishlists.rb

@@ -0,0 +1,18 @@
+class CreateSpreeWishlists < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_wishlists, if_not_exists: true do |t|
+      t.belongs_to :user
+      t.belongs_to :store
+
+      t.column :name, :string
+      t.column :token, :string, null: false
+      t.column :is_private, :boolean, default: true, null: false
+      t.column :is_default, :boolean, default: false, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_wishlists, :token, unique: true
+    add_index :spree_wishlists, [:user_id, :is_default] unless index_exists?(:spree_wishlists, [:user_id, :is_default])
+  end
+end

data/db/migrate/20210921070814_create_spree_wished_products.rb

@@ -0,0 +1,16 @@
+class CreateSpreeWishedProducts < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_wished_products, if_not_exists: true do |t|
+      t.references :variant
+      t.belongs_to :wishlist
+
+      t.column :quantity, :integer, default: 1, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_wished_products, [:variant_id, :wishlist_id], unique: true unless index_exists?(:spree_wished_products, [:variant_id, :wishlist_id])
+    add_index :spree_wished_products, :variant_id unless index_exists?(:spree_wished_products, :variant_id)
+    add_index :spree_wished_products, :wishlist_id unless index_exists?(:spree_wished_products, :wishlist_id)
+  end
+end

data/db/migrate/20210921070815_rename_spree_wished_products_to_spree_wished_items.rb

@@ -0,0 +1,5 @@
+class RenameSpreeWishedProductsToSpreeWishedItems < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :spree_wished_products, :spree_wished_items
+  end
+end

data/db/migrate/20210921090344_add_unique_stock_item_stock_location_variant_deleted_at_index.rb

@@ -0,0 +1,5 @@
+class AddUniqueStockItemStockLocationVariantDeletedAtIndex < ActiveRecord::Migration[5.2]
+  def change
+    add_index :spree_stock_items, [:stock_location_id, :variant_id, :deleted_at], name: 'stock_item_by_loc_var_id_deleted_at', unique: true
+  end
+end

data/db/migrate/20210929090344_create_stock_item_stock_location_id_variant_id_coalesce_deleted_at_unique_index.rb

@@ -0,0 +1,32 @@
+class CreateStockItemStockLocationIdVariantIdCoalesceDeletedAtUniqueIndex < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :spree_stock_items, name: :stock_item_by_loc_var_id_deleted_at
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          CREATE UNIQUE INDEX stock_item_by_loc_var_id_deleted_at
+          ON spree_stock_items(
+            stock_location_id,
+            variant_id,
+            (COALESCE(deleted_at, CAST('1970-01-01' AS #{deleted_at_data_type})))
+          );
+        SQL
+      end
+
+      dir.down do
+        remove_index :spree_stock_items, name: :stock_item_by_loc_var_id_deleted_at
+      end
+    end
+  end
+
+  private
+
+  def deleted_at_data_type
+    case ActiveRecord::Base.connection.adapter_name
+    when 'Mysql2'
+      'DATETIME'
+    when 'PostgreSQL'
+      'TIMESTAMP'
+    end
+  end
+end

data/db/migrate/20210929091444_create_spree_digital_links.rb

@@ -0,0 +1,13 @@
+class CreateSpreeDigitalLinks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_digital_links, if_not_exists: true do |t|
+      t.belongs_to :digital
+      t.belongs_to :line_item
+      t.string :secret
+      t.integer :access_counter
+
+      t.timestamps
+    end
+    add_index :spree_digital_links, :secret, unique: true unless index_exists?(:spree_digital_links, :secret)
+  end
+end

data/db/migrate/20210929093238_create_spree_digitals.rb

@@ -0,0 +1,9 @@
+class CreateSpreeDigitals < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_digitals, if_not_exists: true do |t|
+      t.belongs_to :variant
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210930143043_rename_secret_to_token_on_spree_digital_links.rb

@@ -0,0 +1,5 @@
+class RenameSecretToTokenOnSpreeDigitalLinks < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :spree_digital_links, :secret, :token
+  end
+end

data/db/migrate/20210930155649_add_settings_to_spree_stores.rb

@@ -0,0 +1,11 @@
+class AddSettingsToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_stores do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_stores, :settings, :jsonb
+      else
+        add_column :spree_stores, :settings, :json
+      end
+    end
+  end
+end

data/db/migrate/20211201202851_update_linkable_resource_types.rb

@@ -0,0 +1,10 @@
+class UpdateLinkableResourceTypes < ActiveRecord::Migration[5.2]
+  def change
+    change_column_default :spree_menu_items, :linked_resource_type, 'Spree::Linkable::Uri'
+
+    Spree::MenuItem.where(linked_resource_type: 'URL').update_all(linked_resource_type: 'Spree::Linkable::Uri')
+    Spree::CmsSection.where(linked_resource_type: 'URL').update_all(linked_resource_type: 'Spree::Linkable::Uri')
+    Spree::MenuItem.where(linked_resource_type: 'Home Page').update_all(linked_resource_type: 'Spree::Linkable::Homepage')
+    Spree::CmsSection.where(linked_resource_type: 'Home Page').update_all(linked_resource_type: 'Spree::Linkable::Homepage')
+  end
+end

data/db/migrate/20211203082008_add_settings_to_payment_methods.rb

@@ -0,0 +1,11 @@
+class AddSettingsToPaymentMethods < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_payment_methods do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_payment_methods, :settings, :jsonb
+      else
+        add_column :spree_payment_methods, :settings, :json
+      end
+    end
+  end
+end

data/db/migrate/20211229162122_disable_propagate_all_variants_by_default.rb

@@ -0,0 +1,5 @@
+class DisablePropagateAllVariantsByDefault < ActiveRecord::Migration[5.2]
+  def change
+    change_column_default :spree_stock_locations, :propagate_all_variants, false
+  end
+end

data/db/migrate/20220103082046_add_status_and_make_active_at_to_spree_products.rb

@@ -0,0 +1,7 @@
+class AddStatusAndMakeActiveAtToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_products, :status, :string, null: false, default: 'draft'
+    add_index :spree_products, :status
+    add_index :spree_products, %i[status deleted_at]
+  end
+end

data/db/migrate/20220106230929_add_internal_note_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddInternalNoteToSpreeOrders < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_orders, :internal_note, :text
+  end
+end

data/db/migrate/20220113052823_create_payment_sources.rb

@@ -0,0 +1,22 @@
+class CreatePaymentSources < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_payment_sources do |t|
+      t.string :gateway_payment_profile_id
+      t.string :type, index: true
+
+      t.references :payment_method, index: true, foreign_key: { to_table: :spree_payment_methods }
+      t.references :user, index: true, foreign_key: { to_table: :spree_users }
+
+      if t.respond_to? :jsonb
+        t.jsonb :public_metadata
+        t.jsonb :private_metadata
+      else
+        t.json :public_metadata
+        t.json :private_metadata
+      end
+
+      t.index [:type, :gateway_payment_profile_id], unique: true, name: 'index_payment_sources_on_type_and_gateway_payment_profile_id'
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220117100333_add_make_active_at_to_spree_products.rb

@@ -0,0 +1,17 @@
+class AddMakeActiveAtToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_products, :make_active_at, :datetime
+    add_index :spree_products, :make_active_at
+
+    Spree::Product.
+      where('discontinue_on IS NULL or discontinue_on > ?', Time.current).
+      where('available_on <= ?', Time.current).
+      where(status: 'draft').
+      update_all(status: 'active', updated_at: Time.current)
+
+    Spree::Product.
+      where('discontinue_on <= ?', Time.current).
+      where.not(status: 'archived').
+      update_all(status: 'archived', updated_at: Time.current)
+  end
+end

data/db/migrate/20220120092821_add_metadata_to_spree_tax_rates.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeTaxRates < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_tax_rates do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_tax_rates, :public_metadata, :jsonb
+        add_column :spree_tax_rates, :private_metadata, :jsonb
+      else
+        add_column :spree_tax_rates, :public_metadata, :json
+        add_column :spree_tax_rates, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20220201103922_add_first_name_and_last_name_to_spree_users.rb

@@ -0,0 +1,9 @@
+class AddFirstNameAndLastNameToSpreeUsers < ActiveRecord::Migration[5.2]
+  def change
+    if Spree.user_class.present?
+      users_table_name = Spree.user_class.table_name
+      add_column users_table_name, :first_name, :string unless column_exists?(users_table_name, :first_name)
+      add_column users_table_name, :last_name, :string unless column_exists?(users_table_name, :last_name)
+    end
+  end
+end

data/db/migrate/20220222083546_add_barcode_to_spree_variants.rb

@@ -0,0 +1,6 @@
+class AddBarcodeToSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_variants, :barcode, :string
+    add_index :spree_variants, :barcode
+  end
+end

data/db/migrate/20220329113557_fix_cms_pages_unique_indexes.rb

@@ -0,0 +1,8 @@
+class FixCmsPagesUniqueIndexes < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :spree_cms_pages, [:slug, :store_id, :deleted_at]
+    remove_index :spree_cms_pages, [:slug, :store_id], unique: true
+
+    add_index :spree_cms_pages, [:slug, :store_id, :deleted_at], unique: true
+  end
+end

data/db/migrate/20220613133029_add_metadata_to_spree_stock_items.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeStockItems < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_stock_items do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_stock_items, :public_metadata, :jsonb
+        add_column :spree_stock_items, :private_metadata, :jsonb
+      else
+        add_column :spree_stock_items, :public_metadata, :json
+        add_column :spree_stock_items, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/seeds.rb

@@ -1,5 +1 @@
-# Loads seed data out of default dir
-default_path = File.join(File.dirname(__FILE__), 'default')
-
-Rake::Task['db:load_dir'].reenable
-Rake::Task['db:load_dir'].invoke(default_path)
+Spree::Seeds::All.call

data/lib/friendly_id/paranoia.rb

@@ -0,0 +1,4 @@
+require 'friendly_id'
+require 'paranoia'
+
+FriendlyId::Slug.acts_as_paranoid

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -29,7 +29,7 @@ module Spree
       # calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess
       # object has been known to return nil
       opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
-      opts[:database] = 'sqlite3' if opts[:database].blank?
+      opts[:database] = 'postgresql' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true
@@ -38,13 +38,12 @@ module Spree
       opts[:skip_rc] = true
       opts[:skip_spring] = true
       opts[:skip_test] = true
-      opts[:skip_yarn] = true
-      opts[:skip_javascript] = true
       opts[:skip_bootsnap] = true
 
       puts 'Generating dummy Rails application...'
       invoke Rails::Generators::AppGenerator,
         [File.expand_path(dummy_path, destination_root)], opts
+      inject_yaml_permitted_classes
     end
 
     def test_dummy_config
@@ -58,6 +57,10 @@ module Spree
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
       template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
+
+      if lib_name == 'spree/backend'
+        template 'package.json', "#{dummy_path}/package.json", force: true
+      end
     end
 
     def test_dummy_inject_extension_requirements
@@ -114,6 +117,14 @@ end
       ], before: /require '#{@lib_name}'/, verbose: true
     end
 
+    def inject_yaml_permitted_classes
+      inside dummy_path do
+        inject_into_file 'config/application.rb', %Q[
+    config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess]
+        ], after: /config\.load_defaults.*$/, verbose: true
+      end
+    end
+
     def dummy_path
       ENV['DUMMY_PATH'] || 'spec/dummy'
     end

data/lib/generators/spree/dummy/templates/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "app",
+  "private": "true",
+  "dependencies": {
+    "@hotwired/turbo-rails": "^7.2.0",
+    "@spree/dashboard": "^0.2.1",
+    "esbuild": "^0.15.10"
+  },
+  "scripts": {
+    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds"
+  }
+}

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -8,18 +8,7 @@ end %>
 <% db_username = ENV['DB_USERNAME'] %>
 <% db_host = ENV['DB_HOST'] %>
 <% case ENV['DB']
-  when 'sqlite' %>
-development:
-  adapter: sqlite3
-  database: db/spree_development.sqlite3
-test:
-  adapter: sqlite3
-  database: db/spree_test.sqlite3
-  timeout: 10000
-production:
-  adapter: sqlite3
-  database: db/spree_production.sqlite3
-<% when 'mysql' %>
+  when 'mysql' %>
 mysql: &mysql
   adapter: mysql2
   encoding: utf8
@@ -68,13 +57,26 @@ production:
   <<: *postgres
   database: <%= database_prefix %><%= lib_name %>_spree_production
 <% else %>
+postgres: &postgres
+  adapter: postgresql
+  <% unless db_username.blank? %>
+  username: <%= db_username || 'postgres' %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
+  min_messages: warning
+
 development:
-  adapter: sqlite3
-  database: db/spree_development.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
-  adapter: sqlite3
-  database: db/spree_test.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
-  adapter: sqlite3
-  database: db/spree_production.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% end %>

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -37,4 +37,6 @@ Dummy::Application.configure do
   config.active_job.queue_adapter = :test
 
   config.cache_store = :redis_cache_store
+
+  routes.default_url_options = { host: 'localhost', port: 3000 }
 end