spree_backend 4.2.0.rc2 → 4.2.0.rc3

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

@@ -4,45 +4,61 @@ $.fn.productAutocomplete = function (options) {
   // Default options
   options = options || {}
   var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
+  var values = typeof (options.values) !== 'undefined' ? options.values : null
 
-  function formatProduct (product) {
-    return Select2.util.escapeMarkup(product.name)
+  function formatProductList(products) {
+    return products.map(function(obj) {
+      return { id: obj.id, text: obj.name }
+    })
+  }
+
+  function addOptions(select, values) {
+    $.ajax({
+      url: Spree.routes.products_api,
+      dataType: 'json',
+      data: {
+        q: {
+          id_in: values
+        },
+        token: Spree.api_key
+      }
+    }).then(function (data) {
+      select.addSelect2Options(data.products)
+    })
   }
 
   this.select2({
-    minimumInputLength: 3,
     multiple: multiple,
-    initSelection: function (element, callback) {
-      $.get(Spree.routes.products_api, {
-        ids: element.val().split(','),
-        token: Spree.api_key
-      }, function (data) {
-        callback(multiple ? data.products : data.products[0])
-      })
-    },
+    minimumInputLength: 3,
     ajax: {
       url: Spree.routes.products_api,
-      datatype: 'json',
-      cache: true,
-      data: function (term, page) {
+      dataType: 'json',
+      data: function (params) {
         return {
           q: {
-            name_or_master_sku_cont: term
+            name_or_master_sku_cont: params.term
           },
           m: 'OR',
           token: Spree.api_key
         }
       },
-      results: function (data, page) {
+      processResults: function(data) {
         var products = data.products ? data.products : []
+        var results = formatProductList(products)
+
         return {
-          results: products
+          results: results
         }
       }
     },
-    formatResult: formatProduct,
-    formatSelection: formatProduct
+    templateSelection: function(data, _container) {
+      return data.text
+    }
   })
+
+  if (values) {
+    addOptions(this, values)
+  }
 }
 
 $(document).ready(function () {

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

@@ -1,15 +1,6 @@
 function initProductActions () {
   'use strict'
 
-  // Add classes on promotion items for design
-  $(document).on('mouseover mouseout', 'a.delete', function (event) {
-    if (event.type === 'mouseover') {
-      $(this).parent().addClass('action-remove')
-    } else {
-      $(this).parent().removeClass('action-remove')
-    }
-  })
-
   $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete()
 
   $('.calculator-fields').each(function () {
@@ -39,20 +30,36 @@ function initProductActions () {
   if ($('#promo-rule-option-value-template').length) {
     var optionValueSelectNameTemplate = Handlebars.compile($('#promo-rule-option-value-option-values-select-name-template').html())
     var optionValueTemplate = Handlebars.compile($('#promo-rule-option-value-template').html())
+    var optionValuesList = $('.js-promo-rule-option-values')
 
-    var addOptionValue = function (product, values) {
-      $('.js-promo-rule-option-values').append(optionValueTemplate({
-        productSelect: { value: product },
-        optionValuesSelect: { value: values }
-      }))
-      var optionValue = $('.js-promo-rule-option-values .promo-rule-option-value').last()
-      optionValue.find('.js-promo-rule-option-value-product-select').productAutocomplete({ multiple: false })
-      optionValue.find('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({
-        productSelect: '.js-promo-rule-option-value-product-select'
+    var addOptionValue = function (productId, values) {
+      var template = optionValueTemplate({
+        productId: productId
       })
-      if (product === null) {
-        optionValue.find('.js-promo-rule-option-value-option-values-select').prop('disabled', true)
+
+      optionValuesList.append(template)
+
+      var optionValueId = '#promo-rule-option-value-'
+      if (productId) {
+        optionValueId += productId.toString()
       }
+      var optionValue = optionValuesList.find(optionValueId)
+
+      var productSelect = optionValue.find('.js-promo-rule-option-value-product-select')
+      var valuesSelect = optionValue.find('.js-promo-rule-option-value-option-values-select')
+
+      productSelect.productAutocomplete({ multiple: false, values: productId })
+      productSelect.on('select2:select', function(e) {
+        valuesSelect.attr('disabled', false).removeClass('d-none').addClass('d-block')
+        valuesSelect.attr('name', optionValueSelectNameTemplate({ productId: productSelect.val() }).trim())
+        valuesSelect.optionValueAutocomplete({
+          productId: productId,
+          productSelect: productSelect,
+          multiple: true,
+          values: values,
+          clearSelection: productId != productSelect.val()
+        })
+      })
     }
 
     var originalOptionValues = $('.js-original-promo-rule-option-values').data('original-option-values')
@@ -73,12 +80,6 @@ function initProductActions () {
     $(document).on('click', '.js-remove-promo-rule-option-value', function () {
       $(this).parents('.promo-rule-option-value').remove()
     })
-
-    $(document).on('change', '.js-promo-rule-option-value-product-select', function () {
-      var optionValueSelect = $(this).parents('.promo-rule-option-value').find('.js-promo-rule-option-value-option-values-select')
-      optionValueSelect.attr('name', optionValueSelectNameTemplate({ productId: $(this).val() }).trim())
-      optionValueSelect.prop('disabled', $(this).val() === '').select2('val', '')
-    })
   }
 
   //
@@ -161,5 +162,9 @@ function initProductActions () {
 }
 
 $(document).ready(function () {
-  initProductActions()
+  var promotion_form = $('form.edit_promotion')
+
+  if (promotion_form.length) {
+    initProductActions()
+  }
 })

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

@@ -6,7 +6,6 @@ $(document).ready(function () {
   // handle variant selection, show stock level.
   $('#add_variant_id').change(function () {
     var variantId = parseInt($(this).val())
-
     var variant = _.find(window.variants, function (variant) {
       return variant.id === variantId
     })
@@ -284,48 +283,40 @@ function completeItemSplit(event) {
   var stockLocationId = stockItemRow.find('#item_stock_location').val()
   var originalShipmentNumber = link.closest('tbody').data('shipment-number')
 
-  var selectedShipment = stockItemRow.find($('#item_stock_location').select2('data').element)
+  var selectedShipment = stockItemRow.find('#item_stock_location option:selected')
   var targetShipmentNumber = selectedShipment.data('shipment-number')
   var newShipment = selectedShipment.data('new-shipment')
+
   // eslint-disable-next-line eqeqeq
   if (stockLocationId != 'new_shipment') {
+    var path, additionalData
     if (newShipment !== undefined) {
-      // TRANSFER TO A NEW LOCATION
-      $.ajax({
-        type: 'POST',
-        async: false,
-        url: Spree.url(Spree.routes.shipments_api + '/transfer_to_location'),
-        data: {
-          original_shipment_number: originalShipmentNumber,
-          variant_id: variantId,
-          quantity: quantity,
-          stock_location_id: stockLocationId,
-          token: Spree.api_key
-        }
-      }).fail(function (msg) {
-        alert(msg.responseJSON.message || msg.responseJSON.exception)
-      }).done(function (msg) {
-        window.location.reload()
-      })
+      // transfer to a new location data
+      path = '/transfer_to_location'
+      additionalData = { stock_location_id: stockLocationId }
     } else {
-      // TRANSFER TO AN EXISTING SHIPMENT
-      $.ajax({
-        type: 'POST',
-        async: false,
-        url: Spree.url(Spree.routes.shipments_api + '/transfer_to_shipment'),
-        data: {
-          original_shipment_number: originalShipmentNumber,
-          target_shipment_number: targetShipmentNumber,
-          variant_id: variantId,
-          quantity: quantity,
-          token: Spree.api_key
-        }
-      }).fail(function (msg) {
-        alert(msg.responseJSON.message || msg.responseJSON.exception)
-      }).done(function (msg) {
-        window.location.reload()
-      })
+      // transfer to an existing shipment data
+      path = '/transfer_to_shipment'
+      additionalData = { target_shipment_number: targetShipmentNumber }
+    }
+
+    var data = {
+      original_shipment_number: originalShipmentNumber,
+      variant_id: variantId,
+      quantity: quantity,
+      token: Spree.api_key
     }
+
+    $.ajax({
+      type: 'POST',
+      async: false,
+      url: Spree.url(Spree.routes.shipments_api + path),
+      data: $.extend(data, additionalData)
+    }).fail(function (msg) {
+      alert(msg.responseJSON.message || msg.responseJSON.exception)
+    }).done(function (msg) {
+      window.location.reload()
+    })
   }
 }
 
@@ -344,7 +335,7 @@ function addVariantFromStockLocation(event) {
 
   $('#stock_details').hide()
 
-  var variantId = $('input.variant_autocomplete').val()
+  var variantId = $('select.variant_autocomplete').val()
   var stockLocationId = $(this).data('stock-location-id')
   var quantity = $("input.quantity[data-stock-location-id='" + stockLocationId + "']").val()
 

data/app/assets/javascripts/spree/backend/spree-select2.js

@@ -1,21 +1,40 @@
 document.addEventListener('DOMContentLoaded', function() {
-  // Inititate Select2 on any select element with the class .select2
-  $('select.select2').select2({
+  // Initiate a standard Select2 on any select element with the class .select2
+  // Remember to add a place holder in the HTML as needed.
+  $('select.select2').select2({})
+
+  // Initiate a Select2 with the option to clear, on any select element with the class .select2-clear
+  // Set: include_blank: true in the ERB.
+  // A placeholder is auto-added here as it is required to clear the Select2.
+  $('select.select2-clear').select2({
+    placeholder: Spree.translations.select_an_option,
     allowClear: true
   })
+})
+
+$.fn.addSelect2Options = function (data) {
+  var select = this
 
-  // BELOW: z-index fix for Select2 v3.x to lower the z-index of an opened Select2.
-  // The javascript below is not needed if Spree is updated to use Select2 v4.x
-  window.addEventListener('click', function(e) {
-    var select2Drop = document.getElementById('select2-drop')
+  function appendOption(select, data) {
+    var option = new Option(data.name, data.id, true, true)
+    select.append(option).trigger('change')
+  }
 
-    if (select2Drop) {
-      if (select2Drop.contains(e.target)) {
-        // Clicking inside the Select2 dropdown does nothing...
-      } else {
-        // Clicking outside the Select2 dropdown close all open Select2 dropdowns.
-        $('*').select2('close')
-      }
+  if (Array.isArray(data)) {
+    data.map(function(row) {
+      appendOption(select, row)
+    })
+  } else {
+    appendOption(select, data)
+  }
+  select.trigger({
+    type: 'select2:select',
+    params: {
+      data: data
     }
   })
-})
+}
+
+$.fn.select2.defaults.set('width', 'style')
+$.fn.select2.defaults.set('dropdownAutoWidth', false)
+$.fn.select2.defaults.set('theme', 'bootstrap4')

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

@@ -1,8 +1,9 @@
 $(function () {
   function TransferVariant (variant1) {
+    // refactor variant1
     this.variant = variant1
-    this.id = this.variant.id
-    this.name = this.variant.name + ' - ' + this.variant.sku
+    this.id = this.variant[0].variant.id
+    this.name = this.variant[0].variant.name + ' - ' + this.variant[0].variant.sku
     this.quantity = 0
   }
   TransferVariant.prototype.add = function (quantity) {
@@ -126,35 +127,53 @@ $(function () {
     }
   }
 
+  function formattedVariantList(obj) {
+   return { id: obj.id, text: obj.name, name: obj.name, sku: obj.sku, options_text: obj.options_text, variant: obj }
+  }
+
+  function formattedStockItemsList(obj) {
+    return { id: obj.variant.id, text: obj.variant.name, name: obj.variant.name, sku: obj.variant.sku, options_text: obj.variant.options_text, variant: obj.variant }
+  }
+
   TransferVariants.prototype.build_select = function (url, query) {
     return $('#transfer_variant').select2({
       minimumInputLength: 3,
       ajax: {
         url: url,
         datatype: 'json',
-        data: function (term) {
+        data: function (params) {
           var q = {}
-          q[query] = term
+          q[query] = params.term
           return {
             q: q,
             token: Spree.api_key
           }
         },
-        results: function (data) {
-          var result = data['variants'] || data['stock_items']
-          if (data['stock_items'] != null) {
-            result = _(result).map(function (variant) {
-              return variant.variant
+        processResults: function (data) {
+          var result = data.variants || data.stock_items
+          if (data.variants != null) {
+            var res = (result).map(function (variant) {
+              return formattedVariantList(variant)
+            })
+          } else {
+            var res = (result).map(function (variant) {
+              return formattedStockItemsList(variant)
             })
           }
-          window.variants = result
+
           return {
-            results: result
+            results: res
           }
         }
       },
-      formatResult: this.format_variant_result,
-      formatSelection: function (variant) {
+      templateResult: function(variant) {
+        if (variant.options_text !== "") {
+          return variant.name + ' - ' + variant.sku + ' (' + variant.options_text + ')'
+        } else {
+          return variant.name + ' - ' + variant.sku
+        }
+      },
+      templateSelection: function (variant) {
         // eslint-disable-next-line no-extra-boolean-cast
         if (!!variant.options_text) {
           return variant.name + (' (' + variant.options_text + ')') + (' - ' + variant.sku)

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

@@ -1,52 +1,39 @@
-'use strict'
-// eslint-disable-next-line camelcase
-function set_taxon_select (selector) {
-  function formatTaxon (taxon) {
-    return Select2.util.escapeMarkup(taxon.pretty_name)
+$.fn.taxonAutocomplete = function() {
+  'use strict'
+
+  function formatTaxonList(values) {
+    return values.map(function (obj) {
+      return {
+        id: obj.id,
+        text: obj.pretty_name
+      }
+    })
   }
 
-  if ($(selector).length > 0) {
-    $(selector).select2({
-      placeholder: Spree.translations.taxon_placeholder,
-      multiple: true,
-      initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.taxons_api, {
-          ids: element.val(),
-          without_children: true,
+  this.select2({
+    multiple: true,
+    placeholder: Spree.translations.taxon_placeholder,
+    minimumInputLength: 2,
+    ajax: {
+      url: Spree.routes.taxons_api,
+      dataType: 'json',
+      data: function (params) {
+        return {
+          q: {
+            name_cont: params.term,
+          },
           token: Spree.api_key
-        })
-        return $.getJSON(url, null, function (data) {
-          return callback(data['taxons'])
-        })
-      },
-      ajax: {
-        url: Spree.routes.taxons_api,
-        datatype: 'json',
-        data: function (term, page) {
-          return {
-            per_page: 50,
-            page: page,
-            without_children: true,
-            q: {
-              name_cont: term
-            },
-            token: Spree.api_key
-          }
-        },
-        results: function (data, page) {
-          var more = page < data.pages
-          return {
-            results: data['taxons'],
-            more: more
-          }
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
-    })
-  }
+      processResults: function(data) {
+        return {
+          results: formatTaxonList(data.taxons)
+        }
+      }
+    }
+  })
 }
 
 $(document).ready(function () {
-  set_taxon_select('#product_taxon_ids')
+  $('#product_taxon_ids').taxonAutocomplete()
 })