spree_core 4.0.0 → 4.6.0

data/app/models/spree/cms/pages/homepage.rb

@@ -0,0 +1,20 @@
+module Spree::Cms::Pages
+  class Homepage < Spree::CmsPage
+    before_create :empty_slug
+    after_save :empty_slug
+
+    def sections?
+      true
+    end
+
+    def seo_meta_description
+      meta_description if meta_description.present?
+    end
+
+    private
+
+    def empty_slug
+      self.slug = nil
+    end
+  end
+end

data/app/models/spree/cms/pages/standard_page.rb

@@ -0,0 +1,4 @@
+module Spree::Cms::Pages
+  class StandardPage < Spree::CmsPage
+  end
+end

data/app/models/spree/cms/sections/featured_article.rb

@@ -0,0 +1,22 @@
+module Spree::Cms::Sections
+  class FeaturedArticle < Spree::CmsSection
+    after_initialize :default_values
+
+    store :content, accessors: [:title, :subtitle, :button_text, :rte_content], coder: JSON
+    store :settings, accessors: [:gutters], coder: JSON
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product', 'Spree::CmsPage']
+
+    def gutters?
+      gutters == 'Gutters'
+    end
+
+    private
+
+    def default_values
+      self.gutters ||= 'No Gutters'
+      self.fit ||= 'Screen'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

data/app/models/spree/cms/sections/hero_image.rb

@@ -0,0 +1,38 @@
+module Spree::Cms::Sections
+  class HeroImage < Spree::CmsSection
+    after_initialize :default_values
+
+    store :content, accessors: [:title, :button_text], coder: JSON
+    store :settings, accessors: [:gutters], coder: JSON
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product', 'Spree::CmsPage']
+
+    def gutters?
+      gutters == 'Gutters'
+    end
+
+    def img_one_sm(dimensions = '600x250>')
+      super
+    end
+
+    def img_one_md(dimensions = '1200x500>')
+      super
+    end
+
+    def img_one_lg(dimensions = '2400x1000>')
+      super
+    end
+
+    def img_one_xl(dimensions = '4800x2000>')
+      super
+    end
+
+    private
+
+    def default_values
+      self.gutters ||= 'No Gutters'
+      self.fit ||= 'Screen'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

data/app/models/spree/cms/sections/image_gallery.rb

@@ -0,0 +1,103 @@
+module Spree::Cms::Sections
+  class ImageGallery < Spree::CmsSection
+    after_initialize :default_values
+    validate :reset_multiple_link_attributes
+
+    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
+                             ['Spree::Taxon'].freeze
+                           else
+                             ['Spree::Taxon', 'Spree::Product'].freeze
+                           end
+
+    LAYOUT_OPTIONS = ['Default', 'Reversed'].freeze
+    LABEL_OPTIONS = ['Show', 'Hide'].freeze
+
+    store :content, accessors: [:link_type_one, :link_one, :title_one,
+                                :link_type_two, :link_two, :title_two,
+                                :link_type_three, :link_three, :title_three], coder: JSON
+
+    store :settings, accessors: [:layout_style, :display_labels], coder: JSON
+
+    #
+    # img_one sizing
+    def img_one_md(dimensions = '270x195>')
+      super
+    end
+
+    def img_one_lg(dimensions = '540x390>')
+      super
+    end
+
+    def img_one_xl(dimensions = '1080x780>')
+      super
+    end
+
+    #
+    # img_two sizing
+    def img_two_md(dimensions = '270x400>')
+      super
+    end
+
+    def img_two_lg(dimensions = '540x800>')
+      super
+    end
+
+    def img_two_xl(dimensions = '1080x1600>')
+      super
+    end
+
+    #
+    # img_three sizing
+    def img_three_md(dimensions = '270x195>')
+      super
+    end
+
+    def img_three_lg(dimensions = '540x390>')
+      super
+    end
+
+    def img_three_xl(dimensions = '1080x780>')
+      super
+    end
+
+    def default_layout?
+      layout_style == 'Default'
+    end
+
+    def show_labels?
+      display_labels == 'Show'
+    end
+
+    private
+
+    def reset_multiple_link_attributes
+      return if Rails::VERSION::STRING < '6.0'
+
+      if link_type_one_changed?
+        return if link_type_one_was.nil?
+
+        self.link_one = nil
+      end
+
+      if link_type_two_changed?
+        return if link_type_two_was.nil?
+
+        self.link_two = nil
+      end
+
+      if link_type_three_changed?
+        return if link_type_three_was.nil?
+
+        self.link_three = nil
+      end
+    end
+
+    def default_values
+      self.layout_style ||= 'Default'
+      self.fit ||= 'Container'
+      self.link_type_one ||= 'Spree::Taxon'
+      self.link_type_two ||= 'Spree::Taxon'
+      self.link_type_three ||= 'Spree::Taxon'
+    end
+  end
+end

data/app/models/spree/cms/sections/product_carousel.rb

@@ -0,0 +1,14 @@
+module Spree::Cms::Sections
+  class ProductCarousel < Spree::CmsSection
+    after_initialize :default_values
+
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon']
+
+    private
+
+    def default_values
+      self.fit ||= 'Screen'
+      self.linked_resource_type ||= 'Spree::Taxon'
+    end
+  end
+end

data/app/models/spree/cms/sections/rich_text_content.rb

@@ -0,0 +1,13 @@
+module Spree::Cms::Sections
+  class RichTextContent < Spree::CmsSection
+    after_initialize :default_values
+
+    store :content, accessors: [:rte_content], coder: JSON
+
+    private
+
+    def default_values
+      self.fit ||= 'Container'
+    end
+  end
+end

data/app/models/spree/cms/sections/side_by_side_images.rb

@@ -0,0 +1,74 @@
+module Spree::Cms::Sections
+  class SideBySideImages < Spree::CmsSection
+    after_initialize :default_values
+    validate :reset_multiple_link_attributes
+
+    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
+                             ['Spree::Taxon'].freeze
+                           else
+                             ['Spree::Taxon', 'Spree::Product'].freeze
+                           end
+
+    store :content, accessors: [:link_type_one, :link_one, :title_one, :subtitle_one,
+                                :link_type_two, :link_two, :title_two, :subtitle_two], coder: JSON
+
+    store :settings, accessors: [:gutters], coder: JSON
+
+    def gutters?
+      gutters == 'Gutters'
+    end
+
+    #
+    # img_one sizing
+    def img_one_md(dimensions = '387x250>')
+      super
+    end
+
+    def img_one_lg(dimensions = '540x390>')
+      super
+    end
+
+    def img_one_xl(dimensions = '1468x952>')
+      super
+    end
+
+    #
+    # img_two sizing
+    def img_two_md(dimensions = '387x250>')
+      super
+    end
+
+    def img_two_lg(dimensions = '734x476>')
+      super
+    end
+
+    def img_two_xl(dimensions = '1468x952>')
+      super
+    end
+
+    private
+
+    def reset_multiple_link_attributes
+      return if Rails::VERSION::STRING < '6.0'
+
+      if link_type_one_changed?
+        return if link_type_one_was.nil?
+
+        self.link_one = nil
+      end
+
+      if link_type_two_changed?
+        return if link_type_two_was.nil?
+
+        self.link_two = nil
+      end
+    end
+
+    def default_values
+      self.gutters ||= 'Gutters'
+      self.fit ||= 'Container'
+      self.link_type_one ||= 'Spree::Taxon'
+      self.link_type_two ||= 'Spree::Taxon'
+    end
+  end
+end

data/app/models/spree/cms_page.rb

@@ -0,0 +1,70 @@
+module Spree
+  class CmsPage < Base
+    include SingleStoreResource
+    include DisplayLink
+
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
+    acts_as_paranoid
+
+    TYPES = ['Spree::Cms::Pages::StandardPage',
+             'Spree::Cms::Pages::FeaturePage',
+             'Spree::Cms::Pages::Homepage']
+
+    belongs_to :store, touch: true
+
+    has_many :cms_sections, class_name: 'Spree::CmsSection'
+    has_many :menu_items, as: :linked_resource
+
+    before_validation :handle_slug
+
+    validates :title, :store, :locale, :type, presence: true
+    validates :slug, uniqueness: { scope: :store_id, allow_nil: true, case_sensitive: true }
+    validates :locale, uniqueness: { scope: [:store, :type] }, if: :homepage?
+
+    scope :visible, -> { where(visible: true) }
+    scope :by_locale, ->(locale) { where(locale: locale) }
+    scope :by_slug, ->(slug) { where(slug: slug) }
+
+    scope :home, -> { where(type: 'Spree::Cms::Pages::Homepage') }
+    scope :standard, -> { where(type: 'Spree::Cms::Pages::StandardPage') }
+    scope :feature, -> { where(type: 'Spree::Cms::Pages::FeaturePage') }
+
+    self.whitelisted_ransackable_attributes = %w[title type locale]
+
+    def seo_title
+      if meta_title.present?
+        meta_title
+      else
+        title
+      end
+    end
+
+    # Override this if your page type uses cms_sections
+    def sections?
+      false
+    end
+
+    def homepage?
+      type == 'Spree::Cms::Pages::Homepage'
+    end
+
+    def draft_mode?
+      !visible
+    end
+
+    private
+
+    def handle_slug
+      self.slug = if homepage?
+                    nil
+                  elsif slug.blank?
+                    title&.downcase&.to_url
+                  else
+                    slug&.downcase&.to_url
+                  end
+    end
+  end
+end

data/app/models/spree/cms_section.rb

@@ -0,0 +1,69 @@
+module Spree
+  class CmsSection < Base
+    include DisplayLink
+
+    acts_as_list scope: :cms_page
+    belongs_to :cms_page, touch: true
+
+    validate :reset_link_attributes
+
+    has_one :image_one, class_name: 'Spree::CmsSectionImageOne', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_one, reject_if: :all_blank
+
+    has_one :image_two, class_name: 'Spree::CmsSectionImageTwo', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_two, reject_if: :all_blank
+
+    has_one :image_three, class_name: 'Spree::CmsSectionImageThree', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_three, reject_if: :all_blank
+
+    Spree::CmsSectionImage::IMAGE_COUNT.each do |count|
+      Spree::CmsSectionImage::IMAGE_SIZE.each do |size|
+        define_method("img_#{count}_#{size}") do |dimensions = nil|
+          image = send("image_#{count}")&.attachment
+          return if !image&.attached? || dimensions.nil?
+
+          image.variant(resize_to_limit: dimensions.split('x').map(&:to_i))
+        end
+      end
+    end
+
+    default_scope { order(position: :asc) }
+
+    validates :name, :cms_page, :type, presence: true
+
+    LINKED_RESOURCE_TYPE = []
+
+    TYPES = ['Spree::Cms::Sections::HeroImage',
+             'Spree::Cms::Sections::FeaturedArticle',
+             'Spree::Cms::Sections::ProductCarousel',
+             'Spree::Cms::Sections::ImageGallery',
+             'Spree::Cms::Sections::SideBySideImages',
+             'Spree::Cms::Sections::RichTextContent']
+
+    def boundaries
+      ['Container', 'Screen']
+    end
+
+    def css_classes
+      ['row', 'section-row'].compact
+    end
+
+    def gutters_sizes
+      ['Gutters', 'No Gutters']
+    end
+
+    def fullscreen?
+      fit == 'Screen'
+    end
+
+    private
+
+    def reset_link_attributes
+      if linked_resource_type_changed?
+        return if linked_resource_id_was.nil?
+
+        self.linked_resource_id = nil
+      end
+    end
+  end
+end

data/app/models/spree/cms_section_image.rb

@@ -0,0 +1,15 @@
+module Spree
+  class CmsSectionImage < Asset
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
+
+    IMAGE_COUNT = ['one', 'two', 'three']
+    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
+    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+
+    validates :attachment, attached: true, content_type: IMAGE_TYPES
+  end
+end

data/app/models/spree/cms_section_image_one.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageOne < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_three.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageThree < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_two.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageTwo < CmsSectionImage
+  end
+end

data/app/models/spree/country.rb

@@ -2,22 +2,29 @@ module Spree
   class Country < Spree::Base
     # we need to have this callback before any dependent: :destroy associations
     # https://github.com/rails/rails/issues/3458
-    before_destroy :ensure_not_default
+    # before_destroy :ensure_not_default
 
     has_many :addresses, dependent: :restrict_with_error
-    has_many :states, dependent: :destroy
+    has_many :states,
+             -> { order name: :asc },
+             inverse_of: :country,
+             dependent: :destroy
     has_many :zone_members,
              -> { where(zoneable_type: 'Spree::Country') },
              class_name: 'Spree::ZoneMember',
              dependent: :destroy,
              foreign_key: :zoneable_id
-
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 
-    validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false }
+    validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
 
-    def self.default
-      country_id = Spree::Config[:default_country_id]
+    def self.default(store = nil)
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Country#default` is deprecated and will be removed in Spree 5.0.
+        Please use `current_store.default_country` instead
+      DEPRECATION
+      store ||= Spree::Store.default
+      country_id = store.default_country_id
       default = find_by(id: country_id) if country_id.present?
       default || find_by(iso: 'US') || first
     end
@@ -26,8 +33,9 @@ module Spree
       where(['LOWER(iso) = ?', iso.downcase]).or(where(['LOWER(iso3) = ?', iso.downcase])).take
     end
 
-    def default?
-      id == Spree::Config[:default_country_id]
+    def default?(store = nil)
+      store ||= Spree::Store.default
+      self == store.default_country
     end
 
     def <=>(other)
@@ -41,6 +49,8 @@ module Spree
     private
 
     def ensure_not_default
+      ActiveSupport::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
+
       if id.eql?(Spree::Config[:default_country_id])
         errors.add(:base, Spree.t(:default_country_cannot_be_deleted))
         throw(:abort)

data/app/models/spree/credit_card.rb

@@ -1,18 +1,18 @@
 module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
-
-    # to migrate safely from older Spree versions that din't provide safe deletion for CCs
-    # we need to ensure that we have a connection to the DB and that the `deleted_at` column exists
-    if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
-        connected? &&
-        table_exists? &&
-        connection.column_exists?(:spree_credit_cards, :deleted_at)
-      acts_as_paranoid
+    include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::CreditCards)
+      include Spree::Security::CreditCards
     end
 
+    acts_as_paranoid
+
     belongs_to :payment_method
-    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
+    belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id',
                       optional: true
     has_many :payments, as: :source
 
@@ -24,10 +24,9 @@ module Spree
     attribute :month, ActiveRecord::Type::Integer.new
     attribute :year,  ActiveRecord::Type::Integer.new
 
-    attr_reader :number
+    attr_reader :number, :verification_value
     attr_accessor :encrypted_data,
                   :imported,
-                  :verification_value,
                   :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
@@ -38,6 +37,12 @@ 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))
+    }
+    scope :not_removed, -> { where(deleted_at: nil) }
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type
@@ -101,9 +106,11 @@ module Spree
                        end
     end
 
+    def verification_value=(value)
+      @verification_value = value.to_s.gsub(/\s/, '')
+    end
+
     def set_last_digits
-      number.to_s.gsub!(/\s/, '')
-      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 
@@ -121,6 +128,10 @@ module Spree
       "XXXX-XXXX-XXXX-#{last_digits}"
     end
 
+    def display_brand
+      brand.present? ? brand.upcase : Spree.t(:no_cc_type)
+    end
+
     def actions
       %w{capture void credit}
     end
@@ -167,6 +178,15 @@ module Spree
       )
     end
 
+    def self.json_api_permitted_attributes
+      [
+        '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', 'address_id', 'created_at', 'updated_at', 'user_id',
+        'payment_method_id', 'default', 'deleted_at'
+      ]
+    end
+
     private
 
     def require_card_numbers?

data/app/models/spree/customer_return.rb

@@ -1,7 +1,14 @@
 module Spree
   class CustomerReturn < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
+    include NumberIdentifier
+    include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     belongs_to :stock_location
+    belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns
 
     has_many :reimbursements, inverse_of: :customer_return
     has_many :return_items, inverse_of: :customer_return
@@ -9,7 +16,7 @@ module Spree
 
     after_create :process_return!
 
-    validates :number, uniqueness: { case_sensitive: true }
+    validates :store, presence: true
     validates :return_items, :stock_location, presence: true
     validate :must_have_return_authorization, on: :create
     validate :return_items_belong_to_same_order
@@ -17,7 +24,7 @@ module Spree
     accepts_nested_attributes_for :return_items
 
     extend DisplayMoney
-    money_methods pre_tax_total: { currency: Spree::Config[:currency] }
+    money_methods :pre_tax_total
 
     self.whitelisted_ransackable_attributes = ['number']
 
@@ -31,6 +38,10 @@ module Spree
       completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
     end
 
+    def currency
+      order&.currency
+    end
+
     # Temporarily tie a customer_return to one order
     def order
       return nil if return_items.blank?
@@ -49,7 +60,7 @@ module Spree
     end
 
     def must_have_return_authorization
-      if item = return_items.find { |ri| ri.return_authorization.blank? }
+      if (item = return_items.find { |ri| ri.return_authorization.blank? })
         errors.add(:base, Spree.t(:missing_return_authorization, item_name: item.inventory_unit.variant.name))
       end
     end

data/app/models/spree/data_feed/google.rb

@@ -0,0 +1,15 @@
+require_dependency 'spree/data_feed'
+
+module Spree
+  class DataFeed::Google < DataFeed
+    class << self
+      def label
+        'Google Merchant Center Feed'
+      end
+
+      def provider_name
+        'google'
+      end
+    end
+  end
+end