spree_backend 4.3.0 → 4.5.0

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

@@ -8,23 +8,30 @@
 //  data-autocomplete-url-value="products_api_v2"
 
 //  OPTIONAL:
-//  data-autocomplete-placeholder-value="Seach Pages"     <- Sets the placeholder | DEFAULT is: 'Search'.
+//  data-autocomplete-placeholder-value="Search 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.
+//  data-autocomplete-debug-mode-value=boolean            <- Turn on console login of data returned by the request.
 //
 //  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() {
+document.addEventListener("spree:load", function() {
   loadAutoCompleteParams()
 })
 
+// we need to delete select2 instances before document is saved to cache
+// https://stackoverflow.com/questions/36497723/select2-with-ajax-gets-initialized-several-times-with-rails-turbolinks-events
+document.addEventListener("turbo:before-cache", function() {
+  const select2Autocompletes = document.querySelectorAll('select[data-autocomplete-url-value]')
+  select2Autocompletes.forEach(element => $(element).select2('destroy'))
+})
+
 // eslint-disable-next-line no-unused-vars
 function loadAutoCompleteParams() {
   const select2Autocompletes = document.querySelectorAll('select[data-autocomplete-url-value]')
@@ -77,7 +84,7 @@ $.fn.select2Autocomplete = function(params) {
     // URL + Additional URL Params + Sparse Fields
     apiUrl = `${params.apiUrl}?${additionalUrlParams}&${sparseFields}`
   } else {
-    // URL + Sparse Fields (the default response for a noraml Select2)
+    // URL + Sparse Fields (the default response for a normal Select2)
     apiUrl = `${params.apiUrl}?${sparseFields}`
   }
 

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

@@ -1,6 +1,6 @@
 /**
   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 (Platform v2) and populate an empty <select> with <option> tags, including a selected <option> tag.
 
   ## EXAMPLE A
   # Populating a list of all taxons including a selected item
@@ -67,7 +67,7 @@ const updateSelectSuccess = function(parsedData, returnValueFromAttributes, retu
 
     if (returnValueFromAttributes == null) {
       optionEl.value = object.id
-      if (parseInt(selectedOption, 10) === parseInt(object.id, 10)) optionEl.selected = true
+      if (selectedOption === object.id) optionEl.selected = true
     } else {
       optionEl.value = object.attributes[returnValueFromAttributes]
       if (selectedOpt.value === object.attributes[returnValueFromAttributes]) {

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

@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener("spree:load", function () {
   const navWrapper = document.querySelectorAll('[data-nav-x-wrapper]')
   navWrapper.forEach(el => initHorizontalNav(el))
 })
@@ -16,7 +16,7 @@ function initHorizontalNav (containerEl) {
   const navContent = navContainer.querySelector('[data-nav-x-content]')
   const activeNavItem = navContent.querySelector('.active')
 
-  // Trigger on DOMContentLoaded
+  // Trigger on spree:load
   setOverscrollIndicators()
 
   if (activeNavItem) focusActiveItem(navContainer, activeNavItem)

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

@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener("spree:load", function() {
   var parentEl = document.getElementsByClassName('sortable')[0];
   if (parentEl) {
     var element = parentEl.querySelector('tbody')
@@ -17,7 +17,7 @@ document.addEventListener('DOMContentLoaded', function() {
         var itemEl = evt.item
         var positions = { authenticity_token: AUTH_TOKEN }
         $.each($('tr', element), function(position, obj) {
-          var reg = /spree_(\w+_?)+_(\d+)/
+          var reg = /spree_(\w+_?)+_(.*)/
           var parts = reg.exec($(obj).prop('id'))
           if (parts) {
             positions['positions[' + parts[2] + ']'] = position + 1

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

@@ -1,5 +1,6 @@
-document.addEventListener('DOMContentLoaded', function() {
-  // eslint-disable-next-line no-undef
+document.addEventListener("spree:load", function() {
+  tinymce.remove() // Required for spree:load
+
   tinymce.init({
     selector: '.spree-rte',
     plugins: [
@@ -8,4 +9,13 @@ document.addEventListener('DOMContentLoaded', function() {
     menubar: false,
     toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent | code '
   });
+
+  tinymce.init({
+    selector: '.spree-rte-simple',
+    menubar: false,
+    plugins: [
+      'image table paste link table'
+    ],
+    toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent'
+  });
 })

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

@@ -1,5 +1,5 @@
 /* global toggleItemEdit, order_number */
-$(function () {
+document.addEventListener("spree:load", function() {
   // handle edit click
   $('a.edit-line-item').click(toggleLineItemEdit)
   // handle cancel click
@@ -37,19 +37,19 @@ function toggleLineItemEdit () {
 
 function lineItemURL (lineItemId) {
   // eslint-disable-next-line camelcase
-  return Spree.routes.orders_api + '/' + order_number + '/line_items/' + lineItemId + '.json'
+  return Spree.routes.line_items_api_v2 + '/' + lineItemId
 }
 
 function adjustLineItem (lineItemId, quantity) {
   $.ajax({
-    type: 'PUT',
+    type: 'PATCH',
     url: Spree.url(lineItemURL(lineItemId)),
     data: {
       line_item: {
         quantity: quantity
-      },
-      token: Spree.api_key
-    }
+      }
+    },
+    headers: Spree.apiV2Authentication(),
   }).done(function () {
     window.Spree.advanceOrder()
   })
@@ -59,9 +59,7 @@ function deleteLineItem (lineItemId) {
   $.ajax({
     type: 'DELETE',
     url: Spree.url(lineItemURL(lineItemId)),
-    headers: {
-      'X-Spree-Token': Spree.api_key
-    }
+    headers: Spree.apiV2Authentication(),
   }).done(function () {
     $('#line-item-' + lineItemId).remove()
     if ($('.line-items tr.line-item').length === 0) {

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

@@ -1,15 +1,15 @@
-/* global variantLineItemTemplate, order_number */
+/* global variantLineItemTemplate, order_number, order_id */
 // This file contains the code for interacting with line items in the manual cart
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   'use strict'
 
   // handle variant selection, show stock level.
   $('#add_line_item_variant_id').change(function () {
-    var variantId = $(this).val()
+    var variantId = $(this).val().toString()
 
     var variant = _.find(window.variants, function (variant) {
       // eslint-disable-next-line eqeqeq
-      return variant.id == variantId
+      return variant.id.toString() == variantId
     })
     $('#stock_details').html(variantLineItemTemplate({ variant: variant }))
     $('#stock_details').show()
@@ -20,33 +20,28 @@ $(document).ready(function () {
 function addVariant () {
   $('#stock_details').hide()
   var variantId = $('select.variant_autocomplete').val()
-  var quantity = $('input#variant_quantity').val()
+  var quantity = parseInt($('input#variant_quantity').val())
 
-  adjustLineItems(order_number, variantId, quantity)
+  adjustLineItems(order_id, variantId, quantity)
   return 1
 }
 
-adjustLineItems = function(order_number, variant_id, quantity){
-    var url = Spree.routes.orders_api + '/' + order_number + '/line_items'
-
-    $.ajax({
-      type: 'POST',
-      url: Spree.url(url),
-      data: {
-        line_item: {
-          variant_id: variant_id,
-          quantity: quantity
-        },
-        token: Spree.api_key
-      }
-    }).done(function () {
-        window.Spree.advanceOrder()
-        window.location.reload()
-    }).fail(function (msg) {
-      if (typeof msg.responseJSON.message != 'undefined') {
-        alert(msg.responseJSON.message)
-      } else {
-        alert(msg.responseJSON.exception)
+adjustLineItems = function(order_id, variant_id, quantity){
+  $.ajax({
+    type: 'POST',
+    url: Spree.routes.line_items_api_v2,
+    data: {
+      line_item: {
+        order_id: order_id,
+        variant_id: variant_id,
+        quantity: quantity
       }
-    })
+    },
+    headers: Spree.apiV2Authentication()
+  }).done(function () {
+      window.Spree.advanceOrder()
+      window.location.reload()
+  }).fail(function (response) {
+    show_flash('error', response.responseJSON.error)
+  })
 }

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

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

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

@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener("spree:load", function() {
   const menuItemType = $('#menu_item_item_type').select2()
 
   updateContainerMessage()

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

@@ -1,6 +1,6 @@
 //= require spree/backend
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   $.expr[':'].Contains = function (a, i, m) {
     return (
       (a.textContent || a.innerText || '')
@@ -32,7 +32,7 @@ $(document).ready(function () {
   }
 
   // ondomready
-  $(function () {
+  document.addEventListener("spree:load", function() {
     listFilter($('#variant-prices'))
   })
 })

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

@@ -24,7 +24,7 @@ $.fn.optionTypeAutocomplete = function () {
   })
 }
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   var productOptionTypeSelector = document.getElementById('product_option_type_ids')
   if (productOptionTypeSelector == null) return
   if (productOptionTypeSelector.hasAttribute('data-autocomplete-url-value')) return

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

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   'use strict'
   $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete()
 })

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

@@ -1,5 +1,5 @@
 /* global show_flash */
-jQuery(function ($) {
+document.addEventListener("spree:load", function() {
   var extend = function (child, parent) {
     for (var key in parent) {
       if (hasProp.call(parent, key)) child[key] = parent[key]
@@ -13,54 +13,61 @@ jQuery(function ($) {
     return child
   }
   var hasProp = {}.hasOwnProperty
-  var EditPaymentView, Payment, PaymentView, ShowPaymentView, orderId
-  orderId = $('#payments').data('order-id')
+  var EditPaymentView, Payment, PaymentView, ShowPaymentView
   Payment = (function () {
-    function Payment (number) {
-      this.url = Spree.url(((Spree.routes.payments_api(orderId)) + '/' + number + '.json') + '?token=' + Spree.api_key)
-      this.json = $.getJSON(this.url.toString(), function (data) {
-        this.data = data
-      }.bind(this))
+    function Payment (id) {
+      this.url = Spree.routes.payments_api_v2 + '/' + id
+      this.json = $.ajax({
+        dataType: "json",
+        url: this.url,
+        headers: Spree.apiV2Authentication(),
+        success: function (data) {
+          this.data = data.data
+        }.bind(this)
+      })
       this.updating = false
     }
 
     Payment.prototype.if_editable = function (callback) {
       return this.json.done(function (data) {
         var ref
-        if ((ref = data.state) === 'checkout' || ref === 'pending') {
+        if ((ref = data.data.attributes.state) === 'checkout' || ref === 'pending') {
           return callback()
         }
       })
     }
 
-    Payment.prototype.update = function (attributes) {
+    Payment.prototype.update = function (attributes, onDone) {
       this.updating = true
       var jqXHR = $.ajax({
-        type: 'PUT',
-        url: this.url.toString(),
+        type: 'PATCH',
+        url: this.url,
         data: {
           payment: attributes
-        }
+        },
+        headers: Spree.apiV2Authentication()
       })
       jqXHR.always(function () {
         this.updating = false
       }.bind(this))
       jqXHR.done(function (data) {
-        this.data = data
+        this.data = data.data
+        onDone()
       }.bind(this))
       jqXHR.fail(function () {
         var response = (jqXHR.responseJSON && jqXHR.responseJSON.error) || jqXHR.statusText
         show_flash('error', response)
+        onDone()
       })
       return jqXHR
     }
 
     Payment.prototype.amount = function () {
-      return this.data.amount
+      return this.data.attributes.amount
     }
 
     Payment.prototype.display_amount = function () {
-      return this.data.display_amount
+      return this.data.attributes.display_amount
     }
     return Payment
   })()
@@ -96,7 +103,7 @@ jQuery(function ($) {
 
     PaymentView.prototype.$new_button = function (action) {
       return $('<a><i class="icon icon-' + action + '"></i></a>').attr({
-        'class': 'payment-action-' + action + ' btn btn-outline-secondary btn-sm no-filter',
+        'class': 'payment-action-' + action + ' btn btn-light btn-sm no-filter',
         title: Spree.translations[action]
       }).data({
         action: action
@@ -189,11 +196,14 @@ jQuery(function ($) {
 
     EditPaymentView.prototype.save = function () {
       if (!this.payment.updating) {
-        return this.payment.update({
-          amount: this.$input().val()
-        }).done(function () {
-          return this.show()
-        }.bind(this))
+        return this.payment.update(
+          {
+            amount: this.$input().val()
+          },
+          function () {
+            this.show()
+          }.bind(this)
+        )
       }
     }
 
@@ -223,7 +233,7 @@ jQuery(function ($) {
   })(PaymentView)
   return $('.admin tr[data-hook=payments_row]').each(function () {
     var $el = $(this)
-    var payment = new Payment($el.attr('data-number'))
+    var payment = new Payment($el.attr('data-id'))
     return payment.if_editable(function () {
       return new ShowPaymentView($el, payment)
     })

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

@@ -1,6 +1,6 @@
 /* global Cleave */
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   if ($('#new_payment').length) {
     var cardCodeCleave;
     var updateCardCodeCleave = function (length) {

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

@@ -6,24 +6,21 @@ $.fn.productAutocomplete = function (options) {
   var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
   var values = typeof (options.values) !== 'undefined' ? options.values : null
 
-  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,
+      url: Spree.routes.products_api_v2,
       dataType: 'json',
       data: {
-        q: {
+        filter: {
           id_in: values
         },
-        token: Spree.api_key
-      }
+        fields: {
+          product: 'name'
+        }
+      },
+      headers: Spree.apiV2Authentication(),
     }).then(function (data) {
-      select.addSelect2Options(data.products)
+      select.addSelect2Options(data.data)
     })
   }
 
@@ -31,28 +28,22 @@ $.fn.productAutocomplete = function (options) {
     multiple: multiple,
     minimumInputLength: 3,
     ajax: {
-      url: Spree.routes.products_api,
+      url: Spree.routes.products_api_v2,
       dataType: 'json',
       data: function (params) {
         return {
-          q: {
+          filter: {
             name_or_master_sku_cont: params.term
           },
-          m: 'OR',
-          token: Spree.api_key
+          fields: {
+            product: 'name'
+          }
         }
       },
+      headers: Spree.apiV2Authentication(),
       processResults: function(data) {
-        var products = data.products ? data.products : []
-        var results = formatProductList(products)
-
-        return {
-          results: results
-        }
+        return formatSelect2Options(data)
       }
-    },
-    templateSelection: function(data, _container) {
-      return data.text
     }
   })
 
@@ -61,6 +52,6 @@ $.fn.productAutocomplete = function (options) {
   }
 }
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   $('.product_picker').productAutocomplete()
 })

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

@@ -1,8 +1,10 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   $(document).ajaxStart(function () {
-    $('#progress').stop(true, true).fadeIn()
+    Turbo.navigator.delegate.adapter.progressBar.setValue(0)
+    Turbo.navigator.delegate.adapter.progressBar.show()
   })
   $(document).ajaxStop(function () {
-    $('#progress').fadeOut()
+    Turbo.navigator.delegate.adapter.progressBar.setValue(1)
+    Turbo.navigator.delegate.adapter.progressBar.hide()
   })
 })

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

@@ -16,10 +16,12 @@ function initProductActions () {
         $warning.hide()
         $settings.show()
         $settings.find('input').removeProp('disabled')
+        $settings.find('select').removeProp('disabled')
       } else {
         $warning.show()
         $settings.hide()
         $settings.find('input').prop('disabled', 'disabled')
+        $settings.find('select').prop('disabled', 'disabled')
       }
     })
   })
@@ -161,7 +163,7 @@ function initProductActions () {
   })()
 }
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   var promotion_form = $('form.edit_promotion')
 
   if (promotion_form.length) {

data/app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.js

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   $(document).on('change', '.return-items-table .return-item-exchange-selection', function () {
     $('.expedited-exchanges-warning').fadeIn()
   })

data/app/assets/javascripts/spree/backend/returns/return_item_selection.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   var formFields = $("[data-hook='admin_customer_return_form_fields'], [data-hook='admin_return_authorization_form_fields']")
 
   function checkAddItemBox () {