spree_backend 3.7.14.1 → 4.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea006e0dbe2f7266b92e30120848eb844215e4b453e8db297cf619be0fbfef23
-  data.tar.gz: 4dbee1ec28c0934f14f8083c67bb9a5f5748711586119a5f8f7129d936999a58
+  metadata.gz: 1c6bb4782e47150187105202e4dd34777fbb307d3331e193b3b8c4cd58904208
+  data.tar.gz: 95a899a53419588fc599d0b171e83d1d1b447101253571021051a22bf14c838d
 SHA512:
-  metadata.gz: 01423ce743bb6339fcfecf333d59b92c7797ca2fa3418b7e4c7970c44d3aa25bbd63ca8c186161175e63876a18132a71c8ecdb5830821051daecacc049c5963c
-  data.tar.gz: 15d6a4e40e1cb293daa420b64e6221448a11a13092a0811035052cca6f629d4be9c489f4a58e754f581accffd6ddcff95d6e2c67887e58494233da2784ccaf27
+  metadata.gz: 447eeb4c95197a72921edbfe4c96ce7c8f6316a9cf4e2ecac621ba75fe1599a5704193a8ffdbba616857935bbd9721161cda4c6f244fec48a7ae76d7502ab87b
+  data.tar.gz: '059c56e08cb4605d838c23845d198252f71c38311b5173f30355f66c7d9806513715613e7498dca9b3bfb39c3e482b5cefcc419ecd01d99c9e552acf06bded5d'

data/Gemfile

@@ -1,4 +1,4 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+eval_gemfile('../common_spree_dependencies.rb')
 
 gem 'spree_core', path: '../core'
 gem 'spree_api', path: '../api'

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

@@ -1,7 +1,8 @@
 //= require modernizr
+//= require jquery3
+//= require popper
 //= require bootstrap-sprockets
 //= require handlebars
-//= require jquery
 //= require js.cookie
 //= require jquery.jstree/jquery.jstree
 //= require jquery_ujs

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

@@ -25,25 +25,38 @@ jQuery(function ($) {
   })
 
   // Sidebar nav toggle functionality
-  $('#sidebar-toggle').on('click', function () {
-    var wrapper = $('#wrapper')
-    var main = $('#main-part')
-    var sidebar = $('#main-sidebar')
+  const sidebar_toggle = $('#sidebar-toggle')
 
-    // these should match `spree/backend/app/helpers/spree/admin/navigation_helper.rb#main_part_classes`
-    var mainWrapperCollapsedClasses = 'col-xs-12 sidebar-collapsed'
-    var mainWrapperExpandedClasses = 'col-xs-9 col-xs-offset-3 col-md-10 col-md-offset-2'
+  sidebar_toggle.on('click', function() {
+    const wrapper = $('#wrapper')
+    const main    = $('#main-part')
+    const sidebar = $('#main-sidebar')
+    const version = $('.spree-version')
+    const collapsed = sidebar.find('[aria-expanded="true"]')
+    const collapsedIcons = sidebar.find('.icon-chevron-down')
 
     wrapper.toggleClass('sidebar-minimized')
-    sidebar.toggleClass('hidden-xs')
+
+    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(mainWrapperCollapsedClasses)
-      .toggleClass(mainWrapperExpandedClasses)
+      .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')
     }
   })
 
@@ -72,16 +85,16 @@ jQuery(function ($) {
   })
 
   // Main menu active item submenu show
-  var activeItem = $('#main-sidebar').find('.selected')
-  activeItem.closest('.nav-pills').addClass('in')
-  activeItem.closest('.nav-sidebar')
+  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   in the text
+    // Remove the &nbsp in the text
     var sortLinkText = $(this).text().replace('\xA0', '')
 
     if (sortLinkText.indexOf('▼') >= 0) {
@@ -136,8 +149,8 @@ jQuery(function ($) {
 
       label = ransackField(label.text()) + ': ' + ransackValue
 
-      filter = '<span class="js-filter label label-default" data-ransack-field="' + ransackFieldId + '">' + label + '<span class="icon icon-delete js-delete-filter"></span></span>'
-      $('.js-filters').append(filter).show()
+      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()
     }
   })
 
@@ -205,7 +218,8 @@ function handle_date_picker_fields () {
     monthNames: Spree.translations.month_names,
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,
-    showOn: 'focus'
+    showOn: 'focus',
+    showAnim: ''
   })
 
   // Correctly display range dates
@@ -217,18 +231,18 @@ function handle_date_picker_fields () {
   })
 }
 
-$(document).ready(function () {
+$(document).ready(function(){
   handle_date_picker_fields()
-  $('.observe_field').on('change', function () {
-    var target = $(this).data('update')
+  $('.observe_field').on('change', function() {
+    target = $(this).data('update')
     $(target).hide()
-    $.ajax({ dataType: 'html',
+    $.ajax({
+      dataType: 'html',
       url: $(this).data('base-url') + encodeURIComponent($(this).val()),
-      type: 'get',
-      success: function (data) {
-        $(target).html(data)
-        $(target).show()
-      }
+      type: 'GET'
+    }).done(function (data) {
+      $(target).html(data)
+      $(target).show()
     })
   })
 
@@ -263,25 +277,23 @@ $(document).ready(function () {
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         },
-        dataType: 'script',
-        success: function (response) {
-          var $flashElement = $('.alert-success')
-          if ($flashElement.length) {
-            el.parents('tr').fadeOut('hide', function () {
-              $(this).remove()
-            })
-          }
-        },
-        error: function (response, textStatus, errorThrown) {
-          show_flash('error', response.responseText)
+        dataType: 'script'
+      }).done(function () {
+        var $flash_element = $('.alert-success')
+        if ($flash_element.length) {
+          el.parents('tr').fadeOut('hide', function () {
+            $(this).remove()
+          })
         }
+      }).fail(function (response) {
+        show_flash('error', response.responseText)
       })
     }
     return false
   })
 
   $('body').on('click', 'a.spree_remove_fields', function () {
-    var el = $(this)
+    el = $(this)
     el.prev('input[type=hidden]').val('1')
     el.closest('.fields').hide()
     if (el.prop('href').substr(-1) === '#') {
@@ -293,31 +305,28 @@ $(document).ready(function () {
         data: {
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
-        },
-        success: function (response) {
-          el.parents('tr').fadeOut('hide', function () {
-            $(this).remove()
-          })
-        },
-        error: function (response, textStatus, errorThrown) {
-          show_flash('error', response.responseText)
         }
-
+      }).done(function () {
+        el.parents('tr').fadeOut('hide', function () {
+          $(this).remove()
+        })
+      }).fail(function (response) {
+        show_flash('error', response.responseText)
       })
     }
     return false
   })
 
-  $('body').on('click', '.select_properties_from_prototype', function () {
+  $('body').on('click', '.select_properties_from_prototype', function(){
     $('#busy_indicator').show()
-    var clickedLink = $(this)
-    $.ajax({ dataType: 'script',
-      url: clickedLink.prop('href'),
-      type: 'get',
-      success: function (data) {
-        clickedLink.parent('td').parent('tr').hide()
-        $('#busy_indicator').hide()
-      }
+    var clicked_link = $(this)
+    $.ajax({
+      dataType: 'script',
+      url: clicked_link.prop('href'),
+      type: 'GET'
+    }).done(function () {
+      clicked_link.parent('td').parent('tr').hide()
+      $('#busy_indicator').hide()
     })
     return false
   })
@@ -337,13 +346,13 @@ $(document).ready(function () {
         handle: '.handle',
         helper: fixHelper,
         placeholder: 'ui-sortable-placeholder',
-        update: function (event, ui) {
+        update: function(event, ui) {
           var tbody = this
           $('#progress').show()
-          var positions = {}
-          $.each($('tr', tbody), function (position, obj) {
-            var reg = /spree_(\w+_?)+_(\d+)/
-            var parts = reg.exec($(obj).prop('id'))
+          positions = {}
+          $.each($('tr', tbody), function(position, obj) {
+            reg = /spree_(\w+_?)+_(\d+)/
+            parts = reg.exec($(obj).prop('id'))
             if (parts) {
               positions['positions[' + parts[2] + ']'] = position + 1
             }
@@ -352,8 +361,9 @@ $(document).ready(function () {
             type: 'POST',
             dataType: 'script',
             url: $(ui.item).closest('table.sortable').data('sortable-link'),
-            data: positions,
-            success: function (data) { $('#progress').hide() }
+            data: positions
+          }).done(function () {
+            $('#progress').hide()
           })
         },
         start: function (event, ui) {
@@ -375,16 +385,15 @@ $(document).ready(function () {
     $(this).parent().fadeOut()
   })
 
-  window.Spree.advanceOrder = function () {
+  window.Spree.advanceOrder = function() {
     $.ajax({
       type: 'PUT',
       async: false,
       data: {
         token: Spree.api_key
       },
-      // eslint-disable-next-line camelcase
       url: Spree.url(Spree.routes.checkouts_api + '/' + order_number + '/advance')
-    }).done(function () {
+    }).done(function() {
       window.location.reload()
     })
   }

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

@@ -3,15 +3,15 @@ $(function () {
   var originalCalcType = calculatorSelect.prop('value')
   $('.calculator-settings-warning').hide()
   calculatorSelect.change(function () {
-    // eslint-disable-next-line eqeqeq
+    // eslint-disable-next-line
     if (calculatorSelect.prop('value') == originalCalcType) {
       $('div.calculator-settings').show()
       $('.calculator-settings-warning').hide()
-      $('.calculator-settings').find('input,textarea').prop('disabled', false)
+      $('.calculator-settings').find('input, textarea').prop('disabled', false)
     } else {
       $('div.calculator-settings').hide()
       $('.calculator-settings-warning').show()
-      $('.calculator-settings').find('input,texttarea').prop('disabled', true)
+      $('.calculator-settings').find('input, textarea').prop('disabled', true)
     }
   })
 })

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

@@ -2,7 +2,7 @@ $(function () {
   var originalGtwyType = $('#gtwy-type').prop('value')
   $('div#gateway-settings-warning').hide()
   $('#gtwy-type').change(function () {
-    // eslint-disable-next-line eqeqeq
+    // eslint-disable-next-line
     if ($('#gtwy-type').prop('value') == originalGtwyType) {
       $('div.gateway-settings').show()
       $('div#gateway-settings-warning').hide()

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

@@ -20,34 +20,33 @@ $(document).ready(function () {
 function addVariant () {
   $('#stock_details').hide()
   var variantId = $('input.variant_autocomplete').val()
-  var quantity = $("input.quantity[data-variant-id='" + variantId + "']").val()
+  var quantity = $('input#variant_quantity').val()
 
   adjustLineItems(order_number, variantId, quantity)
   return 1
 }
 
-function adjustLineItems (orderNumber, variantId, quantity) {
-  var url = Spree.routes.orders_api + '/' + orderNumber + '/line_items'
+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: variantId,
-        quantity: quantity
-      },
-      token: Spree.api_key
-    }
-  }).done(function (msg) {
-    window.Spree.advanceOrder()
-    window.location.reload()
-  }).fail(function (msg) {
-    // eslint-disable-next-line eqeqeq
-    if (typeof msg.responseJSON.message != 'undefined') {
-      alert(msg.responseJSON.message)
-    } else {
-      alert(msg.responseJSON.exception)
-    }
-  })
+    $.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)
+      }
+    })
 }

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

@@ -140,12 +140,12 @@ function initProductActions () {
 
     setupRemoveLineItems()
     // Add line item to list
-    $('.promotion_action.create_line_items button.add').unbind('click').click(function () {
+    $('.promotion_action.create_line_items button.add').off('click').click(function () {
       var $container = $(this).parents('.promotion_action')
-      var productName = $container.find('input[name="add_product_name"]').val()
-      var variantId = $container.find('input[name="add_variant_id"]').val()
+      var product_name = $container.find('input[name="add_product_name"]').val()
+      var variant_id = $container.find('input[name="add_variant_id"]').val()
       var quantity = $container.find('input[name="add_quantity"]').val()
-      if (variantId) {
+      if (variant_id) {
         // Add to the table
         var newRow = '<tr><td>' + productName + '</td><td>' + quantity + '</td><td><img src="/assets/admin/icons/cross.png"/></td></tr>'
         $container.find('table').append(newRow)

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

@@ -5,12 +5,12 @@ $(document).ready(function () {
 
   // handle variant selection, show stock level.
   $('#add_variant_id').change(function () {
-    var variantId = $(this).val()
+    var variantId = parseInt($(this).val())
 
     var variant = _.find(window.variants, function (variant) {
-      // eslint-disable-next-line eqeqeq
-      return variant.id == variantId
+      return variant.id === variantId
     })
+
     $('#stock_details').html(variantStockTemplate({ variant: variant }))
     $('#stock_details').show()
 
@@ -80,7 +80,7 @@ $(document).ready(function () {
       }
     }).done(function () {
       window.location.reload()
-    }).error(function (msg) {
+    }).fail(function (msg) {
       alert(msg.responseJSON.message || msg.responseJSON.exception)
     })
   })
@@ -111,12 +111,12 @@ $(document).ready(function () {
       }
     }).done(function () {
       window.location.reload()
-    }).error(function (msg) {
+    }).fail(function (msg) {
       alert(msg.responseJSON.message || msg.responseJSON.exception)
     })
   })
 
-  function toggleTrackingEdit (event) {
+  function toggleTrackingEdit(event) {
     event.preventDefault()
 
     var link = $(this)
@@ -128,7 +128,7 @@ $(document).ready(function () {
   $('a.edit-tracking').click(toggleTrackingEdit)
   $('a.cancel-tracking').click(toggleTrackingEdit)
 
-  function createTrackingValueContent (data) {
+  function createTrackingValueContent(data) {
     var selectedShippingMethod = data.shipping_methods.filter(function (method) {
       return method.id === data.selected_shipping_rate.shipping_method_id
     })[0]
@@ -174,7 +174,7 @@ $(document).ready(function () {
   })
 })
 
-function adjustShipmentItems (shipmentNumber, variantId, quantity) {
+function adjustShipmentItems(shipmentNumber, variantId, quantity) {
   var shipment = _.findWhere(shipments, { number: shipmentNumber + '' })
   var inventoryUnits = _.where(shipment.inventory_units, { variant_id: variantId })
   var url = Spree.routes.shipments_api + '/' + shipmentNumber
@@ -209,7 +209,7 @@ function adjustShipmentItems (shipmentNumber, variantId, quantity) {
   }
 }
 
-function toggleMethodEdit () {
+function toggleMethodEdit() {
   var link = $(this)
   link.parents('tbody').find('tr.edit-method').toggle()
   link.parents('tbody').find('tr.show-method').toggle()
@@ -217,7 +217,7 @@ function toggleMethodEdit () {
   return false
 }
 
-function toggleItemEdit () {
+function toggleItemEdit() {
   var link = $(this)
   var linkParent = link.parent()
   linkParent.find('a.edit-item').toggle()
@@ -231,7 +231,7 @@ function toggleItemEdit () {
   return false
 }
 
-function startItemSplit (event) {
+function startItemSplit(event) {
   event.preventDefault()
   $('.cancel-split').each(function () {
     $(this).click()
@@ -253,9 +253,9 @@ function startItemSplit (event) {
       },
       token: Spree.api_key
     }
-  }).success(function (data) {
+  }).done(function (data) {
     variant = data['variants'][0]
-  }).error(function (msg) {
+  }).fail(function (msg) {
     alert(msg.responseJSON.message || msg.responseJSON.exception)
   })
 
@@ -268,7 +268,7 @@ function startItemSplit (event) {
   $('#item_stock_location').select2({ width: 'resolve', placeholder: Spree.translations.item_stock_placeholder })
 }
 
-function completeItemSplit (event) {
+function completeItemSplit(event) {
   event.preventDefault()
 
   if ($('#item_stock_location').val() === '') {
@@ -287,24 +287,13 @@ function completeItemSplit (event) {
   var selectedShipment = stockItemRow.find($('#item_stock_location').select2('data').element)
   var targetShipmentNumber = selectedShipment.data('shipment-number')
   var newShipment = selectedShipment.data('new-shipment')
-  // eslint-disable-next-line
-  if (stockLocationId !== 'new_shipment') {
-    var splitItems = function (opts) {
+  // eslint-disable-next-line eqeqeq
+  if (stockLocationId != 'new_shipment') {
+    if (newShipment !== undefined) {
+      // TRANSFER TO A NEW LOCATION
       $.ajax({
         type: 'POST',
         async: false,
-        url: opts.url,
-        data: opts.data
-      }).error(function (msg) {
-        alert(msg.responseJSON.message || msg.responseJSON.exception)
-      }).done(function () {
-        window.location.reload()
-      })
-    }
-
-    if (newShipment !== undefined) {
-      // TRANSFER TO A NEW LOCATION
-      splitItems({
         url: Spree.url(Spree.routes.shipments_api + '/transfer_to_location'),
         data: {
           original_shipment_number: originalShipmentNumber,
@@ -313,10 +302,16 @@ function completeItemSplit (event) {
           stock_location_id: stockLocationId,
           token: Spree.api_key
         }
+      }).fail(function (msg) {
+        alert(msg.responseJSON.message || msg.responseJSON.exception)
+      }).done(function (msg) {
+        window.location.reload()
       })
     } else {
       // TRANSFER TO AN EXISTING SHIPMENT
-      splitItems({
+      $.ajax({
+        type: 'POST',
+        async: false,
         url: Spree.url(Spree.routes.shipments_api + '/transfer_to_shipment'),
         data: {
           original_shipment_number: originalShipmentNumber,
@@ -325,12 +320,16 @@ function completeItemSplit (event) {
           quantity: quantity,
           token: Spree.api_key
         }
+      }).fail(function (msg) {
+        alert(msg.responseJSON.message || msg.responseJSON.exception)
+      }).done(function (msg) {
+        window.location.reload()
       })
     }
   }
 }
 
-function cancelItemSplit (event) {
+function cancelItemSplit(event) {
   event.preventDefault()
   var link = $(this)
   var prevRow = link.closest('tr').prev()
@@ -340,7 +339,7 @@ function cancelItemSplit (event) {
   prevRow.find('a.delete-item').toggle()
 }
 
-function addVariantFromStockLocation (event) {
+function addVariantFromStockLocation(event) {
   event.preventDefault()
 
   $('#stock_details').hide()
@@ -366,7 +365,7 @@ function addVariantFromStockLocation (event) {
       }
     }).done(function (msg) {
       window.location.reload()
-    }).error(function (msg) {
+    }).fail(function (msg) {
       alert(msg.responseJSON.message || msg.responseJSON.exception)
     })
   } else {