spree_core 4.2.5 → 4.3.0

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,66 @@
+module Spree
+  class CmsPage < Base
+    include SingleStoreResource
+    include DisplayLink
+
+    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, 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 store_id]
+
+    def seo_title
+      if meta_title.present?
+        meta_title
+      else
+        title
+      end
+    end
+
+    # Overide 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
+
+    IMAGE_COUNT = ['one', 'two', 'three']
+    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
+    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+
+    IMAGE_COUNT.each do |count|
+      send(:has_one_attached, "image_#{count}".to_sym)
+
+      IMAGE_SIZE.each do |size|
+        define_method("img_#{count}_#{size}") do |dimensions = nil|
+          return if !send("image_#{count}").attached? || dimensions.nil?
+
+          send("image_#{count}").variant(resize: dimensions)
+        end
+      end
+    end
+
+    belongs_to :linked_resource, polymorphic: true
+
+    default_scope { order(position: :asc) }
+
+    validates :name, :cms_page, presence: true
+
+    validates :image_one, :image_two, :image_three, content_type: IMAGE_TYPES
+
+    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/country.rb

@@ -5,19 +5,26 @@ module Spree
     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 }
 
-    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)