spree_core 4.2.0.beta → 4.2.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3e3f16eb808f16f592360085f02f1382ee4ddd6ee0903c3eb8a8079e5d8bad
-  data.tar.gz: 8567b7555de6f0f578d6277e6943af11b68329e5e17a77d13c7e66085e7fe09f
+  metadata.gz: 3d0f9d56b3e68e0ff69cfa46d00d61872b775e2e92ddf76a3eccd85899ca863b
+  data.tar.gz: 80879be83858cb06f69c5e78f975b9cbf1846941d62282290c8403bd8b509363
 SHA512:
-  metadata.gz: 113900d45a999bb7aa47209797e8ab47a5ed6f40caa445242952eac3a604cc43bc658fec8fb86dc148743032f71341d97331cd7d6d7b77d84df36ffc979f122b
-  data.tar.gz: a175395cbe157f6ca1704ab5bdacbbf5c9abbee4bdae89f19363c06fc7a1fe06610fab87347342ecddd297d3bf22bf9354116340e8e408270a4f968a78883a0e
+  metadata.gz: 82e15e51f5847c472eac8cd4e24e549dc28705b328f082860009c638277f203adbfe42ff898105862e3385b4ed5935e102200cd247ee998b09b4b2f3912b77d3
+  data.tar.gz: c843177415698e0d50d2d9d81b2803f84713db0dfe7d9098c41a7de69cb9c1c15158d97b93a2ecc97dc62752078797adbd03436bad2a8674c87eef07ecb97e35

data/app/controllers/spree/base_controller.rb

@@ -7,9 +7,8 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
-  include Spree::Core::ControllerHelpers::CurrencyHelpers
+  include Spree::Core::ControllerHelpers::Locale
+  include Spree::Core::ControllerHelpers::Currency
 
   respond_to :html
 end
-
-require 'spree/i18n/initializer'

data/app/controllers/spree/errors_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class ErrorsController < BaseController
+    def forbidden
+      render status: 403
+    end
+
+    def unauthorized
+      render status: 401
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+module Spree
+  module Addresses
+    class Find < ::Spree::BaseFinder
+    end
+  end
+end

data/app/finders/spree/base_finder.rb

@@ -0,0 +1,14 @@
+module Spree
+  class BaseFinder
+    def initialize(scope:, params:)
+      @scope = scope
+      @params = params
+    end
+
+    attr_reader :scope, :params
+
+    def execute
+      scope
+    end
+  end
+end

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

@@ -1,13 +1,21 @@
 module Spree
   module Countries
-    class Find
-      def initialize(scope, params)
+    class Find < ::Spree::BaseFinder
+      def initialize(scope:, params:)
         @scope = scope
 
         @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
       end
 
       def call
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
+          Please use Spree::Countries::Find.new.execute instead
+        DEPRECATION
+        execute
+      end
+
+      def execute
         countries = by_shippability(scope)
 
         countries
@@ -15,7 +23,7 @@ module Spree
 
       private
 
-      attr_reader :shippable, :scope
+      attr_reader :shippable
 
       def shippable?
         shippable.present?

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

@@ -1,7 +1,7 @@
 module Spree
   module CreditCards
-    class Find
-      def execute(scope:, params:)
+    class Find < ::Spree::BaseFinder
+      def execute
         return scope.default.take if params[:id].eql?('default')
         return scope.where(payment_method_id: params[:filter]['payment_method_id']) if params[:filter].present?
 

data/app/finders/spree/orders/find_current.rb

@@ -9,13 +9,13 @@ module Spree
         return order unless order.nil?
         return if user.nil?
 
-        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user)
+        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user, currency: params[:currency])
       end
 
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.includes(scope_includes)
+        Spree::Order.incomplete.not_canceled.includes(scope_includes)
       end
 
       def scope_includes

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

@@ -22,6 +22,7 @@ module Spree
         products = by_ids(scope)
         products = by_skus(products)
         products = by_price(products)
+        products = by_currency(products)
         products = by_taxons(products)
         products = by_concat_taxons(products)
         products = by_name(products)
@@ -51,6 +52,10 @@ module Spree
         price.present?
       end
 
+      def currency?
+        currency.present?
+      end
+
       def taxons?
         taxons.present?
       end
@@ -94,7 +99,7 @@ module Spree
       def by_price(products)
         return products unless price?
 
-        products.joins(master: :default_price).
+        products.joins(master: :prices).
           where(
             spree_prices: {
               amount: price.min..price.max,
@@ -103,6 +108,12 @@ module Spree
           )
       end
 
+      def by_currency(products)
+        return products unless currency?
+
+        products.joins(master: :prices).where(spree_prices: { currency: currency })
+      end
+
       def by_taxons(products)
         return products unless taxons?
 

data/app/helpers/spree/base_helper.rb

@@ -1,13 +1,7 @@
 module Spree
   module BaseHelper
     def available_countries
-      checkout_zone = Spree::Zone.find_by(name: Spree::Config[:checkout_zone])
-
-      countries = if checkout_zone && checkout_zone.kind == 'country'
-                    checkout_zone.country_list
-                  else
-                    Spree::Country.all
-                  end
+      countries = current_store.countries_available_for_checkout
 
       countries.collect do |country|
         country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
@@ -57,8 +51,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 +101,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 +202,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/locale_helper.rb

@@ -0,0 +1,19 @@
+module Spree
+  module LocaleHelper
+    def all_locales_options
+      supported_locales_for_all_stores.map { |locale| locale_presentation(locale) }
+    end
+
+    def available_locales_options
+      available_locales.map { |locale| locale_presentation(locale) }
+    end
+
+    def locale_presentation(locale)
+      if defined?(SpreeI18n)
+        [Spree.t('i18n.this_file_language', locale: locale), locale]
+      else
+        locale.to_s == 'en' ? ['English (US)', :en] : [locale, locale]
+      end
+    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

@@ -35,6 +35,11 @@ module Spree
       variants_option_types_presenter(variants, product).default_variant || product.default_variant
     end
 
+    def should_display_compare_at_price?(default_variant)
+      default_variant_price = default_variant.price_in(current_currency)
+      default_variant_price.compare_at_amount.present? && (default_variant_price.compare_at_amount > default_variant_price.amount)
+    end
+
     def used_variants_options(variants, product)
       variants_option_types_presenter(variants, product).options
     end
@@ -110,23 +115,44 @@ 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
 
+    def product_relation_types
+      @product_relation_types ||= @product.respond_to?(:relation_types) ? @product.relation_types : []
+    end
+
+    def product_relations_by_type(relation_type)
+      return [] if product_relation_types.none? || !@product.respond_to?(:relations)
+
+      product_ids = @product.relations.where(relation_type: relation_type).pluck(:related_to_id).uniq
+
+      return [] if product_ids.empty?
+
+      Spree::Product.
+        available.not_discontinued.distinct.
+        where(id: product_ids).
+        includes(
+          :tax_category,
+          master: [
+            :prices,
+            { images: { attachment_attachment: :blob } },
+          ]
+        ).
+        limit(Spree::Config[:products_per_page])
+    end
+
     def related_products
-      return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
-
-      @related_products ||= @product.
-                            related_products.
-                            includes(
-                              :tax_category,
-                              master: [
-                                :prices,
-                                images: { attachment_attachment: :blob },
-                              ]
-                            ).
-                            limit(Spree::Config[:products_per_page])
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
+        Please use ProductsHelper#relations from now on.
+      DEPRECATION
+
+      return [] unless @product.respond_to?(:has_related_products?)
+
+      @related_products ||= relations_by_type('related_products')
     end
 
     def product_available_in_currency?

data/app/mailers/spree/base_mailer.rb

@@ -1,6 +1,6 @@
 module Spree
   class BaseMailer < ActionMailer::Base
-    add_template_helper(MailHelper)
+    helper Spree::MailHelper
 
     def current_store
       @current_store ||= Spree::Store.current
@@ -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)
@@ -23,7 +23,7 @@ module Spree
     helper_method :frontend_available?
 
     def mail(headers = {}, &block)
-      ensure_default_action_mailer_url_host
+      ensure_default_action_mailer_url_host(headers[:store_url])
       set_email_locale
       super if Spree::Config[:send_core_emails]
     end
@@ -33,9 +33,9 @@ module Spree
     # this ensures that ActionMailer::Base.default_url_options[:host] is always set
     # this is only a fail-safe solution if developer didn't set this in environment files
     # http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
-    def ensure_default_action_mailer_url_host
+    def ensure_default_action_mailer_url_host(store_url = nil)
       ActionMailer::Base.default_url_options ||= {}
-      ActionMailer::Base.default_url_options[:host] ||= current_store.url
+      ActionMailer::Base.default_url_options[:host] ||= store_url || current_store.url
     end
 
     def set_email_locale

data/app/mailers/spree/order_mailer.rb

@@ -5,14 +5,14 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def store_owner_notification_email(order)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       current_store = @order.store
       subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
-      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url)
     end
 
     def cancel_email(order, resend = false)
@@ -20,7 +20,7 @@ module Spree
       current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @reimbursement.store || Spree::Store.current
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: current_store.mail_from_address, subject: subject)
+      mail(to: @order.email, from: current_store.mail_from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -6,7 +6,7 @@ module Spree
       current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
       subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end