spree_core 5.6.1 → 6.0.0.beta2

data/lib/spree/core/controller_helpers/order.rb

@@ -1,172 +0,0 @@
-module Spree
-  module Core
-    module ControllerHelpers
-      module Order
-        extend ActiveSupport::Concern
-
-        included do
-          if defined?(helper_method)
-            helper_method :current_order
-          end
-        end
-
-        def order_token
-          @order_token ||= cookies.signed[:token] || params[:order_token]
-        end
-
-        # The current incomplete order from the token for use in cart and during checkout
-        def current_order(options = {})
-          options[:create_order_if_necessary] ||= false
-          options[:includes] ||= false
-
-          if @current_order
-            @current_order.last_ip_address = ip_address
-            return @current_order
-          end
-
-          @current_order = find_order_by_token_or_user(options, false)
-
-          if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = current_store.orders.create!(current_order_params.except(:token))
-            @current_order.associate_user! try_spree_current_user if try_spree_current_user
-            @current_order.last_ip_address = ip_address
-
-            create_token_cookie(@current_order.token)
-          end
-
-          # There is some edge case where the order doesn't have a token.
-          # but can't reproduce it. So let's generate one on the fly in that case.
-          @current_order.regenerate_token if @current_order && @current_order.token.blank?
-
-          create_token_cookie(@current_order&.token || current_order_params[:token] || params[:token]) if create_cookie_from_token?
-
-          @current_order
-        end
-
-        def associate_user
-          @order ||= current_order
-          if try_spree_current_user && @order
-            @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
-          end
-        end
-
-        def set_current_order
-          return unless try_spree_current_user && current_order
-
-          orders_scope = user_orders_scope
-
-          orders_to_merge = orders_scope.limit(10)
-          order_ids_to_delete = orders_scope.ids - orders_to_merge.ids
-
-          orders_scope_exists = orders_scope.exists?
-
-          if orders_scope.exists?
-            ActiveRecord::Base.connected_to(role: :writing) do
-              orders_to_merge.find_each do |order|
-                current_order.merge!(order, try_spree_current_user)
-              end
-
-              Spree::Order.where(id: order_ids_to_delete).find_each do |order|
-                Rails.logger.error("Failed to destroy order #{order.id} while merging") unless order.destroy
-              end
-            end
-          end
-
-          orders_scope_exists
-        end
-
-        def ip_address
-          request.remote_ip
-        end
-
-        private
-
-        def user_orders_scope
-          try_spree_current_user.orders.
-            incomplete.
-            not_canceled.
-            where.not(id: current_order.id).
-            where(store_id: current_store.id)
-        end
-
-        def create_cookie_from_token?
-          cookies.signed[:token].blank? &&
-            (current_order_params[:token].present? || params[:token].present?)
-        end
-
-        def checkout_complete_path?
-          request.path == spree.checkout_complete_path(current_order_params[:token] || params[:token])
-        end
-
-        def create_token_cookie(token)
-          cookies.signed[:token] = {
-            value: token,
-            expires: 90.days.from_now,
-            secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
-            domain: cookie_domain_without_port,
-            httponly: true
-          }
-        end
-
-        def cookie_domain_without_port
-          domain = current_store.url_or_custom_domain
-          return nil if domain.blank?
-
-          # Remove port from domain (e.g., "localhost:3000" -> "localhost")
-          # Cookies don't support port numbers in the domain attribute
-          domain.split(':').first
-        end
-
-        def last_incomplete_order(includes = {})
-          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
-        end
-
-        def current_order_params
-          @current_order_params ||= { currency: current_currency, token: order_token, user_id: try_spree_current_user.try(:id) }
-        end
-
-        def find_order_by_token_or_user(options = {}, with_adjustments = false)
-          return nil if try_spree_current_user.nil? && order_token.blank?
-
-          options[:lock] ||= false
-
-          includes = options[:includes] ? order_includes : {}
-
-          # Find any incomplete orders for the token
-          incomplete_orders = current_store.orders.incomplete.not_canceled.includes(includes)
-
-          token_order_params = current_order_params.except(:user_id)
-          order = if with_adjustments
-                    incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(token_order_params)
-                  else
-                    incomplete_orders.lock(options[:lock]).find_by(token_order_params)
-                  end
-
-          # Find any incomplete orders for the current user
-          order = last_incomplete_order(includes) if order.nil? && try_spree_current_user
-
-          order
-        end
-
-        def order_includes
-          variant_includes = [
-            :images,
-            :prices,
-            :stock_items,
-            :stock_locations,
-            { option_values: :option_type },
-            { stock_items: :stock_location },
-            { product: :master }
-          ]
-          variant_includes << :default_price if Spree::Config.enable_legacy_default_price
-
-          {
-            line_items: {
-              variant: variant_includes
-            }
-          }
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -1,48 +0,0 @@
-module Spree
-  module Core
-    module ControllerHelpers
-      module StrongParameters
-        def permitted_attributes
-          Spree::PermittedAttributes
-        end
-
-        delegate *Spree::PermittedAttributes::ATTRIBUTES,
-                 to: :permitted_attributes,
-                 prefix: :permitted
-
-        def permitted_payment_attributes
-          permitted_attributes.payment_attributes + [
-            source_attributes: permitted_source_attributes
-          ]
-        end
-
-        def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes + [
-            bill_address_attributes: permitted_address_attributes,
-            ship_address_attributes: permitted_address_attributes,
-            payments_attributes: permitted_payment_attributes,
-            shipments_attributes: permitted_shipment_attributes
-          ]
-        end
-
-        def permitted_order_attributes
-          permitted_checkout_attributes + [
-            line_items_attributes: permitted_line_item_attributes
-          ]
-        end
-
-        def permitted_product_attributes
-          permitted_attributes.product_attributes + [
-            removed_variant_ids: [],
-            variants_attributes: permitted_variant_attributes + ['id', :_destroy],
-            master_attributes: permitted_variant_attributes + ['id']
-          ]
-        end
-
-        def permitted_store_attributes
-          permitted_attributes.store_attributes
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/controller_helpers/turbo.rb

@@ -1,19 +0,0 @@
-module Spree
-  module Core
-    module ControllerHelpers
-      module Turbo
-        extend ActiveSupport::Concern
-
-        included do
-          if defined?(helper_method)
-            helper_method :turbo_frame_request?, :turbo_stream_request?
-          end
-        end
-
-        def turbo_stream_request?
-          request.format.turbo_stream?
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/partials.rb

@@ -1,42 +0,0 @@
-# Ability to define partial injection points for Admin and Storefront
-module Spree
-  module Core
-    class Partials
-      def initialize(config, environment)
-        @config = config
-        @environment = environment
-        define_dynamic_methods
-      end
-
-      attr_reader :config, :environment
-
-      def partial_members
-        environment.members.select { |member| member.to_s.end_with?('_partials') }
-      end
-
-      def keys
-        partial_members.map { |member| member.to_s.sub(/_partials$/, '') }
-      end
-
-      private
-
-      def define_dynamic_methods
-        # Get all members that end with _partials from the Environment
-        partial_members.each do |member|
-          # Strip the _partials suffix for the method name
-          method_name = member.to_s.sub(/_partials$/, '')
-
-          # Define getter method on singleton class
-          singleton_class.define_method(method_name) do
-            config.send(member)
-          end
-
-          # Define setter method on singleton class
-          singleton_class.define_method("#{method_name}=") do |value|
-            config.send("#{member}=", value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/previews/report_preview.rb

@@ -1,40 +0,0 @@
-require_relative 'preview_data'
-
-# Preview Spree report emails at /rails/mailers/spree/report
-class Spree::ReportPreview < ActionMailer::Preview
-  include Spree::PreviewData::LocaleParam
-
-  def report_done
-    Spree::ReportMailer.report_done(report)
-  end
-
-  private
-
-  # Reuse the most recent report, or build an in-memory example so the preview
-  # works on a database that has never run a report. When the preview toolbar
-  # requests a locale, always use the example so its store carries that locale.
-  # The example is never saved, so no `report.created` side effects fire.
-  def report
-    return example_report if locale.present?
-
-    Spree::Report.last || example_report
-  end
-
-  def example_report
-    store = Spree::PreviewData.store(locale)
-    report = Spree::Reports::SalesTotal.new(
-      id: 0,
-      store: store,
-      user: Spree::PreviewData.admin_user,
-      date_from: 30.days.ago.to_date,
-      date_to: Date.current,
-      currency: store.default_currency
-    )
-    report.attachment.attach(
-      io: StringIO.new("date,total\n2026-01-01,1234.56\n"),
-      filename: 'sales-total.csv',
-      content_type: 'text/csv'
-    )
-    report
-  end
-end

data/lib/spree/permitted_attributes.rb

@@ -1,337 +0,0 @@
-module Spree
-  module PermittedAttributes
-    ATTRIBUTES = [
-      :address_attributes,
-      :allowed_origin_attributes,
-      :api_key_attributes,
-      :asset_attributes,
-      :checkout_attributes,
-      :classification_attributes,
-      :cms_page_attributes,
-      :cms_section_attributes,
-      :custom_domain_attributes,
-      :customer_group_attributes,
-      :customer_return_attributes,
-      :digital_attributes,
-      :digital_link_attributes,
-      :export_attributes,
-      :gift_card_attributes,
-      :gift_card_batch_attributes,
-      :image_attributes,
-      :import_attributes,
-      :import_mapping_attributes,
-      :integration_attributes,
-      :inventory_unit_attributes,
-      :invitation_attributes,
-      :line_item_attributes,
-      :market_attributes,
-      :menu_attributes,
-      :menu_item_attributes,
-      :metafield_attributes,
-      :metafield_definition_attributes,
-      :option_type_attributes,
-      :option_value_attributes,
-      :page_attributes,
-      :page_block_attributes,
-      :page_link_attributes,
-      :page_section_attributes,
-      :payment_attributes,
-      :payment_method_attributes,
-      :payment_session_attributes,
-      :payment_setup_session_attributes,
-      :policy_attributes,
-      :price_list_attributes,
-      :product_attributes,
-      :promotion_attributes,
-      :promotion_rule_attributes,
-      :promotion_action_attributes,
-      :refund_attributes,
-      :refund_reason_attributes,
-      :reimbursement_attributes,
-      :reimbursement_type_attributes,
-      :report_attributes,
-      :return_authorization_attributes,
-      :return_authorization_reason_attributes,
-      :role_attributes,
-      :shipment_attributes,
-      :shipping_method_attributes,
-      :shipping_category_attributes,
-      :channel_attributes,
-      :source_attributes,
-      :stock_item_attributes,
-      :stock_location_attributes,
-      :stock_movement_attributes,
-      :stock_transfer_attributes,
-      :store_attributes,
-      :store_credit_attributes,
-      :store_credit_category_attributes,
-      :tax_rate_attributes,
-      :tax_category_attributes,
-      :taxon_attributes,
-      :taxonomy_attributes,
-      :theme_attributes,
-      :user_attributes,
-      :variant_attributes,
-      :webhook_endpoint_attributes,
-      :wishlist_attributes,
-      :wished_item_attributes,
-      :zone_attributes
-    ]
-
-    mattr_reader(*ATTRIBUTES)
-
-    @@address_attributes = [
-      :id, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_iso, :state_abbr, :country_id, :state_id,
-      :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :user_id, :deleted_at, :label, :quick_checkout,
-      { country: [:iso, :name, :iso3, :iso_name],
-        state: [:name, :abbr] }
-    ]
-
-    @@allowed_origin_attributes = [:origin]
-
-    @@api_key_attributes = [:name, :key_type, :channel_id, { scopes: [] }]
-
-    @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position, :url, :signed_id]
-
-    @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
-      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency, :locale,
-      :internal_note
-    ]
-
-    @@classification_attributes = [
-      :position, :taxon_id, :product_id
-    ]
-
-    @@cms_page_attributes = [:title, :meta_title, :content, :meta_description, :visible, :slug, :locale]
-
-    @@cms_section_attributes = [:name, :cms_page_id, :fit, :destination, { content: {}, settings: {} }]
-
-    @@custom_domain_attributes = [:url, :default]
-
-    @@customer_group_attributes = [:name, :description]
-
-    @@customer_return_attributes = [:stock_location_id, {
-      return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
-                                :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
-    }]
-
-    @@digital_attributes = [:attachment, :variant_id]
-
-    @@digital_link_attributes = [:access_counter]
-
-    @@export_attributes = [:type, :format, :record_selection, :search_params]
-
-    @@gift_card_attributes = [:code, :amount, :expires_at, :user_id, :currency]
-
-    @@gift_card_batch_attributes = [:prefix, :codes_count, :amount, :expires_at, :currency]
-
-    @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
-
-    @@import_attributes = [:type, :attachment, :delimiter]
-
-    @@import_mapping_attributes = [:file_column]
-
-    @@integration_attributes = [:type, :active]
-
-    @@inventory_unit_attributes = [:shipment, :shipment_id, :variant_id]
-
-    @@invitation_attributes = [:email, :expires_at, :role_id]
-
-    @@line_item_attributes = [:id, :variant_id, :quantity, { metadata: {} }]
-
-    @@market_attributes = [:name, :currency, :default_locale, :supported_locales,
-                           :tax_inclusive, :default, :position, country_ids: []]
-
-    @@menu_attributes = [:name, :locale, :location]
-
-    @@menu_item_attributes = [:name, :subtitle, :destination, :new_window, :item_type,
-                              :linked_resource_type, :linked_resource_id, :code, :menu_id]
-
-    @@metafield_attributes = [:id, :value, :type, :metafield_definition_id, :_destroy]
-
-    @@metafield_definition_attributes = [
-      :key, :name, :namespace, :metafield_type, :resource_type, :display_on,
-      :searchable, :sortable
-    ]
-
-
-    @@option_type_attributes = [:name, :presentation, :position, :filterable, :kind,
-                                option_values_attributes: [:id, :name, :presentation, :position, :color_code, :image, :_destroy]]
-
-    @@option_value_attributes = [:name, :presentation, :position, :color_code, :image]
-
-    @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
-
-    @@page_block_attributes = [:type, :name, :text, :position, :asset]
-
-    @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url, :open_in_new_tab]
-
-    @@page_section_attributes = [:type, :name, :position, :asset, :text, :description]
-
-    @@payment_attributes = [:amount, :payment_method_id, :payment_method]
-
-    @@payment_method_attributes = [:name, :type, :description, :active, :display_on, :auto_capture, :position, { metadata: {}, preferences: {} }]
-
-    @@payment_session_attributes = [:amount, :payment_method_id, { external_data: {} }]
-
-    @@payment_setup_session_attributes = [:payment_method_id, { external_data: {} }]
-
-    @@policy_attributes = [:name, :slug, :body]
-
-    @@price_list_attributes = [:name, :description, :match_policy, :starts_at, :ends_at, :status, :position]
-
-    @@product_attributes = [
-      :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
-      :meta_keywords, :meta_title, :price, :sku, :deleted_at, :prototype_id,
-      :option_values_hash, :weight, :height, :width, :depth,
-      :shipping_category_id, :tax_category_id,
-      :cost_currency, :cost_price, :compare_at_price,
-      :slug, :track_inventory, :backorderable, :barcode, :status,
-      :weight_unit, :dimensions_unit,
-      {
-        tag_list: [],
-        label_list: [],
-        option_type_ids: [],
-        taxon_ids: [],
-        product_option_types_attributes: [:id, :option_type_id, :position, :_destroy],
-        legacy_product_publications_attributes: [:id, :channel_id, :published_at, :unpublished_at, :_destroy]
-      }
-    ]
-
-    @@promotion_attributes = [:name, :description, :starts_at, :expires_at, :code, :usage_limit, :path, :match_policy,
-                              :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes]
-
-    @@promotion_rule_attributes = [:type, :preferred_match_policy, preferred_eligible_values: [], user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
-
-    @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
-
-    @@refund_attributes = [:amount, :refund_reason_id]
-
-    @@refund_reason_attributes = [:name, :active, :mutable]
-
-    @@reimbursement_attributes = [return_items_attributes: [:id, :override_reimbursement_type_id, :pre_tax_amount, :exchange_variant_id]]
-
-    @@reimbursement_type_attributes = [:name, :type, :active, :mutable]
-
-    @@report_attributes = [:type, :date_from, :date_to, :currency]
-
-    @@return_authorization_attributes = [
-      :amount, :memo, :stock_location_id, :inventory_units_attributes,
-      :return_authorization_reason_id, {
-        return_items_attributes: [
-          :_destroy,
-          :id, :inventory_unit_id,
-          :preferred_reimbursement_type_id,
-          :return_authorization_id, :returned, :pre_tax_amount,
-          :acceptance_status, :exchange_variant_id, :resellable, :return_quantity
-        ]
-      }
-    ]
-
-    @@return_authorization_reason_attributes = [:name, :active]
-
-    @@return_item_attributes = [:inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable, :return_quantity]
-
-    @@role_attributes = [:name]
-
-    @@shipment_attributes = [
-      :order, :special_instructions, :stock_location_id, :id,
-      :tracking, :address, :inventory_units, :selected_shipping_rate_id
-    ]
-
-    @@shipping_category_attributes = [:name]
-
-    @@channel_attributes = [:name, :code, :active, :default, :preferred_order_routing_strategy,
-                            :preferred_storefront_access, :preferred_guest_checkout]
-
-    @@shipping_method_attributes = [:name, :admin_name, :code, :tracking_url, :tax_category_id, :display_on,
-                                    :estimated_transit_business_days_min, :estimated_transit_business_days_max,
-                                    :calculator_type, :preferences, zone_ids: [], shipping_category_ids: [], calculator_attributes: {}]
-
-    # month / year may be provided by some sources, or others may elect to use one field
-    @@source_attributes = [
-      :id, :number, :month, :year, :expiry, :verification_value,
-      :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
-      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data
-    ]
-
-    @@stock_item_attributes = [:variant_id, :stock_location_id, :backorderable, :count_on_hand, { metadata: {} }]
-
-    @@stock_location_attributes = [
-      :name, :admin_name, :active, :address1, :address2, :city, :zipcode, :company,
-      :backorderable_default, :state_name, :state_id, :country_id, :phone,
-      :propagate_all_variants
-    ]
-
-    @@stock_movement_attributes = [
-      :quantity, :stock_item, :stock_item_id, :originator, :action
-    ]
-
-    @@stock_transfer_attributes = [:source_location_id, :destination_location_id, :reference,
-                                   stock_movements_attributes: [:variant_id, :quantity, :originator_id, :stock_item_id]]
-
-    @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :default_country_iso, :mail_from_address,
-                          :customer_support_email, :description, :address, :contact_phone,
-                          :supported_locales, :default_locale, :supported_currencies,
-                          :new_order_notifications_email,
-                          :preferred_admin_locale, :preferred_timezone, :preferred_weight_unit, :preferred_unit_system,
-                          :preferred_digital_asset_authorized_clicks, :preferred_digital_asset_authorized_days,
-                          :preferred_limit_digital_download_count, :preferred_limit_digital_download_days,
-                          :preferred_digital_asset_link_expire_time,
-                          :logo, :mailer_logo,
-                          :preferred_guest_checkout, :preferred_storefront_access]
-
-    @@store_credit_attributes = %i[amount currency category_id memo]
-
-    @@store_credit_category_attributes = [:name]
-
-    @@taxonomy_attributes = [:name, :position]
-
-    @@tax_category_attributes = [:name, :tax_code,:description, :is_default]
-
-    @@tax_rate_attributes = [:name, :amount, :amount_percentage, :zone_id, :tax_category_id, :included_in_price, :show_rate_in_label, :calculator_type, calculator_attributes: {}]
-
-    @@taxon_attributes = [
-      :name, :parent_id, :position, :icon, :description, :permalink, :hide_from_nav,
-      :taxonomy_id, :meta_description, :meta_keywords, :meta_title, :child_index,
-      :automatic, :rules_match_policy, :sort_order,
-      :image, :square_image, :description,
-      taxon_rules_attributes: [:id, :type, :value, :match_policy, :_destroy],
-    ]
-
-    @@theme_attributes = [:name, :type, :default]
-
-    @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
-                         :password_confirmation, :selected_locale, :avatar, :accepts_email_marketing, :phone,
-                         :internal_note,
-                         { public_metadata: {}, private_metadata: {}, tag_list: [], customer_group_ids: [] }]
-
-    @@variant_attributes = [
-      :name, :presentation, :cost_price, :discontinue_on, :lock_version,
-      :position, :track_inventory, :preorderable, :preorder_ships_at, :backorder_limit, :tax_category_id,
-      :product_id, :product, :option_values_attributes, :price, :compare_at_price,
-      :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
-      :weight_unit, :dimensions_unit,
-      {
-        options: [:id, :name, :option_value_presentation, :option_value_name, :position, :_destroy],
-        stock_items_attributes: [:id, :count_on_hand, :stock_location_id, :backorderable, :_destroy],
-        prices_attributes: [:id, :amount, :compare_at_amount, :currency, :_destroy],
-        price: {},
-        option_value_variants_attributes: [:id, :option_value_id, :_destroy],
-        option_value_ids: []
-      }
-    ]
-
-    @@webhook_endpoint_attributes = [:name, :url, :secret, :active, subscriptions: []]
-
-    @@wishlist_attributes = [:name, :is_default, :is_private]
-
-    @@wished_item_attributes = [:variant_id, :quantity]
-
-    @@zone_attributes = [:name, :description, :default_tax, :kind, :states_country_id, country_ids: [], state_ids: []]
-  end
-end