solidus_backend 3.1.6 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc01e3b01c3876e3d6f6ba3868989c62f93183e596b459ed0e5684ac9675b80
-  data.tar.gz: 5e331223ae29935f1faa971e3ed5576ce31e9f351e186132c9015fa6618c2457
+  metadata.gz: dff6dcb76e2419914cf6309bd6bc6fb3433cd757e08c43771724bd3d39bee162
+  data.tar.gz: 65b5260f7bc8c712e6494dc9b362cc133e22f4497cd4753f294856205284d0e5
 SHA512:
-  metadata.gz: 7f94b557b15f599f621aa4a1258a605448b6470c4815757e2f816211921e32fe75f31e80b4d92ca5e67b51c9970e2170fb7f87399099de752b7d02179827da48
-  data.tar.gz: fb27ed84fc99b2070b856195f81622ff4c1c64bb70f9d8fc7b3bf018fb4ff717f12d6d9e9eb8c927a39b14fc5a7f45e428ac250ecd1f3847b53322692a2343a5
+  metadata.gz: fc109ecd2a95f99968e4719f11fe8f70351ac1d70d9dbf73d96c3662b026ebf2df91a85c43c01980b1ce062ceefbbbf1c9f6e3da13a7e8cb4fd46d84a73c1361
+  data.tar.gz: 6ed6a6b85e3f135d17ad3f2743b9ce26b624f6f709ff4ee91ebbb26226a8f39fbe82fcb61f972043a308823aa2273cbf692ae26ba83268cae7f2416f488281e9

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

@@ -92,7 +92,7 @@ module Spree
 
         @search = super.ransack(params[:q])
         @collection = @search.result.includes(:spree_roles)
-        @collection = @collection.includes(:spree_orders)
+        @collection = @collection.includes(:orders)
         @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
@@ -121,7 +121,7 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
+        render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
       end
 
       def sign_in_if_change_own_password

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

@@ -62,8 +62,8 @@
     <%= f.field_container :cart_tax_country_iso do %>
       <%= f.label :cart_tax_country_iso %>
       <%= f.field_hint :cart_tax_country_iso %>
-      <%= f.select :cart_tax_country_iso,
-        Spree::Country.all.map { |c| [c.name, c.iso] },
+      <%= f.collection_select :cart_tax_country_iso,
+        available_countries(restrict_to_zone: nil), :iso, :name,
         { include_blank: t(".no_cart_tax_country") },
         { class: "custom-select fullwidth" } %>
       <%= f.error_message_on :cart_tax_country_iso %>

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

@@ -40,6 +40,7 @@
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
+            <%= hidden_field_tag('user[stock_location_ids][]', nil) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
                 <label>

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

@@ -89,7 +89,7 @@
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
           <% end %>
-          <% if can?(:destroy, user) && user.orders.count.zero? %>
+          <% if can?(:destroy, user) && user.can_be_deleted? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

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

@@ -3,10 +3,9 @@
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
     <col style="width: 5%" />
-    <col style="width: 25%" />
-    <col style="width: 20%" />
+    <col style="width: 35%" />
     <col style="width: 20%" />
-    <col style="width: 15%" />
+    <col style="width: 25%" />
     <col style="width: 15%" />
   </colgroup>
   <thead data-hook="variants_header">
@@ -40,9 +39,11 @@
       </td>
     </tr>
     <% end %>
-    <% if variants.empty? %>
-      <tr><td colspan="4"><%= t('spree.none') %></td></tr>
-    <% end %>
   </tbody>
 </table>
+<% if variants.empty? %>
+  <div class="alert alert-warning">
+    <%= t('.no_variants_found', term: params[:variant_search_term]) %>
+  </div>
+<% end %>
 <%= paginate variants, theme: "solidus_admin" %>

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

@@ -4,14 +4,13 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div class="col-10">
-      <div data-hook="admin_variants_index_search" class="field">
-        <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+    <div class="row">
+      <div class="col-10">
+        <div data-hook="admin_variants_index_search" class="field">
+          <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+        </div>
       </div>
-    </div>
-
-    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,10 +19,10 @@
           </label>
         </div>
       </div>
-    <% end %>
+    </div>
 
     <div class="actions filter-actions">
-      <%= f.button :search %>
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
     </div>
   <% end %>
 <% end %>

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

@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<% if @product.variants.with_discarded.any? %>
+<% if @product.variants.with_discarded.any? || params[:variant_search_term].present? %>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
 <% else %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.8
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -905,7 +905,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -920,8 +920,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.31
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []