spree_core 5.6.1 → 6.0.0.beta2

data/app/javascript/spree/core/controllers/address_form_controller.js

@@ -1,98 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  static targets = [
-    'country',
-    'state',
-    'stateName',
-    'stateLabel',
-    'stateArrow',
-    'zipcode'
-  ]
-
-  static values = {
-    countries: Array,
-    states: Array,
-    currentStateId: String
-  }
-
-  constructor(...args) {
-    super(...args)
-    this.changeCountry()
-  }
-
-  get country() {
-    return this.countriesValue.find(
-      (country) => country.id == this.countryTarget.value
-    )
-  }
-
-  get state() {
-    return this.statesValue.find((state) => state[1] == this.stateTarget.value)
-  }
-
-  get states() {
-    return this.statesValue.filter(
-      (state) => state[0] == this.countryTarget.value
-    )
-  }
-
-  changeCountry(_event) {
-    var form = document.querySelector('.address-form')
-    this.stateTarget.required = this.country.states_required
-    this.stateTarget.value = ''
-    this.stateTarget.innerHTML = ''
-
-    var allStates = this.stateTarget.parentNode.parentNode
-    var stateName = this.stateNameTarget
-    var stateSelector = this.stateTarget
-
-    if (this.country.states_required) {
-      this.stateLabelTarget.parentNode.parentNode.classList.remove('hidden')
-      form.classList.toggle('cols-2', false)
-
-      allStates.classList.remove('hidden')
-      allStates.classList.add('flex')
-      if (this.states.length > 0) {
-        stateSelector.classList.remove('hidden')
-        stateName.classList.add('hidden')
-
-        this.states.map((state) => {
-          const option = document.createElement('option')
-          option.value = state[1]
-          option.dataset.abbr = state[2]
-          option.text = state[3]
-
-          if (option.value == this.currentStateIdValue) {
-            option.selected = true
-          }
-
-          this.stateTarget.add(option)
-        })
-      } else {
-        stateName.classList.remove('hidden')
-        stateSelector.classList.add('hidden')
-      }
-    } else {
-      form.classList.toggle('cols-2', true)
-      allStates.classList.add('hidden')
-      allStates.classList.remove('flex')
-    }
-
-    this.zipcodeTarget.required = this.country.zipcode_required
-    if (this.country.zipcode_required) {
-      form.classList.toggle('col-1', false)
-      this.zipcodeTarget.parentNode.classList.remove('hidden')
-    } else {
-      if (!this.country.states_required) {
-        form.classList.toggle('col-1', true)
-        form.classList.toggle('cols-2', false)
-      } else {
-        form.classList.toggle('col-1', false)
-        form.classList.toggle('cols-2', true)
-      }
-      this.zipcodeTarget.parentNode.classList.add('hidden')
-      this.zipcodeTarget.value = null
-    }
-  }
-}

data/app/javascript/spree/core/controllers/disable_submit_button_controller.js

@@ -1,19 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-export default class extends Controller {
-  static targets = ["button"]
-
-  connect() {
-    this.element.addEventListener('submit', this.toggleDisabledButton)
-  }
-
-  disconnect() {
-    this.element.removeEventListener('submit', this.toggleDisabledButton)
-  }
-
-  toggleDisabledButton = () => {
-    if (this.hasButtonTarget) {
-      this.buttonTarget.disabled = !this.buttonTarget.disabled
-    }
-  }
-}

data/app/javascript/spree/core/controllers/enable_button_controller.js

@@ -1,29 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["input", "button"];
-  static values = {
-    allowBlank: { type: Boolean, default: false },
-    disableWhenNotChanged: { type: Boolean, default: false },
-  }
-
-  connect() {
-    this.buttonTarget.setAttribute("disabled", true);
-
-    if (this.inputTargets.every((input) => input.value || input.checked || this.allowBlankValue) && !this.disableWhenNotChangedValue) {
-      this.buttonTarget.removeAttribute("disabled");
-    }
-
-    this.inputTargets.forEach((input) => {
-      input.addEventListener("input", (event) => this.handleChange(event));
-    });
-  }
-
-  handleChange(event) {
-    if (this.inputTargets.every((input) => event.target.value || event.target.checked || this.allowBlankValue)) {
-      this.buttonTarget.removeAttribute("disabled");
-    } else {
-      this.buttonTarget.setAttribute("disabled", true);
-    }
-  }
-}

data/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js

@@ -1,161 +0,0 @@
-export default class {
-  async connect() {
-    if (typeof google?.maps === 'undefined') {
-      console.error('Google Places API is not loaded')
-      return
-    }
-    this.placesApi = await google.maps.importLibrary('places')
-    this.googleSessionToken = new this.placesApi.AutocompleteSessionToken()
-  }
-
-  async getSuggestions(input, country) {
-    if (this.placesApi === undefined) {
-      throw new Error('You must call connect() before getSuggestions()')
-    }
-
-    const request = {
-      input,
-      // We can use `address`, `street_address`
-      // `street_address` is the most accurate and specific, but sometimes it returns no results, even if the address is valid
-      // Since we are validating the address on the server, we can use `address`
-      includedRegionCodes: [country],
-      sessionToken: this.googleSessionToken
-    }
-
-    try {
-      const response = await this.placesApi.AutocompleteSuggestion.fetchAutocompleteSuggestions(request)
-      return response.suggestions.map((element, index) => this.parsePrediction(element.placePrediction, index))
-    } catch (error) {
-      console.error('Error fetching autocomplete suggestions', error)
-      return []
-    }
-  }
-
-  async getPlaceDetails(placeID) {
-    if (this.placesApi === undefined) {
-      throw new Error('You must call connect() before getPlaceDetails()')
-    }
-
-    try {
-      const service = new this.placesApi.Place({ id: placeID })
-
-      const { place } = await service.fetchFields({ fields: ["addressComponents"] })
-
-      const fullAddress = []
-      let hasStreetNumber = false
-
-      const details = {
-        fullAddress: '',
-        city: '',
-        stateAbbr: '',
-        zipcode: '',
-        hasStreetNumber: false
-      }
-
-      let locality, postal_town, sublocality, administrative_area_level_3, premise, subpremise
-
-      place.addressComponents.forEach((component) => {
-        if (component.types.includes('street_number')) {
-          fullAddress.push(component.longText)
-          hasStreetNumber = true
-        }
-        if (component.types.includes('subpremise')) {
-          subpremise = component.longText
-        }
-        if (component.types.includes('premise')) {
-          premise = component.longText
-        }
-        if (component.types.includes('route')) {
-          fullAddress.push(component.longText)
-        }
-        if (component.types.includes('locality')) {
-          locality = component.longText
-        }
-        if (component.types.includes('postal_town')) {
-          postal_town = component.longText
-        }
-        if (component.types.includes('sublocality')) {
-          sublocality = component.longText
-        }
-        if (component.types.includes('administrative_area_level_1')) {
-          details.stateAbbr = component.shortText
-        }
-        if (component.types.includes('postal_code')) {
-          details.zipcode = component.longText
-        }
-        if (component.types.includes('administrative_area_level_3')) {
-          administrative_area_level_3 = component.longText
-        }
-      })
-      // City is tricky, because it can be in different fields
-      details.city =
-        locality ||
-        postal_town ||
-        sublocality ||
-        administrative_area_level_3 ||
-        ''
-      if (premise && !hasStreetNumber) {
-        fullAddress.unshift(premise)
-        hasStreetNumber = true
-      }
-      if (subpremise) {
-        fullAddress.push(subpremise)
-      }
-      details.hasStreetNumber = hasStreetNumber
-      details.fullAddress = fullAddress.join(' ')
-      return details
-    } catch (error) {
-      console.error('Error fetching autocomplete details', error)
-      return null
-    }
-  }
-
-  parsePrediction(prediction, index) {
-    const suggestion = {
-      index: index,
-      placeID: prediction.placeId,
-      description: prediction.text.text
-    }
-
-    const splittedText = this.splitTextForMarks(prediction)
-    suggestion.html = splittedText
-      .map((textArea) =>
-        textArea.marked
-          ? `<mark class="bg-transparent">${textArea.text}</mark>`
-          : textArea.text
-      )
-      .join('')
-
-    return suggestion
-  }
-
-  // This function takes the prediction and splits the description into an array of objects with the text and a boolean indicating if it should be highlighted
-  splitTextForMarks(prediction) {
-    const description = prediction.text.text;
-    let markedAreas = prediction.text.matches
-      .map(({ startOffset, endOffset }) => ({
-        offset: startOffset,
-        length: endOffset - startOffset
-      }))
-      .sort((a, b) => a.offset - b.offset);
-    const textAreas = []
-    for (let i = 0; i < description.length; i++) {
-      if (markedAreas[0]?.offset === i) {
-        textAreas.push({
-          text: description.substring(i, i + markedAreas[0].length),
-          marked: true
-        })
-        i += markedAreas[0].length - 1
-        markedAreas.shift()
-        markedAreas = [...markedAreas.sort((m) => m.offset)]
-      } else {
-        textAreas.push({
-          text: description.charAt(i),
-          marked: false
-        })
-      }
-    }
-
-    return textAreas
-  }
-}

data/app/javascript/spree/core/helpers/debounce.js

@@ -1,9 +0,0 @@
-export default function debounce(func, timeout = 300) {
-  let timer
-  return (...args) => {
-    clearTimeout(timer)
-    timer = setTimeout(() => {
-      func.apply(this, args)
-    }, timeout)
-  }
-}

data/app/javascript/spree/core/helpers/scroll_lock.js

@@ -1,25 +0,0 @@
-export function lockScroll() {
-  const body = document.body
-  const scrollPosition = window.scrollY || body.scrollTop
-  document.documentElement.style.setProperty('--scroll-y', scrollPosition)
-
-  body.style.top = `-${scrollPosition}px`
-  const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth
-  document.body.style.paddingRight = `${scrollbarWidth}px`
-  body.style.left = '0px'
-  body.style.right = '0px'
-  body.style.overflow = 'hidden'
-  body.style.position = 'fixed'
-}
-
-export function unlockScroll() {
-  const body = document.body
-  body.style.position = ''
-  body.style.paddingRight = ''
-  body.style.left = ''
-  body.style.right = ''
-  body.style.overflow = ''
-
-  document.documentElement.scrollTop = document.documentElement.style.getPropertyValue('--scroll-y') || window.scrollY
-  body.style.top = ''
-}

data/app/jobs/spree/media/migrate_product_assets_job.rb

@@ -1,83 +0,0 @@
-module Spree
-  module Media
-    # Per-product worker for the 5.4 → 5.5 media migration. Idempotent.
-    class MigrateProductAssetsJob < Spree::BaseJob
-      queue_as Spree.queues.images
-
-      def perform(product_id)
-        product = Spree::Product.includes(:master, :variants).find_by(id: product_id)
-        return unless product
-
-        # One query for all variant-pinned assets on the product (master +
-        # non-master). Grouping by viewable_id avoids N queries per variant.
-        viewable_ids = product.variants.map(&:id)
-        viewable_ids << product.master.id if product.master
-        return if viewable_ids.empty?
-
-        assets_by_variant = Spree::Asset
-                              .where(viewable_type: 'Spree::Variant', viewable_id: viewable_ids)
-                              .pluck(:id, :viewable_id)
-                              .group_by(&:last)
-                              .transform_values { |rows| rows.map(&:first) }
-        return if assets_by_variant.empty?
-
-        master_id = product.master&.id
-        touched_variants = []
-
-        product.variants.each do |variant|
-          asset_ids = assets_by_variant[variant.id]
-          next if asset_ids.blank?
-
-          move_assets_to_product(asset_ids, product)
-          link_assets_to_variant(asset_ids, variant.id)
-          touched_variants << variant
-        end
-
-        if master_id && (master_asset_ids = assets_by_variant[master_id]).present?
-          move_assets_to_product(master_asset_ids, product)
-          touched_variants << product.master
-        end
-
-        # update_all + upsert_all skip callbacks, so refresh thumbnails by hand.
-        touched_variants.each(&:update_thumbnail!)
-        recalculate_counters(product)
-      end
-
-      private
-
-      def move_assets_to_product(asset_ids, product)
-        Spree::Asset.where(id: asset_ids).update_all(
-          viewable_type: 'Spree::Product',
-          viewable_id: product.id,
-          updated_at: Time.current
-        )
-      end
-
-      def link_assets_to_variant(asset_ids, variant_id)
-        rows = asset_ids.map { |asset_id| { variant_id: variant_id, media_id: asset_id } }
-
-        # MySQL infers the conflict target from the unique index; only PG/SQLite
-        # need the explicit `unique_by:`.
-        opts = { on_duplicate: :skip }
-        if %w[PostgreSQL SQLite].include?(ActiveRecord::Base.connection.adapter_name)
-          opts[:unique_by] = :idx_variant_media_unique
-        end
-
-        Spree::VariantMedia.upsert_all(rows, **opts)
-      end
-
-      def recalculate_counters(product)
-        new_count = product.media.count
-        new_primary_id = product.media.order(:position).pick(:id)
-
-        return if product.media_count == new_count && product.primary_media_id == new_primary_id
-
-        product.update_columns(
-          media_count: new_count,
-          primary_media_id: new_primary_id,
-          updated_at: Time.current
-        )
-      end
-    end
-  end
-end

data/app/jobs/spree/reports/generate_job.rb

@@ -1,23 +0,0 @@
-module Spree
-  module Reports
-    class GenerateJob < Spree::BaseJob
-      queue_as Spree.queues.reports
-
-      # `Report#generate` is not retry-safe: each call re-attaches a new ActiveStorage
-      # blob (leaving the prior one orphaned) and re-enqueues the completion email.
-      # Opt out of the parent's retry policy so transient errors fail fast into the
-      # dead queue for operator review rather than producing duplicate side effects.
-      retry_on ActiveRecord::Deadlocked,
-               ActiveRecord::LockWaitTimeout,
-               ActiveRecord::ConnectionNotEstablished,
-               ActiveRecord::ConnectionFailed,
-               ActiveRecord::RecordNotFound,
-               attempts: 1
-
-      def perform(report_id)
-        report = Spree::Report.find_by_prefix_id!(report_id)
-        report.generate
-      end
-    end
-  end
-end

data/app/mailers/spree/report_mailer.rb

@@ -1,20 +0,0 @@
-module Spree
-  class ReportMailer < BaseMailer
-    def report_done(report)
-      @report = report
-
-      with_store_locale(@report.store) do
-        mail(
-          to: @report.user.email,
-          subject: Spree.t('report_mailer.report_done.subject', report_name: @report.human_name).to_s
-        )
-      end
-    end
-
-    private
-
-    def current_store
-      @current_store ||= @report.store
-    end
-  end
-end

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

@@ -1,58 +0,0 @@
-module Spree
-  module AdjustmentSource
-    extend ActiveSupport::Concern
-
-    included do
-      has_many :adjustments, as: :source
-      before_destroy :deals_with_adjustments_for_deleted_source
-    end
-
-    protected
-
-    def create_adjustment(order, adjustable, included = false)
-      amount = compute_amount(adjustable)
-
-      return if amount.zero?
-
-      adjustable.adjustments.new(
-        amount: amount,
-        included: included,
-        label: label,
-        order: order,
-        source: self
-      ).save
-    end
-
-    def create_unique_adjustment(order, adjustable)
-      return if already_adjusted?(adjustable)
-
-      create_adjustment(order, adjustable)
-    end
-
-    def create_unique_adjustments(order, adjustables)
-      adjustables.where.not(id: already_adjusted_ids(order)).map do |adjustable|
-        create_adjustment(order, adjustable) if !block_given? || yield(adjustable)
-      end.any?
-    end
-
-    private
-
-    def already_adjusted_ids(order)
-      adjustments.where(order: order).pluck(:adjustable_id)
-    end
-
-    def already_adjusted?(adjustable)
-      adjustments.where(adjustable: adjustable).exists?
-    end
-
-    def deals_with_adjustments_for_deleted_source
-      # For incomplete orders, remove the adjustment completely.
-      adjustments.for_incomplete_order.destroy_all
-
-      # For complete orders, the source will be invalid.
-      # Therefore we nullify the source_id, leaving the adjustment in place.
-      # This would mean that the order's total is not altered at all.
-      adjustments.for_complete_order.update_all(source_id: nil, updated_at: Time.current)
-    end
-  end
-end

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

@@ -1,138 +0,0 @@
-module Spree
-  module DefaultPrice
-    extend ActiveSupport::Concern
-
-    DEPRECATION_MSG = 'Spree::DefaultPrice is deprecated and will be removed in Spree 6.0. ' \
-      'Use variant.set_price(currency, amount) and variant.price_in(currency) instead.'
-
-    included do
-      has_one :default_price,
-              -> { with_deleted.where(currency: Spree::Store.default.default_currency) },
-              class_name: 'Spree::Price',
-              dependent: :destroy
-
-      after_save :save_default_price, if: -> { Spree::Config.enable_legacy_default_price }
-
-      def price
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.price
-        else
-          price_in(Spree::Store.default.default_currency).amount
-        end
-      end
-
-      def price=(value)
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.price = value
-        else
-          set_price(Spree::Store.default.default_currency, value)
-        end
-      end
-
-      def currency
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.currency
-        else
-          Spree::Store.default.default_currency
-        end
-      end
-
-      def currency=(value)
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.currency = value
-        end
-        # no-op when legacy is disabled — currency is determined by the store
-      end
-
-      def display_price
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.display_price
-        else
-          price_in(Spree::Store.default.default_currency).display_amount
-        end
-      end
-
-      def display_amount
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.display_amount
-        else
-          price_in(Spree::Store.default.default_currency).display_amount
-        end
-      end
-
-      def compare_at_price
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.compare_at_price
-        else
-          price_in(Spree::Store.default.default_currency).compare_at_amount
-        end
-      end
-
-      def compare_at_price=(value)
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.compare_at_price = value
-        else
-          default_currency = Spree::Store.default.default_currency
-          price_record = price_in(default_currency)
-          price_record.compare_at_amount = value
-          price_record.save! if price_record.persisted?
-        end
-      end
-
-      def display_compare_at_price
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.display_compare_at_price
-        else
-          price_in(Spree::Store.default.default_currency).display_compare_at_amount
-        end
-      end
-
-      def price_including_vat_for(price_options)
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          find_or_build_default_price.price_including_vat_for(price_options)
-        else
-          price_in(Spree::Store.default.default_currency).price_including_vat_for(price_options)
-        end
-      end
-
-      def has_default_price?
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          !default_price.nil?
-        else
-          prices.base_prices.any? { |p| p.currency == Spree::Store.default.default_currency }
-        end
-      end
-
-      def find_or_build_default_price
-        Spree::Deprecation.warn(Spree::DefaultPrice::DEPRECATION_MSG)
-        if Spree::Config.enable_legacy_default_price
-          default_price || build_default_price
-        else
-          prices.base_prices.find { |p| p.currency == Spree::Store.default.default_currency } ||
-            prices.build(currency: Spree::Store.default.default_currency)
-        end
-      end
-
-      private
-
-      def default_price_changed?
-        default_price && (default_price.changed? || default_price.new_record?)
-      end
-
-      def save_default_price
-        default_price.save if default_price_changed?
-      end
-    end
-  end
-end