spree_core 4.2.0.beta → 4.2.0.rc5

data/app/models/spree/promotion/rules/user.rb

@@ -22,7 +22,8 @@ module Spree
         end
 
         def user_ids_string=(s)
-          self.user_ids = s.to_s.split(',').map(&:strip)
+          # check this
+          self.user_ids = s
         end
       end
     end

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,7 +25,6 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
-
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
           order.order_promotions.where(promotion_id: promotion.id).destroy_all
@@ -76,7 +75,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/promotion_handler/promotion_duplicator.rb

@@ -1,15 +1,16 @@
 module Spree
   module PromotionHandler
     class PromotionDuplicator
-      def initialize(promotion)
+      def initialize(promotion, random_string: nil)
         @promotion = promotion
+        @random_string = random_string || generate_random_string(4)
       end
 
       def duplicate
         @new_promotion = @promotion.dup
-        @new_promotion.path = "#{@promotion.path}_new"
+        @new_promotion.path = "#{@promotion.path}_#{@random_string}"
         @new_promotion.name = "New #{@promotion.name}"
-        @new_promotion.code = "#{@promotion.code}_new"
+        @new_promotion.code = "#{@promotion.code}_#{@random_string}"
 
         ActiveRecord::Base.transaction do
           @new_promotion.save
@@ -33,6 +34,11 @@ module Spree
         end
       end
 
+      def generate_random_string(number)
+        charset = Array('A'..'Z') + Array('a'..'z')
+        Array.new(number) { charset.sample }.join
+      end
+
       def copy_actions
         @promotion.promotion_actions.each do |action|
           new_action = action.dup

data/app/models/spree/refund.rb

@@ -61,14 +61,14 @@ module Spree
                  end
 
       unless response.success?
-        logger.error(Spree.t(:gateway_error) + "  #{response.to_yaml}")
+        Rails.logger.error(Spree.t(:gateway_error) + "  #{response.to_yaml}")
         text = response.params['message'] || response.params['response_reason_text'] || response.message
         raise Core::GatewayError, text
       end
 
       response
     rescue ActiveMerchant::ConnectionError => e
-      logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
+      Rails.logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
       raise Core::GatewayError, Spree.t(:unable_to_connect_to_gateway)
     end
 

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -1,5 +1,3 @@
-require_relative 'r_m_a_required'
-
 module Spree
   class ReturnItem::EligibilityValidator::Default < Spree::ReturnItem::EligibilityValidator::BaseValidator
     class_attribute :permitted_eligibility_validators

data/app/models/spree/shipment.rb

@@ -362,7 +362,7 @@ module Spree
         desired_shipment: shipment_to_transfer_to,
         variant: variant,
         quantity: quantity
-      ).run!
+      )
     end
 
     private

data/app/models/spree/shipping_method.rb

@@ -19,7 +19,7 @@ module Spree
                                      foreign_key: 'shipping_method_id'
     has_many :zones, through: :shipping_method_zones, class_name: 'Spree::Zone'
 
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: true
 
     validates :name, :display_on, presence: true
 
@@ -44,10 +44,6 @@ module Spree
         select { |c| c.to_s.constantize < Spree::ShippingCalculator }
     end
 
-    def tax_category
-      Spree::TaxCategory.unscoped { super }
-    end
-
     def available_to_display?(display_filter)
       (frontend? && display_filter == DISPLAY_ON_FRONT_END) ||
         (backend? && display_filter == DISPLAY_ON_BACK_END)

data/app/models/spree/shipping_rate.rb

@@ -1,9 +1,8 @@
 module Spree
   class ShippingRate < Spree::Base
     belongs_to :shipment, class_name: 'Spree::Shipment'
-    belongs_to :tax_rate, class_name: 'Spree::TaxRate'
-    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
-
+    belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'
+    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
     extend Spree::DisplayMoney
 
     money_methods :base_price, :final_price, :tax_amount
@@ -32,14 +31,6 @@ module Spree
       @tax_amount ||= tax_rate&.calculator&.compute_shipping_rate(self) || BigDecimal(0)
     end
 
-    def shipping_method
-      Spree::ShippingMethod.unscoped { super }
-    end
-
-    def tax_rate
-      Spree::TaxRate.unscoped { super }
-    end
-
     # returns base price - any available discounts for this Shipment
     # useful when you want to present a list of available shipping rates
     def final_price

data/app/models/spree/stock/availability_validator.rb

@@ -14,10 +14,9 @@ module Spree
         display_name = variant.name.to_s
         display_name += " (#{variant.options_text})" unless variant.options_text.blank?
 
-        line_item.errors[:quantity] << Spree.t(
-          :selected_quantity_not_available,
-          item: display_name.inspect
-        )
+        line_item.errors.add(:quantity,
+                             :selected_quantity_not_available,
+                             message: Spree.t(:selected_quantity_not_available, item: display_name.inspect))
       end
 
       private

data/app/models/spree/stock_item.rb

@@ -4,7 +4,7 @@ module Spree
 
     with_options inverse_of: :stock_items do
       belongs_to :stock_location, class_name: 'Spree::StockLocation'
-      belongs_to :variant, class_name: 'Spree::Variant'
+      belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
     end
     has_many :stock_movements, inverse_of: :stock_item
 
@@ -56,10 +56,6 @@ module Spree
       in_stock? || backorderable?
     end
 
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     def reduce_count_on_hand_to_zero
       set_count_on_hand(0) if count_on_hand > 0
     end

data/app/models/spree/store.rb

@@ -3,6 +3,7 @@ module Spree
     has_many :orders, class_name: 'Spree::Order'
     has_many :payment_methods, class_name: 'Spree::PaymentMethod'
     belongs_to :default_country, class_name: 'Spree::Country'
+    belongs_to :checkout_zone, class_name: 'Spree::Zone'
 
     with_options presence: true do
       validates :name, :url, :mail_from_address, :default_currency, :code
@@ -18,6 +19,9 @@ module Spree
     end
 
     has_one_attached :logo
+    has_one_attached :mailer_logo
+
+    validates :mailer_logo, content_type: ['image/png', 'image/jpg', 'image/jpeg']
 
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
@@ -26,6 +30,8 @@ module Spree
 
     after_commit :clear_cache
 
+    alias_attribute :contact_email, :customer_support_email
+
     def self.current(domain = nil)
       current_store = domain ? Store.by_url(domain).first : nil
       current_store || Store.default
@@ -37,12 +43,49 @@ module Spree
       end
     end
 
+    def self.available_locales
+      Rails.cache.fetch('stores_available_locales') do
+        Spree::Store.all.map(&:supported_locales_list).flatten.uniq
+      end
+    end
+
     def supported_currencies_list
-      (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
+      @supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
         ::Money::Currency.find(code.strip)
       end.uniq.compact
     end
 
+    def supported_locales_list
+      # TODO: add support of multiple supported languages to a single Store
+      @supported_locales_list ||= [default_locale].compact.uniq
+    end
+
+    def unique_name
+      @unique_name ||= "#{name} (#{code})"
+    end
+
+    def formatted_url
+      return if url.blank?
+
+      @formatted_url ||= if url.match(/http:\/\/|https:\/\//)
+                           url
+                         else
+                           Rails.env.development? ? "http://#{url}" : "https://#{url}"
+                         end
+    end
+
+    def countries_available_for_checkout
+      @countries_available_for_checkout ||= checkout_zone_or_default.try(:country_list) || Spree::Country.all
+    end
+
+    def states_available_for_checkout(country)
+      checkout_zone_or_default.try(:state_list_for, country) || country.states
+    end
+
+    def checkout_zone_or_default
+      @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
+    end
+
     private
 
     def ensure_default_exists_and_is_unique
@@ -62,6 +105,7 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
+      Rails.cache.delete('stores_available_locales')
     end
   end
 end

data/app/models/spree/store_credit.rb

@@ -68,7 +68,7 @@ module Spree
     end
 
     def validate_authorization(amount, order_currency)
-      if amount_remaining.to_d < amount.to_d
+      if BigDecimal(amount_remaining, 3) < BigDecimal(amount, 3)
         errors.add(:base, Spree.t('store_credit_payment_method.insufficient_funds'))
       elsif currency != order_currency
         errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))

data/app/models/spree/variant.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
-    belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
+    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
     delegate :name, :name=, :description, :slug, :available_on, :shipping_category_id,
@@ -123,15 +123,15 @@ module Spree
     end
 
     def tax_category
-      if self[:tax_category_id].nil?
-        product.tax_category
-      else
-        Spree::TaxCategory.find(self[:tax_category_id])
-      end
+      @tax_category ||= if self[:tax_category_id].nil?
+                          product.tax_category
+                        else
+                          Spree::TaxCategory.find(self[:tax_category_id])
+                        end
     end
 
     def options_text
-      Spree::Variants::OptionsPresenter.new(self).to_sentence
+      @options_text ||= Spree::Variants::OptionsPresenter.new(self).to_sentence
     end
 
     # Default to master name
@@ -150,13 +150,6 @@ module Spree
       !!deleted_at
     end
 
-    # Product may be created with deleted_at already set,
-    # which would make AR's default finder return nil.
-    # This is a stopgap for that little problem.
-    def product
-      Spree::Product.unscoped { super }
-    end
-
     def options=(options = {})
       options.each do |option|
         set_option_value(option[:name], option[:value])
@@ -233,7 +226,7 @@ module Spree
     end
 
     def compare_at_price
-      price_in(cost_currency).try(:compare_at_amount)
+      @compare_at_price ||= price_in(cost_currency).try(:compare_at_amount)
     end
 
     def name_and_sku

data/app/models/spree/zone.rb

@@ -70,6 +70,10 @@ module Spree
       matches.first
     end
 
+    def self.default_checkout_zone
+      find_by(name: Spree::Config[:checkout_zone])
+    end
+
     def kind
       if self[:kind].present?
         self[:kind]
@@ -97,8 +101,6 @@ module Spree
           zone_member.zoneable_id == address.country_id
         when 'Spree::State'
           zone_member.zoneable_id == address.state_id
-        else
-          false
         end
       end
     end
@@ -110,8 +112,6 @@ module Spree
                        zoneables
                      when 'state' then
                        zoneables.collect(&:country)
-                     else
-                       []
                      end.flatten.compact.uniq
     end
 
@@ -167,6 +167,19 @@ module Spree
       true
     end
 
+    def state_list
+      case kind
+      when 'country'
+        zoneables.map(&:states)
+      when 'state'
+        zoneables
+      end.flatten.compact.uniq
+    end
+
+    def state_list_for(country)
+      state_list.select { |state| state.country == country }
+    end
+
     private
 
     def remove_defunct_members

data/app/presenters/spree/variant_presenter.rb

@@ -2,14 +2,16 @@ module Spree
   class VariantPresenter
     include Rails.application.routes.url_helpers
     include Spree::BaseHelper
+    include Spree::ProductsHelper
 
-    attr_reader :current_currency, :current_price_options
+    attr_reader :current_currency, :current_price_options, :current_store
 
     def initialize(opts = {})
       @variants = opts[:variants]
       @is_product_available_in_currency = opts[:is_product_available_in_currency]
       @current_currency = opts[:current_currency]
       @current_price_options = opts[:current_price_options]
+      @current_store = opts[:current_store]
     end
 
     def call
@@ -18,7 +20,7 @@ module Spree
           display_price: display_price(variant),
           price: variant.price_in(current_currency),
           display_compare_at_price: display_compare_at_price(variant),
-          should_display_compare_at_price: should_display_compare_at_price(variant),
+          should_display_compare_at_price: should_display_compare_at_price?(variant),
           is_product_available_in_currency: @is_product_available_in_currency,
           backorderable: backorderable?(variant),
           in_stock: in_stock?(variant),
@@ -74,9 +76,5 @@ module Spree
         purchasable: variant.purchasable?
       }
     end
-
-    def should_display_compare_at_price(variant)
-      variant.compare_at_price.present? && variant.compare_at_price > variant.price
-    end
   end
 end

data/app/services/spree/account/addresses/create.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Account
+    module Addresses
+      class Create
+        prepend Spree::ServiceModule::Base
+        include Spree::Account::Addresses::Helper
+
+        attr_accessor :country
+
+        def call(user:, address_params:)
+          fill_country_and_state_ids(address_params)
+
+          address = user.addresses.new(address_params)
+          if address.save
+            success(address)
+          else
+            failure(address)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/helper.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Account
+    module Addresses
+      module Helper
+        private
+
+        attr_accessor :country
+
+        def fill_country_and_state_ids(params)
+          replace_country_iso_with_id(params)
+          fill_state_id(params)
+        end
+
+        def replace_country_iso_with_id(params)
+          iso = params[:country_iso]
+          return params unless iso.present?
+
+          country = Spree::Country.by_iso(iso)
+          params[:country_id] = country&.id
+          params.delete(:country_iso)
+          params
+        end
+
+        def fill_state_id(params)
+          state_name = params[:state_name]
+          return params unless state_name.present?
+
+          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
+          return params unless country
+
+          params[:state_id] = country.states.find_by(name: state_name)&.id
+          params
+        end
+      end
+    end
+  end
+end