solidus_backend 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff6dcb76e2419914cf6309bd6bc6fb3433cd757e08c43771724bd3d39bee162
-  data.tar.gz: 65b5260f7bc8c712e6494dc9b362cc133e22f4497cd4753f294856205284d0e5
+  metadata.gz: 68a1543b1368db833acd5d99fedacbcb94b6a29796e686b60910e610320e0ea3
+  data.tar.gz: 85130236d083ace48d0a4a0ceded5d856e912419fe29593c568c736480e7a21f
 SHA512:
-  metadata.gz: fc109ecd2a95f99968e4719f11fe8f70351ac1d70d9dbf73d96c3662b026ebf2df91a85c43c01980b1ce062ceefbbbf1c9f6e3da13a7e8cb4fd46d84a73c1361
-  data.tar.gz: 6ed6a6b85e3f135d17ad3f2743b9ce26b624f6f709ff4ee91ebbb26226a8f39fbe82fcb61f972043a308823aa2273cbf692ae26ba83268cae7f2416f488281e9
+  metadata.gz: 4b5bbb57cccca2c85b6c463cfddc1f1c5aff508d677e4bd6c9895a7a7df25c8bc6f6344563e81eb8cb2ff57499263062e16f0da288794e226645500827106d64
+  data.tar.gz: 976db3f4710ecdf6557d45d39a6db8d265d95e654ecd3820fe2c7efdb8e635e5bc47fad73b799238bf358d13e0cf59650228a2c85e511ce2a4240da2b7285e49

data/app/assets/javascripts/spree/backend/variant_autocomplete.js

@@ -34,7 +34,8 @@
             q: {
               product_name_or_sku_cont: term
             },
-            token: Spree.api_key
+            token: Spree.api_key,
+            page: page
           };
           return _.extend(searchData, searchOptions);
         },
@@ -42,7 +43,8 @@
         results: function(data, page) {
           window.variants = data["variants"];
           return {
-            results: data["variants"]
+            results: data["variants"],
+            more: data.current_page * data.per_page < data.total_count
           };
         }
       },

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

@@ -36,7 +36,7 @@
       </tbody>
     </table>
 
-    <% if can?([:create, :update], Spree::ProductProperty) %>
+    <% if can?(:create, Spree::ProductProperty) && can?(:update, Spree::ProductProperty) %>
       <%= render 'spree/admin/shared/edit_resource_links' %>
     <% end %>
 
@@ -95,7 +95,7 @@
             <% end %>
           </tbody>
         </table>
-        <% if can?([:create, :update], Spree::VariantPropertyRule) %>
+        <% if can?(:create, Spree::VariantPropertyRule) && can?(:update, Spree::VariantPropertyRule) %>
           <%= render 'spree/admin/shared/edit_resource_links' %>
         <% end %>
       </fieldset>

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

@@ -33,7 +33,7 @@
         <%= f.field_container :price do %>
           <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
 
-          <% if f.object.new_record? || f.object.has_default_price? %>
+          <% if (f.object.new_record? || f.object.has_default_price?) && !f.object.discarded? %>
             <%= render "spree/admin/shared/number_with_currency",
                        f: f,
                        amount_attr: :price,

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

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
-  <% if can?([:admin, :create], Spree::Order) %>
+  <% if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
     <li>
       <%= link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id), class: 'btn btn-primary' %>
     </li>

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

@@ -60,7 +60,7 @@
                 </span>
               </td>
               <td class="order-number">
-                <% if can?([:admin, :edit], order) %>
+                <% if can?(:admin, order) && can?(:edit, order) %>
                   <%= link_to order.number, edit_admin_order_url(order) %>
                 <% else %>
                   <%= order.number %>

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

@@ -38,7 +38,7 @@
         <tr data-hook="admin_orders_index_rows">
           <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
           <td class="order-number">
-            <% if can?([:admin, :edit], order) %>
+            <% if can?(:admin, order) && can?(:edit, order) %>
               <%= link_to order.number, edit_admin_order_path(order) %>
             <% else %>
               <%= order.number %>

data/vendor/assets/stylesheets/solidus_admin/select2.scss

@@ -439,7 +439,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
-    background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 100%;
+    background: #f4f4f4 image-url('solidus_admin/select2-spinner.gif') no-repeat 95% center;
 }
 
 .select2-results .select2-ajax-error {
@@ -449,6 +449,7 @@ disabled look for disabled choices in the results dropdown
 .select2-more-results {
     background: #f4f4f4;
     display: list-item;
+    padding: 0.5em 1em
 }
 
 /* disabled styles */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2023-02-07 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.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement