spree_backend 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b658a0d5f11161bb88e49c2db87c4a50a2346b2f76bab36c286d93c89fbc171
-  data.tar.gz: 5135287e5f65f52b088d9ecae613efbfb721533eb40f79dcb2a07b80553501c2
+  metadata.gz: ec893557adb0b4d906e3f5135e8d813586568e6849be2dafebd71f927023b133
+  data.tar.gz: fbedae8d3f6c7582727850b52cb282b5b06a7c1fff295957ba6d3294a966eebf
 SHA512:
-  metadata.gz: ed586053b82dbf636a94436d7e960d592ac574fb98c55177a5424366dc34dd6fdd315c8ab24e5e32927f0749c697f206ba21452795aa002776b4188cbb012616
-  data.tar.gz: 2e7b00634d3d7dd86fb4d8a2e65904289865d501789f4263993502753b5c62dd21020265ce2f4ea0931ebe4304dbe2bf0417aa26023c5e6f2b3151179c6499c0
+  metadata.gz: 0bad0854d98bdb6127f07ec478382c025d04568ef931285f6599d49c7bd75d4b6afb513538b9efe01a010b3adb5b08fd8ba046db1c99a53a6d9d986f6eea04b3
+  data.tar.gz: 37548d9f962033dfacb4f17e6b52631dc86ea2048e221536d07770f217b4856a22a2cdb66ccd7df24cbc0e7ac436909e95de57e184da93ec607b688c19a97b0a

data/Gemfile

@@ -23,7 +23,7 @@ end
 
 group :test do
   gem 'tinymce-rails'
-  gem 'capybara', '~> 3.24'
+  gem 'capybara', '~> 3.39'
   gem 'capybara-screenshot', '~> 1.0'
   gem 'capybara-select-2'
   gem 'database_cleaner', '~> 2.0'
@@ -50,7 +50,7 @@ group :test, :development do
   gem 'rubocop', '~> 1.48.1', require: false # bumped
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
-  gem 'webdrivers', '~> 4.1'
+  gem 'webdrivers', '~> 5.3'
   # Puma 6.0 causes issues in specs due to conflict with capybara version
   gem 'puma', '< 6.0'
   gem 'ffaker'
@@ -62,7 +62,7 @@ group :development do
 end
 
 
-spree_opts = { github: 'spree/spree', branch: 'main' }
+spree_opts = { github: 'spree/spree', branch: '4-6-stable' }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
 # Last version that supports Ruby 2.7

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

@@ -13,15 +13,18 @@ module Spree
       private
 
       def save_translation_values
-        translation_params = params[:translation]
+        translation_params = params[:translation].permit!.to_h
 
-        current_store.supported_locales_list.each do |locale|
-          I18n.with_locale(locale) do
-            translation_params.each do |attribute, translations|
-              @object.public_send("#{attribute}=", translations[locale])
-            end
-            @object.save!
+        current_store_locales = current_store.supported_locales_list
+        params_locales = translation_params.flat_map { |_attribute, translations| translations.compact_blank.keys }
+        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])
           end
+          translation.save!
         end
       end
     end

data/app/views/spree/admin/dashboard/_getting_started.html.erb

@@ -45,6 +45,7 @@
         <% else %>
           <p>
             <%= Spree.t('admin.gettting_started.products_section.message_without_products') %>
+            <%= link_to(Spree.t('admin.gettting_started.products_section.import_message'), 'https://api.spreecommerce.org/docs/api-v2/27527143a4edf-create-a-product') %>
           </p>
           <%= link_to_with_icon 'add.svg', Spree.t('admin.gettting_started.add_products'), spree.admin_products_path, class: 'btn btn-success btn-sm mb-2' %>
         <% end %>

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

@@ -6,6 +6,13 @@
   <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::OauthApplication %>
 
+  <div class="card bg-light">
+    <div class="card-body">
+      <%=Spree.t('admin.oauth_applications.documentation_message')%>
+      <%= link_to(Spree.t('admin.oauth_applications.documentation_cta'), 'https://dev-docs.spreecommerce.org/api/platform-api/authenticating-requests')%>
+    </div>
+  </div>
+
 <% if @oauth_applications.any? %>
   <div class="table-responsive rounded border mt-4">
     <table class="table">

data/config/locales/en.yml

@@ -167,6 +167,8 @@ en:
         new: New oAuth application
         uid: UID
         scopes: Scopes
+        documentation_message: 'To learn how to authenticate requests to the Platform API, '
+        documentation_cta: see the documentation
       reports:
         for: For %{store_name}
       return_authorization:
@@ -324,7 +326,8 @@ en:
         setup_taxes_calculation: Setup tax calculation
         products_section:
           message_with_products_html: You have added <strong> %{count} products</strong> so far - good job!</p>
-          message_without_products: You can add products manually through API or import from a CSV file.
+          message_without_products: You can add products manually or
+          import_message: import them via the API.
         shipping_section:
           message_with_shipping: You have setup shipping for
           message_without_shipping: You can add multiple shipping methods, different for each country, continent or region.

data/lib/spree/backend/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2427,9 +2427,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.6.0
+  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.6.1
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_backend/tree/v4.6.0
+  source_code_uri: https://github.com/spree/spree_backend/tree/v4.6.1
 post_install_message:
 rdoc_options: []
 require_paths: