spree_core 4.1.12 → 4.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d0ee9db08dacfb3d34d1040ad4cea3d34ae19282d54726f98f64ea5624d098
-  data.tar.gz: e23248e5fe3a71e58c81a1496165a6d60f4ff86fff82c7dc1d55c5d062dd2bb6
+  metadata.gz: 6e1c991fe1a4f4ffcb163ad34f7db0d399c802a14b09cabae9b6db567db1adbc
+  data.tar.gz: 6d27129f5c12ec9b48941c3001a341d8306e219fdb702b153944645bc1044b72
 SHA512:
-  metadata.gz: 17d12f688f122afd17a59e36d963c57c1dd0a3c36dc40199d25ec716016cb4c045f8f9f894213b561f5b6b0599d95b53dfcf1a15aea7b02073d6e052c1d92fa6
-  data.tar.gz: 969d4e6e871792b735501655fc19a775df64a6bbc4bec014ecc0ecea0b64bcb7820f0a8cd7a6fd1f63afb32f4b86fe0c147fe43f9c87b6b2cc4c018a983c72d4
+  metadata.gz: 4627be5137cf9b13ac72562df61b91a6ad0a95eb0119e9b9cf0c9a32b562874799ff35a0187ae8eadec622c88c0c5ee56f10cb21df79512b6524394b2f668fb1
+  data.tar.gz: ecaf570ab3245130d1ea2b521e0201937617e2aa0d308051d56ec17e2757549ce202fc243bb0c9b7609e379dfb7179005773656a8c7cc69632341c9751a26967

data/app/controllers/spree/base_controller.rb

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

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

@@ -1,17 +1,6 @@
 module Spree
   module Addresses
-    class Find
-      def initialize(scope:, params:)
-        @scope = scope
-      end
-
-      def execute
-        scope
-      end
-
-      private
-
-      attr_reader :scope
+    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

@@ -15,7 +15,7 @@ module Spree
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.includes(scope_includes)
+        Spree::Order.incomplete.not_canceled.includes(scope_includes)
       end
 
       def scope_includes

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)
@@ -22,6 +16,13 @@ module Spree
         to_html
     end
 
+    def display_compare_at_price(product_or_variant)
+      product_or_variant.
+        price_in(current_currency).
+        display_compare_at_price_including_vat_for(current_price_options).
+        to_html
+    end
+
     def link_to_tracking(shipment, options = {})
       return unless shipment.tracking && shipment.shipping_method
 
@@ -34,7 +35,15 @@ module Spree
       end
     end
 
-    def logo(image_path = Spree::Config[:logo], options = {})
+    def logo(image_path = nil, options = {})
+      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
+                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+                     elsif current_store.logo.attached? && current_store.logo.image?
+                       main_app.url_for(current_store.logo)
+                     else
+                       Spree::Config[:logo]
+                     end
+
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
 
       link_to path, 'aria-label': current_store.name, method: options[:method] do
@@ -42,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
@@ -67,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
@@ -97,7 +125,13 @@ module Spree
     def pretty_time(time)
       return '' if time.blank?
 
-      [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
+      [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
+    end
+
+    def pretty_date(date)
+      return '' if date.blank?
+
+      [I18n.l(date.to_date, format: :long)].join(' ')
     end
 
     def seo_url(taxon, options = nil)
@@ -168,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/mail_helper.rb

@@ -0,0 +1,29 @@
+module Spree
+  module MailHelper
+    include BaseHelper
+
+    def variant_image_url(variant)
+      image = default_image_for_product_or_variant(variant)
+      image ? main_app.url_for(image.url(:small)) : 'noimage/small.png'
+    end
+
+    def name_for(order)
+      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
+      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

@@ -1,10 +1,18 @@
 module Spree
   class BaseMailer < ActionMailer::Base
+    helper Spree::MailHelper
+
+    def current_store
+      @current_store ||= Spree::Store.current
+    end
+    helper_method :current_store
+
     def from_address
-      Spree::Store.current.mail_from_address
+      @order&.store&.mail_from_address || current_store.mail_from_address
     end
 
-    def money(amount, currency = Spree::Config[:currency])
+    def money(amount, currency = nil)
+      currency ||= current_store.default_currency
       Spree::Money.new(amount, currency: currency).to_s
     end
     helper_method :money
@@ -15,7 +23,8 @@ 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
 
@@ -24,9 +33,14 @@ 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] ||= Spree::Store.current.url
+      ActionMailer::Base.default_url_options[:host] ||= store_url || current_store.url
+    end
+
+    def set_email_locale
+      locale = @order&.store&.default_locale || current_store&.default_locale
+      I18n.locale = locale if locale.present?
     end
   end
 end

data/app/mailers/spree/order_mailer.rb

@@ -2,16 +2,25 @@ module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
+      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, store_url: current_store.url)
     end
 
     def cancel_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail(to: @order.email, from: from_address, subject: subject)
+      subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -2,9 +2,11 @@ module Spree
   class ReimbursementMailer < BaseMailer
     def reimbursement_email(reimbursement, resend = false)
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
+      @order = @reimbursement.order
+      current_store = @reimbursement.store || Spree::Store.current
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
-      mail(to: @reimbursement.order.email, from: from_address, subject: subject)
+      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, store_url: current_store.url)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -2,9 +2,11 @@ module Spree
   class ShipmentMailer < BaseMailer
     def shipped_email(shipment, resend = false)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
+      @order = @shipment.order
+      current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
-      mail(to: @shipment.order.email, from: from_address, subject: subject)
+      subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
     end
   end
 end

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

@@ -4,19 +4,16 @@ module Spree
 
     included do
       has_one :default_price,
-              -> { where currency: Spree::Config[:currency] },
+              -> { with_deleted.where(currency: Spree::Config[:currency]) },
               class_name: 'Spree::Price',
               dependent: :destroy
 
       delegate :display_price, :display_amount, :price, :currency, :price=,
-               :price_including_vat_for, :currency=, to: :find_or_build_default_price
+               :price_including_vat_for, :currency=, :display_compare_at_price,
+               :compare_at_price, :compare_at_price=, to: :find_or_build_default_price
 
       after_save :save_default_price
 
-      def default_price
-        Spree::Price.unscoped { super }
-      end
-
       def has_default_price?
         !default_price.nil?
       end

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

@@ -30,15 +30,20 @@ module Spree
       self.whitelisted_ransackable_associations = %w[bill_address ship_address]
       self.whitelisted_ransackable_attributes = %w[id email]
 
+      def self.with_email(query)
+        where("#{table_name}.email LIKE ?", "%#{query}%")
+      end
+
       def self.with_address(query, address = :ship_address)
         left_outer_joins(address).
           where("#{Spree::Address.table_name}.firstname like ?", "%#{query}%").
           or(left_outer_joins(address).where("#{Spree::Address.table_name}.lastname like ?", "%#{query}%"))
       end
 
-      def self.with_email_or_addresses_ids(query, addresses_ids = [])
-        where('email LIKE ?', "%#{query}%").
-          or(where(id: addresses_ids))
+      def self.with_email_or_address(email, address)
+        left_outer_joins(:addresses).
+          where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or #{table_name}.email LIKE ?",
+                "%#{address}%", "%#{address}%", "%#{email}%")
       end
     end
 
@@ -54,8 +59,9 @@ module Spree
         first
     end
 
-    def total_available_store_credit
-      store_credits.reload.to_a.sum(&:amount_remaining)
+    def total_available_store_credit(currency = nil)
+      currency ||= Spree::Config[:currency]
+      store_credits.where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
     private