spree_core 5.0.3 → 5.1.0.beta

data/app/models/spree/invitation.rb

@@ -0,0 +1,153 @@
+module Spree
+  class Invitation < Spree.base_class
+    has_secure_token
+    acts_as_paranoid
+
+    #
+    # Virtual Attributes
+    #
+    attribute :skip_email, :boolean, default: false
+
+    #
+    # Associations
+    #
+    belongs_to :resource, polymorphic: true # eg. Store, Vendor, Account
+    belongs_to :inviter, polymorphic: true # User or AdminUser
+    belongs_to :invitee, polymorphic: true, optional: true # User or AdminUser
+    belongs_to :role, class_name: 'Spree::Role'
+    has_one :role_user, dependent: :destroy, class_name: 'Spree::RoleUser'
+
+    #
+    # Validations
+    #
+    validates :email, email: true, presence: true
+    validates :token, presence: true, uniqueness: true
+    validates :inviter, :resource, :role, presence: true
+    validate :invitee_is_not_inviter, on: :create
+    validate :invitee_already_exists, on: :create
+
+    #
+    # Scopes
+    #
+    scope :pending, -> { where(status: 'pending') }
+    scope :accepted, -> { where(status: 'accepted') }
+    scope :not_expired, -> { where('expires_at > ?', Time.current) }
+
+    #
+    # State Machine
+    #
+    state_machine initial: :pending, attribute: :status do
+      state :accepted do
+        validate :accept_invitation_within_time_limit
+        validates :invitee, presence: true
+      end
+
+      event :accept do
+        transition pending: :accepted
+      end
+      after_transition to: :accepted, do: :after_accept
+    end
+
+    #
+    # Callbacks
+    #
+    after_initialize :set_defaults, if: :new_record?
+    before_validation :set_invitee_from_email, on: :create
+    after_create :send_invitation_email, unless: :skip_email
+
+    # returns the store for the invitation
+    # if the resource is a store, return the resource
+    # if the resource responds to store, return the store
+    # otherwise, return the current store
+    # @return [Spree::Store]
+    def store
+      if resource.is_a?(Spree::Store)
+        resource
+      elsif resource.respond_to?(:store)
+        resource.store
+      else
+        Spree::Store.current
+      end
+    end
+
+    # returns true if the invitation has expired
+    # @return [Boolean]
+    def expired?
+      expires_at < Time.current
+    end
+
+    # Resends the invitation email if the invitation is pending and not expired
+    def resend!
+      return if expired? || deleted? || accepted?
+
+      send_invitation_email
+    end
+
+    private
+
+    # this method can be extended by developers now
+    def after_accept
+      create_role_user
+      set_accepted_at
+      send_acceptance_notification
+    end
+
+    def send_invitation_email
+      Spree::InvitationMailer.invitation_email(self).deliver_later
+    end
+
+    def send_acceptance_notification
+      Spree::InvitationMailer.invitation_accepted(self).deliver_later
+    end
+
+    def set_defaults
+      self.expires_at ||= 2.weeks.from_now
+      self.resource ||= Spree::Store.current
+      self.role ||= Spree::Role.default_admin_role
+    end
+
+    def invitee_is_not_inviter
+      if invitee == inviter
+        errors.add(:invitee, 'cannot be the same as the inviter')
+      end
+    end
+
+    def invitee_already_exists
+      return if resource.blank?
+
+      exists = if invitee.present?
+                resource.users.include?(invitee)
+              else
+                resource.users.exists?(email: email)
+              end
+
+      if exists
+        errors.add(:email, 'already exists')
+      end
+    end
+
+    def set_accepted_at
+      update!(accepted_at: Time.current)
+    end
+
+    def create_role_user
+      return if invitee.blank?
+
+      role_user = resource.add_user(invitee, role)
+      self.role_user = role_user
+      save!
+    end
+
+    def set_invitee_from_email
+      return if invitee.present?
+
+      self.invitee = Spree.admin_user_class.find_by(email: email)
+    end
+
+    def accept_invitation_within_time_limit
+      if Time.current > expires_at
+        errors.add(:base, 'Invitation expired')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Spree
+  module Invitations
+    class Store < Base
+    end
+  end
+end

data/app/models/spree/order.rb

@@ -91,6 +91,8 @@ module Spree
     acts_as_taggable_on :tags
     acts_as_taggable_tenant :store_id
 
+    ASSOCIATED_USER_ATTRIBUTES = [:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id]
+
     belongs_to :user, class_name: "::#{Spree.user_class}", optional: true, autosave: true
     belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
     belongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: true
@@ -247,6 +249,13 @@ module Spree
       pre_tax_item_amount + shipments.sum(:pre_tax_amount)
     end
 
+    # Returns the subtotal used for analytics integrations
+    # It's a sum of the item total and the promo total
+    # @return [Float]
+    def analytics_subtotal
+      (item_total + line_items.sum(:promo_total)).to_f
+    end
+
     def shipping_discount
       shipment_adjustments.non_tax.eligible.sum(:amount) * - 1
     end
@@ -355,7 +364,7 @@ module Spree
       self.bill_address ||= user.bill_address
       self.ship_address ||= user.ship_address
 
-      changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
+      changes = slice(*ASSOCIATED_USER_ATTRIBUTES)
 
       # immediately persist the changes we just made, but don't use save
       # since we might have an invalid address associated
@@ -364,6 +373,12 @@ module Spree
       end
     end
 
+    def disassociate_user!
+      nullified_attributes = ASSOCIATED_USER_ATTRIBUTES.index_with(nil)
+
+      update!(nullified_attributes)
+    end
+
     def quantity_of(variant, options = {})
       line_item = find_line_item_by_variant(variant, options)
       line_item ? line_item.quantity : 0
@@ -443,6 +458,7 @@ module Spree
     # @return [Array<Spree::Variant>] the backordered variants for the order
     def backordered_variants
       variants.
+        where(track_inventory: true).
         joins(:stock_items, :product).
         where(Spree::StockItem.table_name => { count_on_hand: ..0, backorderable: true })
     end

data/app/models/spree/order_merger.rb

@@ -7,7 +7,7 @@ module Spree
       @order = order
     end
 
-    def merge!(other_order, user = nil)
+    def merge!(other_order, user = nil, discard_merged: true)
       other_order.line_items.each do |other_order_line_item|
         next unless other_order_line_item.currency == order.currency
 
@@ -16,12 +16,14 @@ module Spree
       end
 
       set_user(user)
-      clear_addresses(other_order)
+      clear_addresses(other_order) if discard_merged
       persist_merge
 
-      # So that the destroy doesn't take out line items which may have been re-assigned
-      other_order.line_items.reload
-      other_order.destroy
+      if discard_merged
+        # So that the destroy doesn't take out line items which may have been re-assigned
+        other_order.line_items.reload
+        other_order.destroy
+      end
     end
 
     # Compare the line item of the other order with mine.

data/app/models/spree/page_blocks/products/buy_buttons.rb

@@ -6,6 +6,14 @@ module Spree
         BOTTOM_PADDING_DEFAULT = 20
 
         preference :text_color, :string
+
+        def icon_name
+          'shopping-cart-plus'
+        end
+
+        def display_name
+          Spree.t('page_blocks.products.buy_buttons.display_name')
+        end
       end
     end
   end

data/app/models/spree/page_blocks/products/quantity_selector.rb

@@ -6,6 +6,10 @@ module Spree
         BOTTOM_PADDING_DEFAULT = 20
 
         preference :text_color, :string
+
+        def icon_name
+          'selector'
+        end
       end
     end
   end

data/app/models/spree/page_blocks/products/variant_picker.rb

@@ -3,6 +3,10 @@ module Spree
     module Products
       class VariantPicker < Spree::PageBlock
         preference :text_color, :string
+
+        def icon_name
+          'select'
+        end
       end
     end
   end

data/app/models/spree/page_sections/featured_product.rb

@@ -41,6 +41,10 @@ module Spree
       def blocks_available?
         true
       end
+
+      def can_sort_blocks?
+        true
+      end
     end
   end
 end

data/app/models/spree/page_sections/image_banner.rb

@@ -26,10 +26,22 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Buttons,
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def blocks_available?
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'slideshow'
       end

data/app/models/spree/page_sections/image_with_text.rb

@@ -27,6 +27,14 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Buttons,
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def default_links
         @default_links.presence || [
           Spree::PageLink.new(
@@ -40,6 +48,10 @@ module Spree
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'photo'
       end

data/app/models/spree/page_sections/newsletter.rb

@@ -32,7 +32,7 @@ module Spree
       end
 
       def available_blocks_to_add
-        [Spree::PageBlocks::Image]
+        [Spree::PageBlocks::Image, Spree::PageBlocks::Heading, Spree::PageBlocks::Text, Spree::PageBlocks::NewsletterForm]
       end
 
       def can_sort_blocks?

data/app/models/spree/page_sections/rich_text.rb

@@ -8,10 +8,21 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [
+          Spree::PageBlocks::Heading,
+          Spree::PageBlocks::Text
+        ]
+      end
+
       def blocks_available?
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def icon_name
         'text-caption'
       end

data/app/models/spree/page_sections/video.rb

@@ -44,6 +44,10 @@ module Spree
         ]
       end
 
+      def available_blocks_to_add
+        [Spree::PageBlocks::Heading]
+      end
+
       def icon_name
         'movie'
       end
@@ -52,6 +56,10 @@ module Spree
         true
       end
 
+      def can_sort_blocks?
+        true
+      end
+
       def video_embed
         @video_embed ||= ::ActionText::VideoEmbed.find_by(id: preferred_youtube_video_embed_id) if preferred_youtube_video_embed_id.present?
       end

data/app/models/spree/product.rb

@@ -595,7 +595,11 @@ module Spree
                      join_translation_table(Taxonomy).
                      find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
                  else
-                   taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                   if taxons.loaded?
+                     taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_brands_name) }
+                   else
+                     taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                   end
                  end
     end
 
@@ -606,7 +610,11 @@ module Spree
                         order(depth: :desc).
                         find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
                     else
-                      taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
+                      if taxons.loaded?
+                        taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_categories_name) }
+                      else
+                        taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
+                      end
                     end
     end
 

data/app/models/spree/product_property.rb

@@ -33,7 +33,7 @@ module Spree
     scope :filterable, -> { joins(:property).where(Property.table_name => { filterable: true }) }
     scope :for_products, ->(products) { joins(:product).merge(products) }
     scope :sort_by_property_position, -> {
-      joins(:property).order("spree_properties.position ASC")
+      unscope(:order).joins(:property).order("spree_properties.position ASC")
     }
 
     self.whitelisted_ransackable_attributes = ['value', 'filter_param']

data/app/models/spree/property.rb

@@ -39,8 +39,10 @@ module Spree
     KIND_OPTIONS = { short_text: 0, long_text: 1, number: 2, rich_text: 3 }.freeze
     enum :kind, KIND_OPTIONS
 
+    DEPENDENCY_UPDATE_FIELDS = [:presentation, :name, :kind, :filterable, :display_on, :position].freeze
+
     after_touch :touch_all_products
-    after_update :touch_all_products, if: -> { saved_changes.key?(:presentation) }
+    after_update :touch_all_products, if: -> { DEPENDENCY_UPDATE_FIELDS.any? { |field| saved_changes.key?(field) } }
     after_save :ensure_product_properties_have_filter_params
 
     self.whitelisted_ransackable_attributes = ['presentation', 'filterable']

data/app/models/spree/reports/sales_total.rb

@@ -2,12 +2,16 @@ module Spree
   module Reports
     class SalesTotal < Spree::Report
       def line_items_scope
-        store.line_items.where(
+        scope = store.line_items.where(
           order: Spree::Order.complete.where(
             currency: currency,
             completed_at: (date_from.to_time.beginning_of_day)..(date_to.to_time.end_of_day)
           )
         ).includes(:order, variant: :product)
+
+        scope = scope.where(vendor_id: vendor.id) if defined?(vendor) && vendor.present?
+
+        scope
       end
     end
   end

data/app/models/spree/role.rb

@@ -4,8 +4,24 @@ module Spree
 
     ADMIN_ROLE = 'admin'
 
+    #
+    # Associations
+    #
     has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
     has_many :users, through: :role_users, source: :user, source_type: Spree.user_class.to_s
     has_many :admin_users, through: :role_users, source: :user, source_type: Spree.admin_user_class.to_s
+    has_many :invitations, class_name: 'Spree::Invitation', dependent: :destroy
+
+    #
+    # Scopes
+    #
+    scope :admin, -> { where(name: ADMIN_ROLE) }
+
+    #
+    # Class Methods
+    #
+    def self.default_admin_role
+      find_or_create_by(name: ADMIN_ROLE)
+    end
   end
 end

data/app/models/spree/role_user.rb

@@ -1,6 +1,37 @@
 module Spree
   class RoleUser < Spree.base_class
-    belongs_to :role, class_name: 'Spree::Role'
+    #
+    # Associations
+    #
+    belongs_to :role, class_name: 'Spree::Role', foreign_key: :role_id
     belongs_to :user, polymorphic: true
+    belongs_to :resource, polymorphic: true
+    belongs_to :invitation, class_name: 'Spree::Invitation', optional: true
+
+    #
+    # Validations
+    #
+    validates :role, presence: true
+    validates :user, presence: true
+    validates :resource, presence: true
+    validates :role_id, uniqueness: { scope: [:user_id, :resource_id, :user_type, :resource_type] }
+
+    #
+    # Delegations
+    #
+    delegate :name, to: :user
+
+    #
+    # Callbacks
+    #
+    before_validation :set_default_resource
+
+    private
+
+    # Set the default resource to the default store if the resource is not set
+    # this will allow a graceful migration from the old roles system to the new one
+    def set_default_resource
+      self.resource ||= Spree::Store.current
+    end
   end
 end

data/app/models/spree/shipment.rb

@@ -430,7 +430,7 @@ module Spree
     end
 
     def manifest_unstock(item)
-      stock_location.unstock item.variant, item.quantity, self
+      stock_location.unstock(item.variant, item.quantity, self) if item.variant.track_inventory?
     end
 
     def recalculate_adjustments

data/app/models/spree/shipment_handler.rb

@@ -1,6 +1,7 @@
 module Spree
   class ShipmentHandler
     include Spree::Shipment::Emails
+    include Spree::IntegrationsConcern
 
     class << self
       def factory(shipment)

data/app/models/spree/shipping_method.rb

@@ -50,7 +50,7 @@ module Spree
     def include?(address)
       return false unless address
 
-      zones.includes(:zone_members).any? do |zone|
+      zones.includes(zone_members: :zoneable).any? do |zone|
         zone.include?(address)
       end
     end

data/app/models/spree/store.rb

@@ -13,6 +13,7 @@ module Spree
     include Spree::Stores::Socials
     include Spree::Webhooks::HasWebhooks if defined?(Spree::Webhooks::HasWebhooks)
     include Spree::Security::Stores if defined?(Spree::Security::Stores)
+    include Spree::UserManagement
 
     #
     # Magic methods
@@ -100,8 +101,10 @@ module Spree
     has_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroy
     has_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'
 
-    has_many :posts
-    has_many :post_categories
+    has_many :posts, class_name: 'Spree::Post'
+    has_many :post_categories, class_name: 'Spree::PostCategory'
+
+    has_many :integrations, class_name: 'Spree::Integration'
 
     #
     # Page Builder associations
@@ -338,9 +341,11 @@ module Spree
                                     end
     end
 
+    # Returns the default stock location for the store or creates a new one if it doesn't exist
+    # @return [Spree::StockLocation]
     def default_stock_location
       @default_stock_location ||= begin
-        stock_location_scope = Spree::StockLocation.order_default
+        stock_location_scope = Spree::StockLocation.where(default: true)
         stock_location_scope.first || ActiveRecord::Base.connected_to(role: :writing) do
           stock_location_scope.create(default: true, name: Spree.t(:default_stock_location_name), country: default_country)
         end
@@ -348,7 +353,9 @@ module Spree
     end
 
     def admin_users
-      @admin_users ||= Spree.admin_user_class.joins(:spree_roles).where(spree_roles: { name: :admin })
+      Spree::Deprecation.warn('Store#admin_users is deprecated and will be removed in Spree 6.0. Please use Store#users instead.')
+
+      users
     end
 
     def favicon

data/app/models/spree/store_credit_category.rb

@@ -28,6 +28,10 @@ module Spree
       end
     end
 
+    def can_be_deleted?
+      !store_credit_category_used?
+    end
+
     class << self
       def default_reimbursement_category(_options = {})
         Spree::StoreCreditCategory.first

data/app/models/spree/taxon.rb

@@ -1,4 +1,3 @@
-# TODO: let friendly id take care of sanitizing the url
 require 'stringex'
 
 module Spree
@@ -96,9 +95,11 @@ module Spree
       if Spree.use_translations?
         joins(:taxonomy).
           join_translation_table(Taxonomy).
-          where(["LOWER(#{Taxonomy.translation_table_alias}.name) = ?", taxonomy_name.downcase.strip])
+          where(
+            Taxonomy.arel_table_alias[:name].lower.matches(taxonomy_name.downcase.strip)
+          )
       else
-        joins(:taxonomy).where(["LOWER(#{Spree::Taxonomy.table_name}.name) = ?", taxonomy_name.downcase.strip])
+        joins(:taxonomy).where(Spree::Taxonomy.arel_table[:name].lower.matches(taxonomy_name.downcase.strip))
       end
     }
 

data/app/models/spree/variant.rb

@@ -73,6 +73,8 @@ module Spree
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
     after_commit :clear_line_items_cache, on: :update
+
+    after_create :create_default_stock_item, unless: :track_inventory?
     after_update_commit :handle_track_inventory_change
 
     after_commit :remove_prices_from_master_variant, on: [:create, :update], unless: :is_master?
@@ -553,11 +555,17 @@ module Spree
       line_items.update_all(updated_at: Time.current)
     end
 
+    def create_default_stock_item
+      return if stock_items.any?
+
+      Spree::Store.current.default_stock_location.set_up_stock_item(self)
+    end
+
     def handle_track_inventory_change
       return unless track_inventory_previously_changed?
       return if track_inventory
 
-      stock_items.update_all(backorderable: true, count_on_hand: 0, updated_at: Time.current)
+      stock_items.update_all(count_on_hand: 0, updated_at: Time.current)
     end
 
     def remove_prices_from_master_variant