spree_backend 4.3.0.rc1 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94292044f4437a2ef5bae417d2241dfcc073ecf4173af095e3485ad27dd5bd0
-  data.tar.gz: 883ef408cd919ac8feb7fc23113c30125c56665643dcd582039dbe3cf6d52ff4
+  metadata.gz: f66f277592476e40c4b45e8a044aa4e88aad8d1c5bcaffb9be969e10f66bc9d1
+  data.tar.gz: 3ea8a5805c632a533e065f8a95079a1d3ab6fef5e22a6571aefac630de061bf4
 SHA512:
-  metadata.gz: f4f80af095b6ab0bc6ce8353ac791d748a6caa2c623541617df89eb04949448437efe0a587ff63d408c24cd258f9085f0a787726d87e1524611fb2711b50449c
-  data.tar.gz: dce1f89871390b8bf603874c2ddd9ef67007242e7f272c78f2f503047ce8e419270b0f4ef6ff9f90cddfc0e2b954bdef2d81c981f11ca1b3de25477b772d14cb
+  metadata.gz: 073e261756b177f6370036d7c51b695f68909cf26cd13e74eb58502c6b8bb0f6f226bfe2e80511a9bdb8ecedf0d509c9ceb3f04f5f9633914b22f55e36701271
+  data.tar.gz: de5654888dc5ed1519b8ec3207a9429bc7a259a0c8eea8c8b42ba661fb251b5e14e56407779df5e426cadd09fa0e6b339d6b1f590943b4fc526a3a8f3d1536c7

data/app/assets/images/noimage/backend-missing-image.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-image" viewBox="0 0 16 16">
+  <path d="M6.002 5.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z"/>
+  <path d="M2.002 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2h-12zm12 1a1 1 0 0 1 1 1v6.5l-3.777-1.947a.5.5 0 0 0-.577.093l-3.71 3.71-2.66-1.772a.5.5 0 0 0-.63.062L1.002 12V3a1 1 0 0 1 1-1h12z"/>
+</svg>

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

@@ -1,49 +1,39 @@
 // SELECT2 AUTOCOMPLETE JS
-// This JavaScript file allows Spree developers to set up Select2 autocomplete search
-// using the API v2 by simply adding data attributes to a select element with the class: 'select2autocomplete'
-// as shown here: <select class="select2autocomplete"></select>.
+//  The JavaScript in this file allows Spree developers to set up Select2 autocomplete search
+//  using the API v2 by simply adding data attributes to a select element.
 
 // REQUIRED ATTRIBUTES
-// You must provide a URL for the API V2, use the format shown below.
-// See the backend.js file for other API V2 URL's.
-//
-//  Example:
+//  You must provide a URL for the API V2, use the format shown below. See backend.js for other API V2 URL's.
+//  REQUIRED:
 //  data-autocomplete-url-value="products_api_v2"
 
-// OPTIONAL ATTRIBUTES
-// These optional attributes have sensible defaults, you many not need to use them in many cases,
-// but they do provide a powerful toolkit to refine your autocomplete search as required.
-//
-//  Examples:
-//  data-autocomplete-placeholder-value="Seach Pages"    <- Sets the placeholder | DEFAULT is: 'Search'
-//  data-autocomplete-clear-value="boolean"              <- Allow select2 to be cleared | DEFAULT is: false (no clear button)
-//  data-autocomplete-multiple-value="boolean"           <- Multiple or Single select | DEFAULT is: false (single)
-//  data-autocomplete-return-attr-value="pretty_name"    <- Return Attribute. | DEFAULT is: 'name'
-//  data-autocomplete-min-input-value="4"                <- Minimum input for search | DEFAULT is: 3
-//  data-autocomplete-search-query-value="title_i_cont"  <- Custom search query | DEFAULT is: 'name_i_cont'
-//  data-autocomplete-custom-return-id-value="permalink" <- Return a custom attribute rather than the ID | DEFAULT: returns id
+//  OPTIONAL:
+//  data-autocomplete-placeholder-value="Seach Pages"     <- Sets the placeholder | DEFAULT is: 'Search'.
+//  data-autocomplete-clear-value=boolean                 <- Allow select2 to be cleared | DEFAULT is: false (no clear button).
+//  data-autocomplete-multiple-value=boolean              <- Multiple or Single select | DEFAULT is: false (single).
+//  data-autocomplete-return-attr-value="pretty_name"     <- Return Attribute. | DEFAULT is: 'name'.
+//  data-autocomplete-min-input-value="4"                 <- Minimum input for search | DEFAULT is: 3.
+//  data-autocomplete-search-query-value="title_i_cont"   <- Custom search query | DEFAULT is: 'name_i_cont'.
+//  data-autocomplete-custom-return-id-value="permalink"  <- Return a custom attribute | DEFAULT: returns id.
+//  data-autocomplete-debug-mode-value=boolean            <- Turn on console loggin of data returned by the request.
 //
-// SECOND HARD CODED FILTER - (OPTIONAL)
-// Use a second hard coded search filter param and term if you require a little more curation
-// than just all results returning, an example of this in use can be seen in the menu_item search for Pages,
-// here we only want to retuen Pages that have linkable slugs, not homepages, and so we filter those using the
-// data attributes shown below.
-//
-//  Examples:
-//  data-autocomplete-additional-query-value="type_not_eq"                  <- Additional hard coded query | DEFAULT: null (not used)
-//  data-autocomplete-additional-term-value="Spree::Cms::Pages::Homepage"   <- Additional hard coded term | DEFAULT: null (not used)
+//  Add your own custom URL params to the request as needed
+//  EXAMPLE:
+//  data-autocomplete-additional-url-params-value="filter[type_not_eq]=Spree::Cms::Pages::Homepage"
 
 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],
-
-    // Optional Attributes
     placeholder: element.dataset.autocompletePlaceholderValue,
     allow_clear: element.dataset.autocompleteClearValue,
     multiple: element.dataset.autocompleteMultipleValue,
@@ -51,19 +41,17 @@ function buildParamsFromDataAttrs (element) {
     minimum_input: element.dataset.autocompleteMinInputValue,
     search_query: element.dataset.autocompleteSearchQueryValue,
     custom_return_id: element.dataset.autocompleteCustomReturnIdValue,
-
-    // Hard coded additional filter for those edge cases.
-    additional_query: element.dataset.autocompleteAdditionalQueryValue,
-    additional_term: element.dataset.autocompleteAdditionalTermValue
+    additional_url_params: element.dataset.autocompleteAdditionalUrlParamsValue,
+    debug_mode: element.dataset.autocompleteDebugModeValue
   })
 }
 
-// Can also be called directly as javastript.
 $.fn.select2Autocomplete = function(params) {
-  // Required params
-  const apiUrl = params.apiUrl || null
+  let apiUrl = null
+  let returnedFields
 
-  // Optional Params
+  const resourcePlural = params.apiUrl.match(/([^/]*)\/*$/)[1]
+  const resourceSingular = resourcePlural.slice(0, -1)
   const select2placeHolder = params.placeholder || Spree.translations.search
   const select2Multiple = params.multiple || false
   const select2allowClear = params.allow_clear || false
@@ -71,19 +59,42 @@ $.fn.select2Autocomplete = function(params) {
   const minimumInput = params.minimum_input || 3
   const searchQuery = params.search_query || 'name_i_cont'
   const customReturnId = params.custom_return_id || null
-  const additionalQuery = params.additional_query || null
-  const additionalTerm = params.additional_term || null
+  const additionalUrlParams = params.additional_url_params || null
+  const DebugMode = params.debug_mode || null
 
+  //
+  // Set up a clean URL for sparseFields
+  if (customReturnId == null) {
+    returnedFields = returnAttribute
+  } else {
+    returnedFields = `${returnAttribute},${customReturnId}`
+  }
+  const sparseFields = `fields[${resourceSingular}]=${returnedFields}`
+
+  //
+  // Set up a clean URL for Additional URL Params
+  if (additionalUrlParams != null) {
+    // URL + Additional URL Params + Sparse Fields
+    apiUrl = `${params.apiUrl}?${additionalUrlParams}&${sparseFields}`
+  } else {
+    // URL + Sparse Fields (the default response for a noraml Select2)
+    apiUrl = `${params.apiUrl}?${sparseFields}`
+  }
+
+  if (DebugMode != null) console.log('Request URL:' + apiUrl)
+
+  //
+  // Format the returned values.
   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]
@@ -92,52 +103,30 @@ $.fn.select2Autocomplete = function(params) {
     }
   }
 
-  if (additionalQuery == null && additionalTerm == null) {
-    this.select2({
-      multiple: select2Multiple,
-      allowClear: select2allowClear,
-      placeholder: select2placeHolder,
-      minimumInputLength: minimumInput,
-      ajax: {
-        url: apiUrl,
-        headers: Spree.apiV2Authentication(),
-        data: function (params) {
-          return {
-            filter: {
-              [searchQuery]: params.term
-            }
-          }
-        },
-        processResults: function(json) {
-          return {
-            results: formatList(json.data)
+  //
+  // Set-up Select2 and make AJAX request.
+  this.select2({
+    multiple: select2Multiple,
+    allowClear: select2allowClear,
+    placeholder: select2placeHolder,
+    minimumInputLength: minimumInput,
+    ajax: {
+      url: apiUrl,
+      headers: Spree.apiV2Authentication(),
+      data: function(params) {
+        return {
+          filter: {
+            [searchQuery]: params.term
           }
         }
-      }
-    })
-  } else {
-    this.select2({
-      multiple: select2Multiple,
-      allowClear: select2allowClear,
-      placeholder: select2placeHolder,
-      minimumInputLength: minimumInput,
-      ajax: {
-        url: apiUrl,
-        headers: Spree.apiV2Authentication(),
-        data: function (params) {
-          return {
-            filter: {
-              [searchQuery]: params.term,
-              [additionalQuery]: additionalTerm
-            }
-          }
-        },
-        processResults: function(json) {
-          return {
-            results: formatList(json.data)
-          }
+      },
+      processResults: function(json) {
+        if (DebugMode != null) console.log(json)
+
+        return {
+          results: formatList(json.data)
         }
       }
-    })
-  }
+    }
+  })
 }

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

@@ -1,11 +1,9 @@
 /**
   populateSelectOptionsFromApi(params)
+  Allows you to easily fetch data from API (Platfrom v2) and populate an empty <select> with <option> tags, including a selected <option> tag.
 
-  Allows you to easily fetch data from API (Platfrom v2)
-  and populate an empty <select> with <option> tags,
-  including a selected <option> tag.
-
-  ## EXAMPLE USE CASE called from ERB view file:
+  ## EXAMPLE A
+  # Populating a list of all taxons including a selected item
 
   populateSelectOptionsFromApi({
     targetElement: '#mySelectElement',
@@ -16,6 +14,24 @@
       selectedOption: <%= @menu_item.linked_resource_id %>
     <% end %>
   })
+
+  ## EXAMPLE B
+  # Populating a single selected item using filter and returning an attribute other than the ID
+
+  <% if resource.link_one.present? %>
+    <script>
+      populateSelectOptionsFromApi({
+        targetElement: "#<%= save_to %>Select2",
+        apiUrl: Spree.routes.taxons_api_v2 + "?filter[permalink_matches]=<%= resource.send(save_to) %>",
+        returnValueFromAttributes: 'permalink',
+        returnOptionText: 'pretty_name',
+
+        <% if resource.send(save_to) %>
+          selectedOption: "<%= resource.send(save_to) %>"
+        <% end %>
+      })
+    </script>
+  <% end %>
 **/
 
 // eslint-disable-next-line no-unused-vars
@@ -32,30 +48,40 @@ const handleErrors = function(response) {
 const createRequest = function(params, succeed, fail) {
   const targetElement = params.targetElement
   const apiUrl = params.apiUrl
-  const returnAttribute = params.returnAttribute
+  const returnOptionText = params.returnOptionText
+  const returnValueFromAttributes = params.returnValueFromAttributes || null
   const selectedOption = params.selectedOption
   const selectEl = document.querySelector(targetElement)
 
   fetch(apiUrl, { headers: Spree.apiV2Authentication() })
     .then((response) => handleErrors(response))
-    .then((json) => succeed(json.data, returnAttribute, selectEl, selectedOption))
+    .then((json) => succeed(json.data, returnValueFromAttributes, returnOptionText, selectEl, selectedOption))
     .catch((error) => fail(error, selectEl))
 }
 
-const updateSelectSuccess = function(parsedData, returnAttribute, selectEl, selectedOption) {
+const updateSelectSuccess = function(parsedData, returnValueFromAttributes, returnOptionText, selectEl, selectedOption) {
+  const selectedOpt = selectEl.querySelector('option[selected]')
+
   parsedData.forEach((object) => {
     const optionEl = document.createElement('option')
-    optionEl.value = object.id
-    optionEl.innerHTML = object.attributes[returnAttribute]
 
-    if (parseInt(selectedOption, 10) === parseInt(object.id, 10)) optionEl.selected = true
+    if (returnValueFromAttributes == null) {
+      optionEl.value = object.id
+      if (parseInt(selectedOption, 10) === parseInt(object.id, 10)) optionEl.selected = true
+    } else {
+      optionEl.value = object.attributes[returnValueFromAttributes]
+      if (selectedOpt.value === object.attributes[returnValueFromAttributes]) {
+        selectedOpt.remove()
+
+        optionEl.setAttribute('selected', 'selected')
+      }
+    }
 
+    optionEl.innerHTML = object.attributes[returnOptionText]
     selectEl.appendChild(optionEl)
   })
 }
 
 const updateSelectError = function(error, selectEl) {
-  selectEl.disabled = true
-
   console.log(error)
 }

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/menus/menu.es6

@@ -29,12 +29,11 @@ document.addEventListener('DOMContentLoaded', function() {
 
 function handleMenuItemMove(evt) {
   const data = {
-    moved_item_id: parseInt(evt.item.dataset.itemId, 10),
     new_parent_id: parseInt(evt.to.dataset.parentId, 10) || null,
     new_position_idx: parseInt(evt.newIndex, 10)
   }
 
-  fetch(Spree.routes.menus_items_api_v2 + '/reposition', {
+  fetch(`${Spree.routes.menus_items_api_v2}/${evt.item.dataset.itemId}/reposition`, {
     method: 'PATCH',
     headers: {
       Authorization: 'Bearer ' + OAUTH_TOKEN,

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/assets/stylesheets/spree/backend/shared/_base.scss

@@ -28,6 +28,58 @@ figure.admin-img-holder {
   }
 }
 
+div.admin-product-image-container {
+  border: 1px solid $gray-500;
+  background-color: #fefefe;
+  border-radius: $border-radius;
+  overflow: hidden;
+  display: flex;
+  justify-content: center;
+  margin: auto;
+
+  a {
+    display: flex
+  }
+
+  img {
+    max-width: 100%;
+    height: auto;
+    align-self: center;
+    transform: scale(1.6);
+  }
+
+  svg {
+    color: $gray-600;
+    align-self: center;
+  }
+
+  &.mini-img {
+    border-radius: $border-radius / 2;
+    width: 24px;
+    height: 24px;
+  }
+
+  &.small-img {
+    border-radius: $border-radius;
+    width: 50px;
+    height: 50px;
+  }
+
+  &.product-img {
+    border-width: 2px;
+    border-radius: $border-radius * 2;
+    width: 100px;
+    height: 100px;
+  }
+
+  &.large-img {
+    border-width: 3px;
+    border-radius: $border-radius * 3;
+    width: 300px;
+    height: 300px;
+  }
+}
+
 .js-remove-promo-rule-option-value {
   color: $primary !important;
   &:hover {

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

@@ -1,10 +1,7 @@
 module Spree
   module Admin
     class ImagesController < ResourceController
-      include Spree::Admin::ProductConcern
-
-      belongs_to 'spree/product', find_by: :slug
-
+      before_action :load_product
       before_action :load_edit_data, except: :index
 
       create.before :set_viewable
@@ -13,24 +10,44 @@ module Spree
       private
 
       def location_after_destroy
-        spree.admin_product_images_url(@arent)
+        spree.admin_product_images_url(@product)
       end
 
       def location_after_save
-        spree.admin_product_images_url(parent)
+        spree.admin_product_images_url(@product)
       end
 
       def load_edit_data
-        @variants = parent.variants.map do |variant|
+        @variants = @product.variants.map do |variant|
           [variant.sku_and_options_text, variant.id]
         end
-        @variants.insert(0, [Spree.t(:all), parent.master.id])
+        @variants.insert(0, [Spree.t(:all), @product.master_id])
       end
 
       def set_viewable
         @image.viewable_type = 'Spree::Variant'
         @image.viewable_id = params[:image][:viewable_id]
       end
+
+      def load_product
+        @product = scope.friendly.find(params[:product_id])
+      end
+
+      def scope
+        current_store.products
+      end
+
+      def collection_url
+        spree.admin_product_images_url
+      end
+
+      def modle_class
+        Spree::Image
+      end
+
+      def collection
+        @collection ||= load_product.variant_images
+      end
     end
   end
 end

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/cms_sections/types/_hero_image.html.erb

@@ -37,10 +37,9 @@
           <%= image_tag main_app.url_for(@cms_section.image_one) %>
         </figure>
       <% end %>
-      <%= f.field_container :image_one, class: ['form-group mb-0'] do %>
-        <%= f.file_field :image_one %>
-        <%= f.error_message_on :image_one %>
-      <% end %>
+
+      <%= f.file_field :image_one %>
+      <%= f.error_message_on :image_one %>
     <% end %>
     <small class="form-text text-muted"><%= Spree.t('admin.cms.hero.aspect_ratio') %></small>
   </div>

data/app/views/spree/admin/cms_sections/types/_image_gallery.html.erb

@@ -22,7 +22,7 @@
 
 <div class="row">
   <div class="col-12 col-md-4 mb-3">
-    <div class="card p-3">
+    <div id="image_a_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_a') %></h4>
         <%= f.field_container :image_one, class: ['form-group'] do %>
@@ -35,10 +35,9 @@
               <%= image_tag main_app.url_for(@cms_section.image_one) %>
             </figure>
           <% end %>
-          <%= f.field_container :image_one, class: ['form-group mb-0'] do %>
-            <%= f.file_field :image_one %>
-            <%= f.error_message_on :image_one %>
-          <% end %>
+
+          <%= f.file_field :image_one %>
+          <%= f.error_message_on :image_one %>
         <% end %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
@@ -67,7 +66,7 @@
   </div>
 
   <div class="col-12 col-md-4 mb-3">
-    <div class="card p-3">
+    <div id="image_b_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_b') %></h4>
         <%= f.field_container :image_two, class: ['form-group'] do %>
@@ -80,10 +79,9 @@
               <%= image_tag main_app.url_for(@cms_section.image_two) %>
             </figure>
           <% end %>
-          <%= f.field_container :image_two, class: ['form-group mb-0'] do %>
-            <%= f.file_field :image_two %>
-            <%= f.error_message_on :image_two %>
-          <% end %>
+
+          <%= f.file_field :image_two %>
+          <%= f.error_message_on :image_two %>
         <% end %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.tall_image') %></small>
@@ -112,7 +110,7 @@
   </div>
 
   <div class="col-12 col-md-4 mb-3">
-    <div class="card p-3">
+    <div id="image_c_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_c') %></h4>
         <%= f.field_container :image_three, class: ['form-group'] do %>
@@ -125,10 +123,9 @@
               <%= image_tag main_app.url_for(@cms_section.image_three) %>
             </figure>
           <% end %>
-          <%= f.field_container :image_three, class: ['form-group mb-0'] do %>
-            <%= f.file_field :image_three %>
-            <%= f.error_message_on :image_three %>
-          <% end %>
+
+          <%= f.file_field :image_three %>
+          <%= f.error_message_on :image_three %>
         <% end %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>

data/app/views/spree/admin/cms_sections/types/_side_by_side_images.html.erb

@@ -1,6 +1,6 @@
 <div class="row pb-0">
   <div class="col-12 col-md-6 mb-3">
-    <div class="card p-3">
+    <div id="left_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.left_image') %></h4>
         <%= f.field_container :image_one, class: ['form-group'] do %>
@@ -51,7 +51,7 @@
   </div>
 
   <div class="col-12 col-md-6 mb-3">
-    <div class="card p-3">
+    <div id="right_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.right_image') %></h4>
         <%= f.field_container :image_two, class: ['form-group'] do %>

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

@@ -41,7 +41,9 @@
             <% end %>
           </td>
           <td class="image">
-            <%= link_to image_tag(main_app.url_for(image.url(:mini))), main_app.rails_blob_url(image.attachment) %>
+            <div class="admin-product-image-container small-img">
+              <%= link_to image_tag(main_app.url_for(image.url(:product))), main_app.rails_blob_url(image.attachment) %>
+            </div>
           </td>
           <% if has_variants %>
             <td><%= options_text_for(image) %></td>

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

@@ -20,7 +20,7 @@
           <% order.line_items.each do |item| %>
             <tr class="line-item" id="line-item-<%= item.id %>">
               <td class="line-item-image image text-center">
-                <%= link_to mini_image(item.variant), edit_admin_product_path(item.variant.product) %>
+                <%= link_to small_image(item.variant), edit_admin_product_path(item.variant.product) %>
               </td>
               <td class="line-item-name text-center">
                 <%= link_to item.name, edit_admin_product_path(item.variant.product) %>

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

@@ -1,7 +1,7 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image image text-center">
-      <%= link_to mini_image(item.variant), edit_admin_product_path(item.variant.product) %>
+      <%= link_to small_image(item.variant), edit_admin_product_path(item.variant.product) %>
     </td>
 
     <td class="item-name">

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -17,9 +17,13 @@
       </nav>
       <div class='image'>
         {{#if image }}
-          <img src='{{image}}' alt='{{ product.attributes.name }}' class='thumbnail rounded border border' />
+          <div class="admin-product-image-container small-img">
+            <img src='{{image}}' alt='{{ product.attributes.name }}' class='thumbnail rounded border border' />
+          </div>
         {{ else }}
-          <img src='<%= image_path("noimage/small.png") %>' alt='{{product.name }}' class='thumbnail' />
+          <div class="admin-product-image-container small-img">
+            <%= inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%" %>
+          </div>
         {{/if}}
       </div>
       <div class="p-0 pt-1 text-center product-info">

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/products/index.html.erb

@@ -68,7 +68,7 @@
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td scope="row" class="image">
               <%= link_to edit_admin_product_path(product) do %>
-                <%= mini_image product %>
+                <%= small_image product %>
               <% end %>
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>

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/shared/cms/_spree_product.html.erb

@@ -1,14 +1,27 @@
 <%= f.field_container save_to, class: ['form-group'] do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_product') %>
-  <%= f.select save_to,
-       options_from_collection_for_select([resource],
-                                       save_to, save_to, resource.send(save_to) || nil),
-       { include_blank: true },
-       class: 'select2autocomplete',
-       data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
-               autocomplete_clear_value: true,
-               autocomplete_url_value: 'products_api_v2',
-               autocomplete_return_attr_value: 'name',
-               autocomplete_custom_return_id_value: 'slug' } %>
+  <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
+                          id: "cms_section_#{save_to}",
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+                                  autocomplete_clear_value: true,
+                                  autocomplete_url_value: 'products_api_v2',
+                                  autocomplete_return_attr_value: 'name',
+                                  autocomplete_custom_return_id_value: 'slug' } %>
+
   <%= f.error_message_on :save_to %>
 <% end %>
+
+<% if resource.link_one.present? %>
+  <script>
+    populateSelectOptionsFromApi({
+      targetElement: "#cms_section_<%= save_to %>",
+      apiUrl: Spree.routes.products_api_v2 + "?filter[slug_matches]=<%= resource.send(save_to) %>",
+      returnValueFromAttributes: 'slug',
+      returnOptionText: 'name',
+
+      <% if resource.send(save_to) %>
+        selectedOption: "<%= resource.send(save_to) %>"
+      <% end %>
+    })
+  </script>
+<% end %>

data/app/views/spree/admin/shared/cms/_spree_taxon.html.erb

@@ -1,14 +1,27 @@
 <%= f.field_container save_to, class: ['form-group'] do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_taxon') %>
-  <%= f.select save_to,
-       options_from_collection_for_select([resource],
-                                       save_to, save_to, resource.send(save_to) || nil),
-       { include_blank: true },
-       class: 'select2autocomplete',
-       data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
-               autocomplete_clear_value: true,
-               autocomplete_url_value: 'taxons_api_v2',
-               autocomplete_return_attr_value: 'permalink',
-               autocomplete_custom_return_id_value: 'permalink' } %>
+  <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
+                          id: "cms_section_#{save_to}",
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+                                  autocomplete_clear_value: true,
+                                  autocomplete_url_value: 'taxons_api_v2',
+                                  autocomplete_return_attr_value: 'pretty_name',
+                                  autocomplete_custom_return_id_value: 'permalink' } %>
+
   <%= f.error_message_on :save_to %>
 <% end %>
+
+<% if resource.link_one.present? %>
+  <script>
+    populateSelectOptionsFromApi({
+      targetElement: "#cms_section_<%= save_to %>",
+      apiUrl: Spree.routes.taxons_api_v2 + "?filter[permalink_matches]=<%= resource.send(save_to) %>",
+      returnValueFromAttributes: 'permalink',
+      returnOptionText: 'pretty_name',
+
+      <% if resource.send(save_to) %>
+        selectedOption: "<%= resource.send(save_to) %>"
+      <% end %>
+    })
+  </script>
+<% end %>

data/app/views/spree/admin/shared/linkables/_spree_cms_page.erb

@@ -16,12 +16,7 @@
                  autocomplete_url_value: 'pages_api_v2',
                  autocomplete_return_attr_value: 'title',
                  autocomplete_search_query_value: 'title_i_cont',
-
-                 # Hard coded additional filter to filter out homepages from
-                 # the results. Homepages don't have a slug, and we already have
-                 # a dedicated Home Page link_to type.
-                 autocomplete_additional_query_value: 'type_not_eq',
-                 autocomplete_additional_term_value: 'Spree::Cms::Pages::Homepage' } %>
+                 autocomplete_additional_url_params_value: 'filter[type_not_eq]=Spree::Cms::Pages::Homepage' } %>
 
    <%= f.error_message_on :linked_resource_id %>
    <small class="form-text text-muted"><%= resource.link %></small>

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/app/views/spree/admin/users/items.html.erb

@@ -27,7 +27,7 @@
             <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
               <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
               <td class="item-image">
-                <%= mini_image(item.variant) %>
+                <%= small_image(item.variant) %>
               </td>
               <td class="item-name">
                 <%= item.name %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -2,9 +2,13 @@
   <div class='variant-autocomplete-item media align-items-center'>
     <figure class='variant-image media-left mb-0 mr-3'>
       {{#if variant.image }}
-        <img src='{{variant.image}}' class="thumbnail mb-0" />
+        <div class="admin-product-image-container small-img">
+          <img src='{{variant.image}}' class="thumbnail mb-0" />
+        </div>
       {{ else }}
-        <img src='<%= image_path("noimage/mini.png") %>' class="thumbnail mb-0" />
+        <div class="admin-product-image-container small-img">
+          <%= inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%" %>
+        </div>
       {{/if}}
     </figure>
 

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.1
 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: 2022-01-09 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.3.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,7 @@ files:
 - app/assets/images/backend-void.svg
 - app/assets/images/backend-window-sidebar.svg
 - app/assets/images/credit_cards/credit_card.gif
+- app/assets/images/noimage/backend-missing-image.svg
 - app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
@@ -817,9 +818,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.1
+  documentation_uri: https://dev-docs.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -831,12 +832,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Admin Dashboard for Spree eCommerce platform