spree_backend 4.2.0.rc1 → 4.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd66fb6fa4c26e09eec76a0c48d70fefc870615eee858e1e6d9b7329e06adc74
-  data.tar.gz: 3c859535b7b1e606c5477354d6fe5fb36b1d13e61456024e339d58ecf17fadb5
+  metadata.gz: caac247ae4531a6f5a3a6801e0bccfb61a89534db3db870157fd4fbc369e6f4a
+  data.tar.gz: 1e6d1992b4ef3922e5581618ad3e3dd8217834d7cdfbdf9e037b8e6f04b77474
 SHA512:
-  metadata.gz: 2a8c12edc73c766fd9c96de625ea6141af5535c55667e6e7d17f2414a56be8ad3463d45c48dd5aff35abceb7f89a07145c271512e7b05cdeab24d2d3a1271157
-  data.tar.gz: 9033d1be3fe6f19793df6aa606e8a75e0723a81d8466def2d556af311c2da9dbea7aa8e5205e15ba0c43b5b29207803437916baf75e99e4027ab01f315dfce24
+  metadata.gz: dce86a37e8ee568b809acaec411c7845c321a4850d39047167e5101fd594ade748f235d00fe4a3bec5915078c1cebe0e44bc01a1b9e9d022e3dfb4859ad20186
+  data.tar.gz: 4e901dd7190ef44b43065ee007aa696c9d89c3e3f6acf7eb6c643712973309cdf6860bf8233c17d10ecd861358562c146e5cbe5f73256f1f307cefc20294cef1

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

@@ -27,7 +27,7 @@ module Spree
       end
 
       def render(*args)
-        @preferences_currency |= [:allow_currency_change, :show_currency_selector]
+        @preferences_currency |= [:show_store_currency_selector]
         super
       end
 

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

@@ -7,6 +7,7 @@ module Spree
       before_action :normalize_supported_currencies, only: [:create, :update]
       before_action :set_default_country_id, only: :new
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
+      before_action :load_all_zones, only: %i[new edit]
 
       if defined?(SpreeI18n)
         include SpreeI18n::LocaleHelper
@@ -114,6 +115,10 @@ module Spree
         @countries = Spree::Country.all
       end
 
+      def load_all_zones
+        @zones = Spree::Zone.pluck(:name, :id)
+      end
+
       def set_default_currency
         @store.default_currency = Spree::Config[:currency]
       end

data/app/helpers/spree/admin/stores_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module StoresHelper
+      def selected_checkout_zone(store)
+        store&.checkout_zone || Spree::Zone.default_checkout_zone
+      end
+    end
+  end
+end

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

@@ -7,20 +7,10 @@
     <div class="form-group">
       <div class="checkbox">
         <label>
-          <%= check_box('', :allow_currency_change, { checked: Spree::Config.allow_currency_change }) %>
-          <%= Spree.t('allow_currency_change.short') %>
+          <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>
+          <%= Spree.t('show_store_currency_selector.short') %>
         </label>
-        <p class="help-block"><%= Spree.t('allow_currency_change.long') %></p>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <div class="checkbox">
-        <label>
-          <%= check_box('', :show_currency_selector, { checked: Spree::Config.show_currency_selector}) %>
-          <%= Spree.t('show_currency_selector.short') %>
-        </label>
-        <p class="help-block"><%= Spree.t('show_currency_selector.long_html') %></p>
+        <p class="help-block"><%= Spree.t('show_store_currency_selector.long') %></p>
       </div>
     </div>
   </div>

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

@@ -14,4 +14,13 @@
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
+
+  <div class="col-12 col-md-6">
+    <%= f.field_container :filterable, class: ['form-group'] do %>
+      <%= label_tag :option_type_filterable do %>
+        <%= f.check_box :filterable %>
+        <%= Spree.t(:filterable) %>
+      <% end %>
+    <% end %>
+  </div>
 </div>

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

@@ -18,6 +18,7 @@
         <th class="no-border handel-head"></th>
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:presentation) %></th>
+        <th><%= Spree.t(:filterable) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -29,6 +30,7 @@
           </td>
           <td><%= option_type.name %></td>
           <td class="presentation"><%= option_type.presentation %></td>
+          <td><%= option_type.filterable %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
             <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>

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

@@ -4,7 +4,7 @@
     <div data-hook="admin_order_store_field">
       <%= f.field_container :store_id, class: ['form-group'] do %>
         <%= f.label :store_id, Spree.t(:store) %>
-        <%= f.collection_select(:store_id, @stores, :id, :name, { include_blank: false }, { class: "select2" }) %>
+        <%= f.collection_select(:store_id, @stores, :id, :unique_name, { include_blank: false }, { class: "select2" }) %>
         <%= f.error_message_on :store_id %>
       <% end %>
     </div>

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

@@ -17,7 +17,7 @@
       </div>
       <div data-hook="store" class="form-group">
         <%= label_tag :payment_method_store, Spree.t(:store) %>
-        <%= collection_select(:payment_method, :store_id, @stores, :id, :name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
+        <%= collection_select(:payment_method, :store_id, @stores, :id, :unique_name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
       </div>
       <div data-hook="display" class="form-group">
         <%= label_tag :payment_method_display_on, Spree.t(:display) %>

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

@@ -75,7 +75,7 @@
             <td class="status"><%= available_status(product) %> </td>
             <td class="text-center"><%= display_price(product) %></td>
             <td class="actions " data-hook="admin_products_index_row_actions">
-              <span class="d-flex">
+              <span class="d-flex justify-content-end">
                 <%= link_to_edit product, no_text: true, class: 'edit' if can?(:edit, product) && !product.deleted? %>
                 <%= link_to_clone product, no_text: true, class: 'clone' if can?(:clone, product) %>
                 <%= link_to_delete product, no_text: true if can?(:delete, product) && !product.deleted? %>

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

@@ -116,6 +116,12 @@
       <%= f.select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false }, { multiple: true, class: 'select2' } %>
       <%= f.error_message_on :supported_currencies %>
     <% end %>
+    <%= f.field_container :checkout_zone_id, class: ['form-group'] do %>
+      <%= f.label :checkout_zone_id, Spree.t(:zone) %>
+      <%= f.select :checkout_zone_id, options_for_select(@zones, selected_checkout_zone(@store)&.id), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
+      <%= f.label :checkout_zone_id, Spree.t('i18n.checkout_zone_warning_html'), class: 'alert alert-warning col-12' %>
+      <%= f.error_message_on :checkout_zone_id %>
+    <% end %>
     <%= f.field_container :default_locale, class: ['form-group'] do %>
       <%= f.label :default_locale, Spree.t('i18n.language') %>
       <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale), {}, { class: 'select2' } %>

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

@@ -19,7 +19,7 @@
     <tbody>
       <% @stores.each do |store| %>
         <tr>
-          <td><%= store.name %></td>
+          <td><%= store.unique_name %></td>
           <td><%= link_to store.url, 'https://' + store.url, target: :blank %></td>
           <td><%= store.default_currency %></td>
           <td><%= store.default ? "<strong>#{Spree.t(:say_yes)}</strong>".html_safe : Spree.t(:say_no) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +349,7 @@ files:
 - app/helpers/spree/admin/reimbursements_helper.rb
 - app/helpers/spree/admin/stock_locations_helper.rb
 - app/helpers/spree/admin/stock_movements_helper.rb
+- app/helpers/spree/admin/stores_helper.rb
 - app/helpers/spree/admin/taxons_helper.rb
 - app/models/spree/admin/resource.rb
 - app/models/spree/backend_configuration.rb
@@ -651,9 +652,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc2
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -670,7 +671,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.