spree_backend 4.8.0 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3300d2767c8c33fab939d5c7c30dd41db56d9c422469820f8eaeef2bcf71ba6e
-  data.tar.gz: 745fb617eed98c7268c185eddc32eab136e6067624b712fbd85f9c777b520bbe
+  metadata.gz: 1fcf46360a990310f18e30818626389d5a0ccb1e0d91bcd470616dacb58ce6b4
+  data.tar.gz: 2280d31a00c62784a613e6d4b0a1be265b5cb87298ef9aca924d4a844dddcb39
 SHA512:
-  metadata.gz: e291674023a82d06681356deeffcfe747da3450e835f6fbbd7ca81be1782bc54be59471a9bf1040ea2ee0b685a30f7a2a2e20cda76d1c6a7b5c8b1016f797f0c
-  data.tar.gz: 27ca5a00563290b6523fa8ff3bcc73f00c8e4a250c319942e15f556c129021603f0555003603ac68f93e196b04cbb45b8dfb11f1ed619d5f3b814cc3c0edaaf7
+  metadata.gz: 4fe9f868e598c4e5762a9508377d619a8bbbd24162dabe14c834b4da642e94a96fd481d2254727bdc77bf8a3321cf2ddb165c1e496402c4e85430f26890aa8fd
+  data.tar.gz: c8efa862bf95922a2c17fa68d1719662e2e7515702ad4fb0a8432991e8148c1038ee764e0280e109204a99324bfa736a04a6cc06daf1e70392970f8c950c0d53

data/app/controllers/concerns/spree/admin/translatable.rb

@@ -20,13 +20,26 @@ module Spree
         locales_to_update = current_store_locales & params_locales
 
         locales_to_update.each do |locale|
-          translation = @object.translations.find_or_initialize_by(locale: locale)
-          translation_params.each do |attribute, translations|
-            translation.public_send("#{attribute}=", translations[locale])
+          if update_translation_value?(locale)
+            translation = @object.translations.find_or_initialize_by(locale: locale)
+            translation_params.each do |attribute, translations|
+              translation.public_send("#{attribute}=", translations[locale])
+            end
+            translation.save!
+          else
+            Mobility.with_locale(locale) do
+              translation_params.each do |attribute, translations|
+                @object.public_send("#{attribute}=", translations[locale])
+              end
+              @object.save!
+            end
           end
-          translation.save!
         end
       end
+
+      def update_translation_value?(locale)
+        Spree.always_use_translations? || I18n.default_locale.to_s != locale
+      end
     end
   end
 end

data/app/models/spree/admin/main_menu/default_configuration_builder.rb

@@ -85,9 +85,11 @@ module Spree
               build,
             ItemBuilder.new('properties', admin_properties_path).
               with_admin_ability_check(Spree::Property).
+              with_match_path('/properties').
               build,
             ItemBuilder.new('prototypes', admin_prototypes_path).
               with_admin_ability_check(Spree::Prototype).
+              with_match_path('/prototypes').
               build,
             ItemBuilder.new('taxonomies', admin_taxonomies_path).
               with_admin_ability_check(Spree::Taxonomy).
@@ -110,9 +112,11 @@ module Spree
           items = [
             ItemBuilder.new('stock_transfers', admin_stock_transfers_path).
               with_manage_ability_check(Spree::StockTransfer).
+              with_match_path('/stock_transfers').
               build,
             ItemBuilder.new('stock_locations', admin_stock_locations_path).
               with_manage_ability_check(Spree::StockLocation).
+              with_match_path('/stock_locations').
               build
           ]
 
@@ -133,10 +137,14 @@ module Spree
 
         def add_promotions_section(root)
           items = [
-            ItemBuilder.new('promotions', admin_promotions_path).build,
+            ItemBuilder.new('promotions', admin_promotions_path).
+            with_admin_ability_check(Spree::Promotion).
+            with_match_path('/promotions').
+            build,
             ItemBuilder.new('promotion_categories', admin_promotion_categories_path).
               with_admin_ability_check(Spree::PromotionCategory).
               with_label_translation_key('admin.tab.promotion_categories').
+              with_match_path('/promotion_categories').
               build
           ]
 
@@ -217,35 +225,53 @@ module Spree
         # rubocop:disable Metrics/AbcSize
         def add_settings_section(root)
           items = [
-            ItemBuilder.new('store', ->(store) { edit_admin_store_path(store) }).build,
+            ItemBuilder.new('store', ->(store) { edit_admin_store_path(store) }).
+              with_match_path(/\/admin\/stores\//).
+              build,
             ItemBuilder.new('tax_categories', admin_tax_categories_path).
+              with_match_path('/tax_categories').
               with_manage_ability_check(Spree::TaxCategory).
               build,
-            ItemBuilder.new('tax_rates', admin_tax_rates_path).with_manage_ability_check(Spree::TaxRate).build,
-            ItemBuilder.new('zones', admin_zones_path).with_manage_ability_check(Spree::Zone).build,
-            ItemBuilder.new('country', admin_countries_path).with_manage_ability_check(Spree::Country).build,
+            ItemBuilder.new('tax_rates', admin_tax_rates_path).with_manage_ability_check(Spree::TaxRate).
+              with_match_path('/tax_rates').
+              build,
+            ItemBuilder.new('zones', admin_zones_path).with_manage_ability_check(Spree::Zone).
+              with_match_path('/zones').
+              build,
+            ItemBuilder.new('country', admin_countries_path).with_manage_ability_check(Spree::Country).
+              with_match_path(%r{^/admin/countries$}).
+              build,
             ItemBuilder.new('states', ->(store) { admin_country_states_path(store.default_country) }).
+              with_match_path(/states/).
               with_manage_ability_check(->(ability, store) { store.default_country && ability.can?(:manage, Spree::Country) }).
               build,
             ItemBuilder.new('shipping_methods', admin_shipping_methods_path).
+              with_match_path('/shipping_methods').
               with_manage_ability_check(Spree::ShippingMethod).
               build,
             ItemBuilder.new('shipping_categories', admin_shipping_categories_path).
+              with_match_path('/shipping_categories').
               with_manage_ability_check(Spree::ShippingCategory).
               build,
             ItemBuilder.new('store_credit_categories', admin_store_credit_categories_path).
+              with_match_path('/store_credit_categories').
               with_manage_ability_check(Spree::StoreCreditCategory).
               build,
             ItemBuilder.new('refund_reasons', admin_refund_reasons_path).
+              with_match_path('/refund_reasons').
               with_manage_ability_check(Spree::RefundReason).
               build,
             ItemBuilder.new('reimbursement_types', admin_reimbursement_types_path).
+              with_match_path('/reimbursement_types').
               with_manage_ability_check(Spree::ReimbursementType).
               build,
             ItemBuilder.new('return_authorization_reasons', admin_return_authorization_reasons_path).
+              with_match_path('/return_authorization_reasons').
               with_manage_ability_check(Spree::ReturnAuthorizationReason).
               build,
-            ItemBuilder.new('roles', admin_roles_path).with_manage_ability_check(Spree::Role).build
+            ItemBuilder.new('roles', admin_roles_path).with_manage_ability_check(Spree::Role).
+              with_match_path('/roles').
+              build
           ]
 
           section = SectionBuilder.new('settings', 'gear-fill.svg').

data/lib/spree/backend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Backend
-    VERSION = '4.8.0'.freeze
+    VERSION = '4.8.2'.freeze
 
     def self.version
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2488,9 +2488,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_backend/issues
-  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.8.0
+  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.8.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_backend/tree/v4.8.0
+  source_code_uri: https://github.com/spree/spree_backend/tree/v4.8.2
 post_install_message:
 rdoc_options: []
 require_paths: