spree_core 4.3.0 → 4.6.1

data/app/models/friendly_id/slug_decorator.rb

@@ -1,9 +0,0 @@
-module FriendlyId
-  module SlugDecorator
-    def self.prepended(base)
-      base.acts_as_paranoid
-    end
-  end
-end
-
-FriendlyId::Slug.prepend FriendlyId::SlugDecorator

data/app/models/spree/app_configuration.rb

@@ -1,89 +0,0 @@
-# This is the primary location for defining spree preferences
-#
-# The expectation is that this is created once and stored in
-# the spree environment
-#
-# setters:
-# a.color = :blue
-# a[:color] = :blue
-# a.set :color = :blue
-# a.preferred_color = :blue
-#
-# getters:
-# a.color
-# a[:color]
-# a.get :color
-# a.preferred_color
-#
-require 'spree/core/search/base'
-
-module Spree
-  class AppConfiguration < Preferences::Configuration
-    # Alphabetized to more easily lookup particular preferences
-    preference :address_requires_state, :boolean, default: true # should state/state_name be required
-    preference :address_requires_phone, :boolean, default: true # Determines whether we require phone in address
-    preference :admin_interface_logo, :string, default: 'admin/logo.png'
-    preference :admin_path, :string, default: '/admin'
-    preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_properties_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_promotions_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_customer_returns_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_users_per_page, :integer, default: Kaminari.config.default_per_page
-    preference :admin_show_version, :boolean, default: true
-    preference :allow_checkout_on_gateway_error, :boolean, default: false
-    preference :allow_guest_checkout, :boolean, default: true
-    preference :alternative_shipping_phone, :boolean, default: false # Request extra phone for ship addr
-    preference :always_include_confirm_step, :boolean, default: false # Ensures confirmation step is always in checkout_progress bar, but does not force a confirm step if your payment methods do not support it.
-    preference :always_put_site_name_in_title, :boolean, default: true
-    preference :title_site_name_separator, :string, default: '-' # When always_put_site_name_in_title is true, insert a separator character before the site name in the title
-    preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
-    preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
-    preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
-    preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
-    preference :company, :boolean, default: false # Request company field for billing and shipping addr
-    preference :currency, :string, default: 'USD'
-    preference :default_country_id, :integer
-    preference :disable_sku_validation, :boolean, default: false # when turned off disables the built-in SKU uniqueness validation
-    preference :disable_store_presence_validation, :boolean, default: false # when turned off disables Store presence validation for Products and Payment Methods
-    preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
-    preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
-    preference :layout, :string, default: 'spree/layouts/spree_application'
-    preference :logo, :string, default: 'logo/spree_50.png'
-    preference :mailer_logo, :string, default: 'logo/spree_50.png'
-    preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
-    preference :products_per_page, :integer, default: 12
-    preference :product_wysiwyg_editor_enabled, :boolean, default: true
-    preference :require_master_price, :boolean, default: true
-    preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
-    preference :return_eligibility_number_of_days, :integer, default: 365
-    preference :send_core_emails, :boolean, default: true # Default mail headers settings
-    preference :shipping_instructions, :boolean, default: false # Request instructions/info for shipping
-    preference :show_only_complete_orders_by_default, :boolean, default: true
-    preference :show_variant_full_price, :boolean, default: false # Displays variant full price or difference with product price. Default false to be compatible with older behavior
-    preference :show_products_without_price, :boolean, default: false
-    preference :show_raw_product_description, :boolean, default: false
-    preference :tax_using_ship_address, :boolean, default: true
-    preference :taxon_wysiwyg_editor_enabled, :boolean, default: true
-    preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
-
-    # Store credits configurations
-    preference :non_expiring_credit_types, :array, default: []
-    preference :credit_to_new_allocation, :boolean, default: false
-
-    # Multi store configurations
-    preference :show_store_selector, :boolean, default: false
-
-    # searcher_class allows spree extension writers to provide their own Search class
-    def searcher_class
-      @searcher_class ||= Spree::Core::Search::Base
-    end
-
-    # Sets the path used for products, taxons and pages.
-    preference :storefront_products_path, :string, default: 'products'
-    preference :storefront_taxons_path, :string, default: 't'
-    preference :storefront_pages_path, :string, default: 'pages'
-
-    attr_writer :searcher_class
-  end
-end

data/app/models/spree/app_dependencies.rb

@@ -1,98 +0,0 @@
-module Spree
-  class AppDependencies
-    include Spree::DependenciesHelper
-
-    INJECTION_POINTS = [
-      :ability_class,
-      :cart_create_service, :cart_add_item_service, :cart_remove_item_service,
-      :cart_remove_line_item_service, :cart_set_item_quantity_service, :cart_recalculate_service,
-      :cms_page_finder, :cart_update_service, :checkout_next_service, :checkout_advance_service, :checkout_update_service,
-      :checkout_complete_service, :checkout_add_store_credit_service, :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
-      :coupon_handler, :menu_finder, :country_finder, :current_order_finder, :credit_card_finder,
-      :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
-      :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
-      :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
-      :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service
-    ].freeze
-
-    attr_accessor *INJECTION_POINTS
-
-    def initialize
-      set_default_ability
-      set_default_services
-      set_default_finders
-    end
-
-    private
-
-    def set_default_ability
-      @ability_class = 'Spree::Ability'
-    end
-
-    def set_default_services
-      # cart
-      @cart_compare_line_items_service = 'Spree::CompareLineItems'
-      @cart_create_service = 'Spree::Cart::Create'
-      @cart_add_item_service = 'Spree::Cart::AddItem'
-      @cart_update_service = 'Spree::Cart::Update'
-      @cart_recalculate_service = 'Spree::Cart::Recalculate'
-      @cart_remove_item_service = 'Spree::Cart::RemoveItem'
-      @cart_remove_line_item_service = 'Spree::Cart::RemoveLineItem'
-      @cart_set_item_quantity_service = 'Spree::Cart::SetQuantity'
-      @cart_estimate_shipping_rates_service = 'Spree::Cart::EstimateShippingRates'
-      @cart_empty_service = 'Spree::Cart::Empty'
-      @cart_destroy_service = 'Spree::Cart::Destroy'
-      @cart_associate_service = 'Spree::Cart::Associate'
-      @cart_change_currency_service = 'Spree::Cart::ChangeCurrency'
-
-      # checkout
-      @checkout_next_service = 'Spree::Checkout::Next'
-      @checkout_advance_service = 'Spree::Checkout::Advance'
-      @checkout_update_service = 'Spree::Checkout::Update'
-      @checkout_complete_service = 'Spree::Checkout::Complete'
-      @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
-      @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
-      @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
-
-      # sorter
-      @collection_sorter = 'Spree::BaseSorter'
-      @order_sorter = 'Spree::BaseSorter'
-      @products_sorter = 'Spree::Products::Sort'
-
-      # paginator
-      @collection_paginator = 'Spree::Shared::Paginate'
-
-      # coupons
-      # TODO: we should split this service into 2 seperate - Add and Remove
-      @coupon_handler = 'Spree::PromotionHandler::Coupon'
-
-      # account
-      @account_create_service = 'Spree::Account::Create'
-      @account_update_service = 'Spree::Account::Update'
-      @account_create_address_service = 'Spree::Account::Addresses::Create'
-      @account_update_address_service = 'Spree::Account::Addresses::Update'
-
-      # credit cards
-      @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
-
-      @classification_reposition_service = 'Spree::Classifications::Reposition'
-
-      @error_handler = 'Spree::ErrorReporter'
-    end
-
-    def set_default_finders
-      @address_finder = 'Spree::Addresses::Find'
-      @country_finder = 'Spree::Countries::Find'
-      @cms_page_finder = 'Spree::CmsPages::Find'
-      @menu_finder = 'Spree::Menus::Find'
-      @current_order_finder = 'Spree::Orders::FindCurrent'
-      @current_store_finder = 'Spree::Stores::FindCurrent'
-      @completed_order_finder = 'Spree::Orders::FindComplete'
-      @credit_card_finder = 'Spree::CreditCards::Find'
-      @products_finder = 'Spree::Products::Find'
-      @taxon_finder = 'Spree::Taxons::Find'
-      @line_item_by_variant_finder = 'Spree::LineItems::FindByVariant'
-    end
-  end
-end

data/app/services/spree/account/addresses/helper.rb

@@ -1,43 +0,0 @@
-module Spree
-  module Account
-    module Addresses
-      module Helper
-        private
-
-        attr_accessor :country
-
-        def fill_country_and_state_ids(params)
-          replace_country_iso_with_id(params)
-          fill_state_id(params)
-        end
-
-        def replace_country_iso_with_id(params)
-          iso = params[:country_iso]
-          return params unless iso.present?
-
-          country = Spree::Country.by_iso(iso)
-          params[:country_id] = country&.id
-          params.delete(:country_iso)
-          params
-        end
-
-        def fill_state_id(params)
-          state_name = params[:state_name]
-          return params unless state_name.present?
-
-          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
-          return params unless country
-
-          params[:state_id] = country.states.find_by(name: state_name)&.id
-          params
-        end
-
-        def assign_to_user_as_default(user:, address_id:)
-          if user.addresses.pluck(:id) == [address_id] # check if it's user first address
-            user.update(bill_address_id: address_id, ship_address_id: address_id)
-          end
-        end
-      end
-    end
-  end
-end

data/app/services/spree/build_localized_redirect_url.rb

@@ -1,101 +0,0 @@
-require 'uri'
-
-module Spree
-  class BuildLocalizedRedirectUrl
-    prepend Spree::ServiceModule::Base
-
-    LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freeze
-
-    SUPPORTED_PATHS_REGEX = /\/(#{Spree::Config[:storefront_products_path]}|#{Spree::Config[:storefront_taxons_path]}\/|cart|checkout|addresses|content|#{Spree::Config[:storefront_pages_path]})/.freeze
-
-    # rubocop:disable Lint/UnusedMethodArgument
-    def call(url:, locale:, default_locale: nil)
-      run :initialize_url_object
-      run :generate_new_path
-      run :append_locale_param
-      run :build_url
-    end
-    # rubocop:enable Lint/UnusedMethodArgument
-
-    protected
-
-    def initialize_url_object(url:, locale:, default_locale:)
-      success(
-        url: URI(url),
-        locale: locale,
-        default_locale_supplied: default_locale_supplied?(locale, default_locale)
-      )
-    end
-
-    def generate_new_path(url:, locale:, default_locale_supplied:)
-      unless supported_path?(url.path)
-        return success(
-          url: url,
-          locale: locale,
-          path: cleanup_path(url.path),
-          default_locale_supplied: default_locale_supplied,
-          locale_added_to_path: false
-        )
-      end
-
-      new_path = if default_locale_supplied
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
-                 else
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
-                 end
-
-      success(
-        url: url,
-        locale: locale,
-        path: cleanup_path(new_path),
-        default_locale_supplied: default_locale_supplied,
-        locale_added_to_path: true
-      )
-    end
-
-    def append_locale_param(url:, locale:, path:, default_locale_supplied:, locale_added_to_path:)
-      return success(url: url, path: path, query: url.query) if locale_added_to_path
-
-      query_params = Rack::Utils.parse_nested_query(url.query)
-
-      if default_locale_supplied
-        query_params.delete('locale')
-      else
-        query_params.merge!('locale' => locale)
-      end
-
-      query_string = query_params.any? ? query_params.to_query : nil
-
-      success(url: url, path: path, query: query_string)
-    end
-
-    def build_url(url:, path:, query:)
-      localized_url = builder_class(url).build(host: url.host, port: url.port, path: path, query: query).to_s
-      success(localized_url)
-    end
-
-    private
-
-    def supported_path?(path)
-      return true if path.blank? || path == '/' || maches_locale_regex?(path)
-
-      path.match(SUPPORTED_PATHS_REGEX)
-    end
-
-    def maches_locale_regex?(path)
-      path.match(LOCALE_REGEX)[0].gsub('/', '') if path.match(LOCALE_REGEX)
-    end
-
-    def default_locale_supplied?(locale, default_locale)
-      default_locale.present? && default_locale.to_s == locale.to_s
-    end
-
-    def cleanup_path(path)
-      path.chomp('/').gsub('//', '/')
-    end
-
-    def builder_class(url)
-      url.scheme == 'http' ? URI::HTTP : URI::HTTPS
-    end
-  end
-end

data/db/default/spree/countries.rb

@@ -1,24 +0,0 @@
-require 'carmen'
-
-EXCLUDED_COUNTRIES = ['AQ', 'AX', 'GS', 'UM', 'HM', 'IO', 'EH', 'BV', 'TF'].freeze
-
-Carmen::Country.all.each do |country|
-  # Skip the creation of some territories, uninhabited islands and the Antarctic.
-  next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)
-
-  Spree::Country.where(
-    name: country.name,
-    iso3: country.alpha_3_code,
-    iso: country.alpha_2_code,
-    iso_name: country.name.upcase,
-    numcode: country.numeric_code
-  ).first_or_create
-end
-
-Spree::Config[:default_country_id] = Spree::Country.find_by(iso: 'US').id
-
-# Find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.
-Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)
-
-# Find all countries that require a state (province) at checkout and set 'states_required' to true.
-Spree::Country.where(iso: Spree::Address::STATES_REQUIRED).update_all(states_required: true)

data/db/default/spree/default_reimbursement_type.rb

@@ -1 +0,0 @@
-Spree::RefundReason.find_or_create_by!(name: 'Return processing', mutable: false)

data/db/default/spree/roles.rb

@@ -1,2 +0,0 @@
-Spree::Role.where(name: 'admin').first_or_create
-Spree::Role.where(name: 'user').first_or_create

data/db/default/spree/states.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-EXCLUDED_US_STATES = ['UM', 'AS', 'MP', 'VI', 'PR', 'GU'].freeze
-EXCLUDED_CN_STATES = ['HK', 'MO', 'TW'].freeze
-
-def state_level(country, subregion)
-  country.states.where(
-    name: subregion.name,
-    abbr: subregion.code
-  ).first_or_create
-end
-
-def province_level(country, subregion)
-  subregion.subregions.each do |province|
-    country.states.where(
-      name: province.name,
-      abbr: province.code
-    ).first_or_create
-  end
-end
-
-Spree::Country.where(states_required: true).each do |country|
-  carmen_country = Carmen::Country.named(country.name)
-  next unless carmen_country
-
-  carmen_country.subregions.each do |subregion|
-    if carmen_country.alpha_2_code == 'US'
-      # Produces 50 states, one postal district (Washington DC)
-      # and 3 APO's as you would expect to see on any good U.S. states list.
-      next if EXCLUDED_US_STATES.include?(subregion.code)
-
-      state_level(country, subregion)
-    elsif carmen_country.alpha_2_code == 'CA' || carmen_country.alpha_2_code == 'MX'
-      # Force Canada and Mexico to use state-level data import from Carmen Gem
-      # else we pull in a subset of provinces that are not common at checkout.
-      state_level(country, subregion)
-    elsif carmen_country.alpha_2_code == 'CN'
-      # Removes 3 "States" from that list that are also listed as Countries,
-      # Hong Kong, Taiwan and Macao
-      next if EXCLUDED_CN_STATES.include?(subregion.code)
-
-      state_level(country, subregion)
-    elsif subregion.subregions?
-      province_level(country, subregion)
-    else
-      state_level(country, subregion)
-    end
-  end
-end

data/db/default/spree/store_credit_categories.rb

@@ -1 +0,0 @@
-Spree::StoreCreditCategory.find_or_create_by!(name: 'Default')

data/db/default/spree/stores.rb

@@ -1,21 +0,0 @@
-default_store = Spree::Store.default
-
-if default_store.persisted?
-  default_store.update!(default_country_id: Spree::Config[:default_country_id])
-else
-  Spree::Store.new do |s|
-    s.name                         = 'Spree Demo Site'
-    s.code                         = 'spree'
-    s.url                          = Rails.application.routes.default_url_options[:host] || 'demo.spreecommerce.org'
-    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_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/'
-    s.facebook                     = 'spreecommerce'
-    s.twitter                      = 'spreecommerce'
-    s.instagram                    = 'spreecommerce'
-  end.save!
-end

data/db/default/spree/zones.rb

@@ -1,29 +0,0 @@
-eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
-uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
-north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
-south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
-middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
-asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
-
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR).each do |name|
-  eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-end
-
-uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
-
-%w(US CA).each do |name|
-  north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-end
-
-%w(BH CY EG IR IQ IL JO KW LB OM QA SA SY TR AE YE).each do |name|
-  middle_east.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-end
-
-%w(AF AM AZ BH BD BT BN KH CN CX CC GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
-  KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE).each do |name|
-  asia.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-end
-
-%w(AR BO BR CL CO EC FK GF GY PY PE SR UY VE).each do |name|
-  south_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-end