spree_admin 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb2e27934e0ce22324b5a7c032fbeb7d0abf76d3512f726dd0acddc30a217dc
-  data.tar.gz: 3caabc53934c4c0bdbd2b70bfea5dcaa9685eb3acb9a2d2bcebcc362c4807e73
+  metadata.gz: 2314972e804657e3746e099913f84a2ffe364d955005ecd2ad0f441f6d38f44c
+  data.tar.gz: b5b4bc046008b7f3077c12dccb7571f5fc965f2196d3a1d077f044d911da0dd2
 SHA512:
-  metadata.gz: ffb8d7703b134adf2439b7f035557930448883896f6e4a07daea768de52847d13dc0ed7ca8cb37fc1e38e0df637b7fcbfb54cc3d7e13fdf03adc23493714e33a
-  data.tar.gz: 88f4985f3985761932f2e341ed62085658c925a18244718bb14ffc729b3074cc9d726fa8419c70af12a3da77e9a624f39d3bba5841b4d759a03a1cb8abaad994
+  metadata.gz: 0f823382a162659d30e565ff7dfc2299f4c8b5ce4e73e11c7b3a146dc0560ebadd289653d09b6c40eb33e30300f4d2032b91389b2a2eebad43657c236d2065df
+  data.tar.gz: 7e104c97735e15737d3b9d209a632ac7cdd8c53b0229e8482225e57e023d44d74228833fef8cb7f2fd54c1f56e696b634fff5d7d289bc6a3bdb5d2e14aa56c23

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

@@ -26,15 +26,23 @@ module Spree
       end
 
       def create
-        allowed_types = Rails.application.config.spree.page_blocks.map(&:to_s)
         page_block_type = params.dig(:page_block, :type)
 
-        if allowed_types.include?(page_block_type) && page_block_type.safe_constantize.present?
+        if allowed_types.map(&:to_s).include?(page_block_type) && page_block_type.safe_constantize.present?
           @page_block = page_block_type.constantize.new
           @page_block.section = @page_section
           @page_block.save!
         end
       end
+
+      private
+
+      def allowed_types
+        [
+          *Rails.application.config.spree.page_blocks,
+          *parent&.available_blocks_to_add
+        ].uniq.sort_by(&:name)
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Spree
 
       def create
         page_section_type = params.dig(:page_section, :type)
-        allowed_types = Rails.application.config.spree.page_sections.map(&:to_s)
+        allowed_types = available_page_section_types.map(&:to_s)
 
         if allowed_types.include?(page_section_type) && page_section_type.safe_constantize.present?
           @page_section = page_section_type.constantize.new(permitted_resource_params)
@@ -52,6 +52,18 @@ module Spree
                       current_store.theme_previews.find(params[:theme_id])
                     end
       end
+
+      def available_page_section_types
+        return [] unless @pageable.present?
+
+        if @pageable.is_a?(Spree::Theme)
+          @pageable.available_page_sections
+        elsif @pageable.respond_to?(:theme)
+          @pageable.theme.available_page_sections
+        else
+          []
+        end
+      end
     end
   end
 end

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

@@ -122,6 +122,10 @@ module Spree
       def product_list_filters_search_form_path
         [:admin, @search]
       end
+
+      def sorted_product_properties(product)
+        product.product_properties.sort_by { |product_property| product_property.property.position }
+      end
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Spree
         @post_tags_scope ||= ActsAsTaggableOn::Tag.
                              joins(:taggings).
                              where("#{ActsAsTaggableOn.taggings_table}.taggable_type = ?", 'Spree::Post').
-                             for_context(:tags)
+                             for_context(:tags).for_tenant(current_store.id)
       end
 
       def post_tags_json_array

data/app/javascript/spree/admin/controllers/variants_form_controller.js

@@ -67,6 +67,8 @@ export default class extends CheckboxSelectAll {
           .filter((internalName) => !existingVariantsOnServer.includes(internalName))
       )
     }
+
+    this.inventoryFormTarget = document.querySelector('.inventory-form');
   }
 
   toggleQuantityTracked() {
@@ -236,11 +238,14 @@ export default class extends CheckboxSelectAll {
   }
 
   optionsValueChanged(value, previousValue) {
+    let hasNoOptions = true
+
     if (this.hasNewOptionButtonTarget) {
       const label = this.newOptionButtonLabelTarget
 
       if (Object.values(value).filter(Boolean).length) {
         label.textContent = label.dataset.hasOptionsText
+        hasNoOptions = false
       } else {
         label.textContent = label.dataset.noOptionsText
       }
@@ -248,6 +253,8 @@ export default class extends CheckboxSelectAll {
     this.refreshOptionNameSelect()
     this.variantsValue = this.generateVariants(value)
 
+    this.toggleInventoryForm(hasNoOptions)
+
     // We want to clear the ignoredVariants when the options change
     if (previousValue && Object.keys(previousValue).length === 0) return
     this.ignoredVariants = new Set()
@@ -765,6 +772,8 @@ export default class extends CheckboxSelectAll {
     this.addOption(newOptionName, newOptionValues, newOptionId)
 
     this.hideNewOptionForm()
+
+    this.toggleInventoryForm(false)
   }
 
   hideNewOptionForm() {
@@ -1052,4 +1061,14 @@ export default class extends CheckboxSelectAll {
       }
     }
   }
+
+  toggleInventoryForm(value) {
+    if (!this.inventoryFormTarget) return
+
+    if (value) {
+      this.inventoryFormTarget.classList.remove('d-none')
+    } else {
+      this.inventoryFormTarget.classList.add('d-none')
+    }
+  }
 }

data/app/views/spree/admin/products/form/_inventory.html.erb

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="inventory-form card mb-4">
   <div class="card-header d-flex align-items-center justify-content-between">
     <h5 class="card-title"><%= Spree.t(:inventory) %></h5>
 

data/app/views/spree/admin/products/form/_properties.html.erb

@@ -15,7 +15,7 @@
         </tr>
       </thead>
       <tbody>
-        <%= f.fields_for :product_properties do |product_property_form| %>
+        <%= f.fields_for :product_properties, sorted_product_properties(f.object) do |product_property_form| %>
           <% property = product_property_form.object.property %>
           <%= product_property_form.hidden_field :id %>
           <%= product_property_form.hidden_field :property_id %>

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

@@ -1,4 +1,4 @@
-<%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top} do %>
+<%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top, row_link_target: :link} do %>
   <% if user.name.present? %>
     <%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>
   <% else %>

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

@@ -44,7 +44,7 @@
           </div>
         </div>
         <div class="card-body border-top pt-4 d-none" data-reveal-target="item">
-          <h6><%= Spree.t(:conditions) %></h6>
+          <h6><%= Spree.t(:rules) %></h6>
           <%= render 'spree/admin/taxons/rules_form', f: f %>
         </div>
       </div>
@@ -52,7 +52,7 @@
       <% if @taxon.automatic? %>
         <div class="card mb-4">
           <div class="card-header">
-            <h5 class="card-title"><%= Spree.t(:conditions) %></h5>
+            <h5 class="card-title"><%= Spree.t(:rules) %></h5>
           </div>
           <div class="card-body">
             <div class="alert alert-info mb-3"><%= Spree.t('admin.taxon_types.automatic_info') %></div>

data/app/views/spree/admin/users/_user.html.erb

@@ -1,17 +1,18 @@
-<tr id="<%= spree_dom_id user %>">
+<tr id="<%= spree_dom_id user %>" data-controller="row-link">
   <td class="pr-0 w-5">
     <%= bulk_operations_checkbox(user) %>
   </td>
-  <td class='user_name w-50 no-wrap py-0 pl-1 pr-0'>
+  <td class='w-50 no-wrap py-0 pl-1 pr-0'>
     <%= render 'spree/admin/shared/user', user: user %>
   </td>
-  <td class="no-wrap">
+  <td class="cursor-pointer" data-action="click->row-link#openLink">
     <%= active_badge(user.accepts_email_marketing?) %>
   </td>
-  <td class="w-25 no-wrap">
+  <td class="w-25 cursor-pointer" data-action="click->row-link#openLink">
     <%= customer_location_flag(user) %>
     <%= customer_location(user) %>
   </td>
-  <td class='user_num_orders w-10 no-wrap'><%= user.completed_orders_for_store(current_store).count %></td>
-  <td class='user_amount_spent w-10 no-wrap'><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
+  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
 </tr>

data/app/views/spree/admin/users/index.html.erb

@@ -3,8 +3,8 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip mr-2 d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
-    <%= icon 'table-export', class: 'mr-2' %>
+  <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
+    <%= icon 'table-export' %>
     <%= Spree.t(:export) %>
   <% end if can?(:export, Spree::Export) %>
   
@@ -53,6 +53,7 @@
                 <th><%= Spree.t(:location) %></th>
                 <th><%= Spree.t('admin.num_orders') %></th>
                 <th><%= Spree.t('admin.amount_spent') %></th>
+                <th><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
               </tr>
             </thead>
             <tbody>

data/config/locales/en.yml

@@ -224,7 +224,7 @@ en:
       taxon_type: Taxon type
       taxon_types:
         automatic: Automatic
-        automatic_info: Automatically match products to this taxon based on the conditions you set.
+        automatic_info: Automatically add products to this taxon if they match the rules you set.
         manual: Manual
         manual_info: Curate products manually. You can add or remove them in bulk.
       upload_new_asset: Upload new asset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1059,9 +1059,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.0.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.3
 post_install_message:
 rdoc_options: []
 require_paths: