spree_backend 4.1.1 → 4.5.0

data/app/assets/images/backend-x-lg.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z"/>
+  <path fill-rule="evenodd" d="M2.146 2.146a.5.5 0 0 0 0 .708l11 11a.5.5 0 0 0 .708-.708l-11-11a.5.5 0 0 0-.708 0Z"/>
+</svg>

data/app/assets/images/backend-x-octagon-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-octagon-fill" viewBox="0 0 16 16">
+  <path d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zm-6.106 4.5L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z"/>
+</svg>

data/app/assets/images/backend-x-octagon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-octagon" viewBox="0 0 16 16">
+  <path d="M4.54.146A.5.5 0 0 1 4.893 0h6.214a.5.5 0 0 1 .353.146l4.394 4.394a.5.5 0 0 1 .146.353v6.214a.5.5 0 0 1-.146.353l-4.394 4.394a.5.5 0 0 1-.353.146H4.893a.5.5 0 0 1-.353-.146L.146 11.46A.5.5 0 0 1 0 11.107V4.893a.5.5 0 0 1 .146-.353L4.54.146zM5.1 1 1 5.1v5.8L5.1 15h5.8l4.1-4.1V5.1L10.9 1H5.1z"/>
+  <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+</svg>

data/app/assets/images/backend-x-square-fill.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-square-fill" viewBox="0 0 16 16">
+  <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm3.354 4.646L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z"/>
+</svg>

data/app/assets/images/backend-x-square.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-square" viewBox="0 0 16 16">
+  <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+  <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+</svg>

data/app/assets/images/backend-x.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x" viewBox="0 0 16 16">
+  <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+</svg>

data/app/assets/images/backend-xbox.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-xbox" viewBox="0 0 16 16">
+  <path d="M7.202 15.967a7.987 7.987 0 0 1-3.552-1.26c-.898-.585-1.101-.826-1.101-1.306 0-.965 1.062-2.656 2.879-4.583C6.459 7.723 7.897 6.44 8.052 6.475c.302.068 2.718 2.423 3.622 3.531 1.43 1.753 2.088 3.189 1.754 3.829-.254.486-1.83 1.437-2.987 1.802-.954.301-2.207.429-3.239.33Zm-5.866-3.57C.589 11.253.212 10.127.03 8.497c-.06-.539-.038-.846.137-1.95.218-1.377 1.002-2.97 1.945-3.95.401-.417.437-.427.926-.263.595.2 1.23.638 2.213 1.528l.574.519-.313.385C4.056 6.553 2.52 9.086 1.94 10.653c-.315.852-.442 1.707-.306 2.063.091.24.007.15-.3-.319Zm13.101.195c.074-.36-.019-1.02-.238-1.687-.473-1.443-2.055-4.128-3.508-5.953l-.457-.575.494-.454c.646-.593 1.095-.948 1.58-1.25.381-.237.927-.448 1.161-.448.145 0 .654.528 1.065 1.104a8.372 8.372 0 0 1 1.343 3.102c.153.728.166 2.286.024 3.012a9.495 9.495 0 0 1-.6 1.893c-.179.393-.624 1.156-.82 1.404-.1.128-.1.127-.043-.148ZM7.335 1.952c-.67-.34-1.704-.705-2.276-.803a4.171 4.171 0 0 0-.759-.043c-.471.024-.45 0 .306-.358A7.778 7.778 0 0 1 6.47.128c.8-.169 2.306-.17 3.094-.005.85.18 1.853.552 2.418.9l.168.103-.385-.02c-.766-.038-1.88.27-3.078.853-.361.176-.676.316-.699.312a12.246 12.246 0 0 1-.654-.319Z"/>
+</svg>

data/app/assets/images/backend-yin-yang.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-yin-yang" viewBox="0 0 16 16">
+  <path d="M9.167 4.5a1.167 1.167 0 1 1-2.334 0 1.167 1.167 0 0 1 2.334 0Z"/>
+  <path d="M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0ZM1 8a7 7 0 0 1 7-7 3.5 3.5 0 1 1 0 7 3.5 3.5 0 1 0 0 7 7 7 0 0 1-7-7Zm7 4.667a1.167 1.167 0 1 1 0-2.334 1.167 1.167 0 0 1 0 2.334Z"/>
+</svg>

data/app/assets/images/backend-youtube.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16">
+  <path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.007 2.007 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.007 2.007 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31.4 31.4 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.007 2.007 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A99.788 99.788 0 0 1 7.858 2h.193zM6.4 5.209v4.818l4.157-2.408L6.4 5.209z"/>
+</svg>

data/app/assets/images/backend-zoom-in.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-zoom-in" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+  <path d="M10.344 11.742c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1 6.538 6.538 0 0 1-1.398 1.4z"/>
+  <path fill-rule="evenodd" d="M6.5 3a.5.5 0 0 1 .5.5V6h2.5a.5.5 0 0 1 0 1H7v2.5a.5.5 0 0 1-1 0V7H3.5a.5.5 0 0 1 0-1H6V3.5a.5.5 0 0 1 .5-.5z"/>
+</svg>

data/app/assets/images/backend-zoom-out.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-zoom-out" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11zM13 6.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z"/>
+  <path d="M10.344 11.742c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1 6.538 6.538 0 0 1-1.398 1.4z"/>
+  <path fill-rule="evenodd" d="M3 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5z"/>
+</svg>

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/address_states.es6

@@ -0,0 +1,50 @@
+function updateAddressState(region, successCallback) {
+  const countryId = $('#' + region + 'country select').val()
+  const stateContainer = $('#' + region + 'state').parent()
+  const stateSelect = $('#' + region + 'state select')
+  const stateInput = $('#' + region + 'state input.state_name')
+
+  if (!countryId) { return }
+
+  fetch(Spree.routes.countries_api_v2 + '/' + countryId + '?include=states', {
+    headers: Spree.apiV2Authentication()
+  }).then((response) => {
+    switch (response.status) {
+      case 200:
+        response.json().then((json) => {
+          const states = json.included
+          const statesRequired = json.data.attributes.states_required
+          const stateSelectValue = stateSelect.val();
+          if (states.length > 0) {
+            stateSelect.html('')
+            $.each(states, function (_pos, state) {
+              const opt = $(document.createElement('option'))
+                .prop('value', state.id)
+                .html(state.attributes.name)
+              stateSelect.append(opt).trigger('change')
+            })
+            stateSelect.prop('disabled', false).show()
+            stateSelect.select2()
+            if (stateSelectValue !== undefined) {
+              stateSelect.val(stateSelectValue).trigger('change')
+            }
+            stateInput.hide().prop('disabled', true)
+            stateContainer.show()
+          } else {
+            stateSelect.val(null).trigger('change')
+            if (stateSelect.data('select2')) {
+              stateSelect.select2('destroy')
+            }
+            stateSelect.hide()
+            if (statesRequired) {
+              stateInput.prop('disabled', false).show()
+            } else {
+              stateContainer.hide()
+            }
+          }
+          if (successCallback) successCallback()
+        })
+        break
+    }
+  })
+}

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

@@ -1,17 +1,17 @@
 /* global order_number, show_flash */
-$(function () {
+document.addEventListener("spree:load", function() {
   $('[data-hook=adjustments_new_coupon_code] #add_coupon_code').click(function () {
     var couponCode = $('#coupon_code').val()
     if (couponCode.length === 0) {
       return
     }
     $.ajax({
-      type: 'PUT',
-      url: Spree.url(Spree.routes.apply_coupon_code(order_number)),
+      type: 'PATCH',
+      url: Spree.routes.apply_coupon_code(order_number),
       data: {
         coupon_code: couponCode,
-        token: Spree.api_key
-      }
+      },
+      headers: Spree.apiV2Authentication(),
     }).done(function () {
       window.location.reload()
     }).fail(function (message) {

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

@@ -1,273 +1,51 @@
-/**
-This is a collection of javascript functions and whatnot
-under the spree namespace that do stuff we find helpful.
-Hopefully, this will evolve into a propper class.
-**/
+/* global order_number, show_flash */
 
-/* global Cookies, AUTH_TOKEN, order_number */
-
-jQuery(function ($) {
-  // Add some tips
-  $('.with-tip').tooltip()
-
-  $('.js-show-index-filters').click(function () {
-    $('.filter-well').slideToggle()
-    $(this).parents('.filter-wrap').toggleClass('collapsed')
-    $('span.icon', $(this)).toggleClass('icon-chevron-down')
-  })
-
-  $('#main-sidebar').find('[data-toggle="collapse"]').on('click', function () {
-    if ($(this).find('.icon-chevron-left').length === 1) {
-      $(this).find('.icon-chevron-left').removeClass('icon-chevron-left').addClass('icon-chevron-down')
-    } else {
-      $(this).find('.icon-chevron-down').removeClass('icon-chevron-down').addClass('icon-chevron-left')
-    }
-  })
-
-  // Sidebar nav toggle functionality
-  var sidebar_toggle = $('#sidebar-toggle')
-
-  sidebar_toggle.on('click', function() {
-    var wrapper = $('#wrapper')
-    var main    = $('#main-part')
-    var sidebar = $('#main-sidebar')
-    var version = $('.spree-version')
-    var collapsed = sidebar.find('[aria-expanded="true"]')
-    var collapsedIcons = sidebar.find('.icon-chevron-down')
-
-    wrapper.toggleClass('sidebar-minimized')
-
-    collapsed
-      .attr('aria-expanded', 'false')
-      .next()
-      .removeClass('show')
-
-    collapsedIcons
-      .removeClass('icon-chevron-down')
-      .addClass('icon-chevron-left')
-
-    // these should match `spree/backend/app/helpers/spree/admin/navigation_helper.rb#main_part_classes`
-    main
-      .toggleClass('col-12 sidebar-collapsed')
-      .toggleClass('col-9 offset-3 col-md-10 offset-md-2')
-
-    if (wrapper.hasClass('sidebar-minimized')) {
-      Cookies.set('sidebar-minimized', 'true', { path: '/admin' })
-      version.removeClass('d-md-block')
-    } else {
-      Cookies.set('sidebar-minimized', 'false', { path: '/admin' })
-      version.addClass('d-md-block')
-    }
-  })
-
-  $('.sidebar-menu-item').mouseover(function () {
-    if ($('#wrapper').hasClass('sidebar-minimized')) {
-      $(this).addClass('menu-active')
-      $(this).find('ul.nav').addClass('submenu-active')
-    }
-  })
-  $('.sidebar-menu-item').mouseout(function () {
-    if ($('#wrapper').hasClass('sidebar-minimized')) {
-      $(this).removeClass('menu-active')
-      $(this).find('ul.nav').removeClass('submenu-active')
-    }
-  })
-
-  // TODO: remove this js temp behaviour and fix this decent
-  // Temp quick search
-  // When there was a search term, copy it
-  $('.js-quick-search').val($('.js-quick-search-target').val())
-  // Catch the quick search form submit and submit the real form
-  $('#quick-search').submit(function () {
-    $('.js-quick-search-target').val($('.js-quick-search').val())
-    $('#table-filter form').submit()
-    return false
-  })
-
-  // Main menu active item submenu show
-  var active_item = $('#main-sidebar').find('.selected')
-  active_item.closest('.nav-pills').addClass('in show')
-  active_item.closest('.nav-sidebar')
-    .find('.icon-chevron-left')
-    .removeClass('icon-chevron-left')
-    .addClass('icon-chevron-down')
-
-  // Replace ▼ and ▲ in sort_link with nicer icons
-  $('.sort_link').each(function () {
-    // Remove the &nbsp in the text
-    var sortLinkText = $(this).text().replace('\xA0', '')
-
-    if (sortLinkText.indexOf('▼') >= 0) {
-      $(this).text(sortLinkText.replace('▼', ''))
-      $(this).append('<span class="icon icon-chevron-down"></span>')
-    } else if (sortLinkText.indexOf('▲') >= 0) {
-      $(this).text(sortLinkText.replace('▲', ''))
-      $(this).append('<span class="icon icon-chevron-up"></span>')
-    }
-  })
-
-  // Clickable ransack filters
-  $('.js-add-filter').click(function () {
-    var ransackField = $(this).data('ransack-field')
-    var ransackValue = $(this).data('ransack-value')
-
-    $('#' + ransackField).val(ransackValue)
-    $('#table-filter form').submit()
-  })
-
-  $(document).on('click', '.js-delete-filter', function () {
-    var ransackField = $(this).parents('.js-filter').data('ransack-field')
-
-    $('#' + ransackField).val('')
-    $('#table-filter form').submit()
-  })
-
-  function ransackField (value) {
-    switch (value) {
-      case 'Date Range':
-        return 'Start'
-      case '':
-        return 'Stop'
-      default:
-        return value.trim()
-    }
-  }
-
-  $('.js-filterable').each(function () {
-    var $this = $(this)
-
-    if ($this.val()) {
-      var ransackValue, filter
-      var ransackFieldId = $this.attr('id')
-      var label = $('label[for="' + ransackFieldId + '"]')
-
-      if ($this.is('select')) {
-        ransackValue = $this.find('option:selected').text()
-      } else {
-        ransackValue = $this.val()
-      }
-
-      label = ransackField(label.text()) + ': ' + ransackValue
-
-      filter = '<span class="js-filter badge badge-secondary" data-ransack-field="' + ransackFieldId + '">' + label + '<span class="icon icon-delete js-delete-filter"></span></span>'
-      $(".js-filters").append(filter).show()
-    }
-  })
-
-  // per page dropdown
-  // preserves all selected filters / queries supplied by user
-  // changes only per_page value
-  $('.js-per-page-select').change(function () {
-    var form = $(this).closest('.js-per-page-form')
-    var url = form.attr('action')
-    var value = $(this).val().toString()
-    if (url.match(/\?/)) {
-      url += '&per_page=' + value
-    } else {
-      url += '?per_page=' + value
-    }
-    window.location = url
-  })
-
-  // injects per_page settings to all available search forms
-  // so when user changes some filters / queries per_page is preserved
-  $(document).ready(function () {
-    var perPageDropdown = $('.js-per-page-select:first')
-    if (perPageDropdown.length) {
-      var perPageValue = perPageDropdown.val().toString()
-      var perPageInput = '<input type="hidden" name="per_page" value=' + perPageValue + ' />'
-      $('#table-filter form').append(perPageInput)
-    }
-  })
-
-  // Make flash messages disappear
-  setTimeout(function () { $('.alert-auto-disappear').slideUp() }, 5000)
-})
-
-$.fn.visible = function (cond) { this[ cond ? 'show' : 'hide' ]() }
-// eslint-disable-next-line camelcase
-function show_flash (type, message) {
-  var flashDiv = $('.alert-' + type)
-  if (flashDiv.length === 0) {
-    flashDiv = $('<div class="alert alert-' + type + '" />')
-    $('#content').prepend(flashDiv)
-  }
-  flashDiv.html(message).show().delay(10000).slideUp()
-}
-
-// Apply to individual radio button that makes another element visible when checked
-$.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
-  if (!this.get(0)) { return }
-  var showValue = this.get(0).value
-  var radioGroup = $("input[name='" + this.get(0).name + "']")
-  radioGroup.each(function () {
-    $(this).click(function () {
-      // eslint-disable-next-line eqeqeq
-      $(dependentElementSelector).visible(this.checked && this.value == showValue)
-    })
-    if (this.checked) { this.click() }
-  })
-}
-// eslint-disable-next-line camelcase
-function handle_date_picker_fields () {
-  $('.datepicker').datepicker({
-    dateFormat: Spree.translations.date_picker,
-    dayNames: Spree.translations.abbr_day_names,
-    dayNamesMin: Spree.translations.abbr_day_names,
-    firstDay: Spree.translations.first_day,
-    monthNames: Spree.translations.month_names,
-    prevText: Spree.translations.previous,
-    nextText: Spree.translations.next,
-    showOn: 'focus',
-    showAnim: ''
-  })
-
-  // Correctly display range dates
-  $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function (selectedDate) {
-    $('.date-range-filter .datepicker-to').datepicker('option', 'minDate', selectedDate)
-  })
-  $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function (selectedDate) {
-    $('.date-range-filter .datepicker-from').datepicker('option', 'maxDate', selectedDate)
-  })
-}
-
-$(document).ready(function(){
-  handle_date_picker_fields()
+document.addEventListener("spree:load", function() {
+  /**
+    OBSERVE FIELD:
+  **/
   $('.observe_field').on('change', function() {
-    target = $(this).data('update')
+    var target = $(this).data('update')
     $(target).hide()
     $.ajax({
       dataType: 'html',
       url: $(this).data('base-url') + encodeURIComponent($(this).val()),
       type: 'GET'
-    }).done(function (data) {
+    }).done(function(data) {
       $(target).html(data)
       $(target).show()
     })
   })
 
+  /**
+    ADD FIELDS
+  **/
   var uniqueId = 1
-  $('.spree_add_fields').click(function () {
+  $('.spree_add_fields').click(function() {
     var target = $(this).data('target')
     var newTableRow = $(target + ' tr:visible:last').clone()
     var newId = new Date().getTime() + (uniqueId++)
-    newTableRow.find('input, select').each(function () {
+    newTableRow.find('input, select').each(function() {
       var el = $(this)
       el.val('')
       el.prop('id', el.prop('id').replace(/\d+/, newId))
       el.prop('name', el.prop('name').replace(/\d+/, newId))
     })
+
     // When cloning a new row, set the href of all icons to be an empty "#"
     // This is so that clicking on them does not perform the actions for the
     // duplicated row
-    newTableRow.find('a').each(function () {
+    newTableRow.find('a').each(function() {
       var el = $(this)
       el.prop('href', '#')
     })
-    $(target).prepend(newTableRow)
+    $(target).append(newTableRow)
   })
 
-  $('body').on('click', '.delete-resource', function () {
+  /**
+    DELETE RESOURCE
+  **/
+  $('body').on('click', '.delete-resource', function() {
     var el = $(this)
     if (confirm(el.data('confirm'))) {
       $.ajax({
@@ -277,23 +55,36 @@ $(document).ready(function(){
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         },
-        dataType: 'script'
-      }).done(function () {
-        var $flash_element = $('.alert-success')
-        if ($flash_element.length) {
-          el.parents('tr').fadeOut('hide', function () {
+        dataType: 'script',
+        complete: function() {
+          el.blur()
+        }
+      }).done(function() {
+        var $flashElement = $('#FlashAlertsContainer span[data-alert-type="success"]')
+        if ($flashElement.length) {
+          el.parents('tr').fadeOut('hide', function() {
+            $(this).remove()
+          })
+          el.closest('.removable-dom-element').fadeOut('hide', function() {
             $(this).remove()
           })
+          var livePreview = document.getElementById('pageLivePreview')
+          if (livePreview) { livePreview.contentWindow.location.reload() }
         }
-      }).fail(function (response) {
+      }).fail(function(response) {
         show_flash('error', response.responseText)
       })
+    } else {
+      el.blur()
     }
     return false
   })
 
-  $('body').on('click', 'a.spree_remove_fields', function () {
-    el = $(this)
+  /**
+    REMOVE FIELDS
+  **/
+  $('body').on('click', 'a.spree_remove_fields', function() {
+    var el = $(this)
     el.prev('input[type=hidden]').val('1')
     el.closest('.fields').hide()
     if (el.prop('href').substr(-1) === '#') {
@@ -306,93 +97,43 @@ $(document).ready(function(){
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         }
-      }).done(function () {
-        el.parents('tr').fadeOut('hide', function () {
+      }).done(function() {
+        el.parents('tr').fadeOut('hide', function() {
           $(this).remove()
         })
-      }).fail(function (response) {
+      }).fail(function(response) {
         show_flash('error', response.responseText)
       })
     }
     return false
   })
 
-  $('body').on('click', '.select_properties_from_prototype', function(){
+  /**
+    SELECT PROPERTIES FROM PROTOTYPE
+  **/
+  $('body').on('click', '.select_properties_from_prototype', function() {
     $('#busy_indicator').show()
-    var clicked_link = $(this)
+    var clickedLink = $(this)
     $.ajax({
       dataType: 'script',
-      url: clicked_link.prop('href'),
+      url: clickedLink.prop('href'),
       type: 'GET'
-    }).done(function () {
-      clicked_link.parent('td').parent('tr').hide()
+    }).done(function() {
+      clickedLink.parent('td').parent('tr').hide()
       $('#busy_indicator').hide()
     })
     return false
   })
 
-  // Fix sortable helper
-  var fixHelper = function (e, ui) {
-    ui.children().each(function () {
-      $(this).width($(this).width())
-    })
-    return ui
-  }
-
-  $('table.sortable').ready(function () {
-    var tdCount = $(this).find('tbody tr:first-child td').length
-    $('table.sortable tbody').sortable(
-      {
-        handle: '.handle',
-        helper: fixHelper,
-        placeholder: 'ui-sortable-placeholder',
-        update: function(event, ui) {
-          var tbody = this
-          $('#progress').show()
-          var positions = { authenticity_token: AUTH_TOKEN }
-          $.each($('tr', tbody), function(position, obj) {
-            reg = /spree_(\w+_?)+_(\d+)/
-            parts = reg.exec($(obj).prop('id'))
-            if (parts) {
-              positions['positions[' + parts[2] + ']'] = position + 1
-            }
-          })
-          $.ajax({
-            type: 'POST',
-            dataType: 'script',
-            url: $(ui.item).closest('table.sortable').data('sortable-link'),
-            data: positions
-          }).done(function () {
-            $('#progress').hide()
-          })
-        },
-        start: function (event, ui) {
-          // Set correct height for placehoder (from dragged tr)
-          ui.placeholder.height(ui.item.height())
-          // Fix placeholder content to make it correct width
-          ui.placeholder.html("<td colspan='" + (tdCount - 1) + "'></td><td class='actions'></td>")
-        },
-        stop: function (event, ui) {
-          // Fix odd/even classes after reorder
-          $('table.sortable tr:even').removeClass('odd even').addClass('even')
-          $('table.sortable tr:odd').removeClass('odd even').addClass('odd')
-        }
-
-      })
-  })
-
-  $('a.dismiss').click(function () {
-    $(this).parent().fadeOut()
-  })
-
+  /**
+    UTILITY
+  **/
   window.Spree.advanceOrder = function() {
     $.ajax({
-      type: 'PUT',
+      type: 'PATCH',
       async: false,
-      data: {
-        token: Spree.api_key
-      },
-      url: Spree.url(Spree.routes.checkouts_api + '/' + order_number + '/advance')
+      headers: Spree.apiV2Authentication(),
+      url: Spree.url(Spree.routes.orders_api_v2 + '/' + order_number + '/advance')
     }).done(function() {
       window.location.reload()
     })

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

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   var calculatorSelect = $('select#calc_type')
   var originalCalcType = calculatorSelect.prop('value')
   $('.calculator-settings-warning').hide()
@@ -6,10 +6,12 @@ $(function () {
     // eslint-disable-next-line
     if (calculatorSelect.prop('value') == originalCalcType) {
       $('div.calculator-settings').show()
+      $('#shipping_method_calculator_attributes_preferred_currency').removeAttr('disabled')
       $('.calculator-settings-warning').hide()
       $('.calculator-settings').find('input, textarea').prop('disabled', false)
     } else {
       $('div.calculator-settings').hide()
+      $('#shipping_method_calculator_attributes_preferred_currency').attr('disabled', 'disabled')
       $('.calculator-settings-warning').show()
       $('.calculator-settings').find('input, textarea').prop('disabled', true)
     }