spree_admin 5.1.6 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced4e88139c2415b6773c33a5a61745fd66c3785038bd2bedbf393e2123eaed6
-  data.tar.gz: 9e3017a0cb8ded68fe31d44f0031fae27ae11eee6a85e299467434086a449f47
+  metadata.gz: 8387831f06788935b81121023a2c83d0f2930eb03b3e9a4a17861c8db8c6acd0
+  data.tar.gz: 1684b2c66579ada1e3faf72867b4ac72a942c9df44cc96dada5459d72b68a2f0
 SHA512:
-  metadata.gz: 031ac7b75b3e3ae2d1772d1a85f09f6ad0de3fedb198199e49799868cb8d037b44a6c0267448eba5dbc920b944680ccff9f685fb3afe8b4307dae2b5ca3849aa
-  data.tar.gz: 2836282801798b9f0a493002735342e31f387af928158566bf8c7773776ebf36de0a579bb5898ce86873fa257752b7dc9df0043991fead981ac7a3bee142b0e5
+  metadata.gz: 4dc24174671f9cb9d62e65e1bd07bc6207a71fd044085283e4e17c52fcb78a7fbc0b8bc71ca2899f0d85857b0c9ac2d9c82548ec9ebf32691845f962aa105e28
+  data.tar.gz: 8ebb3cdb8185136fe868f7f5a347bca8de8eace8b82d29c8db5d0d4ece42f1af4568cb6f86e1dec1640532e6d54dcc959db05750e5690e86bb1db9010fef5721

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

@@ -3,8 +3,10 @@ module Spree
     module Orders
       class ReturnAuthorizationsController < ResourceController
         include Spree::Admin::OrderConcern
+        include Spree::Admin::OrderBreadcrumbConcern
 
         before_action :load_order
+        before_action :add_breadcrumb_for_order
 
         before_action :load_return_authorization
         before_action :load_form_data, only: [:new, :edit]
@@ -14,6 +16,11 @@ module Spree
 
         private
 
+
+        def add_breadcrumb_for_order
+          add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
+        end
+
         def location_after_save
           spree.edit_admin_order_path(@order)
         end

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

@@ -32,10 +32,6 @@ module Spree
         @collection = @search.result.page(params[:page]).per(params[:per_page])
       end
 
-      def update_turbo_stream_enabled?
-        true
-      end
-
       def require_payment_type
         redirect_to spree.admin_payment_methods_path unless params.dig(:payment_method, :type).present?
       end

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

@@ -1,12 +1,26 @@
 module Spree
   module Admin
     class TranslationsController < Spree::Admin::BaseController
+      # Set the resource being translated and any related data
       before_action :set_resource, only: [:edit, :update]
       before_action :load_data, only: [:edit]
       before_action :set_translation_locale, only: [:edit, :update]
 
+      helper_method :normalized_locale
+      helper_method :resource_class
+
+      # GET /admin/translations/:id/edit
+      # Renders the edit translation page for the resource
       def edit; end
 
+      # Normalizes a locale string by replacing '-' with '_' and downcasing
+      def normalized_locale(locale)
+        locale.to_s.downcase.tr('-', '_')
+      end
+
+      # PUT /admin/translations/:id
+      # Updates the translations for the resource
+      # Sets flash messages for success or failure
       def update
         @resource.update!(permitted_translation_params)
 
@@ -34,10 +48,12 @@ module Spree
         end
       end
 
+      # Build translation field names with normalized locale suffix
       def translation_fields(klass)
-        klass.translatable_fields.map { |field| "#{field}_#{@selected_translation_locale}" }
+        klass.translatable_fields.map { |field| "#{field}_#{normalized_locale(@selected_translation_locale)}" }
       end
 
+      # Determine the class of the resource
       def resource_class
         @resource_class ||= begin
           klass = params[:resource_type]
@@ -46,10 +62,12 @@ module Spree
         end
       end
 
+      # Allowed translatable resources configured in Spree
       def allowed_resource_class
         Rails.application.config.spree.translatable_resources
       end
 
+      # Set the resource object using friendly find if available
       def set_resource
         @resource = if resource_class.respond_to?(:friendly)
                       resource_class.friendly.find(params[:id])
@@ -58,10 +76,17 @@ module Spree
                     end
       end
 
+      # Determine the translation locale to use
       def set_translation_locale
-        @selected_translation_locale = params[:translation_locale].presence || @locales&.first || current_store.supported_locales_list.first
+        raw_locale = params[:translation_locale].presence ||
+        @locales&.first ||
+        current_store.default_locale ||
+        current_store.supported_locales_list.first
+
+        @selected_translation_locale = normalized_locale(raw_locale)
       end
 
+      # Load available locales for this resource, excluding default
       def load_data
         @locales = (current_store.supported_locales_list - [@default_locale]).sort
         @resource_name = @resource.try(:name)

data/app/helpers/spree/admin/base_helper.rb

@@ -222,7 +222,7 @@ module Spree
         case key
         when :currency
           content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
-            form.currency_select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { class: 'custom-select', disabled: current_store.supported_currencies.split(',').count == 1 }),
+            form.select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { data: { controller: 'autocomplete-select' }, disabled: current_store.supported_currencies.split(',').count == 1 }),
                       class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
         else
           if object.preference_type(key).to_sym == :boolean

data/app/helpers/spree/admin/orders_helper.rb

@@ -20,7 +20,15 @@ module Spree
       def order_payment_state(order, options = {})
         return if order.payment_state.blank?
 
-        content_tag :span, class: "badge  #{options[:class]} badge-#{order.partially_refunded? ? 'warning' : order.payment_state}" do
+        badge_class = if order.order_refunded?
+                        'badge-danger'
+                      elsif order.partially_refunded?
+                        'badge-warning'
+                      else
+                        "badge-#{order.payment_state}"
+                      end
+
+        content_tag :span, class: "badge #{options[:class]} #{badge_class}" do
           if order.order_refunded?
             icon('credit-card-refund') + Spree.t('payment_states.refunded')
           elsif order.partially_refunded?

data/app/views/spree/admin/gift_cards/show.html.erb

@@ -67,7 +67,7 @@
                       <% end %>
                     </td>
                     <td>
-                      <%= order.user.email %>
+                      <%= render 'spree/admin/orders/customer_summary', order: order %>
                     </td>
                     <td class="text-right">
                       <%= order.display_gift_card_total %>

data/app/views/spree/admin/pages/_page.html.erb

@@ -15,7 +15,7 @@
       </button>
       <ul class="dropdown-menu">
         <li>
-          <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item' %>
+          <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item', data: { turbo_frame: '_top' } %>
         </li>
         <li>
           <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>

data/app/views/spree/admin/promotion_rules/forms/_currency.html.erb

@@ -1,9 +1,6 @@
 <div class="form-group">
   <%= f.select :preferred_currency,
-    currency_options_for_select(
-      f.object.preferred_currency,
-      current_store.supported_currencies.split(',')
-    ),
+    options_for_select(supported_currency_options, f.object.preferred_currency),
     {},
     { data: { controller: 'autocomplete-select' } } 
   %>

data/app/views/spree/admin/shared/_head.html.erb

@@ -37,9 +37,13 @@
 <%= tinymce_assets %>
 <link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.1.12/dist/trix.css">
 
-<script async src="https://ga.jspm.io/npm:es-module-shims@1.8.2/dist/es-module-shims.js" data-turbo-track="reload"></script>
+<% if Rails.application.importmap.packages["application"].present? && Spree::Admin::RuntimeConfig.include_application_importmap %>
+  <%= javascript_importmap_tags "application" %>
+<% else %>
+  <script async src="https://ga.jspm.io/npm:es-module-shims@1.8.2/dist/es-module-shims.js" data-turbo-track="reload"></script>
+<% end %>
 
-<%= javascript_importmap_tags 'application-spree-admin', importmap: Rails.application.config.spree_admin.importmap %>
+<%= javascript_importmap_tags "application-spree-admin", importmap: Rails.application.config.spree_admin.importmap %>
 
 <%= yield :head %>
 

data/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb

@@ -1,4 +1,4 @@
-<% returns_active = %[customer_returns return_authorizations].include?(controller_name) %>
+<% returns_active = %[customer_returns return_authorizations].include?(controller_name) && !@order %>
 
 <% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
   <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>

data/app/views/spree/admin/store_credits/_form.html.erb

@@ -6,11 +6,11 @@
 
 <div class="form-group">
   <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag), class: 'form-label' %>
-  <%= f.select :currency, preferred_currencies_select_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+  <%= f.select :currency, options_for_select(supported_currency_options, f.object.currency), {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
 </div>
 
 <div class="form-group">
 <%= f.label :memo, Spree.t(:memo) %>
 <%= f.text_area :memo, class: 'form-control' %>
 <%= f.error_message_on :memo %>
-</div>
+</div>

data/app/views/spree/admin/stores/form/_basic.html.erb

@@ -91,7 +91,7 @@
         </p>
         <div class="form-group">
           <%= f.label :default_currency, Spree.t(:default_currency) %>
-          <%= f.currency_select :default_currency, preferred_currencies, {}, data: { controller: 'autocomplete-select' } %>
+          <%= f.select :default_currency, currency_options(@store.default_currency), {}, { data: { controller: 'autocomplete-select' } } %>
           <%= f.error_message_on :default_currency %>
         </div>
         <div class="form-group">

data/app/views/spree/admin/stores/new.html.erb

@@ -32,7 +32,7 @@
 
                   <div class="form-group">
                     <%= f.label :default_currency, Spree.t(:currency) %>
-                    <%= f.currency_select :default_currency, preferred_currencies, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+                    <%= f.select :default_currency, currency_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
                   </div>
 
                   <% if available_stores.any? %>

data/config/importmap.rb

@@ -7,7 +7,7 @@ pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
 pin '@rails/actioncable', to: 'actioncable.esm.js', preload: ['application-spree-admin']
 pin '@rails/activestorage', to: 'activestorage.esm.js', preload: ['application-spree-admin']
 pin '@rails/actiontext', to: '@rails--actiontext@7.2.201.js', preload: ['application-spree-admin']
-pin 'trix', to: 'trix@2.1.12.js', preload: ['application-spree-admin']
+pin 'trix', to: 'trix@2.1.15.js', preload: ['application-spree-admin']
 
 pin 'sortablejs', preload: ['application-spree-admin'] # @1.15.6
 pin 'chartkick', to: 'chartkick.js', preload: ['application-spree-admin']

data/lib/spree/admin/runtime_configuration.rb

@@ -7,6 +7,8 @@ module Spree
       preference :admin_records_per_page, :integer, default: Kaminari.config.default_per_page
       preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
       preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
+
+      preference :include_application_importmap, :boolean, default: false
     end
   end
 end

data/lib/spree/admin.rb

@@ -6,7 +6,6 @@ require 'sprockets/railtie'
 require 'active_link_to'
 require 'breadcrumbs_on_rails'
 require 'chartkick'
-require 'currency_select'
 require 'groupdate'
 require 'hightop'
 require 'importmap-rails'