solidus_core 4.3.5 → 4.4.1

data/app/models/spree/role.rb

@@ -4,8 +4,10 @@ module Spree
   class Role < Spree::Base
     has_many :role_users, class_name: "Spree::RoleUser", dependent: :destroy
     has_many :users, through: :role_users
+    has_many :role_permissions, dependent: :destroy
+    has_many :permission_sets, through: :role_permissions
 
-    validates_uniqueness_of :name, case_sensitive: true
+    validates :name, presence: true, uniqueness: { case_sensitive: true, allow_blank: true }
 
     def admin?
       name == "admin"

data/app/models/spree/role_permission.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spree
+  class RolePermission < Spree::Base
+    belongs_to :role
+    belongs_to :permission_set
+  end
+end

data/app/models/spree/shipment.rb

@@ -31,7 +31,7 @@ module Spree
     scope :ready,   -> { with_state('ready') }
     scope :shipped, -> { with_state('shipped') }
     scope :trackable, -> { where("tracking IS NOT NULL AND tracking != ''") }
-    scope :with_state, ->(*state) { where(state: state) }
+    scope :with_state, ->(*state) { where(state:) }
     # sort by most recent shipped_at, falling back to created_at. add "id desc" to make specs that involve this scope more deterministic.
     scope :reverse_chronological, -> {
       order(Arel.sql("coalesce(#{Spree::Shipment.table_name}.shipped_at, #{Spree::Shipment.table_name}.created_at) desc"), id: :desc)
@@ -92,7 +92,7 @@ module Spree
     # @return [BigDecimal] the amount of this item, taking into consideration
     #   all non-tax adjustments.
     def total_before_tax
-      amount + adjustments.select { |adjustment| !adjustment.tax? && adjustment.eligible? }.sum(&:amount)
+      amount + adjustments.reject(&:tax?).sum(&:amount)
     end
 
     # @return [BigDecimal] the amount of this shipment before VAT tax
@@ -175,7 +175,7 @@ module Spree
     end
 
     def manifest
-      @manifest ||= Spree::ShippingManifest.new(inventory_units: inventory_units).items
+      @manifest ||= Spree::ShippingManifest.new(inventory_units:).items
     end
 
     def selected_shipping_rate_id
@@ -217,7 +217,7 @@ module Spree
 
     def set_up_inventory(state, variant, _order, line_item)
       inventory_units.create(
-        state: state,
+        state:,
         variant_id: variant.id,
         line_item_id: line_item.id
       )
@@ -263,7 +263,7 @@ module Spree
         self.cost = selected_shipping_rate.cost
         if changed?
           update_columns(
-            cost: cost,
+            cost:,
             updated_at: Time.current
           )
         end
@@ -312,7 +312,7 @@ module Spree
     end
 
     def after_ship
-      order.shipping.ship_shipment(self, suppress_mailer: suppress_mailer)
+      order.shipping.ship_shipment(self, suppress_mailer:)
     end
 
     def can_get_rates?
@@ -339,7 +339,7 @@ module Spree
 
     def ensure_can_destroy
       if shipped? || canceled?
-        errors.add(:state, :cannot_destroy, state: state)
+        errors.add(:state, :cannot_destroy, state:)
         throw :abort
       end
     end

data/app/models/spree/shipping_category.rb

@@ -2,6 +2,8 @@
 
 module Spree
   class ShippingCategory < Spree::Base
+    self.allowed_ransackable_attributes = %w[name]
+
     validates :name, presence: true
     has_many :products, inverse_of: :shipping_category
     has_many :shipping_method_categories, inverse_of: :shipping_category

data/app/models/spree/shipping_rate.rb

@@ -31,7 +31,7 @@ module Spree
       tax_explanations = taxes.map(&:label).join(tax_label_separator)
 
       I18n.t 'spree.shipping_rate.display_price.display_price_with_explanations',
-             price: price,
+             price:,
              explanations: tax_explanations
     end
     alias_method :display_cost, :display_price

data/app/models/spree/{order_contents.rb → simple_order_contents.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  class OrderContents
+  class SimpleOrderContents
     attr_accessor :order
 
     def initialize(order)
@@ -38,12 +38,7 @@ module Spree
       if order.update(params)
         unless order.completed?
           order.line_items = order.line_items.select { |li| li.quantity > 0 }
-          # Update totals, then check if the order is eligible for any cart promotions.
-          # If we do not update first, then the item total will be wrong and ItemTotal
-          # promotion rules would not be triggered.
-          reload_totals
           order.check_shipments_and_restart_checkout
-          PromotionHandler::Cart.new(order).activate
         end
         reload_totals
         true
@@ -71,10 +66,8 @@ module Spree
     private
 
     def after_add_or_remove(line_item, options = {})
-      reload_totals
       shipment = options[:shipment]
       shipment.present? ? shipment.update_amounts : order.check_shipments_and_restart_checkout
-      PromotionHandler::Cart.new(order, line_item).activate
       reload_totals
       line_item
     end
@@ -88,8 +81,8 @@ module Spree
 
       line_item ||= order.line_items.new(
         quantity: 0,
-        variant: variant,
-        adjustments: [],
+        variant:,
+        adjustments: []
       )
 
       line_item.quantity += quantity.to_i
@@ -117,7 +110,7 @@ module Spree
     def grab_line_item_by_variant(variant, raise_error = false, options = {})
       line_item = order.find_line_item_by_variant(variant, options)
 
-      if !line_item.present? && raise_error
+      if line_item.blank? && raise_error
         raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
       end
 

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

@@ -39,7 +39,7 @@ module Spree
           cost = shipping_method.calculator.compute(package)
           if cost
             rate = shipping_method.shipping_rates.new(
-              cost: cost,
+              cost:,
               shipment: package.shipment
             )
             tax_calculator.calculate(rate).each do |tax|

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

@@ -25,7 +25,7 @@ module Spree
           Spree::InventoryUnit.new(
             pending: true,
             variant: line_item.variant,
-            line_item: line_item
+            line_item:
           )
         end
       end

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

@@ -124,8 +124,8 @@ module Spree
         contents.each { |content_item| content_item.inventory_unit.state = content_item.state.to_s }
 
         Spree::Shipment.new(
-          order: order,
-          stock_location: stock_location,
+          order:,
+          stock_location:,
           inventory_units: contents.map(&:inventory_unit)
         )
       end

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

@@ -41,7 +41,7 @@ module Spree
         @desired = Spree::StockQuantities.new(inventory_units_by_variant.transform_values(&:count))
         @availability = Spree::Stock::Availability.new(
           variants: desired.variants,
-          stock_locations: stock_locations
+          stock_locations:
         )
 
         @allocator = Spree::Config.stock.allocator_class.new(availability)

data/app/models/spree/stock_location.rb

@@ -39,7 +39,7 @@ module Spree
 
     # Wrapper for creating a new stock item respecting the backorderable config
     def propagate_variant(variant)
-      stock_items.create!(variant: variant, backorderable: backorderable_default)
+      stock_items.create!(variant:, backorderable: backorderable_default)
     end
 
     # Return either an existing stock item or create a new one. Useful in
@@ -55,7 +55,7 @@ module Spree
     #
     # @return [StockItem] Corresponding StockItem for the StockLocation's variant.
     def stock_item(variant_id)
-      stock_items.where(variant_id: variant_id).order(:id).first
+      stock_items.where(variant_id:).order(:id).first
     end
 
     # Attempts to look up StockItem for the variant, and creates one if not found.
@@ -101,8 +101,8 @@ module Spree
       if quantity < 1 && !stock_item(variant)
         raise InvalidMovementError.new(I18n.t('spree.negative_movement_absent_item'))
       end
-      stock_item_or_create(variant).stock_movements.create!(quantity: quantity,
-                                                            originator: originator)
+      stock_item_or_create(variant).stock_movements.create!(quantity:,
+                                                            originator:)
     end
 
     def fill_status(variant, quantity)
@@ -121,7 +121,7 @@ module Spree
 
     def ensure_one_default
       if default
-        Spree::StockLocation.where(default: true).where.not(id: id).find_each do |stock_location|
+        Spree::StockLocation.where(default: true).where.not(id:).find_each do |stock_location|
           stock_location.default = false
           stock_location.save!
         end

data/app/models/spree/store.rb

@@ -58,7 +58,7 @@ module Spree
 
     def ensure_default_exists_and_is_unique
       if default
-        Spree::Store.where.not(id: id).update_all(default: false)
+        Spree::Store.where.not(id:).update_all(default: false)
       elsif Spree::Store.where(default: true).count == 0
         self.default = true
       end

data/app/models/spree/store_credit.rb

@@ -58,7 +58,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   def authorize(amount, order_currency, options = {})
     authorization_code = options[:action_authorization_code]
     if authorization_code
-      if store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
+      if store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code:)
         # Don't authorize again on capture
         return true
       end
@@ -92,7 +92,7 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def capture(amount, authorization_code, order_currency, options = {})
     return false unless authorize(amount, order_currency, action_authorization_code: authorization_code)
-    auth_event = store_credit_events.find_by!(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
+    auth_event = store_credit_events.find_by!(action: AUTHORIZE_ACTION, authorization_code:)
 
     if amount <= auth_event.amount
       if currency != order_currency
@@ -117,7 +117,7 @@ class Spree::StoreCredit < Spree::PaymentSource
   end
 
   def void(authorization_code, options = {})
-    if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
+    if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code:)
       update!({
         action: VOID_ACTION,
         action_amount: auth_event.amount,
@@ -135,7 +135,7 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def credit(amount, authorization_code, order_currency, options = {})
     # Find the amount related to this authorization_code in order to add the store credit back
-    capture_event = store_credit_events.find_by(action: CAPTURE_ACTION, authorization_code: authorization_code)
+    capture_event = store_credit_events.find_by(action: CAPTURE_ACTION, authorization_code:)
 
     if currency != order_currency # sanity check to make sure the order currency hasn't changed since the auth
       errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
@@ -221,25 +221,25 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def create_credit_record_params(amount)
     {
-      amount: amount,
-      user_id: user_id,
-      category_id: category_id,
-      created_by_id: created_by_id,
-      currency: currency,
-      type_id: type_id,
+      amount:,
+      user_id:,
+      category_id:,
+      created_by_id:,
+      currency:,
+      type_id:,
       memo: credit_allocation_memo
     }
   end
 
   def credit_allocation_memo
-    I18n.t("spree.store_credit.credit_allocation_memo", id: id)
+    I18n.t("spree.store_credit.credit_allocation_memo", id:)
   end
 
   def store_event
     return unless saved_change_to_amount? || saved_change_to_amount_used? || saved_change_to_amount_authorized? || [ELIGIBLE_ACTION, INVALIDATE_ACTION].include?(action)
 
     event = if action
-      store_credit_events.build(action: action)
+      store_credit_events.build(action:)
     else
       store_credit_events.where(action: ALLOCATION_ACTION).first_or_initialize
     end
@@ -247,10 +247,10 @@ class Spree::StoreCredit < Spree::PaymentSource
     event.update!({
       amount: action_amount || amount,
       authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
-      amount_remaining: amount_remaining,
-      user_total_amount: user.available_store_credit_total(currency: currency),
+      amount_remaining:,
+      user_total_amount: user.available_store_credit_total(currency:),
       originator: action_originator,
-      store_credit_reason: store_credit_reason
+      store_credit_reason:
     })
   end
 

data/app/models/spree/store_credit_event.rb

@@ -33,15 +33,15 @@ module Spree
     end
 
     def display_amount
-      Spree::Money.new(amount, { currency: currency })
+      Spree::Money.new(amount, { currency: })
     end
 
     def display_user_total_amount
-      Spree::Money.new(user_total_amount, { currency: currency })
+      Spree::Money.new(user_total_amount, { currency: })
     end
 
     def display_remaining_amount
-      Spree::Money.new(amount_remaining, { currency: currency })
+      Spree::Money.new(amount_remaining, { currency: })
     end
 
     def display_event_date

data/app/models/spree/tax_calculator/default.rb

@@ -46,7 +46,7 @@ module Spree
           Spree::Tax::ItemTax.new(
             label: rate.adjustment_label(amount),
             tax_rate: rate,
-            amount: amount,
+            amount:,
             included_in_price: rate.included_in_price
           )
         end
@@ -89,7 +89,7 @@ module Spree
             item_id: item.id,
             label: rate.adjustment_label(amount),
             tax_rate: rate,
-            amount: amount,
+            amount:,
             included_in_price: rate.included_in_price
           )
         end

data/app/models/spree/tax_calculator/shipping_rate.rb

@@ -35,7 +35,7 @@ module Spree
             item_id: shipping_rate.id,
             label: rate.adjustment_label(amount),
             tax_rate: rate,
-            amount: amount
+            amount:
           )
         end
       end

data/app/models/spree/tax_category.rb

@@ -4,6 +4,8 @@ module Spree
   class TaxCategory < Spree::Base
     include Spree::SoftDeletable
 
+    self.allowed_ransackable_attributes = %w[name description]
+
     after_discard do
       self.tax_rate_tax_categories = []
     end
@@ -28,7 +30,7 @@ module Spree
 
     def ensure_one_default
       if is_default
-        Spree::TaxCategory.where(is_default: true).where.not(id: id).update_all(is_default: false, updated_at: Time.current)
+        Spree::TaxCategory.where(is_default: true).where.not(id:).update_all(is_default: false, updated_at: Time.current)
       end
     end
   end

data/app/models/spree/tax_rate.rb

@@ -11,10 +11,10 @@ module Spree
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
 
-    enum level: {
+    enum :level, {
       item: 0,
       order: 1
-    }, _suffix: true
+    }, suffix: true
 
     belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates, optional: true
 
@@ -37,7 +37,7 @@ module Spree
     # Finds all tax rates whose zones match a given address
     scope :for_address, ->(address) { joins(:zone).merge(Spree::Zone.for_address(address)) }
     scope :for_country,
-          ->(country) { for_address(Spree::Tax::TaxLocation.new(country: country)) }
+          ->(country) { for_address(Spree::Tax::TaxLocation.new(country:)) }
     scope :active, -> do
       table = arel_table
       time = Time.current

data/app/models/spree/taxonomy.rb

@@ -21,11 +21,11 @@ module Spree
     def set_name
       if root
         root.update_columns(
-          name: name,
+          name:,
           updated_at: Time.current
         )
       else
-        self.root = Spree::Taxon.create!(taxonomy_id: id, name: name)
+        self.root = Spree::Taxon.create!(taxonomy_id: id, name:)
       end
     end
   end

data/app/models/spree/unit_cancel.rb

@@ -20,10 +20,9 @@ class Spree::UnitCancel < Spree::Base
 
     self.adjustment = inventory_unit.line_item.adjustments.create!(
       source: self,
-      amount: amount,
+      amount:,
       order: inventory_unit.order,
       label: "#{I18n.t('spree.cancellation')} - #{reason}",
-      eligible: true,
       finalized: true
     )
 

data/app/models/spree/variant/vat_price_generator.rb

@@ -41,7 +41,7 @@ module Spree
       def find_or_initialize_price_by(country_iso, currency)
         variant.prices.detect do |price|
           price.country_iso == country_iso && price.currency == currency
-        end || variant.prices.build(country_iso: country_iso, currency: currency)
+        end || variant.prices.build(country_iso:, currency:)
       end
 
       # nil is added to the array so we always have an export price.

data/app/models/spree/variant.rb

@@ -80,6 +80,11 @@ module Spree
 
     after_destroy :destroy_option_values_variants
 
+    scope :template_variants, -> do
+      left_joins(product: { option_types: :option_values }).where(is_master: true).where.not(spree_option_values: { id: nil }).reorder(nil).distinct
+    end
+    scope :non_template_variants, -> { where.not(id: template_variants) }
+
     # Returns variants that are in stock. When stock locations are provided as
     # a parameter, the scope is limited to variants that are in stock in the
     # provided stock locations.
@@ -94,7 +99,7 @@ module Spree
       if stock_locations.present?
         in_stock_variants = in_stock_variants.where(spree_stock_items: { stock_location_id: stock_locations.map(&:id) })
       end
-      in_stock_variants
+      in_stock_variants.distinct
     end
 
     # Returns a scope of Variants which are suppliable. This includes:
@@ -194,7 +199,7 @@ module Spree
     #
     # @return [String] a sentence-ified string of option values.
     def options_text
-      values = option_values.includes(:option_type).sort_by do |option_value|
+      values = option_values.sort_by do |option_value|
         option_value.option_type.position
       end
 

data/app/models/spree/wallet.rb

@@ -28,7 +28,7 @@ class Spree::Wallet
   # @param payment_source [PaymentSource] The payment source to add to the wallet
   # @return [WalletPaymentSource] the generated WalletPaymentSource
   def add(payment_source)
-    user.wallet_payment_sources.find_or_create_by!(payment_source: payment_source)
+    user.wallet_payment_sources.find_or_create_by!(payment_source:)
   end
 
   # Remove a PaymentSource from the wallet.
@@ -37,7 +37,7 @@ class Spree::Wallet
   # @raise [ActiveRecord::RecordNotFound] if the source is not in the wallet.
   # @return [WalletPaymentSource] the destroyed WalletPaymentSource
   def remove(payment_source)
-    user.wallet_payment_sources.find_by!(payment_source: payment_source).destroy!
+    user.wallet_payment_sources.find_by!(payment_source:).destroy!
   end
 
   # Find a WalletPaymentSource in the wallet by id.

data/app/views/spree/order_mailer/cancel_email.html.erb

@@ -26,7 +26,7 @@
           <td><%= t('.subtotal') %></td>
           <td><%= @order.display_item_total %></td>
         </tr>
-        <% @order.adjustments.eligible.each do |adjustment| %>
+        <% @order.adjustments.each do |adjustment| %>
           <tr>
             <td></td>
             <td><%= sanitize(adjustment.label) %></td>

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -10,7 +10,7 @@
 <% end %>
 ============================================================
 <%= t('.subtotal') %> <%= @order.display_item_total %>
-<% @order.adjustments.eligible.each do |adjustment| %>
+<% @order.adjustments.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
 <%= t('.total') %> <%= @order.display_total %>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -31,8 +31,8 @@
           </td>
         </tr>
         <% if @order.line_item_adjustments.exists? %>
-          <% if @order.all_adjustments.promotion.eligible.exists? %>
-            <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <% if @order.all_adjustments.promotion.exists? %>
+            <% @order.all_adjustments.promotion.group_by(&:label).each do |label, adjustments| %>
               <tr>
                 <td></td>
                 <td><%= t('spree.promotion') %> <%= label %>:</td>
@@ -48,8 +48,8 @@
             <td><%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: @order.currency) %></td>
           </tr>
         <% end %>
-        <% if @order.all_adjustments.eligible.tax.exists? %>
-          <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+        <% if @order.all_adjustments.tax.exists? %>
+          <% @order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
             <tr>
               <td></td>
               <td><%= t('spree.tax') %> <%= label %>:</td>
@@ -57,7 +57,7 @@
             </tr>
           <% end %>
         <% end %>
-        <% @order.adjustments.eligible.each do |adjustment| %>
+        <% @order.adjustments.each do |adjustment| %>
           <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr>
             <td></td>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -11,8 +11,8 @@
 ============================================================
 <%= t('.subtotal') %> <%= @order.display_item_total %>
 <% if @order.line_item_adjustments.exists? %>
-  <% if @order.all_adjustments.promotion.eligible.exists? %>
-    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+  <% if @order.all_adjustments.promotion.exists? %>
+    <% @order.all_adjustments.promotion.group_by(&:label).each do |label, adjustments| %>
 <%= t('spree.promotion') %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
     <% end %>
   <% end %>
@@ -22,13 +22,13 @@
 <%= t('spree.shipping') %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: @order.currency) %>
 <% end %>
 
-<% if @order.all_adjustments.eligible.tax.exists? %>
-  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+<% if @order.all_adjustments.tax.exists? %>
+  <% @order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
 <%= t('spree.tax') %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
   <% end %>
 <% end %>
 
-<% @order.adjustments.eligible.each do |adjustment| %>
+<% @order.adjustments.each do |adjustment| %>
   <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
 <%= adjustment.label %> <%= adjustment.display_amount %>
 <% end %>