spree_core 4.2.0.beta → 4.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3e3f16eb808f16f592360085f02f1382ee4ddd6ee0903c3eb8a8079e5d8bad
-  data.tar.gz: 8567b7555de6f0f578d6277e6943af11b68329e5e17a77d13c7e66085e7fe09f
+  metadata.gz: 9aaaa7166983682cd10080012ae8c4b54c89808552125eed36bce0345c2ed023
+  data.tar.gz: b330046bd7a2af73be37cfedc5bae1a591c22e0344d62d1672d5ba84d0cf6f84
 SHA512:
-  metadata.gz: 113900d45a999bb7aa47209797e8ab47a5ed6f40caa445242952eac3a604cc43bc658fec8fb86dc148743032f71341d97331cd7d6d7b77d84df36ffc979f122b
-  data.tar.gz: a175395cbe157f6ca1704ab5bdacbbf5c9abbee4bdae89f19363c06fc7a1fe06610fab87347342ecddd297d3bf22bf9354116340e8e408270a4f968a78883a0e
+  metadata.gz: f2faa906d370fd03cb6e477b00e9e52c5a658e051df9cf02d6f19a62f1480a99785e038e3ade796c92b2a8dc1cec4c820602e68dcc3615142c9cfe1a191f33bb
+  data.tar.gz: 578828b9e6649880bfd6f1029adc1f0b5563ef5c68cda14d5ff1e3237ccc057953f0b30c4cad0984eff273417701c5303f6efe6ef3f13b19dd4cec4bc67358e2

data/app/finders/spree/addresses/find.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Addresses
+    class Find
+      def initialize(scope:, params:)
+        @scope = scope
+      end
+
+      def execute
+        scope
+      end
+
+      private
+
+      attr_reader :scope
+    end
+  end
+end

data/app/helpers/spree/base_helper.rb

@@ -57,8 +57,33 @@ module Spree
       end
     end
 
+    def object
+      instance_variable_get('@' + controller_name.singularize)
+    end
+
+    def og_meta_data
+      og_meta = {}
+
+      if object.is_a? Spree::Product
+        image                             = default_image_for_product_or_variant(object)
+        og_meta['og:image']               = main_app.url_for(image.attachment) if image&.attachment
+
+        og_meta['og:url']                 = spree.url_for(object) if frontend_available? # url_for product needed
+        og_meta['og:type']                = object.class.name.demodulize.downcase
+        og_meta['og:title']               = object.name
+        og_meta['og:description']         = object.description
+
+        price = object.price_in(current_currency)
+        if price
+          og_meta['product:price:amount']   = price.amount
+          og_meta['product:price:currency'] = current_currency
+        end
+      end
+
+      og_meta
+    end
+
     def meta_data
-      object = instance_variable_get('@' + controller_name.singularize)
       meta = {}
 
       if object.is_a? ApplicationRecord
@@ -82,16 +107,10 @@ module Spree
       meta
     end
 
-    def meta_image_url_path
-      object = instance_variable_get('@' + controller_name.singularize)
-      return unless object.is_a?(Spree::Product)
-
-      image = default_image_for_product_or_variant(object)
-      image&.attachment.present? ? main_app.url_for(image.attachment) : asset_path(Spree::Config[:logo])
-    end
-
-    def meta_image_data_tag
-      tag('meta', property: 'og:image', content: meta_image_url_path) if meta_image_url_path
+    def og_meta_data_tags
+      og_meta_data.map do |property, content|
+        tag('meta', property: property, content: content) unless property.nil? || content.nil?
+      end.join("\n")
     end
 
     def meta_data_tags
@@ -189,5 +208,12 @@ module Spree
         style if style.in? Spree::Image.styles.with_indifferent_access
       end
     end
+
+    def meta_robots
+      return unless current_store.respond_to?(:seo_robots)
+      return if current_store.seo_robots.blank?
+      
+      tag('meta', name: 'robots', content: current_store.seo_robots)
+    end
   end
 end

data/app/helpers/spree/mail_helper.rb

@@ -11,14 +11,19 @@ module Spree
       order.name || Spree.t('customer')
     end
 
+    def store_logo
+      @order&.store&.mailer_logo || @order&.store&.logo || current_store.mailer_logo || current_store.logo
+    end
+
+    def default_logo
+      Spree::Config.mailer_logo || Spree::Config.logo
+    end
+
     def logo_path
-      if current_store.present? && current_store.logo.attached? && current_store.logo.variable?
-        main_app.url_for(current_store.logo.variant(resize: '244x104>'))
-      elsif current_store.present? && current_store.logo.attached? && current_store.logo.image?
-        main_app.url_for(current_store.logo)
-      else
-        Spree::Config.mailer_logo || Spree::Config.logo
-      end
+      return default_logo unless store_logo.attached?
+      return main_app.url_for(store_logo.variant(resize: '244x104>')) if store_logo.variable?
+
+      return main_app.url_for(store_logo) if store_logo.image?
     end
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -110,7 +110,8 @@ module Spree
         variants: @variants,
         is_product_available_in_currency: is_product_available_in_currency,
         current_currency: current_currency,
-        current_price_options: current_price_options
+        current_price_options: current_price_options,
+        current_store: current_store
       ).call.to_json
     end
 

data/app/mailers/spree/base_mailer.rb

@@ -8,7 +8,7 @@ module Spree
     helper_method :current_store
 
     def from_address
-      current_store.mail_from_address
+      @order&.store&.mail_from_address || current_store.mail_from_address
     end
 
     def money(amount, currency = nil)

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

@@ -9,7 +9,7 @@ module Spree
       end
 
       def payment_sources
-        credit_cards.with_payment_profile
+        credit_cards.with_payment_profile.not_expired
       end
 
       def drop_payment_source(source)

data/app/models/spree/address.rb

@@ -10,10 +10,16 @@ module Spree
       'TO', 'TV', 'UG', 'AE', 'VU', 'YE', 'ZW'
     ].freeze
 
+    # The required states listed below match those used by PayPal and Shopify.
+    STATES_REQUIRED = [
+      'AU', 'AE', 'BR', 'CA', 'CN', 'ES', 'HK', 'IE', 'IN',
+      'IT', 'MY', 'MX', 'NZ', 'PT', 'RO', 'TH', 'US', 'ZA'
+    ].freeze
+
     # we're not freezing this on purpose so developers can extend and manage
     # those attributes depending of the logic of their applications
     ADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)
-    EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at deleted_at user_id)
+    EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at deleted_at label user_id)
 
     belongs_to :country, class_name: 'Spree::Country'
     belongs_to :state, class_name: 'Spree::State', optional: true
@@ -31,6 +37,12 @@ module Spree
 
     validate :state_validate, :postal_code_validate
 
+    validates :label, uniqueness: { conditions: -> { where(deleted_at: nil) },
+                                    scope: :user_id,
+                                    case_sensitive: false,
+                                    allow_blank: true,
+                                    allow_nil: true }
+
     delegate :name, :iso3, :iso, :iso_name, to: :country, prefix: true
     delegate :abbr, to: :state, prefix: true, allow_nil: true
 

data/app/models/spree/app_dependencies.rb

@@ -11,7 +11,8 @@ module Spree
       :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
       :coupon_handler, :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
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
+      :account_create_address_service, :account_update_address_service, :address_finder
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -59,9 +60,14 @@ module Spree
       # coupons
       # TODO: we should split this service into 2 seperate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
+
+      # account
+      @account_create_address_service = 'Spree::Account::Addresses::Create'
+      @account_update_address_service = 'Spree::Account::Addresses::Update'
     end
 
     def set_default_finders
+      @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'

data/app/models/spree/credit_card.rb

@@ -37,6 +37,11 @@ module Spree
 
     scope :with_payment_profile, -> { where.not(gateway_customer_profile_id: nil) }
     scope :default, -> { where(default: true) }
+    scope :not_expired, lambda {
+      where('CAST(spree_credit_cards.year AS DECIMAL) > ?', Time.current.year).
+        or(where('CAST(spree_credit_cards.year AS DECIMAL) = ?', Time.current.year).
+           where('CAST(spree_credit_cards.month AS DECIMAL) >= ?', Time.current.month))
+    }
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type

data/app/models/spree/line_item.rb

@@ -75,7 +75,8 @@ module Spree
 
     extend DisplayMoney
     money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
-                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total
+                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
+                  :pre_tax_amount
 
     alias single_money display_price
     alias single_display_amount display_price

data/app/models/spree/order.rb

@@ -22,7 +22,7 @@ module Spree
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
                   :shipment_total,      :promo_total,          :total,
-                  :cart_promo_total
+                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -174,7 +174,12 @@ module Spree
 
     # Sum of all line item amounts pre-tax
     def pre_tax_item_amount
-      line_items.to_a.sum(&:pre_tax_amount)
+      line_items.sum(:pre_tax_amount)
+    end
+
+    # Sum of all line item and shipment pre-tax
+    def pre_tax_total
+      pre_tax_item_amount + shipments.sum(:pre_tax_amount)
     end
 
     def shipping_discount

data/app/models/spree/order/payments.rb

@@ -32,7 +32,7 @@ module Spree
         end
 
         def pending_payments
-          payments.select(&:pending?)
+          payments.pending
         end
 
         def unprocessed_payments
@@ -52,7 +52,7 @@ module Spree
 
             payment.public_send(method)
 
-            if payment.completed? && payment_total != total
+            if payment.completed? && payment_total != total_without_pending_store_credits
               self.payment_total += payment.amount
             end
           end
@@ -60,6 +60,14 @@ module Spree
           result = !!Spree::Config[:allow_checkout_on_gateway_error]
           errors.add(:base, e.message) && (return result)
         end
+
+        # Pending store credits are not added to `self.payment_total`.
+        # It can cause a situation where the amount of the credit card payment reduced with store credits
+        # may be added twice to `self.payment_total` causing wrong `order.outstanding_balance`
+        # calculations and thus an incorrect payment state.
+        def total_without_pending_store_credits
+          total - payments.map { |p| p.amount if p.source.is_a?(Spree::StoreCredit) && p.pending? }.sum(&:to_f)
+        end
       end
     end
   end

data/app/models/spree/preferences/store.rb

@@ -6,7 +6,7 @@
 
 require 'singleton'
 
-DB_EXCEPTIONS = if defined? PG
+DB_EXCEPTIONS ||= if defined? PG
                   [PG::ConnectionBad, ActiveRecord::NoDatabaseError]
                 elsif defined? Mysql2
                   [Mysql2::Error::ConnectionError, ActiveRecord::NoDatabaseError]

data/app/models/spree/promotion.rb

@@ -28,6 +28,8 @@ module Spree
 
     before_save :normalize_blank_values
 
+    before_validation :normalize_code
+
     scope :coupons, -> { where.not(code: nil) }
     scope :advertised, -> { where(advertise: true) }
     scope :applied, lambda {
@@ -227,6 +229,10 @@ module Spree
       end
     end
 
+    def normalize_code
+      self.code = code.strip if code.present?
+    end
+
     def match_all?
       match_policy == 'all'
     end

data/app/models/spree/promotion_handler/promotion_duplicator.rb

@@ -1,15 +1,16 @@
 module Spree
   module PromotionHandler
     class PromotionDuplicator
-      def initialize(promotion)
+      def initialize(promotion, random_string: nil)
         @promotion = promotion
+        @random_string = random_string || generate_random_string(4)
       end
 
       def duplicate
         @new_promotion = @promotion.dup
-        @new_promotion.path = "#{@promotion.path}_new"
+        @new_promotion.path = "#{@promotion.path}_#{@random_string}"
         @new_promotion.name = "New #{@promotion.name}"
-        @new_promotion.code = "#{@promotion.code}_new"
+        @new_promotion.code = "#{@promotion.code}_#{@random_string}"
 
         ActiveRecord::Base.transaction do
           @new_promotion.save
@@ -33,6 +34,11 @@ module Spree
         end
       end
 
+      def generate_random_string(number)
+        charset = Array('A'..'Z') + Array('a'..'z')
+        Array.new(number) { charset.sample }.join
+      end
+
       def copy_actions
         @promotion.promotion_actions.each do |action|
           new_action = action.dup

data/app/models/spree/store.rb

@@ -18,6 +18,9 @@ module Spree
     end
 
     has_one_attached :logo
+    has_one_attached :mailer_logo
+
+    validates :mailer_logo, content_type: ['image/png', 'image/jpg', 'image/jpeg']
 
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default

data/app/presenters/spree/variant_presenter.rb

@@ -3,13 +3,14 @@ module Spree
     include Rails.application.routes.url_helpers
     include Spree::BaseHelper
 
-    attr_reader :current_currency, :current_price_options
+    attr_reader :current_currency, :current_price_options, :current_store
 
     def initialize(opts = {})
       @variants = opts[:variants]
       @is_product_available_in_currency = opts[:is_product_available_in_currency]
       @current_currency = opts[:current_currency]
       @current_price_options = opts[:current_price_options]
+      @current_store = opts[:current_store]
     end
 
     def call

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

@@ -0,0 +1,39 @@
+module Spree
+  module Account
+    module Addresses
+      class Base
+        prepend Spree::ServiceModule::Base
+
+        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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Create < ::Spree::Account::Addresses::Base
+        def call(user:, address_params:)
+          fill_country_and_state_ids(address_params)
+
+          address = user.addresses.new(address_params)
+          if address.save
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Spree
+  module Account
+    module Addresses
+      class Update < ::Spree::Account::Addresses::Base
+        def call(address:, address_params:)
+          address_params[:country_id] ||= address.country_id
+          fill_country_and_state_ids(address_params)
+
+          if address.update(address_params)
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,12 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call(order:, params:, permitted_attributes:, request_env:)
-        params = replace_country_iso_with_id(params, 'ship') if address_with_country_iso_present?(params, 'ship')
-        params = replace_country_iso_with_id(params, 'bill') if address_with_country_iso_present?(params, 'bill')
+        ship_changed = address_with_country_iso_present?(params, 'ship')
+        bill_changed = address_with_country_iso_present?(params, 'bill')
+        params = replace_country_iso_with_id(params, 'ship') if ship_changed
+        params = replace_country_iso_with_id(params, 'bill') if bill_changed
+        order.state = 'address' if (ship_changed || bill_changed) && order.has_checkout_step?('address')
+        order.state = 'delivery' if selected_shipping_rate_present?(params) && order.has_checkout_step?('delivery')
         return success(order) if order.update_from_params(params, permitted_attributes, request_env)
 
         failure(order)
@@ -20,6 +24,13 @@ module Spree
         true
       end
 
+      def selected_shipping_rate_present?(params)
+        shipments_attributes = params.dig(:order, :shipments_attributes)
+        return false unless shipments_attributes
+
+        shipments_attributes.any? { |s| s.dig(:selected_shipping_rate_id) }
+      end
+
       def replace_country_iso_with_id(params, address_kind = 'ship')
         country_id = Spree::Country.by_iso(params[:order]["#{address_kind}_address_attributes"].fetch(:country_iso))&.id
 

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
   activerecord:
     attributes:
       spree/address:
+        label: Address name
         address1: Address
         address2: Address (contd.)
         city: City
@@ -502,10 +503,14 @@ en:
     address_book:
       other_address: "Other address"
       add_new_shipping_address: "Add new address"
-      new_shipping_address: "New Address"
-      edit_shipping_address: "Edit Address"
+      label: Address Name
+      address_name_label: Address Name
+      address_name_placeholder: Give this address a unique name (Work, Home, etc.)
+      new_address: "New Address"
+      edit_address: "Edit Address"
+      remove_address: Remove Address
       no_shipping_addresses_on_file: "No addresses on file"
-      shipping_addresses: "Addresses"
+      addresses: "Addresses"
       successfully_created: "Address has been successfully created."
       successfully_removed: "Address has been successfully removed."
       successfully_saved: "Saved successfully"
@@ -945,6 +950,7 @@ en:
       fields: Fields
       language: Language
       country: Country
+      default_country: Default Country
       localization_settings: Localization Settings
       only_incomplete: Only incomplete
       only_complete: Only complete
@@ -1036,6 +1042,7 @@ en:
     make_refund: Make refund
     make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
     mail_from_address: Mail from address
+    mailer_logo: Mailer logo (JPG or PNG images only)
     manage_promotion_categories: Manage Promotion Categories
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
@@ -1637,7 +1644,7 @@ en:
     stock_transfer:
       errors:
         must_have_variant: You must add at least one variant.
-        variants_unavailable: "Some variants are not available on %{stock}" 
+        variants_unavailable: "Some variants are not available on %{stock}"
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store

data/db/default/spree/countries.rb

@@ -1,18 +1,24 @@
 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,
-    states_required: country.subregions?
+    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.
-
+# 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/states.rb

@@ -1,12 +1,49 @@
+# 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|
-    country.states.where(
-      name: subregion.name,
-      abbr: subregion.code,
-      country_id: country.id
-    ).first_or_create
+    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/stores.rb

@@ -1,16 +1,20 @@
-# Possibly already created by a migration.
-unless Spree::Store.default.persisted?
+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.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'
+    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.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

@@ -16,7 +16,7 @@ end
   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 IO GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
+%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

data/db/migrate/20200610113542_add_label_to_spree_addresses.rb

@@ -0,0 +1,5 @@
+class AddLabelToSpreeAddresses < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_addresses, :label, :string unless column_exists?(:spree_addresses, :label)
+  end
+end

data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb

@@ -0,0 +1,5 @@
+class AddSeoRobotsToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :seo_robots, :string unless column_exists?(:spree_stores, :seo_robots)
+  end
+end

data/lib/spree/core.rb

@@ -13,6 +13,7 @@ require 'premailer/rails'
 require 'ransack'
 require 'responders'
 require 'state_machines-activerecord'
+require 'active_storage_validations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.

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

@@ -52,10 +52,15 @@ module Spree
         end
 
         def set_current_order
-          if try_spree_current_user && current_order
-            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
-              current_order.merge!(order, try_spree_current_user)
-            end
+          return unless try_spree_current_user && current_order
+
+          orders_scope = try_spree_current_user.orders.
+                         incomplete.
+                         where.not(id: current_order.id).
+                         where(store_id: current_store.id)
+
+          orders_scope.each do |order|
+            current_order.merge!(order, try_spree_current_user)
           end
         end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.2.0.beta'
+    '4.2.0.rc1'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -33,7 +33,7 @@ module Spree
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :user_id, :deleted_at,
+      :user_id, :deleted_at, :label,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
     ]
@@ -101,7 +101,7 @@ module Spree
                           :customer_support_email, :facebook, :twitter, :instagram,
                           :description, :address, :contact_email, :contact_phone,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email]
+                          :new_order_notifications_email, :mailer_logo]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/spree_core.gemspec

@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
   s.add_dependency 'image_processing', '~> 1.2'
+  s.add_dependency 'active_storage_validations', '~> 0.9'
 
   s.add_development_dependency 'email_spec', '~> 2.2'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -377,6 +377,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: active_storage_validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -407,6 +421,7 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/finders/spree/addresses/find.rb
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -620,6 +635,9 @@ files:
 - app/presenters/spree/variant_presenter.rb
 - app/presenters/spree/variants/option_types_presenter.rb
 - app/presenters/spree/variants/options_presenter.rb
+- app/services/spree/account/addresses/base.rb
+- app/services/spree/account/addresses/create.rb
+- app/services/spree/account/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -956,7 +974,9 @@ files:
 - db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb
 - db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb
 - db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
+- db/migrate/20200610113542_add_label_to_spree_addresses.rb
 - db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
+- db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -1108,10 +1128,10 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1126,8 +1146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []