spree_core 4.7.2 → 4.8.0

data/app/models/spree/product_property.rb

@@ -1,15 +1,17 @@
 module Spree
   class ProductProperty < Spree::Base
     include Spree::FilterParam
-    include TranslatableResource
+    include Spree::TranslatableResource
 
-    TRANSLATABLE_FIELDS = %i[value filter_param].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[value].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
       auto_strip_attributes :value
     end
 
+    auto_strip_attributes :value
+
     acts_as_list scope: :product
 
     with_options inverse_of: :product_properties do

data/app/models/spree/promotion.rb

@@ -1,8 +1,8 @@
 module Spree
   class Promotion < Spree::Base
-    include MultiStoreResource
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::MultiStoreResource
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Promotions)

data/app/models/spree/property.rb

@@ -1,19 +1,21 @@
 module Spree
   class Property < Spree::Base
     include Spree::FilterParam
-    include Metadata
-    include TranslatableResource
-    if defined?(Spree::Webhooks)
+    include Spree::Metadata
+    include Spree::TranslatableResource
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
-    TRANSLATABLE_FIELDS = %i[name presentation filter_param].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[presentation].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
-      auto_strip_attributes :name, :presentation
+      auto_strip_attributes :presentation
     end
 
+    auto_strip_attributes :name, :presentation
+
     has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'
     has_many :prototypes, through: :property_prototypes, class_name: 'Spree::Prototype'
 

data/app/models/spree/prototype.rb

@@ -1,7 +1,7 @@
 module Spree
   class Prototype < Spree::Base
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/refund.rb

@@ -1,7 +1,7 @@
 module Spree
   class Refund < Spree::Base
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Refunds)

data/app/models/spree/reimbursement.rb

@@ -1,8 +1,8 @@
 module Spree
   class Reimbursement < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
-    include NumberIdentifier
-    if defined?(Spree::Webhooks)
+    include Spree::NumberIdentifier
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/return_authorization.rb

@@ -1,8 +1,8 @@
 module Spree
   class ReturnAuthorization < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
-    include NumberIdentifier
-    if defined?(Spree::Webhooks)
+    include Spree::NumberIdentifier
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/return_item.rb

@@ -2,7 +2,7 @@ module Spree
   class ReturnItem < Spree::Base
     COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/role.rb

@@ -1,6 +1,6 @@
 module Spree
   class Role < Spree::Base
-    include UniqueName
+    include Spree::UniqueName
 
     has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
     has_many :users, through: :role_users, class_name: "::#{Spree.user_class}"

data/app/models/spree/shipment.rb

@@ -3,10 +3,10 @@ require 'ostruct'
 module Spree
   class Shipment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
-    include NumberIdentifier
-    include NumberAsParam
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Shipments)

data/app/models/spree/shipping_category.rb

@@ -1,7 +1,7 @@
 module Spree
   class ShippingCategory < Spree::Base
-    include UniqueName
-    if defined?(Spree::Webhooks)
+    include Spree::UniqueName
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/shipping_method.rb

@@ -2,8 +2,8 @@ module Spree
   class ShippingMethod < Spree::Base
     acts_as_paranoid
     include Spree::CalculatedAdjustments
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::VendorConcern)

data/app/models/spree/stock/estimator.rb

@@ -1,7 +1,7 @@
 module Spree
   module Stock
     class Estimator
-      include VatPriceCalculation
+      include Spree::VatPriceCalculation
 
       attr_reader :order, :currency
 

data/app/models/spree/stock_item.rb

@@ -2,8 +2,8 @@ module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
 
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
@@ -14,7 +14,7 @@ module Spree
     has_many :stock_movements, inverse_of: :stock_item
 
     validates :stock_location, :variant, presence: true
-    validates :variant_id, uniqueness: { scope: %i[stock_location_id deleted_at] }
+    validates :variant_id, uniqueness: { scope: :stock_location_id }, unless: :deleted_at
 
     validates :count_on_hand, numericality: {
       greater_than_or_equal_to: 0,

data/app/models/spree/stock_location.rb

@@ -1,7 +1,7 @@
 module Spree
   class StockLocation < Spree::Base
-    include UniqueName
-    if defined?(Spree::Webhooks)
+    include Spree::UniqueName
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::StockLocations)
@@ -71,6 +71,11 @@ module Spree
       stock_item(variant_id) || propagate_variant(variant)
     end
 
+    # Returns the count on hand number for the variant
+    #
+    # @param variant Variant instance
+    #
+    # @return [Integer]
     def count_on_hand(variant)
       stock_item(variant).try(:count_on_hand)
     end

data/app/models/spree/stock_movement.rb

@@ -5,7 +5,7 @@ module Spree
       min: -2**31
     }.freeze
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/stock_transfer.rb

@@ -1,10 +1,10 @@
 module Spree
   class StockTransfer < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'T')
-    include NumberIdentifier
-    include NumberAsParam
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/store.rb

@@ -1,7 +1,7 @@
 module Spree
   class Store < Spree::Base
-    include TranslatableResource
-    if defined?(Spree::Webhooks)
+    include Spree::TranslatableResource
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Stores)
@@ -11,7 +11,7 @@ module Spree
     TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebook
                              twitter instagram customer_support_email description
                              address contact_phone new_order_notifications_email].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
       acts_as_paranoid
@@ -109,8 +109,6 @@ module Spree
 
     after_commit :clear_cache
 
-    alias_attribute :contact_email, :customer_support_email
-
     def self.current(url = nil)
       Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Spree::Store.current` is deprecated and will be removed in Spree 5.0

data/app/models/spree/store_credit.rb

@@ -1,8 +1,8 @@
 module Spree
   class StoreCredit < Spree::Base
-    include SingleStoreResource
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::SingleStoreResource
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/store_favicon_image.rb

@@ -10,8 +10,17 @@ module Spree
 
     validates :attachment,
               content_type: VALID_CONTENT_TYPES,
-              dimension: { max: 256..256 },
-              aspect_ratio: :square,
               size: { less_than_or_equal_to: 1.megabyte }
+
+    validates :attachment,
+              if: :is_png?,
+              dimension: { max: 256..256 },
+              aspect_ratio: :square
+
+    private
+
+    def is_png?
+      attachment.content_type.in?('image/png')
+    end
   end
 end

data/app/models/spree/tax_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class TaxCategory < Spree::Base
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/tax_rate.rb

@@ -5,7 +5,7 @@ module Spree
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/taxon.rb

@@ -3,10 +3,10 @@ require 'stringex'
 
 module Spree
   class Taxon < Spree::Base
-    include TranslatableResource
-    include TranslatableResourceSlug
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::TranslatableResource
+    include Spree::TranslatableResourceSlug
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
@@ -48,6 +48,8 @@ module Spree
     after_update :sync_taxonomy_name
     after_touch :touch_ancestors_and_taxonomy
 
+    has_one :store, through: :taxonomy
+
     has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'
 
     scope :for_store, ->(store) { joins(:taxonomy).where(spree_taxonomies: { store_id: store.id }) }
@@ -58,7 +60,7 @@ module Spree
     scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
 
     TRANSLATABLE_FIELDS = %i[name description permalink].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
       alias_attribute :slug, :permalink
@@ -117,7 +119,21 @@ module Spree
 
     # Creates permalink base for friendly_id
     def set_permalink
-      translations.each(&:set_permalink)
+      if Spree.use_translations?
+        translations.each(&:set_permalink)
+      else
+        self.permalink = generate_slug
+      end
+    end
+
+    def generate_slug
+      if parent.present?
+        [parent.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last.to_url)].join('/')
+      elsif permalink.blank?
+        name.to_url
+      else
+        permalink.to_url
+      end
     end
 
     def active_products
@@ -150,7 +166,7 @@ module Spree
     private
 
     def sync_taxonomy_name
-      if saved_change_to_name? && root?
+      if saved_changes.key?(:name) && root?
         return if taxonomy.name.to_s == name.to_s
 
         taxonomy.update(name: name)

data/app/models/spree/taxon_image.rb

@@ -1,8 +1,8 @@
 module Spree
   class TaxonImage < Asset
-    include Configuration::ActiveStorage
+    include Spree::TaxonImage::Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
-    include ::Spree::ImageMethods
+    include Spree::ImageMethods
 
     def styles
       self.class.styles.map do |_, size|

data/app/models/spree/taxonomy.rb

@@ -1,13 +1,13 @@
 module Spree
   class Taxonomy < Spree::Base
-    include TranslatableResource
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::TranslatableResource
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
     TRANSLATABLE_FIELDS = %i[name].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     acts_as_list
 
@@ -32,7 +32,7 @@ module Spree
     end
 
     def set_root_taxon_name
-      return unless saved_change_to_name?
+      return unless saved_changes.key?(:name)
       return if name.to_s == root.name.to_s
 
       root.update(name: name)

data/app/models/spree/variant.rb

@@ -3,9 +3,9 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
-    include MemoizedData
-    include Metadata
-    if defined?(Spree::Webhooks)
+    include Spree::MemoizedData
+    include Spree::Metadata
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
@@ -122,9 +122,14 @@ module Spree
     self.whitelisted_ransackable_scopes = %i(product_name_or_sku_cont search_by_product_name_or_sku)
 
     def self.product_name_or_sku_cont(query)
-      joins(:product).join_translation_table(Product).
-        where("LOWER(#{Product.translation_table_alias}.name) LIKE LOWER(:query)
-               OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+      if Spree.use_translations?
+        joins(:product).
+          join_translation_table(Product).
+          where("LOWER(#{Product.translation_table_alias}.name) LIKE LOWER(:query)
+                 OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+      else
+        joins(:product).where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query) OR LOWER(sku) LIKE LOWER(:query)", query: "%#{query}%")
+      end
     end
 
     def self.search_by_product_name_or_sku(query)

data/app/models/spree/wished_item.rb

@@ -1,6 +1,6 @@
 module Spree
   class WishedItem < Spree::Base
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/wishlist.rb

@@ -1,7 +1,7 @@
 module Spree
   class Wishlist < Spree::Base
-    include SingleStoreResource
-    if defined?(Spree::Webhooks)
+    include Spree::SingleStoreResource
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/zone.rb

@@ -1,7 +1,7 @@
 module Spree
   class Zone < Spree::Base
-    include UniqueName
-    if defined?(Spree::Webhooks)
+    include Spree::UniqueName
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/services/spree/addresses/update.rb

@@ -9,6 +9,7 @@ module Spree
       def call(address:, address_params:)
         address_params[:country_id] ||= address.country_id
         address_params = fill_country_and_state_ids(address_params)
+        address_params[:user_id] = address.user_id if address.user_id.present?
 
         if address&.editable?
           address.update(address_params) ? success(address) : failure(address)

data/app/services/spree/seeds/all.rb

@@ -4,22 +4,24 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call
-        # GEO
-        Countries.call
-        States.call
-        Zones.call
+        Spree::Webhooks.disable_webhooks do
+          # GEO
+          Countries.call
+          States.call
+          Zones.call
 
-        # user roles
-        Roles.call
+          # user roles
+          Roles.call
 
-        # additional data
-        DefaultReimbursementTypes.call
-        ShippingCategories.call
-        StoreCreditCategories.call
+          # additional data
+          DefaultReimbursementTypes.call
+          ShippingCategories.call
+          StoreCreditCategories.call
 
-        # store & stock location
-        Stores.call
-        StockLocations.call
+          # store & stock location
+          Stores.call
+          StockLocations.call
+        end
       end
     end
   end

data/app/services/spree/seeds/stores.rb

@@ -7,7 +7,7 @@ module Spree
         default_store = Spree::Store.default
 
         if default_store.persisted?
-          default_store.update!(default_country_id: Spree::Config[:default_country_id])
+          default_store.update!(default_country: Spree::Country.first)
         else
           Spree::Store.new do |s|
             s.name                         = 'Spree Demo Site'
@@ -16,7 +16,7 @@ module Spree
             s.mail_from_address            = 'no-reply@example.com'
             s.customer_support_email       = 'support@example.com'
             s.default_currency             = 'USD'
-            s.default_country_id           = Spree::Config[:default_country_id]
+            s.default_country              = Spree::Country.first
             s.default_locale               = I18n.locale
             s.seo_title                    = 'Spree Commerce Demo Shop'
             s.meta_description             = 'This is the new Spree UX DEMO | OVERVIEW: http://bit.ly/new-spree-ux | DOCS: http://bit.ly/spree-ux-customization-docs | CONTACT: https://spreecommerce.org/contact/'

data/app/sorters/spree/products/sort.rb

@@ -11,7 +11,7 @@ module Spree
         products = by_price(products)
         products = by_sku(products)
 
-        products = select_translatable_fields(products)
+        products = select_translatable_fields(products) if Spree.use_translations?
 
         products.distinct
       end

data/config/initializers/mobility.rb

@@ -12,5 +12,6 @@ Mobility.configure do |config|
     locale_accessors
     presence
     dirty
+    column_fallback
   end
 end

data/config/routes.rb

@@ -2,6 +2,11 @@
 # see: https://github.com/rails/rails/issues/34872
 Rails.application.routes.draw do
   direct :cdn_image do |model, options|
+    options[:host] = Spree.cdn_host if Spree.cdn_host.present?
+    options[:host] ||= Rails.application.routes.default_url_options[:host]
+
+    options[:only_path] = true if options[:host].blank?
+
     if model.blob.service_name == 'cloudinary' && defined?(Cloudinary)
       if model.class.method_defined?(:has_mvariation)
         Cloudinary::Utils.cloudinary_url(model.blob.key,
@@ -17,10 +22,7 @@ Rails.application.routes.draw do
         :rails_service_blob_proxy,
         model.signed_id,
         model.filename,
-        options.merge(
-          host: Spree.cdn_host || Rails.application.routes.default_url_options[:host],
-          port: Rails.application.routes.default_url_options[:port]
-        )
+        options
       )
     else
       signed_blob_id = model.blob.signed_id
@@ -32,10 +34,7 @@ Rails.application.routes.draw do
         signed_blob_id,
         variation_key,
         filename,
-        options.merge(
-          host: Spree.cdn_host || Rails.application.routes.default_url_options[:host],
-          port: Rails.application.routes.default_url_options[:port]
-        )
+        options
       )
     end
   end

data/db/migrate/20210929090344_create_stock_item_stock_location_id_variant_id_coalesce_deleted_at_unique_index.rb

@@ -1,32 +1,5 @@
 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
+    # this migration was broken and is fixed in the following migration
   end
 end

data/db/migrate/20230103144439_create_option_type_translations.rb

@@ -9,7 +9,6 @@ class CreateOptionTypeTranslations < ActiveRecord::Migration[6.1]
       create_table :spree_option_type_translations do |t|
 
         # Translated attribute(s)
-        t.string :name
         t.string :presentation
 
         t.string  :locale, null: false