solidus_core 4.1.6 → 4.5.1

data/lib/spree/permission_sets/order_management.rb

@@ -1,40 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for order management.
-    #
-    # This permission set grants full control over all order and related resources,
-    # including:
-    #
-    # - Orders
-    # - Payments
-    # - Shipments
-    # - Adjustments
-    # - Line items
-    # - Return authorizations
-    # - Customer returns
-    # - Order cancellations
-    # - Reimbursements
-    # - Return items
-    # - Refunds
-    #
-    # It also allows reading reimbursement types, but not modifying them.
-    class OrderManagement < PermissionSets::Base
-      def activate!
-        can :read, Spree::ReimbursementType
-        can :manage, Spree::Order
-        can :manage, Spree::Payment
-        can :manage, Spree::Shipment
-        can :manage, Spree::Adjustment
-        can :manage, Spree::LineItem
-        can :manage, Spree::ReturnAuthorization
-        can :manage, Spree::CustomerReturn
-        can :manage, Spree::OrderCancellations
-        can :manage, Spree::Reimbursement
-        can :manage, Spree::ReturnItem
-        can :manage, Spree::Refund
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/product_display.rb

@@ -1,33 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for products.
-    #
-    # This permission set allows users to view all related information about
-    # products, also from the admin panel, including:
-    #
-    # - Products
-    # - Images
-    # - Variants
-    # - Option values
-    # - Product properties
-    # - Option types
-    # - Properties
-    # - Taxonomies
-    # - Taxons
-    class ProductDisplay < PermissionSets::Base
-      def activate!
-        can [:read, :admin, :edit], Spree::Product
-        can [:read, :admin], Spree::Image
-        can [:read, :admin], Spree::Variant
-        can [:read, :admin], Spree::OptionValue
-        can [:read, :admin], Spree::ProductProperty
-        can [:read, :admin], Spree::OptionType
-        can [:read, :admin], Spree::Property
-        can [:read, :admin], Spree::Taxonomy
-        can [:read, :admin], Spree::Taxon
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/product_management.rb

@@ -1,37 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for product management.
-    #
-    # This permission set grants full control over all product and related resources,
-    # including:
-    #
-    # - Products
-    # - Images
-    # - Variants
-    # - Option values
-    # - Product properties
-    # - Option types
-    # - Properties
-    # - Taxonomies
-    # - Taxons
-    # - Classifications
-    # - Prices
-    class ProductManagement < PermissionSets::Base
-      def activate!
-        can :manage, Spree::Classification
-        can :manage, Spree::Image
-        can :manage, Spree::OptionType
-        can :manage, Spree::OptionValue
-        can :manage, Spree::Price
-        can :manage, Spree::Product
-        can :manage, Spree::ProductProperty
-        can :manage, Spree::Property
-        can :manage, Spree::Taxon
-        can :manage, Spree::Taxonomy
-        can :manage, Spree::Variant
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/restricted_stock_display.rb

@@ -1,23 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read permissions for stock limited to allowed locations.
-    #
-    # This permission set allows users to view information about stock items and
-    # locations, both of them limited to locations they have access to.
-    # Permissions are also granted for the admin panel for items.
-    class RestrictedStockDisplay < PermissionSets::Base
-      def activate!
-        can [:read, :admin], Spree::StockItem, stock_location_id: location_ids
-        can :read, Spree::StockLocation, id: location_ids
-      end
-
-      private
-
-      def location_ids
-        @ids ||= user.stock_locations.pluck(:id)
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/restricted_stock_management.rb

@@ -1,23 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for stock management limited to allowed locations.
-    #
-    # This permission set grants full control over all stock items a user has
-    # access to their locations. Those locations are also readable by the
-    # corresponding ability.
-    class RestrictedStockManagement < PermissionSets::Base
-      def activate!
-        can :manage, Spree::StockItem, stock_location_id: location_ids
-        can :read, Spree::StockLocation, id: location_ids
-      end
-
-      private
-
-      def location_ids
-        @ids ||= user.stock_locations.pluck(:id)
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/stock_display.rb

@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for stock.
-    #
-    # This permission set allows users to view information about stock items
-    # (also from the admin panel) and stock locations.
-    class StockDisplay < PermissionSets::Base
-      def activate!
-        can [:read, :admin], Spree::StockItem
-        can :read, Spree::StockLocation
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/stock_management.rb

@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for stock management.
-    #
-    # This permission set grants full control over all stock items and read
-    # access to locations.
-    class StockManagement < PermissionSets::Base
-      def activate!
-        can :manage, Spree::StockItem
-        can :read, Spree::StockLocation
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/super_user.rb

@@ -1,16 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for store administration.
-    #
-    # This permission set is always added to users with the `:admin` role.
-    #
-    # It grants permission to perform any read or write action on any resource.
-    class SuperUser < PermissionSets::Base
-      def activate!
-        can :manage, :all
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/user_display.rb

@@ -1,17 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Read-only permissions for users, roles and store credits.
-    #
-    # This permission set allows users to view all related information about
-    # users, roles and store credits, also from the admin panel.
-    class UserDisplay < PermissionSets::Base
-      def activate!
-        can [:read, :admin, :edit, :addresses, :orders, :items], Spree.user_class
-        can [:read, :admin], Spree::StoreCredit
-        can :read, Spree::Role
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets/user_management.rb

@@ -1,34 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module PermissionSets
-    # Full permissions for user management.
-    #
-    # This permission set grants full control over all user and
-    # related resources, including:
-    #
-    # - Users
-    # - Store credits
-    # - Roles
-    # - API keys
-    class UserManagement < PermissionSets::Base
-      def activate!
-        can [:admin, :read, :create, :update, :save_in_address_book, :remove_from_address_book, :addresses, :orders, :items], Spree.user_class
-
-        # Note: This does not work with accessible_by.
-        # See https://github.com/solidusio/solidus/pull/1263
-        can :update_email, Spree.user_class do |user|
-          user.spree_roles.none?
-        end
-        can :update_password, Spree.user_class do |user|
-          user.spree_roles.none?
-        end
-
-        cannot :destroy, Spree.user_class
-        can :manage, Spree::StoreCredit
-        can :manage, :api_key
-        can :read, Spree::Role
-      end
-    end
-  end
-end
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permission_sets.rb

@@ -1,20 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/permission_sets/base'
-require 'spree/permission_sets/configuration_display'
-require 'spree/permission_sets/configuration_management'
-require 'spree/permission_sets/dashboard_display'
-require 'spree/permission_sets/default_customer'
-require 'spree/permission_sets/order_display'
-require 'spree/permission_sets/order_management'
-require 'spree/permission_sets/product_display'
-require 'spree/permission_sets/product_management'
-require 'spree/permission_sets/promotion_display'
-require 'spree/permission_sets/promotion_management'
-require 'spree/permission_sets/restricted_stock_display'
-require 'spree/permission_sets/restricted_stock_management'
-require 'spree/permission_sets/stock_display'
-require 'spree/permission_sets/stock_management'
-require 'spree/permission_sets/super_user'
-require 'spree/permission_sets/user_display'
-require 'spree/permission_sets/user_management'
+Spree.deprecator.warn(
+  <<~MSG
+    The file "#{__FILE__}" does not need to be `require`d any longer, it is now autoloaded.
+  MSG
+)

data/lib/spree/permitted_attributes.rb

@@ -14,6 +14,7 @@ module Spree
       :checkout_confirm_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
+      :customer_metadata_attributes,
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
@@ -55,21 +56,23 @@ module Spree
       :stock_location_id, return_items_attributes: [
         :id, :inventory_unit_id, :return_authorization_id, :returned, :amount,
         :reception_status_event, :acceptance_status, :exchange_variant_id,
-        :resellable, :return_reason_id
+        :resellable, :return_reason_id, customer_metadata: {}
       ]
     ]
 
+    @@customer_metadata_attributes = [customer_metadata: {}]
+
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
     @@inventory_unit_attributes = [:shipment, :variant_id]
 
-    @@line_item_attributes = [:id, :variant_id, :quantity]
+    @@line_item_attributes = [:id, :variant_id, :quantity, customer_metadata: {}]
 
     @@option_value_attributes = [:name, :presentation]
 
     @@option_type_attributes = [:name, :presentation, option_values_attributes: option_value_attributes]
 
-    @@payment_attributes = [:amount, :payment_method_id, :payment_method]
+    @@payment_attributes = [:amount, :payment_method_id, :payment_method, customer_metadata: {}]
 
     @@product_properties_attributes = [:property_name, :value, :position]
 
@@ -78,16 +81,24 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :option_type_ids, :cost_currency, :cost_price
+      :taxon_ids, :option_type_ids, :cost_currency, :cost_price, :primary_taxon_id,
+      :gtin, :condition
     ]
 
     @@property_attributes = [:name, :presentation]
 
-    @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id, return_items_attributes: [:inventory_unit_id, :exchange_variant_id, :return_reason_id, :preferred_reimbursement_type_id]]
+    @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id,
+                                         customer_metadata: {},
+                                         return_items_attributes: [
+                                           :inventory_unit_id,
+                                           :exchange_variant_id,
+                                           :return_reason_id,
+                                           :preferred_reimbursement_type_id
+                                         ]]
 
     @@shipment_attributes = [
       :special_instructions, :stock_location_id, :id, :tracking,
-      :selected_shipping_rate_id
+      :selected_shipping_rate_id, customer_metadata: {}
     ]
 
     # month / year may be provided by some sources, or others may elect to use one field
@@ -95,7 +106,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :wallet_payment_source_id, address_attributes: address_attributes
+      :wallet_payment_source_id, address_attributes:
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -126,7 +137,7 @@ module Spree
     # by changing a user with higher priveleges' email to one a lower-priveleged
     # admin owns. Creating a user with an email is handled separate at the
     # controller level.
-    @@user_attributes = [:password, :password_confirmation]
+    @@user_attributes = [:password, :password_confirmation, customer_metadata: {}]
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
@@ -140,6 +151,7 @@ module Spree
 
     @@checkout_address_attributes = [
       :use_billing,
+      :use_shipping,
       :email,
       bill_address_attributes: address_attributes,
       ship_address_attributes: address_attributes
@@ -152,7 +164,7 @@ module Spree
 
     @@checkout_payment_attributes = [
       payments_attributes: payment_attributes + [
-        source_attributes: source_attributes
+        source_attributes:
       ]
     ]
 

data/lib/spree/preferences/configuration.rb

@@ -173,6 +173,10 @@ module Spree::Preferences
         class_name = class_name.constantize if class_name.is_a?(String)
         class_name
       end
+
+      define_method("#{name}_name") do
+        instance_variable_get(ivar) || default
+      end
     end
 
     def self.by_version(*args)

data/lib/spree/preferences/persistable.rb

@@ -7,7 +7,13 @@ module Spree
 
       included do
         include Spree::Preferences::Preferable
-        serialize :preferences, Hash
+
+        if Rails.gem_version >= Gem::Version.new('7.1')
+          serialize :preferences, type: Hash, coder: YAML
+        else
+          serialize :preferences, Hash, coder: YAML
+        end
+
         after_initialize :initialize_preference_defaults
       end
 

data/lib/spree/preferences/store.rb

@@ -19,7 +19,7 @@ module Spree::Preferences
 
     def exist?(key)
       @cache.exist?(key) ||
-        should_persist? && Spree::Preference.where(key: key).exists?
+        should_persist? && Spree::Preference.where(key:).exists?
     end
 
     def get(key)
@@ -35,7 +35,7 @@ module Spree::Preferences
         # has been cleared from the cache
 
         # does it exist in the database?
-        if preference = Spree::Preference.find_by(key: key)
+        if preference = Spree::Preference.find_by(key:)
           # it does exist
           val = preference.value
         else

data/lib/spree/testing_support/capybara_ext.rb

@@ -23,7 +23,7 @@ module Spree
             field.dispatchEvent(event);
           JS
         else
-          fill_in locator, with: with
+          fill_in locator, with:
         end
       end
 
@@ -110,6 +110,16 @@ module Spree
         # find the original.
         find('label:not(.select2-offscreen)', text: /#{Regexp.escape(text)}/i, match: :one)
       end
+
+      def dialog(parent: 'body', **options)
+        within(parent) do
+          find('dialog', visible: :all, **options)
+        end
+      end
+
+      def turbo_frame_modal
+        dialog(parent: find('turbo-frame', visible: :all))
+      end
     end
   end
 end

data/lib/spree/testing_support/common_rake.rb

@@ -31,6 +31,7 @@ class CommonRakeTasks
           'solidus:install',
           Dir.pwd, # use the current dir as Rails.root
           "--auto-accept",
+          "--admin-preview=#{ENV.fetch('ADMIN_PREVIEW', 'false')}",
           "--authentication=none",
           "--payment-method=none",
           "--migrate=false",

data/lib/spree/testing_support/dummy_ability.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'cancan'
+
+class DummyAbility
+  include CanCan::Ability
+end

data/lib/spree/testing_support/dummy_app/assets/stylesheets/solidus_admin/tailwind.css

@@ -0,0 +1 @@
+/* Placeholder for compiled tailwind.css file */

data/lib/spree/testing_support/dummy_app/database.yml

@@ -1,54 +1,45 @@
-<% db = case ENV['DB']
-        when 'mysql'
-          'mysql'
-        when 'postgres', 'postgresql'
-          'postgres'
-        when 'sqlite', '', nil
-          'sqlite'
-        else
-          raise "Invalid DB specified: #{ENV['DB']}"
-        end %>
-<% db_host = case db
-             when 'mysql'
-               ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
-             when 'postgres'
-               ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
-             else
-               ENV['DB_HOST']
-             end %>
-<% db_prefix = ENV['LIB_NAME'].presence || "solidus" %>
-<% db_username = ENV['DB_USERNAME'] %>
-<% db_password = ENV['DB_PASSWORD'] %>
-<% case db
-when 'mysql' %>
+<%
+  adapter =
+    case ENV['DB']
+    when 'mysql2', 'mysql' then 'mysql2'
+    when 'postgresql', 'postgres' then 'postgresql'
+    when 'sqlite3', 'sqlite', '', nil then 'sqlite3'
+    else raise "Invalid DB specified " + ENV['DB'].inspect
+    end
+
+  db_host =
+    case adapter
+    when 'mysql2' then ENV['DB_MYSQL_HOST'] || ENV['DB_HOST']
+    when 'postgresql' then ENV['DB_POSTGRES_HOST'] || ENV['DB_HOST']
+    else ENV['DB_HOST']
+    end
+
+  db_prefix = ENV['LIB_NAME'].presence || "solidus"
+  db_username = ENV['DB_USERNAME']
+  db_password = ENV['DB_PASSWORD'] %>
+
+default: &default
+  adapter: <%= adapter %>
+  <% unless db_username.blank? %>username: <%= db_username %><% end %>
+  <% unless db_password.blank? %>password: <%= db_password %><% end %>
+  <% unless db_host.blank? %>host: <%= db_host %><% end %>
+  <% if adapter == 'mysql2' %>encoding: utf8<% end %>
+  <% if adapter == 'postgresql' %>min_messages: warning<% end %>
+
+<% if adapter == 'mysql2' %>
 test:
-  adapter: mysql2
+  <<: *default
   database: <%= db_prefix %>_test
-  <% unless db_username.blank? %>
-  username: <%= db_username %>
-  <% end %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  encoding: utf8
-<% when 'postgres' %>
+
+<% elsif adapter == 'postgresql' %>
 test:
-  adapter: postgresql
+  <<: *default
   database: <%= db_prefix %>_test
-  username: <%= db_username.presence || "postgres" %>
-  <% unless db_password.blank? %>
-  password: <%= db_password %>
-  <% end %>
-  <% unless db_host.blank? %>
-  host: <%= db_host %>
-  <% end %>
-  min_messages: warning
-<% when 'sqlite' %>
+
+<% elsif adapter == 'sqlite3' %>
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/<%= db_prefix %>_test.sqlite3
   timeout: 10000
+
 <% end %>

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -4,21 +4,6 @@ module DummyApp
   module Migrations
     extend self
 
-    # Ensure database exists
-    def database_exists?
-      ActiveRecord::Base.connection
-    rescue ActiveRecord::NoDatabaseError
-      false
-    else
-      true
-    end
-
-    def needs_migration?
-      return true if !database_exists?
-
-      ActiveRecord::Base.connection.migration_context.needs_migration?
-    end
-
     def auto_migrate
       if needs_migration?
         puts "Configuration changed. Re-running migrations"
@@ -35,6 +20,14 @@ module DummyApp
 
     private
 
+    def needs_migration?
+      ActiveRecord::Migration.check_all_pending!
+    rescue ActiveRecord::PendingMigrationError, ActiveRecord::NoDatabaseError
+      true
+    else
+      false
+    end
+
     def sh(cmd)
       puts cmd
       system cmd