solidus_backend 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b86594eac44c015e9c7d6c206ce3c15086baa96db0338ccb845e026b9d61c0d
-  data.tar.gz: 388007e9b8b1dc8fe7ac3c04af96d60bb06d44fbddc0cd84919aaae65a7b5497
+  metadata.gz: e35c129c55af8f84be5738dc2fc035edd162afdbeb348dfebda1a1e59e2988ff
+  data.tar.gz: 1a684f58d3a9716fc5f090e14d8debade6f1b2a1d6096fd644ed3b08da0d7e3d
 SHA512:
-  metadata.gz: a1005b2bed74bc5c3fe9c20bf964aa5c73a96fe45f751752751a1f17f8f18fef03c695cc911d4e6e72f7381aad45399f5a63f188316931bea22bd8db3079e3bf
-  data.tar.gz: 5c98470d7f898b841413275bb8296f4c4ed50263c995696b3baf5b8be0ac98e4dbaeb82022b18833facfffd082d5c002fd86bf7c12d81e925c41dbd3d9b01677
+  metadata.gz: f5c35ef9d44943033d97eddaaca062ee5b921315b787e756dd63ffb868637be582d88d0119728cdde06a5cf9a7aa71ede41b62c72645f0e7e48874472aee2e5f
+  data.tar.gz: 171a020998f6c281b0c788d655e7d57eb186aaa0e0d49802f9bfc0356267b13234169de444e1940109b8b465c926805b19d8758169caae3664cb5cfc857e7850

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -1,3 +1,5 @@
+@import "spree/backend/components/actions";
+
 table {
   // Extend all tables with Bootstrap's default table style
   @extend .table;
@@ -114,8 +116,8 @@ table {
   tbody {
     tr {
       &.deleted td {
-        background-color: lighten(theme-color("danger"), 6);
-        border-color: lighten(theme-color("danger"), 15);
+        background-color: $color-action-remove-bg;
+        text-decoration: line-through;
       }
     }
 

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

@@ -8,7 +8,7 @@ module Spree
       def index
         params[:q] ||= {}
 
-        @search = @product.prices.accessible_by(current_ability, :index).ransack(params[:q])
+        @search = @product.prices.kept.accessible_by(current_ability, :index).ransack(params[:q])
         @master_prices = @search.result
           .currently_valid
           .for_master

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/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 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 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.2.4
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -896,7 +896,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -911,8 +911,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.21
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []