spree_admin 5.2.5 → 5.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6343175e74e621e960e6f2797a86935789eb638369639898f29ab9b1e05729a2
-  data.tar.gz: 7bd5f0d40d6ea7bc8bd222cb7c6d1d1bc58eb31beab299113631328c3d1ff16d
+  metadata.gz: 6390ee879e264cc465b0782308537ecb4ddf72b1e44bb3be480895679f09dc0e
+  data.tar.gz: ee4c89a7cb0c3ea4d4849e2102c2eb0107f26eb05c5b216714a06ccb63224b57
 SHA512:
-  metadata.gz: f3dc85d308a5168297a7a10d5dc902c2ccb6e5337d2c74a47c034d5462bf72c115d758760efb14f0b86b7e96f58cbdc63f9525db83468d9809da08059f28faf1
-  data.tar.gz: d0c2bdb7d28b2a80e4bbde137d936353e48ef24d96593e58257e19c51b78069e926a79e22a891ef2ee3a23d25cb1f0daa81cb78ef24ee7562dd6a0fd188412a6
+  metadata.gz: 4abd46a6f7ed2d5024ede1d6a21590ad21e055913671056e7295d869b96f064404de387869addbded86c1446b729524d876498c9bf125c4f0dd45470b98623a7
+  data.tar.gz: 615a0e0d2c2c892f0580d08443cf56f2228fbd514c1321f35d93d60e3c6920aac868d5374fdc849ebf44d7b3fa4efa840c4b77351522c8123187cfc6bfc722e6

data/app/controllers/spree/admin/addresses_controller.rb

@@ -54,11 +54,11 @@ module Spree
       end
 
       def create_service
-        Spree::Dependencies.address_create_service.constantize
+        Spree.address_create_service
       end
 
       def update_service
-        Spree::Dependencies.address_update_service.constantize
+        Spree.address_update_service
       end
 
       def address_update_address_changes_except

data/app/controllers/spree/admin/line_items_controller.rb

@@ -20,7 +20,7 @@ module Spree
                             'address'
                           end
 
-              result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               unless result.success?
                 flash[:error] = result.error.value.full_messages.to_sentence
@@ -53,7 +53,7 @@ module Spree
                             'address'
                           end
 
-              result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               unless result.success?
                 flash[:error] = result.error.value.full_messages.to_sentence
@@ -98,15 +98,15 @@ module Spree
       end
 
       def update_service
-        Spree::Dependencies.line_item_update_service.constantize
+        Spree.line_item_update_service
       end
 
       def destroy_service
-        Spree::Dependencies.line_item_destroy_service.constantize
+        Spree.line_item_destroy_service
       end
 
       def create_service
-        Spree::Dependencies.line_item_create_service.constantize
+        Spree.line_item_create_service
       end
 
       def build_resource

data/app/controllers/spree/admin/orders/billing_address_controller.rb

@@ -36,7 +36,7 @@ module Spree
                             'address'
                           end
 
-              advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               unless advance_to_payment_result.success?
                 flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
@@ -76,7 +76,7 @@ module Spree
                             'address'
                           end
 
-              advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               unless advance_to_payment_result.success?
                 flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence

data/app/controllers/spree/admin/orders/contact_information_controller.rb

@@ -18,7 +18,7 @@ module Spree
                             'address'
                           end
 
-              result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               unless result.success?
                 flash[:error] = result.error.value.full_messages.to_sentence

data/app/controllers/spree/admin/orders/shipping_address_controller.rb

@@ -23,7 +23,7 @@ module Spree
             @order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)
             if !@order.completed? && @order.line_items.any?
               @order.ensure_updated_shipments
-              advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')
+              advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: 'payment')
 
               unless advance_to_payment_result.success?
                 flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
@@ -57,7 +57,7 @@ module Spree
             @order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)
             if !@order.completed? && @order.line_items.any?
               @order.ensure_updated_shipments
-              advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')
+              advance_to_payment_result = Spree.checkout_advance_service.call(order: @order, state: 'payment')
 
               unless advance_to_payment_result.success?
                 flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence

data/app/controllers/spree/admin/orders/user_controller.rb

@@ -22,7 +22,7 @@ module Spree
                             'address'
                           end
 
-              result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+              result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
               if result.success?
                 flash[:success] = flash_message_for(@order, :successfully_updated)
@@ -64,7 +64,7 @@ module Spree
                           'address'
                         end
 
-            result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+            result = Spree.checkout_advance_service.call(order: @order, state: max_state)
 
             unless result.success?
               flash[:error] = result.error.value.full_messages.to_sentence

data/app/controllers/spree/admin/reports_controller.rb

@@ -7,7 +7,7 @@ module Spree
       add_breadcrumb Spree.t(:reports), :admin_reports_path
 
       before_action :set_user, only: [:new, :create]
-      before_action :load_report_line_items, only: [:new, :create]
+      before_action :load_report_line_items, only: :new
 
       def show
         redirect_to @object.attachment.url, status: :see_other, allow_other_host: true
@@ -20,7 +20,7 @@ module Spree
       end
 
       def load_report_line_items
-        @report_line_items = @object.line_items
+        @report_line_items = @object.line_items(limit: Spree::Admin::RuntimeConfig.reports_line_items_limit.to_i)
       end
 
       def create_turbo_stream_enabled?

data/app/controllers/spree/admin/shipments_controller.rb

@@ -11,7 +11,7 @@ module Spree
       before_action :refresh_shipping_rates, only: :edit
 
       def update
-        @result = Spree::Dependencies.shipment_update_service.constantize.call(shipment: @shipment, shipment_attributes: permitted_resource_params)
+        @result = Spree.shipment_update_service.call(shipment: @shipment, shipment_attributes: permitted_resource_params)
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:shipment)) if @result.success?
 
         redirect_back fallback_location: spree.edit_admin_order_path(@order)

data/app/models/spree/admin/form_builder.rb

@@ -220,13 +220,13 @@ module Spree
       #
       # @param method [Symbol] the field name
       # @param options [Hash] field options
-      # @option options [Boolean] :crop whether to crop the image
-      # @option options [Boolean] :auto_submit whether to auto-submit the form when the file is uploaded
-      # @option options [Boolean] :can_delete whether to show the delete button
-      # @option options [Boolean] :inline whether to display the uploader inline
-      # @option options [Integer] :height the height of the uploader
-      # @option options [Integer] :width the width of the uploader
-      # @option options [Array] :allowed_file_types the allowed file types, defaults to image types
+      # @option options [Integer] :width Width of the image preview in pixels
+      # @option options [Integer] :height Height of the image preview in pixels
+      # @option options [Boolean] :crop Enable image cropping with recommended size indicator
+      # @option options [Boolean] :auto_submit Automatically submit form when file is selected
+      # @option options [Boolean] :can_delete Show delete button for removing uploaded image
+      # @option options [String] :css Additional CSS classes for the upload placeholder area
+      # @option options [Array] :allowed_file_types Specify the allowed file types
       # @return [String] HTML string containing the complete form group with direct file upload field
       def spree_file_field(method, options = {})
         @template.content_tag(:div, class: 'form-group') do

data/app/views/active_storage/_upload_form.html.erb

@@ -2,6 +2,7 @@
 <% height ||= 300 %>
 <% crop ||= false unless defined?(crop) %>
 <% auto_submit ||= false %>
+<% allowed_file_types ||= Rails.application.config.active_storage.web_image_content_types %>
 <% show_delete_button = defined?(can_delete) ? can_delete : true %>
 <% css ||= '' %>
 
@@ -12,7 +13,7 @@
       data-active-storage-upload-crop-value="<%= crop.presence || false %>"
       data-active-storage-upload-auto-submit-value="<%= auto_submit %>"
       data-active-storage-upload-field-name-value="<%= form.object_name %>[<%= field_name %>]"
-      data-active-storage-upload-allowed-file-types-value="<%= Rails.application.config.active_storage.web_image_content_types %>"
+      data-active-storage-upload-allowed-file-types-value="<%= allowed_file_types %>"
       class="d-flex flex-column justify-content-center w-100 position-relative">
     <div class="upload-area"
          data-action="click->active-storage-upload#open"

data/lib/spree/admin/runtime_configuration.rb

@@ -13,6 +13,8 @@ module Spree
 
       preference :include_application_importmap, :boolean, default: false
       preference :legacy_sidebar_navigation, :boolean, default: false
+
+      preference :reports_line_items_limit, :integer, default: 1000
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.2.5
+  version: 5.2.6
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 5.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 5.2.6
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 5.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.5
+        version: 5.2.6
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1272,9 +1272,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.6
 rdoc_options: []
 require_paths:
 - lib