spree_backend 4.3.0.rc1 → 4.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94292044f4437a2ef5bae417d2241dfcc073ecf4173af095e3485ad27dd5bd0
-  data.tar.gz: 883ef408cd919ac8feb7fc23113c30125c56665643dcd582039dbe3cf6d52ff4
+  metadata.gz: b552e452716a6965ec77028e7de7ee0ffec1b444fc7b3bbf019f9030754efbda
+  data.tar.gz: a20695449a9e53981d1291f4b306bb837b1b70b328228cf43f0ef142c1e2a19e
 SHA512:
-  metadata.gz: f4f80af095b6ab0bc6ce8353ac791d748a6caa2c623541617df89eb04949448437efe0a587ff63d408c24cd258f9085f0a787726d87e1524611fb2711b50449c
-  data.tar.gz: dce1f89871390b8bf603874c2ddd9ef67007242e7f272c78f2f503047ce8e419270b0f4ef6ff9f90cddfc0e2b954bdef2d81c981f11ca1b3de25477b772d14cb
+  metadata.gz: e5d1ba5defe556748572163de7e1492ab6493b7f40beca608d9b8f490c064396335a661783074cef046fba09460a3b7179aca8886bf31ffab8a20478393eac15
+  data.tar.gz: 43efc1472186e5b332e8733fbacb4a3fee831511c906860704d9b008ecd8e4301ac7ad7be68a8a34d9994c5c208899dcf312d960c0eee77e7b840370cb223ce7

data/app/assets/javascripts/spree/backend/global/select2_autocomplete.es6

@@ -34,11 +34,16 @@
 //  data-autocomplete-additional-term-value="Spree::Cms::Pages::Homepage"   <- Additional hard coded term | DEFAULT: null (not used)
 
 document.addEventListener('DOMContentLoaded', function() {
-  const select2Autocompletes = document.querySelectorAll('select.select2autocomplete')
-  select2Autocompletes.forEach(element => buildParamsFromDataAttrs(element))
+  loadAutoCompleteParams()
 })
 
-function buildParamsFromDataAttrs (element) {
+// eslint-disable-next-line no-unused-vars
+function loadAutoCompleteParams() {
+  const select2Autocompletes = document.querySelectorAll('select[data-autocomplete-url-value]')
+  select2Autocompletes.forEach(element => buildParamsFromDataAttrs(element))
+}
+
+function buildParamsFromDataAttrs(element) {
   $(element).select2Autocomplete({
     // Required Attributes
     apiUrl: Spree.routes[element.dataset.autocompleteUrlValue],
@@ -62,6 +67,8 @@ function buildParamsFromDataAttrs (element) {
 $.fn.select2Autocomplete = function(params) {
   // Required params
   const apiUrl = params.apiUrl || null
+  const resourcePlural = apiUrl.match(/([^/]*)\/*$/)[1]
+  const resourceSingular = resourcePlural.slice(0, -1)
 
   // Optional Params
   const select2placeHolder = params.placeholder || Spree.translations.search
@@ -76,14 +83,14 @@ $.fn.select2Autocomplete = function(params) {
 
   function formatList(values) {
     if (customReturnId) {
-      return values.map(function (obj) {
+      return values.map(function(obj) {
         return {
           id: obj.attributes[customReturnId],
           text: obj.attributes[returnAttribute]
         }
       })
     } else {
-      return values.map(function (obj) {
+      return values.map(function(obj) {
         return {
           id: obj.id,
           text: obj.attributes[returnAttribute]
@@ -101,8 +108,11 @@ $.fn.select2Autocomplete = function(params) {
       ajax: {
         url: apiUrl,
         headers: Spree.apiV2Authentication(),
-        data: function (params) {
+        data: function(params) {
           return {
+            fields: {
+              [resourceSingular]: returnAttribute
+            },
             filter: {
               [searchQuery]: params.term
             }
@@ -124,8 +134,11 @@ $.fn.select2Autocomplete = function(params) {
       ajax: {
         url: apiUrl,
         headers: Spree.apiV2Authentication(),
-        data: function (params) {
+        data: function(params) {
           return {
+            fields: {
+              [resourceSingular]: returnAttribute
+            },
             filter: {
               [searchQuery]: params.term,
               [additionalQuery]: additionalTerm

data/app/assets/javascripts/spree/backend/global/tinymce.es6

@@ -6,6 +6,6 @@ document.addEventListener('DOMContentLoaded', function() {
       'image table paste code link table'
     ],
     menubar: false,
-    toolbar: 'undo redo | styleselect | bold italic link | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent | code '
+    toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent | code '
   });
 })

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

@@ -1,6 +1,8 @@
 $.fn.optionTypeAutocomplete = function () {
   'use strict'
 
+  console.warn('optionTypeAutocomplete is deprecated and will be removed in Spree 5.0')
+
   this.select2({
     minimumInputLength: 2,
     multiple: true,
@@ -23,5 +25,9 @@ $.fn.optionTypeAutocomplete = function () {
 }
 
 $(document).ready(function () {
+  var productOptionTypeSelector = document.getElementById('product_option_type_ids')
+  if (productOptionTypeSelector == null) return
+  if (productOptionTypeSelector.hasAttribute('data-autocomplete-url-value')) return
+
   $('#product_option_type_ids').optionTypeAutocomplete()
 })

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

@@ -2,6 +2,8 @@ $.fn.taxonAutocomplete = function() {
   'use strict'
 
   function formatTaxonList(values) {
+    console.warn('taxonAutocomplete is deprecated and will be removed in Spree 5.0')
+
     return values.map(function (obj) {
       return {
         id: obj.id,
@@ -20,7 +22,7 @@ $.fn.taxonAutocomplete = function() {
       data: function (params) {
         return {
           q: {
-            name_cont: params.term,
+            name_cont: params.term
           },
           token: Spree.api_key
         }
@@ -35,5 +37,9 @@ $.fn.taxonAutocomplete = function() {
 }
 
 $(document).ready(function () {
+  var productTaxonSelector = document.getElementById('product_taxon_ids')
+  if (productTaxonSelector == null) return
+  if (productTaxonSelector.hasAttribute('data-autocomplete-url-value')) return
+
   $('#product_taxon_ids').taxonAutocomplete()
 })

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

@@ -13,7 +13,7 @@ module Spree
       private
 
       def location_after_destroy
-        spree.admin_product_images_url(@arent)
+        spree.admin_product_images_url(parent)
       end
 
       def location_after_save

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

@@ -113,7 +113,7 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver_later
+        @order.deliver_order_confirmation_email
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_back fallback_location: spree.edit_admin_order_url(@order)

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

@@ -10,7 +10,7 @@ module Spree
       def create
         @payment_method = params[:payment_method].delete(:type).constantize.new(payment_method_params)
         @object = @payment_method
-        ensure_current_store
+        set_current_store
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
@@ -39,7 +39,7 @@ module Spree
         end
 
         if @payment_method.update(attributes)
-          ensure_current_store
+          set_current_store
           invoke_callbacks(:update, :after)
           flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
           redirect_to spree.edit_admin_payment_method_path(@payment_method)

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

@@ -30,7 +30,7 @@ module Spree
         end
         invoke_callbacks(:update, :before)
         if @object.update(permitted_resource_params)
-          ensure_current_store
+          set_current_store
           invoke_callbacks(:update, :after)
           flash[:success] = flash_message_for(@object, :successfully_updated)
           respond_with(@object) do |format|

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

@@ -3,7 +3,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
   before_action :load_resource, except: :update_positions
-  before_action :set_currency, :ensure_current_store, only: [:new, :create]
+  before_action :set_currency, :set_current_store, only: [:new, :create]
+
   rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
 
   respond_to :html
@@ -26,7 +27,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def update
     invoke_callbacks(:update, :before)
     if @object.update(permitted_resource_params)
-      ensure_current_store
+      set_current_store
       invoke_callbacks(:update, :after)
       respond_with(@object) do |format|
         format.html do
@@ -207,21 +208,17 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     collection_url
   end
 
-  def set_currency
+  def set_current_store
     return if @object.nil?
 
-    @object.currency = current_currency if model_class.method_defined?(:currency=)
-    @object.cost_currency = current_currency if model_class.method_defined?(:cost_currency=)
+    ensure_current_store(@object)
   end
 
-  def ensure_current_store
+  def set_currency
     return if @object.nil?
 
-    if @object.has_attribute?(:store_id)
-      @object.store = current_store
-    elsif model_class.method_defined?(:stores) && @object.stores.exclude?(current_store)
-      @object.stores << current_store
-    end
+    @object.currency = current_currency if model_class.method_defined?(:currency=)
+    @object.cost_currency = current_currency if model_class.method_defined?(:cost_currency=)
   end
 
   # URL helpers

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

@@ -204,7 +204,12 @@
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids),
+                                  { include_hidden: true },
+                                    multiple: true,
+                                    data: { autocomplete_url_value: 'taxons_api_v2',
+                                            autocomplete_return_attr_value: 'pretty_name',
+                                            autocomplete_multiple_value: true } %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>
@@ -223,7 +228,13 @@
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
-        <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+      <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids),
+                                      { include_hidden: true },
+                                        multiple: true,
+                                        class: 'select2-hidden-accessible',
+                                        data: { autocomplete_url_value: 'option_types_api_v2',
+                                                autocomplete_return_attr_value: 'name',
+                                                autocomplete_multiple_value: true } %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">
           <% @product.option_types.each do |type| %>

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

@@ -28,6 +28,16 @@
         </div>
       </div>
 
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= label_tag :q_filterable_eq, Spree.t(:filterable_status) %>
+            <%= f.select :filterable_eq, options_for_select([[Spree.t(:filterable), true], [Spree.t(:non_filterable), false]]), { include_blank: true }, class: 'select2-clear js-filterable' %>
+          </div>
+        </div>
+      </div>
+    </div>
+
       <div class="form-actions" data-hook="admin_pproperties_index_search_buttons">
         <%= button Spree.t(:search), 'search.svg' %>
       </div>

data/app/views/spree/admin/shared/_account_nav.html.erb

@@ -37,7 +37,7 @@
 
       <div class="dropdown-divider m-0"></div>
 
-        <%= link_to 'http://guides.spreecommerce.org/support', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "info.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:support) %>
@@ -49,7 +49,7 @@
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://guides.spreecommerce.org/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'https://dev-docs.spreecommerce.org/extensions/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:extensions_directory) %>

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

@@ -8,19 +8,31 @@
     <table class="table" id="user-lifetime-stats" data-hook>
       <tr>
         <td width="30%"><%= Spree.t(:total_sales) %>:</td>
-        <td><%= @user.display_lifetime_value.to_html %></td>
+        <td>
+          <% @user.report_values_for(:lifetime_value, current_store).each do |value| %>
+            <div><%= value %></div>
+          <% end %>
+        </td>
       </tr>
       <tr>
         <td><%= Spree.t(:num_orders) %>:</td>
-        <td><%= @user.order_count %></td>
+        <td><%= @user.order_count(current_store) %></td>
       </tr>
       <tr>
         <td><%= Spree.t(:average_order_value) %>:</td>
-        <td><%= @user.display_average_order_value.to_html %></td>
+        <td>
+          <% @user.report_values_for(:average_order_value, current_store).each do |value| %>
+            <div><%= value %></div>
+          <% end %>
+        </td>
       </tr>
       <tr>
         <td><%= Spree.t('admin.user.store_credits') %>:</td>
-        <td id="store_credit"><%= Spree::Money.new(@user.total_available_store_credit) %></td>
+        <td id="store_credit">
+          <% @user.available_store_credits(current_store).each do |value| %>
+            <div><%= value %></div>
+          <% end %>
+        </td>
       </tr>
       <tr>
         <td><%= Spree.t(:member_since) %>:</td>

data/spree_backend.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
     "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "documentation_uri" => "https://dev-docs.spreecommerce.org/",
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc1
+  version: 4.3.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-23 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.3.0.rc1
+        version: 4.3.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.3.0.rc2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.3.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.3.0.rc2
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
@@ -817,9 +817,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.3.0.rc1
-  documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc2
+  documentation_uri: https://dev-docs.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: