spree_backend 4.3.3 → 4.4.0.rc1

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

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   function TransferVariant (variant1) {
     // refactor variant1
     this.variant = variant1
@@ -16,13 +16,26 @@ $(function () {
     this.destination = $('#transfer_destination_location_id')
     this.source.change(this.populate_destination.bind(this))
     $('#transfer_receive_stock').change(this.receive_stock_change.bind(this))
-    $.getJSON(Spree.url(Spree.routes.stock_locations_api) + '?token=' + Spree.api_key + '&per_page=1000', function (data) {
+
+    $.ajax({
+      url: Spree.routes.stock_locations_api_v2 + '?per_page=1000',
+      type: 'GET',
+      data: {
+        fields: {
+          stock_location: 'name'
+        }
+      },
+      headers: Spree.apiV2Authentication()
+    }).then(function (json) {
       this.locations = (function () {
-        var ref = data.stock_locations
+        var ref = json.data
         var results = []
         var i, len
         for (i = 0, len = ref.length; i < len; i++) {
-          results.push(ref[i])
+          results.push({
+            id: ref[i].id,
+            name: ref[i].attributes.name
+          })
         }
         return results
       })()
@@ -73,7 +86,7 @@ $(function () {
     if (this.is_source_location_hidden()) {
       return this.populate_select(this.destination)
     } else {
-      return this.populate_select(this.destination, parseInt(this.source.val()))
+      return this.populate_select(this.destination, this.source.val())
     }
   }
 
@@ -110,12 +123,12 @@ $(function () {
   }
 
   TransferVariants.prototype._search_transfer_variants = function () {
-    return this.build_select(Spree.url(Spree.routes.variants_api), 'product_name_or_sku_cont')
+    return this.build_select(Spree.url(Spree.routes.variants_api_v2), 'product_name_or_sku_cont')
   }
 
   TransferVariants.prototype._search_transfer_stock_items = function () {
     var stockLocationId = $('#transfer_source_location_id').val()
-    return this.build_select(Spree.url(Spree.routes.stock_locations_api + ('/' + stockLocationId + '/stock_items')), 'variant_product_name_or_variant_sku_cont')
+    return this.build_select(Spree.routes.stock_items_api_v2 + '?filter[stock_location_id_eq]=' + stockLocationId + '&include=variant', 'variant_product_name_or_variant_sku_cont')
   }
 
   TransferVariants.prototype.format_variant_result = function (result) {
@@ -128,11 +141,14 @@ $(function () {
   }
 
   function formattedVariantList(obj) {
-   return { id: obj.id, text: obj.name, name: obj.name, sku: obj.sku, options_text: obj.options_text, variant: obj }
-  }
-
-  function formattedStockItemsList(obj) {
-    return { id: obj.variant.id, text: obj.variant.name, name: obj.variant.name, sku: obj.variant.sku, options_text: obj.variant.options_text, variant: obj.variant }
+    return {
+     id: obj.id,
+     text: obj.name,
+     name: obj.name,
+     sku: obj.sku,
+     options_text: obj.options_text,
+     variant: obj
+    }
   }
 
   TransferVariants.prototype.build_select = function (url, query) {
@@ -142,27 +158,40 @@ $(function () {
         url: url,
         datatype: 'json',
         data: function (params) {
-          var q = {}
-          q[query] = params.term
+          var filter = {}
+          filter[query] = params.term
+
           return {
-            q: q,
-            token: Spree.api_key
+            filter: filter,
+            fields: {
+              'variant': 'name,sku,options_text'
+            }
           }
         },
-        processResults: function (data) {
-          var result = data.variants || data.stock_items
-          if (data.variants != null) {
-            var res = (result).map(function (variant) {
-              return formattedVariantList(variant)
-            })
-          } else {
-            var res = (result).map(function (variant) {
-              return formattedStockItemsList(variant)
-            })
-          }
+        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) {
+          if (json && json.data && jsonApiVariants) {
+            var res = {}
 
-          return {
-            results: res
+            if (json.links.self.match(/platform\/variants/)) {
+              res = jsonApiVariants.map(function (variant) {
+                return formattedVariantList(variant)
+              })
+            } else {
+              res = jsonApiVariants.map(function (variant) {
+                return formattedVariantList(variant.variant)
+              })
+            }
+
+            return {
+              results: res
+            }
           }
         }
       },
@@ -218,7 +247,7 @@ $(function () {
 
   TransferAddVariants.prototype.find_or_add = function (variant) {
     var existing = _.find(this.variants, function (v) {
-      return v.id === variant.id
+      return v.id.toString() === variant[0].id
     })
     if (existing) {
       return existing
@@ -231,14 +260,15 @@ $(function () {
 
   TransferAddVariants.prototype.remove_variant = function (target) {
     var v
-    var variantId = parseInt(target.data('variantId'))
+    var variantId = target.data('variantId').toString()
+
     this.variants = (function () {
       var ref = this.variants
       var results = []
       var i, len
       for (i = 0, len = ref.length; i < len; i++) {
         v = ref[i]
-        if (v.id !== variantId) {
+        if (v.id.toString() !== variantId) {
           results.push(v)
         }
       }

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

@@ -2,12 +2,10 @@ $.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,
-        text: obj.pretty_name
+        text: obj.attributes.pretty_name
       }
     })
   }
@@ -17,26 +15,29 @@ $.fn.taxonAutocomplete = function() {
     placeholder: Spree.translations.taxon_placeholder,
     minimumInputLength: 2,
     ajax: {
-      url: Spree.routes.taxons_api,
+      url: Spree.routes.taxons_api_v2,
       dataType: 'json',
       data: function (params) {
         return {
-          q: {
+          filter: {
             name_cont: params.term
           },
-          token: Spree.api_key
+          fields: {
+            taxon: 'pretty_name'
+          }
         }
       },
+      headers: Spree.apiV2Authentication(),
       processResults: function(data) {
         return {
-          results: formatTaxonList(data.taxons)
+          results: formatTaxonList(data.data)
         }
       }
     }
   })
 }
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   var productTaxonSelector = document.getElementById('product_taxon_ids')
   if (productTaxonSelector == null) return
   if (productTaxonSelector.hasAttribute('data-autocomplete-url-value')) return

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

@@ -1,5 +1,5 @@
 /* global productTemplate */
-$(function () {
+document.addEventListener("spree:load", function() {
   window.productTemplate = Handlebars.compile($('#product_template').text())
   var taxonProducts = $('#taxon_products')
   var taxonId = $('#taxon_id')
@@ -14,23 +14,26 @@ $(function () {
       swapThreshold: 0.9,
       forceFallback: true,
       onEnd: function (evt) {
-        var classificationId = evt.item.getAttribute('data-classification-id')
-        var newIndex = evt.newIndex
-        return $.ajax({
-          url: Spree.routes.classifications_api_v2 + '/' + classificationId.toString() + '/reposition',
-          headers: Spree.apiV2Authentication(),
-          method: 'PUT',
-          dataType: 'json',
-          data: {
-            classification: {
-              position: newIndex
-            }
-          }
-        })
+        handleClassificationReposition(evt)
       }
     })
   }
 
+  function handleClassificationReposition(evt) {
+    var classificationId = evt.item.getAttribute('data-classification-id')
+    var data = {
+      classification: {
+        position: parseInt(evt.newIndex, 10) + 1
+      }
+    }
+    var requestData = {
+       uri: Spree.routes.classifications_api_v2 + '/' + classificationId,
+       method: 'PATCH',
+       dataBody: data,
+    }
+    spreeFetchRequest(requestData)
+  }
+
   if (taxonId.length > 0) {
     taxonId.select2({
       placeholder: Spree.translations.find_a_taxon,

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

@@ -33,6 +33,6 @@ $.fn.userAutocomplete = function () {
   })
 }
 
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   $('.user_picker').userAutocomplete()
 })

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

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+document.addEventListener("spree:load", function() {
   var useBilling = $('#user_use_billing')
 
   if (useBilling.is(':checked')) {

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

@@ -1,6 +1,6 @@
 /* global variantTemplate */
 // variant autocompletion
-$(function () {
+document.addEventListener("spree:load", function() {
   var variantAutocompleteTemplate = $('#variant_autocomplete_template')
   if (variantAutocompleteTemplate.length > 0) {
     window.variantTemplate = Handlebars.compile(variantAutocompleteTemplate.text())
@@ -14,8 +14,8 @@ function formatVariantResult(variant) {
     return variant.text
   }
 
-  if (variant['images'][0] !== undefined && variant['images'][0].mini_url !== undefined) {
-    variant.image = variant.images[0].mini_url
+  if (variant['images'][0] !== undefined && variant['images'][0].transformed_url !== undefined) {
+    variant.image = variant.images[0].transformed_url
   }
   return $(variantTemplate({
     variant: variant
@@ -30,23 +30,31 @@ $.fn.variantAutocomplete = function () {
     minimumInputLength: 3,
     quietMillis: 200,
     ajax: {
-      url: Spree.url(Spree.routes.variants_api),
+      url: Spree.url(Spree.routes.variants_api_v2),
       dataType: 'json',
       data: function (params) {
         var query = {
-          q: {
+          filter: {
             search_by_product_name_or_sku: params.term
           },
-          token: Spree.api_key
+          include: 'images,stock_items.stock_location',
+          image_transformation: {
+            size: '100x100'
+          }
         }
 
         return query;
       },
-      processResults: function(data) {
-        window.variants = data['variants']
-        return {
-          results: data.variants
-        }
+      headers: Spree.apiV2Authentication(),
+      success: function(data) {
+        var JSONAPIDeserializer = require('jsonapi-serializer').Deserializer
+        new JSONAPIDeserializer({ keyForAttribute: 'snake_case' }).deserialize(data, function (_err, variants) {
+          jsonApiVariants = variants
+          window.variants = variants
+        })
+      },
+      processResults: function (_data) {
+        return { results: jsonApiVariants } // we need to return deserialized json api data
       }
     },
     templateResult: formatVariantResult,

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

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   $('.track_inventory_checkbox').on('click', function () {
     $(this).siblings('.variant_track_inventory').val($(this).is(':checked'))
     $(this).parents('form').submit()

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

@@ -1,4 +1,4 @@
-$(function () {
+document.addEventListener("spree:load", function() {
   var countryBased = $('#country_based')
   var stateBased = $('#state_based')
   countryBased.click(show_country)

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

@@ -1,21 +1,13 @@
-//= require modernizr
 //= require purify
 //= require sortable
-//= require flatpickr
 //= require jquery3
-//= require popper
-//= require bootstrap-sprockets
 //= require handlebars
 //= require cleave
-//= require js.cookie
-//= require jquery.jstree/jquery.jstree
 //= require jquery_ujs
 //= require jquery-ui/widgets/autocomplete
 //= require select2-full
 //= require sweetalert2
 //= require tinymce
-//= require spree/backend/global/tinymce
-
 //= require underscore-min.js
 //= require jsonapi-serializer.min
 
@@ -53,9 +45,6 @@
 //= require spree/backend/stock_movement
 //= require spree/backend/stock_transfer
 //= require spree/backend/taxon_autocomplete
-//= require spree/backend/taxon_permalink_preview
-//= require spree/backend/taxon_tree_menu
-//= require spree/backend/taxonomy
 //= require spree/backend/taxons
 //= require spree/backend/users/edit
 //= require spree/backend/user_picker
@@ -64,47 +53,38 @@
 //= require spree/backend/zone
 
 Spree.routes.clear_cache = Spree.adminPathFor('general_settings/clear_cache')
-Spree.routes.checkouts_api = Spree.pathFor('api/v1/checkouts')
-Spree.routes.classifications_api = Spree.pathFor('api/v1/classifications')
-Spree.routes.option_types_api = Spree.pathFor('api/v1/option_types')
-Spree.routes.option_values_api = Spree.pathFor('api/v1/option_values')
-Spree.routes.orders_api = Spree.pathFor('api/v1/orders')
-Spree.routes.products_api = Spree.pathFor('api/v1/products')
-Spree.routes.shipments_api = Spree.pathFor('api/v1/shipments')
-Spree.routes.checkouts_api = Spree.pathFor('api/v1/checkouts')
-Spree.routes.stock_locations_api = Spree.pathFor('api/v1/stock_locations')
-Spree.routes.taxon_products_api = Spree.pathFor('api/v1/taxons/products')
-Spree.routes.taxons_api = Spree.pathFor('api/v1/taxons')
-Spree.routes.users_api = Spree.pathFor('api/v1/users')
-Spree.routes.variants_api = Spree.pathFor('api/v1/variants')
 
 Spree.routes.edit_product = function (productId) {
   return Spree.adminPathFor('products/' + productId + '/edit')
 }
-
-Spree.routes.payments_api = function (orderId) {
-  return Spree.pathFor('api/v1/orders/' + orderId + '/payments')
-}
-
-Spree.routes.stock_items_api = function (stockLocationId) {
-  return Spree.pathFor('api/v1/stock_locations/' + stockLocationId + '/stock_items')
+Spree.routes.apply_coupon_code = function (orderId) {
+  return Spree.pathFor('api/v2/platform/orders/' + orderId + '/apply_coupon_code')
 }
 
 // API v2
 Spree.routes.countries_api_v2 = Spree.pathFor('api/v2/platform/countries')
 Spree.routes.classifications_api_v2 = Spree.pathFor('api/v2/platform/classifications')
+Spree.routes.line_items_api_v2 = Spree.pathFor('api/v2/platform/line_items')
 Spree.routes.menus_api_v2 = Spree.pathFor('api/v2/platform/menus')
 Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items')
 Spree.routes.option_types_api_v2 = Spree.pathFor('api/v2/platform/option_types')
 Spree.routes.option_values_api_v2 = Spree.pathFor('api/v2/platform/option_values')
+Spree.routes.orders_api_v2 = Spree.pathFor('api/v2/platform/orders')
 Spree.routes.pages_api_v2 = Spree.pathFor('api/v2/platform/cms_pages')
+Spree.routes.payments_api_v2 = Spree.pathFor('/api/v2/platform/payments')
 Spree.routes.products_api_v2 = Spree.pathFor('/api/v2/platform/products')
 Spree.routes.sections_api_v2 = Spree.pathFor('/api/v2/platform/cms_sections')
+Spree.routes.shipments_api_v2 = Spree.pathFor('/api/v2/platform/shipments')
+Spree.routes.stock_items_api_v2 = Spree.pathFor('/api/v2/platform/stock_items')
+Spree.routes.stock_locations_api_v2 = Spree.pathFor('/api/v2/platform/stock_locations')
 Spree.routes.taxons_api_v2 = Spree.pathFor('/api/v2/platform/taxons')
 Spree.routes.users_api_v2 = Spree.pathFor('api/v2/platform/users')
+Spree.routes.variants_api_v2 = Spree.pathFor('api/v2/platform/variants')
 
 Spree.apiV2Authentication = function() {
-  return {
-    'Authorization': 'Bearer ' + OAUTH_TOKEN
+  if (typeof(OAUTH_TOKEN) !== 'undefined') {
+    return {
+      'Authorization': 'Bearer ' + OAUTH_TOKEN
+    }
   }
 }

data/app/assets/javascripts/spree.js

@@ -2,7 +2,7 @@
 function Spree () {}
 
 Spree.ready = function (callback) {
-  return jQuery(document).on('page:load turbolinks:load', function () {
+  return document.addEventListener("spree:load", function() {
     return callback(jQuery)
   })
 }
@@ -67,12 +67,5 @@ Spree.ajax = function (urlOrSettings, settings) {
   }
 }
 
-Spree.routes = {
-  states_search: Spree.pathFor('api/v1/states'),
-  apply_coupon_code: function (orderId) {
-    return Spree.pathFor('api/v1/orders/' + orderId + '/apply_coupon_code')
-  },
-  cart: Spree.pathFor('cart')
-}
-
+Spree.routes = {}
 Spree.url_params = {}

data/app/assets/stylesheets/spree/backend/components/_main.scss

@@ -36,3 +36,11 @@ body.modal-open #multi-backdrop {
     padding: 1.25rem;
   }
 }
+
+.rounded-bottom-only {
+  border-radius: 0 0 $border-radius $border-radius;
+}
+
+.rounded-top-only {
+  border-radius: $border-radius $border-radius 0 0;
+}

data/app/assets/stylesheets/spree/backend/plugins/_nav_x.scss

@@ -27,7 +27,7 @@
   }
 
   // Bug fix for iOS jittery elastic scroll from Bootstrap
-  // transaition on pills and buttons.
+  // transition on pills and buttons.
   & > li > a {
     transition: none !important;
   }

data/app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss

@@ -3,7 +3,7 @@
   z-index: 1028;
 }
 
-// Hides the empty <li> tag highligted in open select2-dropdown.
+// Hides the empty <li> tag highlighted in open select2-dropdown.
 ul.select2-results__options {
   li:empty  {
     display: none;

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -53,7 +53,7 @@ input[type="file"] {
 }
 
 *:focus {
-    outline: none;
+  outline: none;
 }
 
 :-webkit-direct-focus {

data/app/assets/stylesheets/spree/backend/shared/_sortable_tree.scss

@@ -0,0 +1,62 @@
+#itemImgContainer {
+  width: 200px;
+  img {
+    max-width: 100%;
+  }
+}
+
+#sortableTreeArea {
+  .space-buttons {
+    box-shadow: -11px 0 16px 6px white;
+    z-index: 9;
+    a {
+      margin: 2px;
+    }
+  }
+
+  .sortable-tree-item-row {
+    overflow: hidden;
+    border: 1px solid $border-color;
+    margin: 2px;
+    background-color: white;
+  }
+
+  .sortable-tree-item {
+    border: solid 1px transparent;
+    padding: 0;
+    background-color: var(--light);
+
+    [data-sortable-tree-parent-id-value] {
+      margin-left: 25px;
+      background-color: var(--light);
+    }
+
+    @include media-breakpoint-up(sm) {
+      [data-sortable-tree-parent-id-value] {
+        margin-left: 50px;
+      }
+    }
+  }
+
+  .sortable-chosen {
+    border: 1px dashed var(--gray);
+    border-radius: 5px;
+  }
+
+  .item_image_holder {
+    position: relative;
+    border: 1px solid $border-color;
+    border-radius: 7px;
+    overflow: hidden;
+    width: 45px;
+    height: 45px;
+    img {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      height: 100%;
+      width: auto;
+      transform: translate(-50%,-50%);
+    }
+  }
+}

data/app/assets/stylesheets/spree/backend/spree_admin.css.scss

@@ -29,9 +29,12 @@
 
 @import 'shared/base';
 @import 'shared/forms';
+@import 'shared/sortable_tree';
 
 @import 'views/menus';
 @import 'views/cms_pages';
+@import 'views/digitals';
 @import 'views/order_payments';
 @import 'views/product_properties';
 @import 'views/prototypes';
+@import 'views/taxonomies'

data/app/assets/stylesheets/spree/backend/views/_digitals.scss

@@ -0,0 +1,33 @@
+div.digital-container {
+  border: 1px solid $gray-500;
+  background-color: #fefefe;
+  border-radius: $border-radius;
+  overflow: hidden;
+  display: flex;
+  justify-content: center;
+  margin: auto;
+
+  .delete-digital-info-container {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .delete-digital-button-container {
+    min-width: 44px;
+    flex-grow: 0;
+    a {
+      padding: 3px;
+      height: 32px;
+    }
+  }
+
+  .delete-digital-icon-container {
+    width: 50px;
+    flex-grow: 0;
+    svg {
+      color: $gray-600;
+      align-self: center;
+    }
+  }
+}

data/app/assets/stylesheets/spree/backend/views/_taxonomies.scss

@@ -0,0 +1,3 @@
+form.edit_taxonomy {
+  width: 100%;
+}

data/app/controllers/spree/admin/base_controller.rb

@@ -17,7 +17,6 @@ module Spree
       layout 'spree/layouts/admin'
 
       before_action :authorize_admin
-      before_action :generate_admin_api_key
       before_action :load_stores
 
       helper_method :admin_oauth_token
@@ -56,14 +55,6 @@ module Spree
         end
       end
 
-      # Need to generate an API key for a user due to some backend actions
-      # requiring authentication to the Spree API
-      def generate_admin_api_key
-        if (user = try_spree_current_user) && user.spree_api_key.blank?
-          user.generate_spree_api_key!
-        end
-      end
-
       def flash_message_for(object, event_sym)
         resource_desc  = object.class.model_name.human
         resource_desc += " \"#{object.name}\"" if (object.persisted? || object.destroyed?) && object.respond_to?(:name) && object.name.present? && !object.is_a?(Spree::Order)
@@ -95,7 +86,7 @@ module Spree
 
       def admin_oauth_application
         @admin_oauth_application ||= begin
-          Doorkeeper::Application.find_or_create_by!(name: 'Admin Panel', scopes: 'admin', redirect_uri: '')
+          Spree::OauthApplication.find_or_create_by!(name: 'Admin Panel', scopes: 'admin', redirect_uri: '')
         end
       end
 
@@ -105,9 +96,9 @@ module Spree
         return unless user
 
         @admin_oauth_token ||= begin
-          Doorkeeper::AccessToken.active_for(user).where(application_id: admin_oauth_application.id).last ||
-            Doorkeeper::AccessToken.create!(
-              resource_owner_id: user.id,
+          Spree::OauthAccessToken.active_for(user).where(application_id: admin_oauth_application.id).last ||
+            Spree::OauthAccessToken.create!(
+              resource_owner: user,
               application_id: admin_oauth_application.id,
               scopes: admin_oauth_application.scopes
             )