spree_core 3.6.6 → 3.7.0.rc1

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

@@ -36,6 +36,7 @@ module Spree
 
       def update_backorder
         return if backorder_package.nil?
+
         if fulfilled?
           backorder_package.remove_item backorder_item
         elsif backorder_item.present?

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

@@ -33,6 +33,7 @@ module Spree
           cost = shipping_method.calculator.compute(package)
 
           next unless cost
+
           shipping_method.shipping_rates.new(
             cost: gross_amount(cost, taxation_options_for(shipping_method)),
             tax_rate: first_tax_rate_for(shipping_method.tax_category)
@@ -52,6 +53,7 @@ module Spree
 
       def first_tax_rate_for(tax_category)
         return unless @order.tax_zone && tax_category
+
         Spree::TaxRate.for_tax_category(tax_category).
           potential_rates_for_zone(@order.tax_zone).first
       end

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

@@ -10,11 +10,11 @@ module Spree
           # They go through multiple splits, avoid loading the
           # association to order until needed.
           InventoryUnit.new(
-            pending:    true,
-            line_item:  line_item,
-            variant:    line_item.variant,
-            quantity:   line_item.quantity,
-            order_id:   @order.id
+            pending: true,
+            line_item: line_item,
+            variant: line_item.variant,
+            quantity: line_item.quantity,
+            order_id: @order.id
           )
         end
       end

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

@@ -26,6 +26,7 @@ module Spree
           unit = inventory_unit.dup # Can be used by others, do not use directly
           if variant.should_track_inventory?
             next unless stock_location.stocks? variant
+
             on_hand, backordered = stock_location.fill_status(variant, unit.quantity)
             package.add(InventoryUnit.split(unit, backordered), :backordered) if backordered.positive?
             package.add(InventoryUnit.split(unit, on_hand), :on_hand) if on_hand.positive?

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

@@ -1,11 +1,11 @@
 module Spree
   module Stock
     class Quantifier
-      attr_reader :stock_items, :variant
+      attr_reader :variant, :stock_location
 
-      def initialize(variant)
-        @variant = variant
-        @stock_items = @variant.stock_items.with_active_stock_location
+      def initialize(variant, stock_location = nil)
+        @variant        = variant
+        @stock_location = stock_location
       end
 
       def total_on_hand
@@ -23,6 +23,18 @@ module Spree
       def can_supply?(required = 1)
         variant.available? && (total_on_hand >= required || backorderable?)
       end
+
+      def stock_items
+        @stock_items ||= scope_to_location(variant.stock_items)
+      end
+
+      private
+
+      def scope_to_location(collection)
+        return collection.with_active_stock_location unless stock_location.present?
+
+        collection.where(stock_location: stock_location)
+      end
     end
   end
 end

data/app/models/spree/stock_item.rb

@@ -75,6 +75,7 @@ module Spree
     # If stock was -20 but then was -25 (decrease of 5 units), do nothing.
     def process_backorders(number)
       return unless number.positive?
+
       units = backordered_inventory_units.first(number) # We can process atmost n backorders
 
       units.each do |unit|

data/app/models/spree/stock_location.rb

@@ -7,7 +7,7 @@ module Spree
     belongs_to :state, class_name: 'Spree::State', optional: true
     belongs_to :country, class_name: 'Spree::Country'
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: { allow_blank: true }
 
     scope :active, -> { where(active: true) }
     scope :order_default, -> { order(default: :desc, name: :asc) }

data/app/models/spree/stock_movement.rb

@@ -31,6 +31,7 @@ module Spree
 
     def update_stock_item_quantity
       return unless stock_item.should_track_inventory?
+
       stock_item.adjust_count_on_hand quantity
     end
   end

data/app/models/spree/stock_transfer.rb

@@ -26,7 +26,7 @@ module Spree
     def transfer(source_location, destination_location, variants)
       transaction do
         variants.each_pair do |variant, quantity|
-          source_location.unstock(variant, quantity, self) if source_location
+          source_location&.unstock(variant, quantity, self)
           destination_location.restock(variant, quantity, self)
 
           self.source_location = source_location

data/app/models/spree/store_credit.rb

@@ -35,13 +35,8 @@ module Spree
 
     attr_accessor :action, :action_amount, :action_originator, :action_authorization_code
 
-    def display_amount
-      Spree::Money.new(amount)
-    end
-
-    def display_amount_used
-      Spree::Money.new(amount_used)
-    end
+    extend Spree::DisplayMoney
+    money_methods :amount, :amount_used
 
     def amount_remaining
       amount - amount_used - amount_authorized
@@ -204,9 +199,9 @@ module Spree
 
     def store_event
       return unless saved_change_to_amount? ||
-          saved_change_to_amount_used? ||
-          saved_change_to_amount_authorized? ||
-          action == ELIGIBLE_ACTION
+        saved_change_to_amount_used? ||
+        saved_change_to_amount_authorized? ||
+        action == ELIGIBLE_ACTION
 
       event = if action
                 store_credit_events.build(action: action)

data/app/models/spree/tax_rate.rb

@@ -30,6 +30,7 @@ module Spree
     # Gets the array of TaxRates appropriate for the specified tax zone
     def self.match(order_tax_zone)
       return [] unless order_tax_zone
+
       potential_rates_for_zone(order_tax_zone)
     end
 
@@ -82,6 +83,7 @@ module Spree
 
     def self.included_tax_amount_for(options)
       return 0 unless options[:tax_zone] && options[:tax_category]
+
       potential_rates_for_zone(options[:tax_zone]).
         included_in_price.
         for_tax_category(options[:tax_category]).
@@ -107,6 +109,7 @@ module Spree
 
     def amount_for_label
       return '' unless show_rate_in_label?
+
       ' ' + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
         amount * 100,
         locale: I18n.locale

data/app/models/spree/taxon.rb

@@ -32,7 +32,7 @@ module Spree
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy
 
-    has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonIcon'
+    has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'
 
     self.whitelisted_ransackable_associations = %w[taxonomy]
 
@@ -97,7 +97,7 @@ module Spree
     end
 
     def check_for_root
-      if taxonomy.try(:root).present? && parent_id == nil
+      if taxonomy.try(:root).present? && parent_id.nil?
         errors.add(:root_conflict, 'this taxonomy already has a root taxon')
       end
     end

data/app/models/spree/taxon_image.rb

@@ -0,0 +1,18 @@
+module Spree
+  class TaxonImage < Asset
+    include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
+    include Rails.application.routes.url_helpers
+
+    def styles
+      self.class.styles.map do |_, size|
+        width, height = size[/(\d+)x(\d+)/].split('x')
+
+        {
+          url: polymorphic_path(attachment.variant(resize: size), only_path: true),
+          width: width,
+          height: height
+        }
+      end
+    end
+  end
+end

data/app/models/spree/{taxon_icon → taxon_image}/configuration/active_storage.rb

@@ -1,5 +1,5 @@
 module Spree
-  class TaxonIcon < Asset
+  class TaxonImage < Asset
     module Configuration
       module ActiveStorage
         extend ActiveSupport::Concern
@@ -11,7 +11,7 @@ module Spree
 
           def self.styles
             @styles ||= {
-              mini:   '32x32>',
+              mini: '32x32>',
               normal: '128x128>'
             }
           end

data/app/models/spree/{taxon_icon → taxon_image}/configuration/paperclip.rb

@@ -1,5 +1,5 @@
 module Spree
-  class TaxonIcon < Asset
+  class TaxonImage < Asset
     module Configuration
       module Paperclip
         extend ActiveSupport::Concern

data/app/models/spree/variant.rb

@@ -56,6 +56,22 @@ module Spree
     after_touch :clear_in_stock_cache
 
     scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
+    scope :backorderable, -> { joins(:stock_items).where(spree_stock_items: { backorderable: true }) }
+    scope :in_stock_or_backorderable, -> { in_stock.or(backorderable) }
+
+    scope :eligible, -> {
+      where(is_master: false).or(
+        where(
+          <<-SQL
+            #{Variant.quoted_table_name}.id IN (
+              SELECT MIN(#{Variant.quoted_table_name}.id) FROM #{Variant.quoted_table_name}
+              GROUP BY #{Variant.quoted_table_name}.product_id
+              HAVING COUNT(*) = 1
+            )
+          SQL
+        )
+      )
+    }
 
     scope :not_discontinued, -> do
       where(
@@ -159,6 +175,7 @@ module Spree
         end
       else
         return if current_value.name == opt_value
+
         option_values.delete(current_value)
       end
 
@@ -227,6 +244,10 @@ module Spree
 
     alias is_backorderable? backorderable?
 
+    def purchasable?
+      in_stock? || backorderable?
+    end
+
     # Shortcut method to determine if inventory tracking is enabled for this variant
     # This considers both variant tracking flag and site-wide inventory tracking settings
     def should_track_inventory?
@@ -253,6 +274,10 @@ module Spree
       !!discontinue_on && discontinue_on <= Time.current
     end
 
+    def backordered?
+      total_on_hand <= 0 && stock_items.exists?(backorderable: true)
+    end
+
     private
 
     def ensure_no_line_items
@@ -267,7 +292,7 @@ module Spree
     end
 
     def set_master_out_of_stock
-      if product.master && product.master.in_stock?
+      if product.master&.in_stock?
         product.master.stock_items.update_all(backorderable: false)
         product.master.stock_items.each(&:reduce_count_on_hand_to_zero)
       end
@@ -276,8 +301,9 @@ module Spree
     # Ensures a new variant takes the product master price when price is not supplied
     def check_price
       if price.nil? && Spree::Config[:require_master_price]
-        return errors.add(:base, :no_master_variant_found_to_infer_price)  unless product && product.master
+        return errors.add(:base, :no_master_variant_found_to_infer_price)  unless product&.master
         return errors.add(:base, :must_supply_price_for_variant_or_master) if self == product.master
+
         self.price = product.master.price
       end
       if price.present? && currency.nil?

data/app/models/spree/zone.rb

@@ -52,12 +52,12 @@ module Spree
     # Returns nil in the case of no matches.
     def self.match(address)
       return unless address &&
-          matches = includes(:zone_members).
+        matches = includes(:zone_members).
                     order('spree_zones.zone_members_count', 'spree_zones.created_at').
                     where("(spree_zone_members.zoneable_type = 'Spree::Country' AND " \
-                            'spree_zone_members.zoneable_id = ?) OR ' \
-                            "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
-                            'spree_zone_members.zoneable_id = ?)', address.country_id, address.state_id).
+                          'spree_zone_members.zoneable_id = ?) OR ' \
+                          "(spree_zone_members.zoneable_type = 'Spree::State' AND " \
+                          'spree_zone_members.zoneable_id = ?)', address.country_id, address.state_id).
                     references(:zones)
 
       %w[state country].each do |zone_kind|
@@ -74,7 +74,7 @@ module Spree
       else
         not_nil_scope = members.where.not(zoneable_type: nil)
         zone_type = not_nil_scope.order('created_at ASC').pluck(:zoneable_type).last
-        zone_type.demodulize.underscore if zone_type
+        zone_type&.demodulize&.underscore
       end
     end
 

data/app/paginators/spree/shared/paginate.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Shared
+    class Paginate
+      def initialize(collection, params)
+        @collection = collection
+        @page       = params[:page]
+        @per_page   = params[:per_page]
+      end
+
+      def call
+        collection.page(page).per(per_page)
+      end
+
+      private
+
+      attr_reader :collection, :page, :per_page
+    end
+  end
+end

data/app/services/spree/cart/add_item.rb

@@ -0,0 +1,43 @@
+module Spree
+  module Cart
+    class AddItem
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, variant:, quantity: nil, options: {})
+        ApplicationRecord.transaction do
+          run :add_to_line_item
+          run Spree::Cart::Recalculate
+        end
+      end
+
+      private
+
+      def add_to_line_item(order:, variant:, quantity: nil, options: {})
+        options ||= {}
+        quantity ||= 1
+
+        line_item = Spree::LineItems::FindByVariant.new.execute(order: order, variant: variant, options: options)
+
+        line_item_created = line_item.nil?
+        if line_item.nil?
+          opts = ::Spree::PermittedAttributes.line_item_attributes.flatten.each_with_object({}) do |attribute, result|
+            result[attribute] = options[attribute]
+          end.merge(currency: order.currency).delete_if { |_key, value| value.nil? }
+
+          line_item = order.line_items.new(quantity: quantity,
+                                           variant: variant,
+                                           options: opts)
+        else
+          line_item.quantity += quantity.to_i
+        end
+
+        line_item.target_shipment = options[:shipment] if options.key? :shipment
+
+        return failure(line_item) unless line_item.save
+
+        ::Spree::TaxRate.adjust(order, [line_item.reload]) if line_item_created
+        success(order: order, line_item: line_item, line_item_created: line_item_created, options: options)
+      end
+    end
+  end
+end

data/app/services/spree/cart/create.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Cart
+    class Create
+      prepend Spree::ServiceModule::Base
+
+      def call(user:, store:, currency:, order_params: nil)
+        order_params ||= {}
+
+        default_params = {
+          user: user,
+          store: store,
+          currency: currency,
+          token: GenerateToken.new.call(Spree::Order)
+        }
+
+        order = Spree::Order.create!(default_params.merge(order_params))
+        success(order)
+      end
+    end
+  end
+end

data/app/services/spree/cart/recalculate.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Cart
+    class Recalculate
+      prepend Spree::ServiceModule::Base
+
+      def call(order:, line_item:, line_item_created: false, options: {})
+        order_updater = ::Spree::OrderUpdater.new(order)
+
+        order.payments.store_credits.checkout.destroy_all
+        order_updater.update
+
+        shipment = options[:shipment]
+        if shipment.present?
+          # ADMIN END SHIPMENT RATE FIX
+          # refresh shipments to ensure correct shipment amount is calculated when using price sack calculator
+          # for calculating shipment rates.
+          # Currently shipment rate is calculated on previous order total instead of current order total when updating a shipment from admin end.
+          order.refresh_shipment_rates(::Spree::ShippingMethod::DISPLAY_ON_BACK_END)
+          shipment.update_amounts
+        else
+          order.ensure_updated_shipments
+        end
+
+        ::Spree::PromotionHandler::Cart.new(order, line_item).activate
+        ::Spree::Adjustable::AdjustmentsUpdater.update(line_item)
+        ::Spree::TaxRate.adjust(order, [line_item.reload]) if line_item_created
+        order_updater.update
+        success(line_item)
+      end
+    end
+  end
+end