spree_backend 4.3.0 → 4.4.0.rc1

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
   })()
@@ -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 () {

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

@@ -1,13 +1,13 @@
-/* global shipments, variantStockTemplate, order_number */
+/* global shipments, variantStockTemplate, order_number, order_id */
 // Shipments AJAX API
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   'use strict'
 
   // handle variant selection, show stock level.
   $('#add_variant_id').change(function () {
-    var variantId = parseInt($(this).val())
+    var variantId = $(this).val().toString()
     var variant = _.find(window.variants, function (variant) {
-      return variant.id === variantId
+      return variant.id.toString() === variantId
     })
 
     $('#stock_details').html(variantStockTemplate({ variant: variant }))
@@ -45,22 +45,23 @@ $(document).ready(function () {
       var shipmentNumber = del.data('shipment-number')
       var variantId = del.data('variant-id')
       // eslint-disable-next-line
-      var shipment = _.findWhere(shipments, { number: shipmentNumber + '' })
-      var url = Spree.routes.shipments_api + '/' + shipmentNumber + '/remove'
+      var url = Spree.routes.shipments_api_v2 + '/' + shipmentNumber + '/remove_item'
 
       toggleItemEdit()
 
       $.ajax({
-        type: 'PUT',
+        type: 'PATCH',
         url: Spree.url(url),
         data: {
-          variant_id: variantId,
-          token: Spree.api_key
-        }
+          shipment: {
+            variant_id: variantId
+          }
+        },
+        headers: Spree.apiV2Authentication()
       }).done(function (msg) {
         window.location.reload()
       }).fail(function (msg) {
-        alert(msg.responseJSON.message || msg.responseJSON.exception)
+        alert(msg.responseJSON.error)
       })
     }
     return false
@@ -69,18 +70,15 @@ $(document).ready(function () {
   // handle ship click
   $('[data-hook=admin_shipment_form] a.ship').on('click', function () {
     var link = $(this)
-    var shipmentNumber = link.data('shipment-number')
-    var url = Spree.url(Spree.routes.shipments_api + '/' + shipmentNumber + '/ship.json')
+    var url = Spree.url(Spree.routes.shipments_api_v2 + '/' + link.data('shipment-number') + '/ship')
     $.ajax({
-      type: 'PUT',
+      type: 'PATCH',
       url: url,
-      data: {
-        token: Spree.api_key
-      }
+      headers: Spree.apiV2Authentication()
     }).done(function () {
       window.location.reload()
     }).fail(function (msg) {
-      alert(msg.responseJSON.message || msg.responseJSON.exception)
+      alert(msg.responseJSON.error)
     })
   })
 
@@ -96,22 +94,22 @@ $(document).ready(function () {
     var shipmentNumber = link.data('shipment-number')
     var selectedShippingRateId = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipmentNumber + "']").val()
     var unlock = link.parents('tbody').find("input[name='open_adjustment'][data-shipment-number='" + shipmentNumber + "']:checked").val()
-    var url = Spree.url(Spree.routes.shipments_api + '/' + shipmentNumber + '.json')
+    var url = Spree.url(Spree.routes.shipments_api_v2 + '/' + shipmentNumber + '.json')
 
     $.ajax({
-      type: 'PUT',
+      type: 'PATCH',
       url: url,
       data: {
         shipment: {
           selected_shipping_rate_id: selectedShippingRateId,
           unlock: unlock
         },
-        token: Spree.api_key
-      }
+      },
+      headers: Spree.apiV2Authentication()
     }).done(function () {
       window.location.reload()
     }).fail(function (msg) {
-      alert(msg.responseJSON.message || msg.responseJSON.exception)
+      alert(msg.responseJSON.error)
     })
   })
 
@@ -128,16 +126,11 @@ $(document).ready(function () {
   $('a.cancel-tracking').click(toggleTrackingEdit)
 
   function createTrackingValueContent(data) {
-    var selectedShippingMethod = data.shipping_methods.filter(function (method) {
-      return method.id === data.selected_shipping_rate.shipping_method_id
-    })[0]
-
-    if (selectedShippingMethod && selectedShippingMethod.tracking_url) {
-      var shipmentTrackingUrl = selectedShippingMethod.tracking_url.replace(/:tracking/, data.tracking)
-      return '<a target="_blank" href="' + shipmentTrackingUrl + '">' + data.tracking + '<a>'
+    if (data.attributes.tracking_url && data.attributes.tracking) {
+      return '<a target="_blank" href="' + data.attributes.tracking_url + '">' + data.attributes.tracking + '<a>'
     }
 
-    return data.tracking
+    return data.attributes.tracking
   }
 
   // handle tracking save
@@ -147,25 +140,25 @@ $(document).ready(function () {
     var link = $(this)
     var shipmentNumber = link.data('shipment-number')
     var tracking = link.parents('tbody').find('input#tracking').val()
-    var url = Spree.url(Spree.routes.shipments_api + '/' + shipmentNumber + '.json')
+    var url = Spree.url(Spree.routes.shipments_api_v2 + '/' + shipmentNumber + '.json')
 
     $.ajax({
-      type: 'PUT',
+      type: 'PATCH',
       url: url,
       data: {
         shipment: {
           tracking: tracking
-        },
-        token: Spree.api_key
-      }
-    }).done(function (data) {
+        }
+      },
+      headers: Spree.apiV2Authentication()
+    }).done(function (json) {
       link.parents('tbody').find('tr.edit-tracking').toggle()
 
       var show = link.parents('tbody').find('tr.show-tracking')
       show.toggle()
 
-      if (data.tracking) {
-        show.find('.tracking-value').html($('<strong>').html(Spree.translations.tracking + ': ')).append(createTrackingValueContent(data))
+      if (json.data.attributes.tracking) {
+        show.find('.tracking-value').html($('<strong>').html(Spree.translations.tracking + ': ')).append(createTrackingValueContent(json.data))
       } else {
         show.find('.tracking-value').html(Spree.translations.no_tracking_present)
       }
@@ -176,34 +169,36 @@ $(document).ready(function () {
 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
+  var url = Spree.routes.shipments_api_v2 + '/' + shipmentNumber
   var previousQuantity = inventoryUnits.reduce(function (accumulator, currentUnit, _index, _array) {
     return accumulator + currentUnit.quantity
   }, 0)
   var newQuantity = 0
 
   if (previousQuantity < quantity) {
-    url += '/add'
+    url += '/add_item'
     newQuantity = (quantity - previousQuantity)
   } else if (previousQuantity > quantity) {
-    url += '/remove'
+    url += '/remove_item'
     newQuantity = (previousQuantity - quantity)
   }
   url += '.json'
 
   if (newQuantity !== 0) {
     $.ajax({
-      type: 'PUT',
+      type: 'PATCH',
       url: Spree.url(url),
       data: {
-        variant_id: variantId,
-        quantity: newQuantity,
-        token: Spree.api_key
-      }
+        shipment: {
+          variant_id: variantId,
+          quantity: newQuantity,
+        }
+      },
+      headers: Spree.apiV2Authentication()
     }).done(function (msg) {
       window.location.reload()
     }).fail(function (msg) {
-      alert(msg.responseJSON.message || msg.responseJSON.exception)
+      alert(msg.responseJSON.error)
     })
   }
 }
@@ -245,26 +240,28 @@ function startItemSplit(event) {
   $.ajax({
     type: 'GET',
     async: false,
-    url: Spree.url(Spree.routes.variants_api),
+    url: Spree.routes.variants_api_v2 + '/' + variantId,
     data: {
-      q: {
-        'id_eq': variantId
-      },
-      token: Spree.api_key
-    }
-  }).done(function (data) {
-    variant = data['variants'][0]
+      include: 'stock_items.stock_location'
+    },
+    headers: Spree.apiV2Authentication()
+  }).done(function (json) {
+    var JSONAPIDeserializer = require('jsonapi-serializer').Deserializer
+    new JSONAPIDeserializer({ keyForAttribute: 'snake_case' }).deserialize(json, function (_err, deserializedJson) {
+      variant = deserializedJson
+
+      var maxQuantity = link.closest('tr').data('item-quantity')
+      var splitItemTemplate = Handlebars.compile($('#variant_split_template').text())
+
+      link.closest('tr').after(splitItemTemplate({ variant: variant, shipments: shipments, max_quantity: maxQuantity }))
+      $('a.cancel-split').click(cancelItemSplit)
+      $('a.save-split').click(completeItemSplit)
+
+      $('#item_stock_location').select2({ width: 'resolve', placeholder: Spree.translations.item_stock_placeholder })
+    })
   }).fail(function (msg) {
-    alert(msg.responseJSON.message || msg.responseJSON.exception)
+    alert(msg.responseJSON.error)
   })
-
-  var maxQuantity = link.closest('tr').data('item-quantity')
-  var splitItemTemplate = Handlebars.compile($('#variant_split_template').text())
-  link.closest('tr').after(splitItemTemplate({ variant: variant, shipments: shipments, max_quantity: maxQuantity }))
-  $('a.cancel-split').click(cancelItemSplit)
-  $('a.save-split').click(completeItemSplit)
-
-  $('#item_stock_location').select2({ width: 'resolve', placeholder: Spree.translations.item_stock_placeholder })
 }
 
 function completeItemSplit(event) {
@@ -301,19 +298,20 @@ function completeItemSplit(event) {
     }
 
     var data = {
-      original_shipment_number: originalShipmentNumber,
       variant_id: variantId,
-      quantity: quantity,
-      token: Spree.api_key
+      quantity: quantity
     }
 
     $.ajax({
-      type: 'POST',
+      type: 'PATCH',
       async: false,
-      url: Spree.url(Spree.routes.shipments_api + path),
-      data: $.extend(data, additionalData)
+      url: Spree.url(Spree.routes.shipments_api_v2 + '/' + originalShipmentNumber + path),
+      data: {
+        shipment: $.extend(data, additionalData)
+      },
+      headers: Spree.apiV2Authentication()
     }).fail(function (msg) {
-      alert(msg.responseJSON.message || msg.responseJSON.exception)
+      alert(msg.responseJSON.error)
     }).done(function (msg) {
       window.location.reload()
     })
@@ -347,17 +345,20 @@ function addVariantFromStockLocation(event) {
     $.ajax({
       type: 'POST',
       // eslint-disable-next-line camelcase
-      url: Spree.url(Spree.routes.shipments_api + '?shipment[order_id]=' + order_number),
+      url: Spree.routes.shipments_api_v2,
       data: {
-        variant_id: variantId,
-        quantity: quantity,
-        stock_location_id: stockLocationId,
-        token: Spree.api_key
-      }
+        shipment: {
+          order_id: order_id,
+          variant_id: variantId,
+          quantity: quantity,
+          stock_location_id: stockLocationId
+        }
+      },
+      headers: Spree.apiV2Authentication()
     }).done(function (msg) {
       window.location.reload()
     }).fail(function (msg) {
-      alert(msg.responseJSON.message || msg.responseJSON.exception)
+      alert(msg.responseJSON.error)
     })
   } else {
     // add to existing shipment

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

@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener("spree:load", function() {
   // 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({})

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

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   'use strict'
 
   if ($('#new_state_link').length) {

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

@@ -1,3 +1,3 @@
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   $('[data-hook=stock_location_country] span#country .select2').on('change', function () { updateAddressState('') })
 })

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

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   $('.stock_item_backorderable').on('click', function () {
     $(this).parent('form').submit()
   })

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

@@ -1,18 +1,48 @@
 /* global variantTemplate */
-$(function () {
+document.addEventListener("spree:load", function() {
   var el = $('#stock_movement_stock_item_id')
+  var jsonApiVariants = {}
   el.select2({
     placeholder: 'Find a stock item', // translate
+    minimumInputLength: 3,
+    quietMillis: 200,
     ajax: {
-      url: Spree.url(Spree.routes.stock_items_api(el.data('stock-location-id'))),
-      data: function (term, page) {
+      url: Spree.routes.stock_items_api_v2,
+      data: function (params, page) {
         return {
-          q: {
-            variant_product_name_cont: term
+          filter: {
+            variant_product_name_cont: params.term,
+            stock_location_id_eq: el.data('stock-location-id')
+          },
+          include: 'variant',
+          image_transformation: {
+            size: '100x100'
+          },
+          fields: {
+            'variant': 'name,sku,options_text,images'
           },
           per_page: 50,
-          page: page,
-          token: Spree.api_key
+          page: page
+        }
+      },
+      headers: Spree.apiV2Authentication(),
+      success: function(data) {
+        var JSONAPIDeserializer = require('jsonapi-serializer').Deserializer
+        new JSONAPIDeserializer({ keyForAttribute: 'snake_case' }).deserialize(data, function (_err, variants) {
+          jsonApiVariants = variants
+        })
+      },
+      processResults: function (json) {
+        var res = jsonApiVariants.map(function (stockItem) {
+          return {
+            id: stockItem.id,
+            text: stockItem.variant.name,
+            variant: stockItem.variant
+          }
+        })
+
+        return {
+          results: res
         }
       },
       results: function (data, page) {
@@ -23,13 +53,28 @@ $(function () {
         }
       }
     },
-    formatResult: function (stockItem) {
-      return variantTemplate({
-        variant: stockItem.variant
-      })
+    templateResult: function (stockItem) {
+      if (stockItem.loading) {
+        return stockItem.text
+      }
+
+      let variant = stockItem.variant
+      if (variant['images'][0] !== undefined && variant['images'][0].transformed_url !== undefined) {
+        variant.image = variant.images[0].transformed_url
+      }
+      return $(variantTemplate({
+        variant: variant
+      }))
     },
-    formatSelection: function (stockItem) {
-      return Select2.util.escapeMarkup(stockItem.variant.name + '(' + stockItem.variant.options_text + ')')
+    templateSelection: function(stockItem) {
+      const variant = stockItem.variant
+      if (variant === undefined) {
+        return stockItem.text
+      } else if (!!variant.options_text && variant.options_text !== '') {
+        return variant.name + '(' + variant.options_text + ')'
+      } else {
+        return variant.name
+      }
     }
   })
 })