solidus_core 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41166c504ad4a467ac0d444551669efca2f6ff36b8083b11483ca1d6953c838e
-  data.tar.gz: f9c8abd6767eb3aaecf807d1e360defbb57ba7af0590d88b6019f0cd8bf2f1b1
+  metadata.gz: 37474ca0bd9f64c6406eec5f01194d820551f5d0c4c683c5e772fdcf767bd4e8
+  data.tar.gz: fceb4a330c37ccb986a3ba4079461772065e0b301deae565d4dbbfd7679ec34c
 SHA512:
-  metadata.gz: 5f9384ee4d463107d31e2cff1670ee587e7c2ad61795f11d1120bb69049fcc0bec3f04a0edee1e10e4c951a5b287cd9b93986c4194b87303e1a2a1ee38a7062a
-  data.tar.gz: 6d924bbc21a024712b1579c6bb73390904b456fc4671f1dc15b17de255d2f543b7cdcd2a4484e005444be085041a98819c6b3d2a1d55469305ce5b85108327e3
+  metadata.gz: f8a9ff14b85d5d84cc59653a962da56241c91ca872de1c171e803081235503ca0275915908f013eaa4f144f5eebf4eab4a53dfd527b4a95982f35cc07e0999a7
+  data.tar.gz: fa0d9f73641d28cb08699b802c8c921a3348c033e9835011834ecac3c0caa31d3ca551d5f4d6b7c32a82005b21b62a52cee86132e624ba7792d8ba11ee020766

data/app/models/concerns/spree/default_price.rb

@@ -32,6 +32,12 @@ module Spree
         prices.build(self.class.default_price_attributes)
     end
 
+    # @deprecated Use {#default_price_or_build} instead.
+    def find_or_build_default_price
+      default_price_or_build
+    end
+    deprecate find_or_build_default_price: :default_price_or_build, deprecator: Spree::Deprecation
+
     # Select from {#prices} the one to be considered as the default
     #
     # This method works with the in-memory association, so non-persisted prices

data/app/models/spree/product.rb

@@ -83,6 +83,7 @@ module Spree
       :height,
       :price,
       :sku,
+      :track_inventory,
       :weight,
       :width,
     ]

data/lib/generators/solidus/install/install_generator.rb

@@ -98,7 +98,7 @@ module Solidus
         rake 'active_storage:install'
       else
         say_status :assets, "Paperclip", :green
-        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
+        gsub_file 'config/initializers/spree.rb', "::ActiveStorageAttachment", "::PaperclipAttachment"
       end
     end
 

data/lib/generators/solidus/update/update_generator.rb

@@ -8,7 +8,7 @@ module Solidus
   class UpdateGenerator < ::Rails::Generators::Base
     FROM = Spree.previous_solidus_minor_version
 
-    desc 'Generates a new initializer to preview the new defaults for current Solidus version'
+    desc 'Generates a new initializer to preview the new defaults for current Solidus version and copy new migrations'
 
     source_root File.expand_path('templates', __dir__)
 
@@ -37,10 +37,15 @@ module Solidus
                  default: 'config/initializers/',
                  hide: true
 
+    class_option :install_migrations,
+                 type: :boolean,
+                 default: true,
+                 hide: true
+
     def create_new_defaults_initializer
       previous_version_prompt = options[:previous_version_prompt]
       return if previous_version_prompt && !yes?(<<~MSG, :red)
-        The update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
+        The default preferences update process is only supported if you are coming from version #{FROM}. If this is not the case, please, skip it and update your application to use Solidus #{FROM} before retrying.
         If you are confident you want to upgrade from a previous version, you must rerun the generator with the "--from={OLD_VERSION}" argument.
         Are you sure you want to continue? (y/N)
       MSG
@@ -57,6 +62,13 @@ module Solidus
                File.join(options[:initializer_directory], "#{options[:initializer_basename]}.rb")
     end
 
+    def install_migrations
+      return unless options[:install_migrations]
+
+      say_status :copying, "migrations"
+      rake 'spree:install:migrations'
+    end
+
     def print_message
       say <<~MSG
 

data/lib/spree/core/product_duplicator.rb

@@ -45,7 +45,7 @@ module Spree
         new_master.sku = "COPY OF #{master.sku}"
         new_master.deleted_at = nil
         new_master.images = master.images.map { |image| duplicate_image image } if @include_images
-        new_master.price = master.price
+        new_master.prices = master.prices.map(&:dup)
       end
     end
 

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "3.3.1"
+  VERSION = "3.3.3"
 
   def self.solidus_version
     VERSION

data/lib/spree/migration_helpers.rb

@@ -6,9 +6,9 @@ module Spree
       remove_index(table, column) if index_exists?(table, column)
     end
 
-    def safe_add_index(table, column, options = {})
-      if columns_exist?(table, column) && !index_exists?(table, column, options)
-        add_index(table, column, options)
+    def safe_add_index(table, column, **options)
+      if columns_exist?(table, column) && !index_exists?(table, column, **options)
+        add_index(table, column, **options)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer