solidus_backend 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab64fa4b8eb0932e3fb616f4b369516d94e733480d3c28511ee0b32da4f2a0a
-  data.tar.gz: 5f26f407eabfbf710f0a5f7cb28a75a80415b38647ef572937dc6d03fab67ed6
+  metadata.gz: 013dd9d01948eac2de99e184d6bb7f395f82416263cd714a632850955005144b
+  data.tar.gz: 35bf7fdf47cab56c76d89dfee1f711f388c69de5799954c2334bbfb3e5f3f831
 SHA512:
-  metadata.gz: ebc5bd3117563bfcc2f382406f92339c9c93bcaed1c4e604dc66dd163d79159d18a6e096c5719c4935b40826cb4d36661a69525346bf33975b6fda3684874f92
-  data.tar.gz: 38d30d5f044f9cf732b09d1fb8a314b5291788f1d39a81d98c4bc2c1632edbd09ded46866ef9e9eb47f4a15cce1680b838aead0009458ffec0835677fdcfbc78
+  metadata.gz: f38d975c0c853412f13079a7cbc8cb69c06df8c1a1c950a9d7aa26d97387f90480e15bd3c6bf81ebeedafa60ab06c6594795826f1dcc2ca612b41f5ee6517340
+  data.tar.gz: 9a84581e63970a276a646de74b7e75999f93c961722730eef87c0a357b290463c9c1d7d22315c258eaec4616cfe514045645384bf1ceb2a8e14c2ac94d8f566a

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/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.none? %>
+          <% 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,14 @@
 
 <% 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.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,10 +20,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 @variants.any? || @product.variants.discarded.any? %>
+<% if @variants.any? || @product.variants.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.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 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.0.7
+        version: 3.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -904,7 +904,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -919,8 +919,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []