spree_admin 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 896d26ce5c5cefb448bf77753fbb39af32b548d26aad748b20eae32ac51f1972
-  data.tar.gz: c51934c9b3763132ad0978789d770645819016286aa505a065e0257a1bbb517d
+  metadata.gz: 274d9668ae1ea544815eb385842f5556570acb9c999fe65ab07a6b639bb42b06
+  data.tar.gz: 706699d5694ae8d8e2ea3df88b4b1a27c7196474efdf9928ebbbb27fba3b1828
 SHA512:
-  metadata.gz: 3e4045b8196f7e9d3464942a40d5d8875ee37b0511df0e41a91876f83f052ea84ac94623ead5f91eff08fb1be514cb268894af96cd1b678045fb2f21ab6d26b6
-  data.tar.gz: 2845718bc86d3007d26c8482fe14b566d72a51b5b0159557969ce53c42cc2ddba9abd853da9458ee3914901cdce1341212babe1010e7b8dab81109d6cc0cf090
+  metadata.gz: 227638a7b026550f3cdfb9b0549798c91ae1a4feeefe7b97c7984d4005c74b1fc1a1d180707ebe2037af02d90b912bd7508d74fd291b5c29c520cbfe62f28691
+  data.tar.gz: f1ef07a89426530a25d0db9a50bed68eebd9af552a9d639f0b5bc138201deca3ae626d01032fa147f167bc82ebb714a71c470dadabbccac66dfe9eb02dff2716

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

@@ -70,7 +70,7 @@ module Spree
         @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
         @refunds = @order.refunds
 
-        @return_authorizations = @order.return_authorizations
+        @return_authorizations = @order.return_authorizations.includes(:return_items)
         @customer_returns = @order.customer_returns.distinct
       end
 

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

@@ -151,7 +151,7 @@ module Spree
       protected
 
       def find_resource
-        current_store.products.accessible_by(current_ability, :manage).with_deleted.friendly.find(params[:id])
+        current_store.products.accessible_by(current_ability, :manage).friendly.find(params[:id])
       end
 
       def load_data
@@ -179,10 +179,10 @@ module Spree
             @product_options[option_type.id.to_s] = {
               name: option_type.presentation,
               position: index + 1,
-              values: option_values.pluck(:presentation).uniq
+              values: option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { value: name, text: presentation } }
             }
 
-            @product_available_options[option_type.id.to_s] = option_type.option_values.to_tom_select_json
+            @product_available_options[option_type.id.to_s] = option_type.option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { id: name, name: presentation } }
           end
 
         @product_stock = {}
@@ -273,7 +273,7 @@ module Spree
                       for_ordering_with_translations(model_class, :name).
                       includes(product_includes).
                       page(params[:page]).
-                      per(params[:per_page] || ENV.fetch('ADMIN_PRODUCTS_PER_PAGE', 25))
+                      per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_products_per_page)
 
         @collection
       end

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

@@ -57,7 +57,7 @@ module Spree
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
-        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page])
+        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)
       end
 
       def load_user

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

@@ -11,11 +11,6 @@ module Spree
         end
       end
 
-      def payment_method_icon_tag(payment_method, opts = {})
-        image_tag "payment_icons/#{payment_method}.svg", opts
-      rescue Sprockets::Rails::Helper::AssetNotFound
-      end
-
       def available_payment_methods
         @available_payment_methods ||= Spree::PaymentMethod.providers.map { |provider| provider.name.constantize.new }.delete_if { |payment_method| !payment_method.show_in_admin? || current_store.payment_methods.pluck(:type).include?(payment_method.type) }.sort_by(&:name)
       end

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

@@ -29,7 +29,8 @@ export default class extends Controller {
     })
 
     this.uppy.use(ActiveStorageUpload, {
-      directUploadUrl: document.querySelector("meta[name='direct-upload-url']").getAttribute('content')
+      directUploadUrl: document.querySelector("meta[name='direct-upload-url']").getAttribute('content'),
+      crop: this.cropValue
     })
 
     let dashboardOptions = {}
@@ -55,16 +56,6 @@ export default class extends Controller {
 
     this.uppy.on('file-editor:complete', (updatedFile) => {
       console.log('File editing complete:', updatedFile)
-      // Remove the old file from Uppy's file list
-      this.uppy.removeFile(updatedFile.id)
-      // Add the updated file to Uppy
-      this.uppy.addFile({
-        name: updatedFile.name,
-        type: updatedFile.type,
-        data: updatedFile.data,
-        source: 'local',
-        isRemote: false
-      })
 
       this.handleUI(updatedFile)
 

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

@@ -26,8 +26,9 @@ export default class extends Controller {
   values() {
     return this.selectTargets
       .map((selectTarget) => selectTarget.querySelector('select'))
-      .map((select) => select.options[select.selectedIndex].text)
-      .filter((text) => text?.length > 0)
+      .map((select) => select.options[select.selectedIndex])
+      .filter((option) => option.value.length > 0)
+      .map((option) => ({ text: option.text, value: option.value}))
   }
 
   setValues() {

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

@@ -129,7 +129,7 @@ export default class extends CheckboxSelectAll {
       const nestingLevel = internalName.split('/').length
       if (nestingLevel === 1) {
         const firstOptionKey = Object.keys(this.optionsValue)[0]
-        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value !== internalName)
+        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value.text !== internalName)
         if (newOptionValues.length === 0) {
           const newOptionsValue = this.optionsValue
           delete newOptionsValue[firstOptionKey]
@@ -265,12 +265,12 @@ export default class extends CheckboxSelectAll {
     let name = ''
     let internalName = name
     if (i === 0) {
-      name = variant[keys[i]]
+      name = variant[keys[i]].text
       internalName = name
     } else {
-      const namesPath = keys.slice(1, keys.length).map((key) => variant[key])
+      const namesPath = keys.slice(1, keys.length).map((key) => variant[key].text)
       name = namesPath.join(' / ')
-      internalName = `${variant[keys[0]]}/${namesPath.join('/')}`
+      internalName = `${variant[keys[0]].text}/${namesPath.join('/')}`
     }
 
     return { name, internalName }
@@ -572,12 +572,12 @@ export default class extends CheckboxSelectAll {
   refreshParentInputs() {
     const firstOption = Object.values(this.optionsValue)[0]
     if (firstOption) {
-      firstOption.values.forEach((name) => {
+      firstOption.values.forEach((option) => {
         this.currenciesValue.forEach((currency) => {
-          this.updateParentPriceRange(name, currency)
+          this.updateParentPriceRange(option.text, currency)
         })
         this.stockLocationsValue.forEach((stockLocationId) => {
-          this.updateParentStockSum(name, stockLocationId)
+          this.updateParentStockSum(option.text, stockLocationId)
         })
         this.updateShopLocationCountOnHand()
       })
@@ -615,11 +615,17 @@ export default class extends CheckboxSelectAll {
         .find((option) => option.name === key).position
       inputs.push(positionInput)
 
-      const valueInput = document.createElement('input')
-      valueInput.type = 'hidden'
-      valueInput.name = `product[variants_attributes][${i}][options][][value]`
-      valueInput.value = variant[key]
-      inputs.push(valueInput)
+      const optionNameInput = document.createElement('input')
+      optionNameInput.type = 'hidden'
+      optionNameInput.name = `product[variants_attributes][${i}][options][][option_value_name]`
+      optionNameInput.value = variant[key].value
+      inputs.push(optionNameInput)
+
+      const optionIdInput = document.createElement('input')
+      optionIdInput.type = 'hidden'
+      optionIdInput.name = `product[variants_attributes][${i}][options][][option_value_presentation]`
+      optionIdInput.value = variant[key].text
+      inputs.push(optionIdInput)
     })
 
     return inputs
@@ -924,8 +930,8 @@ export default class extends CheckboxSelectAll {
     const optionValuesSelectContainer = template.querySelector('[data-slot="optionValuesSelectContainer"]')
     const tomSelectOptionValues = optionValues.map((optionValue) => {
       return {
-        id: availableOptions.find((availableOption) => availableOption.name === optionValue)?.id,
-        name: optionValue
+        id: optionValue.value,
+        name: optionValue.text,
       }
     })
 
@@ -948,8 +954,8 @@ export default class extends CheckboxSelectAll {
     values.forEach((value) => {
       const template = this.optionValueTemplateTarget.content.cloneNode(true)
       const optionValueNameEl = template.querySelector('[data-slot="optionValueName"]')
-      optionValueNameEl.textContent = value
-      optionValueNameEl.dataset.name = value
+      optionValueNameEl.textContent = value.text
+      optionValueNameEl.dataset.name = value.text
 
       templates.push(template)
     })

data/app/javascript/spree/admin/helpers/uppy_active_storage.js

@@ -20,7 +20,8 @@ export default class ActiveStorageUpload extends BasePlugin {
       limit: 0,
       timeout: 30 * 1000,
       directUploadUrl: null,
-      headers: {}
+      headers: {},
+      crop: false
     }
 
     this.opts = Object.assign({}, defaultOptions, opts)
@@ -37,10 +38,19 @@ export default class ActiveStorageUpload extends BasePlugin {
 
   install() {
     this.uppy.addUploader(this.handleUpload)
+    this.uppy.on('file-editor:complete', this.onEditorComplete)
   }
 
   uninstall() {
     this.uppy.removeUploader(this.handleUpload)
+    this.uppy.off('file-editor:complete', this.onEditorComplete)
+  }
+  
+  onEditorComplete = (updatedFile) => {
+    this.handleUpload([updatedFile.id])
+
+    // call directly upload method after editing image
+    return this.uploadFiles([updatedFile])
   }
 
   handleUpload(fileIDs) {
@@ -48,6 +58,10 @@ export default class ActiveStorageUpload extends BasePlugin {
       this.uppy.log("[ActiveStorage] No files to upload!")
       return Promise.resolve()
     }
+    // do not upload before editing is done
+    if (this.opts.crop) {
+      return Promise.resolve()
+    }
 
     this.uppy.log("[ActiveStorage] Uploading...")
     const files = fileIDs.map(fileID => this.uppy.getFile(fileID))
@@ -115,8 +129,6 @@ export default class ActiveStorageUpload extends BasePlugin {
             directUploadSignedId: blob.signed_id,
           }
 
-          this.uppy.setFileState(file.id, { response })
-
           this.uppy.emit("upload-success", file, blob)
 
           return resolve(file)

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

@@ -2,7 +2,7 @@
 <% height ||= 300 %>
 <% crop ||= false unless defined?(crop) %>
 <% auto_submit ||= false %>
-<% can_delete ||= true unless defined?(can_delete) %>
+<% show_delete_button = defined?(can_delete) ? can_delete : true %>
 <% css ||= '' %>
 
 <% if field_name && form %>
@@ -48,7 +48,7 @@
         <%= Spree.t('actions.select_file') %>
       </button>
 
-      <% if can_delete %>
+      <% if show_delete_button %>
         <button type="button" class="btn btn-danger ml-auto" data-action="active-storage-upload#remove" data-turbo-confirm="<%= Spree.t(:are_you_sure) %>">
           <%= icon('trash') %>
 

data/app/views/spree/admin/orders/_return_authorizations.html.erb

@@ -17,7 +17,9 @@
             </tr>
           </thead>
           <tbody>
-            <%= render partial: 'spree/admin/orders/return_authorizations/return_authorization', collection: @return_authorizations, cached: spree_base_cache_scope %>
+            <%= render partial: "spree/admin/orders/return_authorizations/return_authorization",
+            collection: @return_authorizations,
+            cached: ->(r) { [spree_base_cache_key, r.cache_key_with_version, r.return_items.maximum(:updated_at)] } %>
           </tbody>
         </table>
       </div>

data/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb

@@ -21,11 +21,6 @@
   <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>
 </div>
 
-<div class="form-group">
-  <%= f.label :preferred_posts_to_show, Spree.t('admin.page_builder.posts_to_show') %>
-  <%= f.select :preferred_posts_to_show, options_for_select([["Newest", "newest"], ["Most popular", "most_popular"]], @page_section.preferred_posts_to_show), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>
-</div>
-
 <div class="form-group">
   <div data-controller="better-slider">
     <label><%= Spree.t('admin.page_builder.maximum_posts_to_show') %>: <span data-better-slider-target="currentValueLabel"></span></label>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -44,7 +44,7 @@
 
   <div class="form-group col-6">
     <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>
-    <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM/YYYY" %>
+    <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: Spree.t(:card_expiration_placeholder) %>
   </div>
 
   <div class="form-group col-6">

data/app/views/spree/admin/preferences/_password_field.html.erb

@@ -3,7 +3,7 @@
     <div data-replace-target="from">
       <div readonly class="form-control d-flex align-items-center justify-content-between pr-1">
         <span class="text-muted">
-          ...<%= form.object.send(field).last(4) %>
+          ...<%= form.object.send(field)&.last(4) %>
         </span>
         <button class="btn btn-sm btn-light" type="button" data-action="click->replace#replace">
           <%= icon 'edit', class: 'mr-2' %>
@@ -23,4 +23,4 @@
   <% else %>
     <%= form.password_field(field, preference_field_options(options)) %>
   <% end %>
-</div>
+</div>

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

@@ -7,13 +7,14 @@
     <% end unless @product.has_variants? %>
     <%= render 'spree/admin/products/form/variants', f: f %>
     <%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %>
-    <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/properties', f: f %>
     <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
   <div class="col-md-4">
     <%= render 'spree/admin/products/form/status', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
+    <%= render 'spree/admin/products/form/shipping', f: f %>
+    <%= render 'spree/admin/products/form/tax', f: f %>
     <%= render 'spree/admin/products/form/stores', f: f if available_stores.count > 1 %>
     <%= render_admin_partials(:product_form_sidebar_partials, f: f, product: @product) %>
 

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

@@ -0,0 +1,12 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:tax) %></h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+      <%= f.select(:tax_category_id, @tax_categories.pluck(:name, :id), { include_blank: false }, { class: 'custom-select' }) %>
+      <%= f.error_message_on :tax_category %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/translations/edit.html.erb

@@ -18,7 +18,7 @@
         <thead class="text-muted">
           <tr>
             <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
-            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>
+            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
             <th scope="col" class="text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
           </tr>
         </thead>

data/app/views/spree/admin/variants/_variant.html.erb

@@ -1,12 +1,12 @@
 <% cache variant do %>
-  <% if variant.is_master? %>
+  <% if variant.is_master? || variant.product.deleted? %>
     <% variant_url = spree.edit_admin_product_path(variant.product) %>
   <% else %>
     <% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
   <% end %>
 
   <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>
-    <%= render 'spree/admin/shared/product_image', object: variant %>
+    <%= render "spree/admin/shared/product_image", object: variant %>
     <div class="ml-3">
       <strong><%= variant.name %></strong>
       <% if variant.options_text.present? %>

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

@@ -5,22 +5,22 @@
     </h5>
   </div>
   <div class="card-body">
-    <div class="form-group" data-hook="sku">
+    <div class="form-group">
       <%= f.label :sku, Spree.t(:sku) %>
       <%= f.text_field :sku, class: 'form-control' %>
     </div>
 
-    <div class="form-group" data-hook="sku">
+    <div class="form-group">
       <%= f.label :barcode, Spree.t(:barcode) %>
       <%= f.text_field :barcode, class: 'form-control' %>
     </div>
 
-    <div class="form-group" data-hook="tax_category">
+    <div class="form-group">
       <%= f.label :tax_category_id, Spree.t(:tax_category) %>
       <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { data: { controller: 'autocomplete-select' } }) %>
     </div>
 
-    <div class="form-group" data-hook="discontinue_on">
+    <div class="form-group">
       <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
       <%= f.error_message_on :discontinue_on %>
       <%= f.date_field :discontinue_on, class: 'form-control' %>

data/config/locales/en.yml

@@ -138,7 +138,6 @@ en:
         maximum_products_to_show: Maximum products to show
         nav_centered: Nav centered
         not_set: Not set
-        posts_to_show: Posts to show
         separated: Separated
         show_more_button: Show explore category button
         show_taxon_image: Show taxon image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-06-30 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.4
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -746,6 +746,7 @@ files:
 - app/views/spree/admin/products/form/_shipping.html.erb
 - app/views/spree/admin/products/form/_status.html.erb
 - app/views/spree/admin/products/form/_stores.html.erb
+- app/views/spree/admin/products/form/_tax.html.erb
 - app/views/spree/admin/products/form/_variants.html.erb
 - app/views/spree/admin/products/form/variants/_option_template.html.erb
 - app/views/spree/admin/products/form/variants/_variant_template.html.erb
@@ -1058,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.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.4
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
 post_install_message:
 rdoc_options: []
 require_paths: