spree_backend 4.2.4 → 4.3.0.rc3

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

@@ -0,0 +1,35 @@
+document.addEventListener('DOMContentLoaded', function() {
+  var parentEl = document.getElementsByClassName('sortable')[0];
+  if (parentEl) {
+    var element = parentEl.querySelector('tbody')
+  }
+
+  if (element) {
+    Sortable.create(element, {
+      handle: '.move-handle',
+      animation: 550,
+      ghostClass: 'bg-light',
+      dragClass: 'sortable-drag-v',
+      easing: 'cubic-bezier(1, 0, 0, 1)',
+      swapThreshold: 0.9,
+      forceFallback: true,
+      onEnd: function(evt) {
+        var itemEl = evt.item
+        var positions = { authenticity_token: AUTH_TOKEN }
+        $.each($('tr', element), function(position, obj) {
+          var reg = /spree_(\w+_?)+_(\d+)/
+          var parts = reg.exec($(obj).prop('id'))
+          if (parts) {
+            positions['positions[' + parts[2] + ']'] = position + 1
+          }
+        })
+        $.ajax({
+          type: 'POST',
+          dataType: 'json',
+          url: $(itemEl).closest('table.sortable').data('sortable-link'),
+          data: positions
+        })
+      }
+    })
+  }
+})

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

@@ -0,0 +1,11 @@
+document.addEventListener('DOMContentLoaded', function() {
+  // eslint-disable-next-line no-undef
+  tinymce.init({
+    selector: '.spree-rte',
+    plugins: [
+      'image table paste code link table'
+    ],
+    menubar: false,
+    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/_index.es6

@@ -0,0 +1,2 @@
+//= require spree/backend/menus/menu
+//= require spree/backend/menus/menu_item

data/app/assets/javascripts/spree/backend/menus/menu.es6

@@ -0,0 +1,57 @@
+/* eslint-disable no-new */
+
+document.addEventListener('DOMContentLoaded', function() {
+  const menuItemSortable = {
+    group: {
+      name: 'sortable-menu',
+      pull: true,
+      put: true
+    },
+    handle: '.move-handle',
+    swapThreshold: 0.5,
+    emptyInsertThreshold: 8,
+    dragClass: 'menu-item-dragged',
+    draggable: '.dragable',
+    animation: 350,
+    forceFallback: false,
+    onEnd: function (evt) {
+      handleMenuItemMove(evt)
+    }
+  }
+
+  let containers = null;
+  containers = document.querySelectorAll('.menu-container');
+
+  for (let i = 0; i < containers.length; i++) {
+    new Sortable(containers[i], menuItemSortable);
+  }
+})
+
+function handleMenuItemMove(evt) {
+  const data = {
+    new_parent_id: parseInt(evt.to.dataset.parentId, 10) || null,
+    new_position_idx: parseInt(evt.newIndex, 10)
+  }
+
+  fetch(`${Spree.routes.menus_items_api_v2}/${evt.item.dataset.itemId}/reposition`, {
+    method: 'PATCH',
+    headers: {
+      Authorization: 'Bearer ' + OAUTH_TOKEN,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(data)
+  })
+    .then(response => {
+      if (response.ok !== true) {
+        handleMenuItemMoveError()
+      }
+    })
+    .catch(err => {
+      console.error(err);
+    });
+}
+
+function handleMenuItemMoveError () {
+  // eslint-disable-next-line no-undef
+  show_flash('error', Spree.translations.move_could_not_be_saved)
+}

data/app/assets/javascripts/spree/backend/menus/menu_item.es6

@@ -0,0 +1,26 @@
+document.addEventListener('DOMContentLoaded', function() {
+  const menuItemType = $('#menu_item_item_type').select2()
+
+  updateContainerMessage()
+
+  menuItemType.on('change', function() {
+    updateContainerMessage()
+  });
+
+  function updateContainerMessage () {
+    const linkSettingsPanel = document.getElementById('LinkSettings')
+
+    if (!linkSettingsPanel) return
+
+    const selectedLinkType = $('#menu_item_item_type').val()
+    const usingConainerMessage = document.getElementById('usingContainerInfo')
+
+    if (selectedLinkType === 'Container') {
+      linkSettingsPanel.classList.add('d-none')
+      usingConainerMessage.classList.remove('d-none')
+    } else {
+      linkSettingsPanel.classList.remove('d-none')
+      usingConainerMessage.classList.add('d-none')
+    }
+  }
+})

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

@@ -1,37 +1,33 @@
 $.fn.optionTypeAutocomplete = function () {
   'use strict'
 
+  console.warn('optionTypeAutocomplete is deprecated and will be removed in Spree 5.0')
+
   this.select2({
     minimumInputLength: 2,
     multiple: true,
     ajax: {
-      url: Spree.routes.option_types_api,
+      url: Spree.routes.option_types_api_v2,
       datatype: 'json',
+      headers: Spree.apiV2Authentication(),
       data: function (params) {
-        var query = {
-          q: {
-            name_cont: params.term
-          },
-          token: Spree.api_key
+        return {
+          filter: {
+            name_i_cont: params.term
+          }
         }
-
-        return query
       },
       processResults: function (data) {
-        return {
-          results: data
-        }
+        return formatSelect2Options(data)
       }
-    },
-    templateResult: function (optionType) {
-      return optionType.name
-    },
-    templateSelection: function (optionType) {
-      return optionType.text
     }
   })
 }
 
 $(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/option_value_picker.js

@@ -9,26 +9,20 @@ $.fn.optionValueAutocomplete = function (options) {
   var values = options.values
   var clearSelection = options.clearSelection
 
-  function formatOptionValueList(values) {
-    return values.map(function(obj) {
-      return { id: obj.id, text: obj.name }
-    })
-  }
-
   function addOptions(select, productId, values) {
     $.ajax({
       type: 'GET',
-      url: Spree.routes.option_values_api,
+      url: Spree.routes.option_values_api_v2,
+      headers: Spree.apiV2Authentication(),
       dataType: 'json',
       data: {
-        token: Spree.api_key,
-        q: {
+        filter: {
           id_in: values,
           variants_product_id_eq: productId
         }
       }
     }).then(function (data) {
-      select.addSelect2Options(data)
+      select.addSelect2Options(data.data)
     })
   }
 
@@ -36,27 +30,21 @@ $.fn.optionValueAutocomplete = function (options) {
     multiple: multiple,
     minimumInputLength: 1,
     ajax: {
-      url: Spree.routes.option_values_api,
+      url: Spree.routes.option_values_api_v2,
       dataType: 'json',
+      headers: Spree.apiV2Authentication(),
       data: function (params) {
         var selectedProductId = typeof (productSelect) !== 'undefined' ? productSelect.val() : null
 
-        var query = {
-          q: {
+        return {
+          filter: {
             name_cont: params.term,
             variants_product_id_eq: selectedProductId
-          },
-          token: Spree.api_key
+          }
         }
-
-        return query;
       },
       processResults: function(data) {
-        var results = formatOptionValueList(data)
-
-        return {
-          results: results
-        }
+        return formatSelect2Options(data)
       }
     }
   })

data/app/assets/javascripts/spree/backend/payments/edit.js

@@ -115,7 +115,7 @@ jQuery(function ($) {
     }
 
     PaymentView.prototype.$actions = function () {
-      return this.$el.find('.actions')
+      return this.$el.find('.payment-action-buttons')
     }
 
     PaymentView.prototype.$amount = function () {

data/app/assets/javascripts/spree/backend/payments/new.js

@@ -2,11 +2,29 @@
 
 $(document).ready(function () {
   if ($('#new_payment').length) {
+    var cardCodeCleave;
+    var updateCardCodeCleave = function (length) {
+      if (cardCodeCleave) cardCodeCleave.destroy()
+
+      cardCodeCleave = new Cleave('.cardCode', {
+        numericOnly: true,
+        blocks: [length]
+      })
+    }
+
+    updateCardCodeCleave(3)
+
     /* eslint-disable no-new */
     new Cleave('.cardNumber', {
       creditCard: true,
       onCreditCardTypeChanged: function (type) {
         $('.ccType').val(type)
+
+        if (type === 'amex') {
+          updateCardCodeCleave(4)
+        } else {
+          updateCardCodeCleave(3)
+        }
       }
     })
     /* eslint-disable no-new */
@@ -14,11 +32,6 @@ $(document).ready(function () {
       date: true,
       datePattern: ['m', 'Y']
     })
-    /* eslint-disable no-new */
-    new Cleave('.cardCode', {
-      numericOnly: true,
-      blocks: [3]
-    })
 
     $('.payment_methods_radios').click(
       function () {

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

@@ -16,7 +16,14 @@ $.fn.addSelect2Options = function (data) {
   var select = this
 
   function appendOption(select, data) {
-    var option = new Option(data.name, data.id, true, true)
+    var option = null;
+    if (data.attributes) {
+      // API v2
+      option = new Option(data.attributes.name, data.id, true, true)
+    } else {
+      // API v1
+      option = new Option(data.name, data.id, true, true)
+    }
     select.append(option).trigger('change')
   }
 
@@ -38,3 +45,14 @@ $.fn.addSelect2Options = function (data) {
 $.fn.select2.defaults.set('width', 'style')
 $.fn.select2.defaults.set('dropdownAutoWidth', false)
 $.fn.select2.defaults.set('theme', 'bootstrap4')
+
+function formatSelect2Options(data) {
+  var results = data.data.map(function (obj) {
+    return {
+      id: obj.id,
+      text: obj.attributes.name
+    }
+  })
+
+  return { results: results }
+}

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

@@ -1,4 +1,3 @@
-/* global update_state */
 $(document).ready(function () {
-  $('[data-hook=stock_location_country] span#country .select2').on('change', function () { update_state('') })
+  $('[data-hook=stock_location_country] span#country .select2').on('change', function () { updateAddressState('') })
 })

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/javascripts/spree/backend/taxons.js

@@ -1,4 +1,4 @@
-/* global productTemplate, Sortable */
+/* global productTemplate */
 $(function () {
   window.productTemplate = Handlebars.compile($('#product_template').text())
   var taxonProducts = $('#taxon_products')
@@ -14,17 +14,17 @@ $(function () {
       swapThreshold: 0.9,
       forceFallback: true,
       onEnd: function (evt) {
-        var itemEl = evt.item.getAttribute('data-product-id')
-        var newin = evt.newIndex
+        var classificationId = evt.item.getAttribute('data-classification-id')
+        var newIndex = evt.newIndex
         return $.ajax({
-          url: Spree.routes.classifications_api,
+          url: Spree.routes.classifications_api_v2 + '/' + classificationId.toString() + '/reposition',
+          headers: Spree.apiV2Authentication(),
           method: 'PUT',
           dataType: 'json',
           data: {
-            token: Spree.api_key,
-            product_id: itemEl,
-            taxon_id: $('#taxon_id').val(),
-            position: newin
+            classification: {
+              position: newIndex
+            }
           }
         })
       }
@@ -37,22 +37,27 @@ $(function () {
       minimumInputLength: 3,
       multiple: false,
       ajax: {
-        url: Spree.routes.taxons_api,
+        url: Spree.routes.taxons_api_v2,
         datatype: 'json',
+        headers: Spree.apiV2Authentication(),
         data: function (params, page) {
           return {
             per_page: 50,
             page: page,
-            without_children: true,
-            q: {
+            filter: {
               name_cont: params.term
-            },
-            token: Spree.api_key
+            }
           }
         },
         processResults: function (data, page) {
-          var more = page < data.pages
-          var results = formatTaxonList(data.taxons)
+          var more = page < data.meta.total_pages
+
+          var results = data.data.map(function (obj) {
+            return {
+              id: obj.id,
+              text: obj.attributes.pretty_name
+            }
+          })
 
           return {
             results: results,
@@ -61,40 +66,61 @@ $(function () {
             }
           }
         }
-      },
-      templateResult: formatTaxon,
-      templateSelection: formatTaxon
+      }
     }).on('select2:select', function (e) {
-      var el = $('#taxon_products')
       $.ajax({
-        url: Spree.routes.taxon_products_api,
-        data: { id: e.params.data.id, token: Spree.api_key }
-      }).done(function (data) {
-        var i, j, len, len1, product, ref, ref1, results, variant
-        el.empty()
-        if (data.products.length === 0) {
-          return $('#taxon_products').html('<div class="alert alert-info">' + Spree.translations.no_results + '</div>')
+        url: Spree.routes.classifications_api_v2,
+        headers: Spree.apiV2Authentication(),
+        data: {
+          filter: {
+            taxon_id_eq: e.params.data.id
+          },
+          include: 'product.images',
+          per_page: 150,
+          sort: 'position'
+        }
+      }).done(function (json) {
+        taxonProducts.empty()
+
+        if (json.meta.total_count === 0) {
+          return taxonProducts.html('<p class="text-center w-100 p-4">' + Spree.translations.no_results + '</p>')
         } else {
-          ref = data.products
-          results = []
-          for (i = 0, len = ref.length; i < len; i++) {
-            product = ref[i]
-            if (product.master.images[0] !== void 0 && product.master.images[0].small_url !== void 0) {
-              product.image = product.master.images[0].small_url
-            } else {
-              ref1 = product.variants
-              for (j = 0, len1 = ref1.length; j < len1; j++) {
-                variant = ref1[j]
-                if (variant.images[0] !== void 0 && variant.images[0].small_url !== void 0) {
-                  product.image = variant.images[0].small_url
-                  break
+          var results = []
+
+          json.data.forEach(function (classification) {
+            var productId = classification.relationships.product.data.id.toString()
+
+            var product = json.included.find(function(included) {
+              if (included.type === 'product' && included.id === productId) {
+                return included
+              }
+            })
+
+            if (product && classification) {
+              var imageUrl = null
+
+              if (product.relationships.images.data.length > 0) {
+                var imageId = product.relationships.images.data[0].id
+
+                var image = json.included.find(function(included) {
+                  if (included.type === 'image' && included.id === imageId) {
+                    return included
+                  }
+                })
+
+                if (image && image.attributes && image.attributes.styles) {
+                  imageUrl = image.attributes.styles[2].url
                 }
               }
+
+              results.push(taxonProducts.append(productTemplate({
+                product: product,
+                classification: classification,
+                image: imageUrl
+              })))
             }
-            results.push(el.append(productTemplate({
-              product: product
-            })))
-          }
+          })
+
           return results
         }
       })
@@ -102,43 +128,18 @@ $(function () {
   }
 
   taxonProducts.on('click', '.js-delete-product', function (e) {
-    var currentTaxonId = $('#taxon_id').val()
     var product = $(this).parents('.product')
-    var productId = product.data('product-id')
-    var productTaxons = String(product.data('taxons')).split(',').map(Number)
-    var productIndex = productTaxons.indexOf(parseFloat(currentTaxonId))
-    productTaxons.splice(productIndex, 1)
-    var taxonIds = productTaxons.length > 0 ? productTaxons : ['']
+    var classificationId = product.data('classification-id')
     $.ajax({
-      url: Spree.routes.products_api + '/' + productId,
-      data: {
-        product: {
-          taxon_ids: taxonIds
-        },
-        token: Spree.api_key
-      },
-      type: 'PUT'
+      url: Spree.routes.classifications_api_v2 + '/' + classificationId.toString(),
+      headers: Spree.apiV2Authentication(),
+      type: 'DELETE'
     }).done(function () {
       product.fadeOut(400, function (e) {
         product.remove()
       })
     })
   })
-  $('.variant_autocomplete').variantAutocomplete()
 
-  function formatTaxon (taxon) {
-    if (taxon.loading) {
-      return taxon.text;
-    }
-    return taxon.pretty_name
-  }
-
-  function formatTaxonList(values) {
-    return values.map(function (obj) {
-      return {
-        id: obj.id,
-        pretty_name: obj.pretty_name
-      }
-    })
-  }
+  $('.variant_autocomplete').variantAutocomplete()
 })