spree_core 6.0.0.beta4 → 6.0.0.rc1

data/app/presenters/spree/csv/order_line_item_presenter.rb

@@ -97,7 +97,7 @@ module Spree
           index.zero? ? order.status : nil,
           index.zero? ? order.currency : nil,
           index.zero? ? order.item_total.to_f : nil,
-          index.zero? ? order.shipment_total.to_f : nil,
+          index.zero? ? order.delivery_total.to_f : nil,
           index.zero? ? order.tax_total.to_f : nil,
           index.zero? ? order.included_tax_total.positive? : nil,
           index.zero? ? (order.discount_total.negative? || line_item.discount_total.negative?) : nil,

data/app/presenters/spree/csv/product_variant_presenter.rb

@@ -30,6 +30,7 @@ module Spree
         'track_inventory',
         'inventory_count',
         'inventory_backorderable',
+        'stock_location',
         'tax_category',
         'product_type',
         'image1_src',
@@ -46,7 +47,13 @@ module Spree
         'category3',
       ].freeze
 
-      def initialize(product, variant, index = 0, properties = [], categories = [], store = nil, custom_fields = [], currency = nil)
+      # @param default_stock_location [Spree::StockLocation, nil] where the full row's
+      #   inventory columns read from, blank when the variant has no stock
+      #   there; the store's default when nil
+      # @param stock_level [Spree::StockLevel, nil] turns the row into a
+      #   stock-only row for that level's location
+      def initialize(product, variant, index = 0, properties = [], categories = [], store = nil, custom_fields = [], currency = nil,
+                     default_stock_location: nil, stock_level: nil)
         @product = product
         @variant = variant
         @index = index
@@ -56,9 +63,12 @@ module Spree
         @currency = currency || @store.default_currency
         @price_only = @currency != @store.default_currency
         @custom_fields = custom_fields
+        @default_stock_location = default_stock_location
+        @stock_level = stock_level
       end
 
-      attr_accessor :product, :variant, :index, :properties, :categories, :store, :currency, :price_only, :custom_fields
+      attr_accessor :product, :variant, :index, :properties, :categories, :store, :currency, :price_only, :custom_fields,
+                    :default_stock_location, :stock_level
 
       ##
       # Generates an array representing a CSV row of product variant data.
@@ -73,8 +83,7 @@ module Spree
       # @return [Array] An array containing the combined product and variant CSV data.
       def call
         return price_only_row if price_only
-
-        total_on_hand = variant.total_on_hand
+        return stock_only_row if stock_level
 
         csv = [
           product.id,
@@ -104,19 +113,23 @@ module Spree
           publication_available_on&.strftime('%Y-%m-%d %H:%M:%S'),
           (variant.discontinue_on || publication_discontinue_on)&.strftime('%Y-%m-%d %H:%M:%S'),
           variant.track_inventory?,
-          total_on_hand == BigDecimal::INFINITY ? '∞' : total_on_hand,
-          variant.backorderable?,
+          # The shelf count at the one location the import writes this row
+          # back to, not what is left to sell: that would drop every unit held
+          # by a cart or promised to an order on each round trip.
+          variant.should_track_inventory? ? default_stock_level&.count_on_hand : '∞',
+          default_stock_level&.backorderable,
+          nil,
           variant.tax_category&.name,
           product.product_type&.name,
           spree_image_url(variant.images[0], image_url_options),
           spree_image_url(variant.images[1], image_url_options),
           spree_image_url(variant.images[2], image_url_options),
-          index.positive? ? option_type(0)&.label : nil,
-          index.positive? ? option_value(option_type(0)) : nil,
-          index.positive? ? option_type(1)&.label : nil,
-          index.positive? ? option_value(option_type(1)) : nil,
-          index.positive? ? option_type(2)&.label : nil,
-          index.positive? ? option_value(option_type(2)) : nil
+          option_type(0)&.label,
+          option_value(option_type(0)),
+          option_type(1)&.label,
+          option_value(option_type(1)),
+          option_type(2)&.label,
+          option_value(option_type(2))
         ]
 
         if index.zero?
@@ -168,6 +181,23 @@ module Spree
         csv
       end
 
+      def stock_only_row
+        csv = Array.new(CSV_HEADERS.size)
+        csv[CSV_HEADERS.index('sku')] = variant.sku
+        csv[CSV_HEADERS.index('slug')] = product.slug
+        csv[CSV_HEADERS.index('inventory_count')] = stock_level.count_on_hand
+        csv[CSV_HEADERS.index('inventory_backorderable')] = stock_level.backorderable
+        csv[CSV_HEADERS.index('stock_location')] = stock_level.stock_location.name
+        csv
+      end
+
+      def default_stock_level
+        return @default_stock_level if defined?(@default_stock_level)
+
+        location = default_stock_location || store.default_stock_location
+        @default_stock_level = variant.stock_levels.find { |level| level.stock_location_id == location.id }
+      end
+
       def image_url_options
         { variant: :xlarge }
       end

data/app/serializers/spree/emails/base_serializer.rb

@@ -0,0 +1,14 @@
+module Spree
+  module Emails
+    # Base for the serializers that feed email templates. Emails read plain
+    # JSON, the same data a renderer outside Ruby would receive, never models.
+    # Never expose a token here: URLs carrying secrets are built by the mailer.
+    class BaseSerializer
+      include Alba::Resource
+
+      attribute :id do |object|
+        object.prefixed_id if object.respond_to?(:prefixed_id)
+      end
+    end
+  end
+end

data/app/serializers/spree/emails/export_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Emails
+    class ExportSerializer < BaseSerializer
+      attributes :number, :results_url
+
+      attribute :filename do |export|
+        export.attachment.filename.to_s if export.attachment.attached?
+      end
+
+      one :user, resource: Spree::Emails::UserSerializer
+    end
+  end
+end

data/app/serializers/spree/emails/import_serializer.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Emails
+    class ImportSerializer < BaseSerializer
+      attributes :number
+
+      attribute :results_url, &:results_page_url
+
+      attribute :completed_count do |import|
+        import.rows_status_counts['completed'].to_i
+      end
+
+      attribute :failed_count do |import|
+        import.rows_status_counts['failed'].to_i
+      end
+
+      one :user, resource: Spree::Emails::UserSerializer
+    end
+  end
+end

data/app/serializers/spree/emails/invitation_serializer.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Emails
+    class InvitationSerializer < BaseSerializer
+      attributes :email
+
+      attribute :resource_name do |invitation|
+        invitation.resource.try(:name)
+      end
+
+      attribute :inviter_name do |invitation|
+        invitation.inviter.try(:full_name).presence || invitation.inviter.try(:name)
+      end
+
+      attribute :inviter_first_name do |invitation|
+        invitation.inviter.try(:first_name)
+      end
+
+      # Nil until the invitation is accepted by someone with an account.
+      attribute :invitee_name do |invitation|
+        invitation.invitee.try(:full_name).presence || invitation.invitee.try(:name)
+      end
+
+      attribute :invitee_first_name do |invitation|
+        invitation.invitee.try(:first_name)
+      end
+    end
+  end
+end

data/app/serializers/spree/emails/store_serializer.rb

@@ -0,0 +1,31 @@
+module Spree
+  module Emails
+    class StoreSerializer < BaseSerializer
+      include Spree::ImagesHelper
+
+      LOGO_HEIGHT = 32
+
+      attributes :name, :address, :mail_from_address, :default_currency, :default_locale
+
+      attribute :url, &:storefront_url
+
+      attribute :support_email, &:support_email_address
+
+      attribute :logo_url do |store|
+        spree_image_url(store.email_logo, height: LOGO_HEIGHT)
+      end
+
+      # The width the logo shows at, from its proportions. Nil until the file
+      # has been analyzed, when the layout lets the width follow the height.
+      attribute :logo_width do |store|
+        width, height = store.email_logo&.metadata.to_h.values_at('width', 'height').map(&:to_f)
+        (LOGO_HEIGHT * width / height).round if height.to_f.positive?
+      end
+
+      # Colors and font (see Spree::Emails::Branding).
+      attribute :branding do |store|
+        store.email_branding(params[:branding] || {}).to_h
+      end
+    end
+  end
+end

data/app/serializers/spree/emails/user_serializer.rb

@@ -0,0 +1,12 @@
+module Spree
+  module Emails
+    # Staff and seller-panel users, as back-office emails address them.
+    class UserSerializer < BaseSerializer
+      attributes :email, :first_name, :last_name
+
+      attribute :name do |user|
+        user.try(:full_name).presence || user.try(:name).presence
+      end
+    end
+  end
+end

data/app/serializers/spree/emails/webhook_endpoint_serializer.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Emails
+    # Never add the signing secret: an email must not carry it.
+    class WebhookEndpointSerializer < BaseSerializer
+      attributes :name, :url, :disabled_reason
+
+      attribute :display_name do |endpoint|
+        endpoint.name.presence || endpoint.url
+      end
+
+      attribute :disabled_at do |endpoint|
+        endpoint.disabled_at&.iso8601
+      end
+    end
+  end
+end

data/app/services/spree/carts/create.rb

@@ -9,8 +9,14 @@ module Spree
         store = @params.delete(:store)
         return failure(:store_is_required) if store.nil?
 
+        customer = @params.delete(:customer)
+        if @params.key?(:user)
+          Spree::Deprecation.warn('Passing user: to Spree::Carts::Create is deprecated and will be removed in Spree 6.1. Pass customer: instead.')
+          customer ||= @params.delete(:user)
+        end
+
         cart = store.carts.create!(
-          user: @params.delete(:user),
+          customer: customer,
           market: @params.delete(:market) || Spree::Current.market,
           channel: @params.delete(:channel) || Spree::Current.channel,
           currency: @params.delete(:currency) || store.default_currency,
@@ -19,7 +25,7 @@ module Spree
 
         # Delegate all attribute/address/item processing to Carts::Update
         if @params.present?
-          result = Spree::Carts::Update.call(cart: cart, params: @params)
+          result = Spree.carts_update_service.call(cart: cart, params: @params)
           return result if result.failure?
         end
 

data/app/services/spree/carts/destroy.rb

@@ -20,7 +20,7 @@ module Spree
       private
 
       def check_if_can_be_destroyed(cart:)
-        return failure(false, Spree.t(:cannot_be_destroyed)) unless cart&.can_be_deleted?
+        return failure(false, I18n.t('spree.cannot_be_destroyed')) unless cart&.can_be_deleted?
 
         success(cart: cart)
       end
@@ -62,7 +62,7 @@ module Spree
       def destroy_order(cart:)
         destroyed_result = cart.destroy
 
-        return failure(false, Spree.t(:cannot_be_destroyed)) unless destroyed_result.present?
+        return failure(false, I18n.t('spree.cannot_be_destroyed')) unless destroyed_result.present?
 
         success(cart)
       end

data/app/services/spree/carts/remove_out_of_stock_items.rb

@@ -72,7 +72,7 @@ module Spree
       def valid_status?(line_item)
         product = line_item.product
         if !product.active? || product.deleted? || product.discontinued? || line_item.variant.discontinued?
-          message = Spree.t('cart_line_item.discontinued', li_name: line_item.name)
+          message = I18n.t('spree.cart_line_item.discontinued', li_name: line_item.name)
           @messages << message
           @warnings << {
             code: 'line_item_removed',
@@ -87,7 +87,7 @@ module Spree
 
       def stock_available?(line_item)
         if line_item.insufficient_stock?
-          message = Spree.t('cart_line_item.out_of_stock', li_name: line_item.name)
+          message = I18n.t('spree.cart_line_item.out_of_stock', li_name: line_item.name)
           @messages << message
           @warnings << {
             code: 'line_item_removed',

data/app/services/spree/carts/split_by_seller.rb

@@ -242,7 +242,7 @@ module Spree
       end
 
       def clone_fulfillment(fulfillment, sibling)
-        attributes = fulfillment.attributes.except('id', 'cart_id', 'number', 'created_at', 'updated_at')
+        attributes = fulfillment.attributes.except('id', 'cart_id', 'number', 'tracking', 'created_at', 'updated_at')
         replacement = sibling.fulfillments.create!(
           attributes.merge('order_id' => sibling.id, 'address_id' => sibling.ship_address_id)
         )

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

@@ -16,6 +16,9 @@ module Spree
           assign_default_addresses
 
           cart.save!
+          # Read before the items: processing them reloads the cart, which forgets what this save changed.
+          @destination_changed = destination_changed?
+          @new_delivery_destination = new_delivery_destination?
 
           process_items
           try_advance
@@ -45,7 +48,7 @@ module Spree
         end
         cart.warnings |= warnings if warnings.present?
 
-        failure(cart, Spree.t('cart_line_item.pricing_unavailable'))
+        failure(cart, I18n.t('spree.cart_line_item.pricing_unavailable'))
       rescue ActiveRecord::RecordInvalid => e
         failure(cart, e.record.errors.full_messages.to_sentence)
       rescue StandardError => e
@@ -65,6 +68,15 @@ module Spree
           cart.saved_change_to_preferred_stock_location_id?
       end
 
+      # Whether the chosen delivery belongs to a place the cart no longer
+      # ships to. A market change or a corrected phone number keeps the
+      # choice, quoted again.
+      def new_delivery_destination?
+        cart.saved_change_to_ship_address_id? ||
+          cart.saved_change_to_preferred_stock_location_id? ||
+          cart.ship_address&.saved_change_to_destination? || false
+      end
+
       def assign_cart_attributes
         cart.email = params[:email] if params[:email].present?
         cart.customer_note = params[:customer_note] if params.key?(:customer_note)
@@ -98,7 +110,7 @@ module Spree
           cart.po_document.attach(value)
         end
       rescue ActiveStorage::FileNotFoundError
-        cart.errors.add(:po_document, :po_document_upload_incomplete, message: Spree.t(:po_document_upload_incomplete))
+        cart.errors.add(:po_document, :po_document_upload_incomplete, message: I18n.t('spree.po_document_upload_incomplete'))
         raise ActiveRecord::RecordInvalid, cart
       end
 
@@ -175,7 +187,9 @@ module Spree
       def process_items
         return unless params[:items].is_a?(Array)
 
-        result = Spree.cart_upsert_items_workflow.call(cart: cart, items: params[:items])
+        # Resolved after the save, so a company named in the same request
+        # decides which catalogs the items are checked against.
+        result = Spree.cart_upsert_items_workflow.call(cart: cart, items: params[:items], orderable_variants: cart.orderable_variants)
 
         raise StandardError, result.error.to_s if result.failure?
       end
@@ -237,8 +251,8 @@ module Spree
       def try_advance
         return if cart.complete?
 
-        if @address_invalidated || destination_changed?
-          cart.recalculate_for_address_change!
+        if @address_invalidated || @destination_changed
+          cart.recalculate_for_address_change!(keep_selection: !@new_delivery_destination)
         else
           cart.recalculate_totals!
         end

data/app/services/spree/catalogs/set_product_terms.rb

@@ -21,7 +21,7 @@ module Spree
         return success(catalog) if terms.empty?
 
         foreign = terms.keys.reject { |product| product.store_id == catalog.store_id }
-        return failure(catalog, Spree.t('catalogs.product_not_in_store')) if foreign.any?
+        return failure(catalog, I18n.t('spree.catalogs.product_not_in_store')) if foreign.any?
 
         invalid = nil
 

data/app/services/spree/categories/add_products.rb

@@ -2,8 +2,9 @@ module Spree
   module Categories
     class AddProducts
       prepend Spree::ServiceModule::Base
+      include Spree::ProductMemberships
 
-      # Creates product-category links for the given categories and products in bulk.
+      # Adds the given products to the given categories, in bulk.
       #
       # @param categories [Array<Spree::Category>]
       # @param products [Array<Spree::Product>]
@@ -11,40 +12,21 @@ module Spree
       def call(categories:, products:)
         return if categories.blank? || products.blank?
 
-        # build the params for the insert_all
-        product_categories_params = categories.pluck(:id).flat_map do |category_id|
-          position = Spree::ProductCategory.where(category_id: category_id).count
-
-          products.pluck(:id).map do |product_id|
-            {
-              category_id: category_id,
-              product_id: product_id,
-              position: (position += 1),
-              created_at: Time.current,
-              updated_at: Time.current
-            }
-          end
-        end
-        # doing a quick insert_all here to avoid the overhead of instantiating
-        Spree::ProductCategory.insert_all(product_categories_params)
+        add_memberships(categories, products)
+        success(true)
+      end
 
-        # update counter caches
-        category_ids = categories.pluck(:id)
-        product_ids = products.pluck(:id)
-        product_ids.each { |id| Spree::Product.reset_counters(id, :product_categories) }
-        # Recompute the descendant-inclusive products_count for the categories and
-        # their ancestors (bulk insert skips ProductCategory callbacks).
-        Spree::Category.recalculate_products_count(category_ids)
+      private
 
-        # clear cache & index products
-        Spree::Product.where(id: product_ids).touch_all
-        products.each(&:enqueue_search_index)
+      def membership_class = Spree::ProductCategory
+      def group_class = Spree::Category
 
-        Spree::Category.where(id: category_ids).touch_all
-        # Optional external hook (e.g. storefront featured sections); namespace owned by that gem.
+      # Recomputes the descendant-inclusive products_count for the categories
+      # and their ancestors, and lets an optional storefront extension refresh
+      # its featured sections.
+      def refresh_group_counters(category_ids)
+        Spree::Category.recalculate_products_count(category_ids)
         Spree::Taxons::TouchFeaturedSections.call(taxon_ids: category_ids) if defined?(Spree::Taxons::TouchFeaturedSections)
-
-        success(true)
       end
     end
   end

data/app/services/spree/categories/remove_products.rb

@@ -2,8 +2,9 @@ module Spree
   module Categories
     class RemoveProducts
       prepend Spree::ServiceModule::Base
+      include Spree::ProductMemberships
 
-      # Removes the given products from the given categories.
+      # Removes the given products from the given categories and re-packs positions.
       #
       # @param categories [Array<Spree::Category>]
       # @param products [Array<Spree::Product>]
@@ -11,61 +12,21 @@ module Spree
       def call(categories:, products:)
         return if categories.blank? || products.blank?
 
-        category_ids = categories.pluck(:id)
-        product_ids = products.pluck(:id)
-
-        ApplicationRecord.transaction do
-          category_ids.each do |category_id|
-            Spree::ProductCategory.where(category_id: category_id, product_id: product_ids).delete_all
-          end
-
-          product_categories_params = category_ids.flat_map do |category_id|
-            position = 0
-            existing_product_ids = Spree::ProductCategory.where(category_id: category_id).pluck(:product_id)
-
-            existing_product_ids.map do |product_id|
-              {
-                category_id: category_id,
-                product_id: product_id,
-                position: (position += 1),
-                created_at: Time.current,
-                updated_at: Time.current
-              }
-            end
-          end
-
-          if product_categories_params.any?
-            opts = {}
-            opts[:unique_by] = %i[product_id category_id] unless mysql_adapter?
-
-            Spree::ProductCategory.upsert_all(
-              product_categories_params,
-              **opts
-            )
-          end
-        end
-
-        # update counter caches
-        product_ids.each { |id| Spree::Product.reset_counters(id, :product_categories) }
-        # Recompute the descendant-inclusive products_count for the categories and
-        # their ancestors (delete_all skips ProductCategory callbacks).
-        Spree::Category.recalculate_products_count(category_ids)
-
-        # clear cache & index products
-        Spree::Product.where(id: product_ids).touch_all
-        products.each(&:enqueue_search_index)
-
-        Spree::Category.where(id: category_ids).touch_all
-        # Optional external hook (e.g. storefront featured sections); namespace owned by that gem.
-        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: category_ids) if defined?(Spree::Taxons::TouchFeaturedSections)
-
+        remove_memberships(categories, products)
         success(true)
       end
 
       private
 
-      def mysql_adapter?
-        Spree.mysql?
+      def membership_class = Spree::ProductCategory
+      def group_class = Spree::Category
+
+      # Recomputes the descendant-inclusive products_count for the categories
+      # and their ancestors, and lets an optional storefront extension refresh
+      # its featured sections.
+      def refresh_group_counters(category_ids)
+        Spree::Category.recalculate_products_count(category_ids)
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: category_ids) if defined?(Spree::Taxons::TouchFeaturedSections)
       end
     end
   end

data/app/services/spree/checkout/advance.rb

@@ -11,10 +11,7 @@ module Spree
       def call(order:, state: nil, shipping_method_id: nil)
         cart = order
 
-        # A destination is either a shipping address or a pickup intent — a
-        # pure-pickup cart never gets an address, but still needs proposals.
-        has_destination = cart.ship_address.present? || cart.preferred_stock_location_id.present?
-        if cart.fulfillments.empty? && cart.delivery_step_required? && has_destination && cart.respond_to?(:rebuild_fulfillments!)
+        if cart.fulfillments.empty? && cart.delivery_step_required? && cart.can_propose_deliveries? && cart.respond_to?(:rebuild_fulfillments!)
           cart.rebuild_fulfillments!
         end
 

data/app/services/spree/collections/add_products.rb

@@ -2,8 +2,9 @@ module Spree
   module Collections
     class AddProducts
       prepend Spree::ServiceModule::Base
+      include Spree::ProductMemberships
 
-      # Adds the given products to the given collections (manual curation), in bulk.
+      # Adds the given products to the given collections, in bulk.
       #
       # @param collections [Array<Spree::Collection>]
       # @param products [Array<Spree::Product>]
@@ -11,31 +12,17 @@ module Spree
       def call(collections:, products:)
         return if collections.blank? || products.blank?
 
-        product_collections_params = collections.pluck(:id).flat_map do |collection_id|
-          position = Spree::ProductCollection.where(collection_id: collection_id).count
-
-          products.pluck(:id).map do |product_id|
-            {
-              collection_id: collection_id,
-              product_id: product_id,
-              position: (position += 1),
-              created_at: Time.current,
-              updated_at: Time.current
-            }
-          end
-        end
-        Spree::ProductCollection.insert_all(product_collections_params)
+        add_memberships(collections, products)
+        success(true)
+      end
 
-        collection_ids = collections.pluck(:id)
-        product_ids = products.pluck(:id)
-        collection_ids.each { |id| Spree::Collection.reset_counters(id, :product_collections) }
-        product_ids.each { |id| Spree::Product.reset_counters(id, :product_collections) }
+      private
 
-        Spree::Product.where(id: product_ids).touch_all
-        products.each(&:enqueue_search_index)
-        Spree::Collection.where(id: collection_ids).touch_all
+      def membership_class = Spree::ProductCollection
+      def group_class = Spree::Collection
 
-        success(true)
+      def refresh_group_counters(collection_ids)
+        collection_ids.each { |id| Spree::Collection.reset_counters(id, :product_collections) }
       end
     end
   end