spree_backend 3.1.14 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2f693c44f7556e08514b351fc17fc2bdd7ac82
-  data.tar.gz: 8c31f9c6a91f3c52b01848b41c3af58510336bba
+  metadata.gz: 6a9f7de48919e990d609ddf3fb74255c00c6a4c2
+  data.tar.gz: dc522ba30d7641a682f0a6f33c028f224a06c3ba
 SHA512:
-  metadata.gz: e1307d425f716646ac2a8f9b9d5cd52e7f625d8f84d4579fe9a75c30456904087148a4f406e5bd50a2391ff0f1b2fc20241e44e07bfb6b4968f8c5e658799a79
-  data.tar.gz: 6580e31307e44568992214bd6e13518cf7eb58696e9f6021c512766fc6dfff1fee4445c4f3d92e276d8612562945891264eddf6c0c89f02a114a4dd1a18cc6e3
+  metadata.gz: f9ff1ad9d293d181c874f8e4378227b4cee241097d8f0e6d97c081d1b24064b5ecd9ff3c2d009f2a2ae2504f914a2d3f1ba287b677642d7a7c42e54f2725d5fe
+  data.tar.gz: e83dc490934970ee0f8711cd9dccd2adaffb6e29398045453ec7cfa7e305fcb5c8cc8e7d98bf1b1fe33386c6147327965cb620e03be49f64bbc4cd21c51da909

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

@@ -15,13 +15,6 @@ jQuery(function($) {
     $("span.icon", $(this)).toggleClass("icon-chevron-down");
   });
 
-  $(".js-collapse-sidebar").click(function(){
-    $(".main-right-sidebar").toggleClass("collapsed");
-    $("section.content").toggleClass("sidebar-collapsed");
-    $("span.icon", $(this)).toggleClass("icon-chevron-right");
-    $("span.icon", $(this)).toggleClass("icon-chevron-left");
-  });
-
   $('#main-sidebar').find('[data-toggle="collapse"]').on('click', function()
     {
       if($(this).find('.icon-chevron-left').length == 1){
@@ -165,23 +158,6 @@ jQuery(function($) {
     }
   });
 
-  // Enable sidebar toggle
-  $("[data-toggle='offcanvas']").click(function(e) {
-    e.preventDefault();
-
-    // If window is small enough, enable sidebar push menu
-    if ($(window).width() <= 992) {
-      $('.row-offcanvas').toggleClass('active');
-      $('.left-side').removeClass("collapse-left");
-      $(".right-side").removeClass("strech");
-      $('.row-offcanvas').toggleClass("relative");
-    } else {
-      // Else, enable content streching
-      $('.left-side').toggleClass("collapse-left");
-      $(".right-side").toggleClass("strech");
-    }
-  });
-
   // Make flash messages disappear
   setTimeout('$(".alert-auto-disappear").slideUp()', 5000);
 
@@ -351,9 +327,10 @@ $(document).ready(function(){
         helper: fixHelper,
         placeholder: 'ui-sortable-placeholder',
         update: function(event, ui) {
+          var tbody = this;
           $("#progress").show();
           positions = {};
-          $.each($('table.sortable tbody tr'), function(position, obj){
+          $.each($('tr', tbody), function(position, obj){
             reg = /spree_(\w+_?)+_(\d+)/;
             parts = reg.exec($(obj).prop('id'));
             if (parts) {

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

@@ -16,8 +16,9 @@ $(document).ready(function() {
     $("#customer_search").select2({
       placeholder: Spree.translations.choose_a_customer,
       ajax: {
-        url: Spree.routes.user_search,
+        url: Spree.routes.users_api,
         datatype: 'json',
+        cache: true,
         data: function(term, page) {
           return {
             q: term,

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

@@ -55,8 +55,8 @@ deleteLineItem = (line_item_id) ->
   $.ajax(
     type: "DELETE"
     url: Spree.url(url)
-    data:
-      token: Spree.api_key
+    headers:
+      'X-Spree-Token': Spree.api_key
   ).done (msg) ->
     $('#line-item-' + line_item_id).remove()
     if $('.line-items tr.line-item').length == 0

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

@@ -43,7 +43,10 @@ adjustLineItems = function(order_number, variant_id, quantity){
         window.Spree.advanceOrder();
         window.location.reload();
     }).fail(function(msg) {
-        alert(msg.responseJSON.message)
+      if (typeof msg.responseJSON.message != 'undefined') {
+        alert(msg.responseJSON.message);
+      } else {
+        alert(msg.responseJSON.exception);
+      }
     });
-
 }

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

@@ -10,7 +10,7 @@ $(document).ready(function () {
       placeholder: Spree.translations.option_type_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.option_type_search, {
+        var url = Spree.url(Spree.routes.option_types_api, {
           ids: element.val(),
           token: Spree.api_key
         });
@@ -19,7 +19,7 @@ $(document).ready(function () {
         });
       },
       ajax: {
-        url: Spree.routes.option_type_search,
+        url: Spree.routes.option_types_api,
         quietMillis: 200,
         datatype: 'json',
         data: function (term) {

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

@@ -11,7 +11,7 @@ $.fn.optionValueAutocomplete = function (options) {
     minimumInputLength: 3,
     multiple: multiple,
     initSelection: function (element, callback) {
-      $.get(Spree.routes.option_value_search, {
+      $.get(Spree.routes.option_values_api, {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
@@ -19,7 +19,7 @@ $.fn.optionValueAutocomplete = function (options) {
       });
     },
     ajax: {
-      url: Spree.routes.option_value_search,
+      url: Spree.routes.option_values_api,
       datatype: 'json',
       data: function (term) {
         var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;

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

@@ -12,15 +12,19 @@ jQuery ($) ->
         callback() if data.state in ['checkout', 'pending']
 
     update: (attributes, success) ->
+      @updating = true
+
       jqXHR = $.ajax
         type: 'PUT'
         url:  @url.toString()
         data: { payment: attributes }
+      jqXHR.always =>
+        @updating = false
       jqXHR.done (data) =>
         @data = data
       jqXHR.fail ->
-        response = $.parseJSON(jqXHR.responseText)
-        show_flash('error', response.error)
+        response = jqXHR.responseJSON and jqXHR.responseJSON.error or jqXHR.statusText
+        show_flash('error', response)
 
     amount:         -> @data.amount
     display_amount: -> @data.display_amount
@@ -57,8 +61,6 @@ jQuery ($) ->
         .one
           click: (event) ->
             event.preventDefault()
-          mousedown: ->
-            $(@).data('clicked', true)
           mouseup: =>
             @[action]()
 
@@ -115,8 +117,9 @@ jQuery ($) ->
       amount.html(@$new_input(amount.find('span').width()))
 
     save: (event) ->
-      @payment.update(amount: @$input().val())
-        .done(=> @show())
+      unless @payment.updating
+        @payment.update(amount: @$input().val())
+          .done(=> @show())
 
     cancel: @::show
 
@@ -127,8 +130,7 @@ jQuery ($) ->
         .width(width)
         .one
           blur: =>
-            clicked = (@$buttons().filter -> $(@).data('clicked')).length
-            @save() unless clicked
+            @save()
         .css('text-align': 'right')
 
     $input: ->

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

@@ -13,7 +13,7 @@ $.fn.productAutocomplete = function (options) {
     minimumInputLength: 3,
     multiple: multiple,
     initSelection: function (element, callback) {
-      $.get(Spree.routes.product_search, {
+      $.get(Spree.routes.products_api, {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
@@ -21,8 +21,9 @@ $.fn.productAutocomplete = function (options) {
       });
     },
     ajax: {
-      url: Spree.routes.product_search,
+      url: Spree.routes.products_api,
       datatype: 'json',
+      cache: true,
       data: function (term, page) {
         return {
           q: {

data/app/assets/javascripts/spree/backend/{shipments.js.erb → shipments.js}

@@ -134,7 +134,7 @@ $(document).ready(function () {
 
       var show = link.parents('tbody').find('tr.show-tracking');
       show.toggle();
-      show.find('.tracking-value').html($("<strong>").html("<%= Spree.t(:tracking) %>: ")).append(data.tracking);
+      show.find('.tracking-value').html($("<strong>").html(Spree.translations.tracking + ": ")).append(data.tracking);
     });
   });
 });

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

@@ -1,11 +1,13 @@
 $(document).ready(function () {
   'use strict';
 
-  $('#country').on('change', function () {
-    var new_state_link_href = $('#new_state_link').prop('href');
-    var selected_country_id = $('#country option:selected').prop('value');
-    var new_link = new_state_link_href.replace(/countries\/(\d+)/,
-      'countries/' + selected_country_id);
-    $('#new_state_link').attr('href', new_link);
-  });
+  if ($('#new_state_link').length) {
+    $('#country').on('change', function () {
+      var new_state_link_href = $('#new_state_link').prop('href');
+      var selected_country_id = $('#country option:selected').prop('value');
+      var new_link = new_state_link_href.replace(/countries\/(\d+)/,
+        'countries/' + selected_country_id);
+      $('#new_state_link').attr('href', new_link);
+    });
+  };
 });

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

@@ -0,0 +1,3 @@
+$(document).ready(function(){
+  $('[data-hook=stock_location_country] span#country .select2').on('change', function() { update_state(''); });
+});

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

@@ -0,0 +1,52 @@
+$.fn.tagAutocomplete = function () {
+  'use strict';
+
+  function formatTag(tag) {
+    return Select2.util.escapeMarkup(tag.name);
+  }
+
+  this.select2({
+    placeholder: Spree.translations.tags_placeholder,
+    minimumInputLength: 1,
+    tokenSeparators: [','],
+    multiple: true,
+    tags: true,
+    initSelection: function (element, callback) {
+      var data = $(element.val().split(',')).map(function() {
+        return { name: this, id: this };
+      });
+      callback(data);
+    },
+    ajax: {
+      url: Spree.routes.tags_api,
+      datatype: 'json',
+      cache: true,
+      data: function (term) {
+        return {
+          q: term,
+          token: Spree.api_key
+        };
+      },
+      results: function (data) {
+        return {
+          results: data.tags.map(function(tag) {
+            return { name: tag.name, id: tag.name };
+          })
+        };
+      }
+    },
+    createSearchChoice: function(term, data) {
+      if ($(data).filter(function() {
+        return this.name.localeCompare(term)===0;
+      }).length===0) {
+        return { id: term, name: term };
+      }
+    },
+    formatResult:    formatTag,
+    formatSelection: formatTag
+  });
+};
+
+$(document).ready(function () {
+  $('.tag_picker').tagAutocomplete();
+});

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

@@ -10,7 +10,7 @@ var set_taxon_select = function(selector){
       placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.taxons_search, {
+        var url = Spree.url(Spree.routes.taxons_api, {
           ids: element.val(),
           without_children: true,
           token: Spree.api_key
@@ -20,7 +20,7 @@ var set_taxon_select = function(selector){
         });
       },
       ajax: {
-        url: Spree.routes.taxons_search,
+        url: Spree.routes.taxons_api,
         datatype: 'json',
         data: function (term, page) {
           return {

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

@@ -0,0 +1,12 @@
+$(document).ready(function() {
+  if ($('#permalink_part_display').length) {
+    var field  = $('#permalink_part'),
+        target = $('#permalink_part_display'),
+        permalink_part_default = target.text().trim();
+
+    target.text(permalink_part_default + field.val());
+    field.on('keyup blur', function () {
+      target.text(permalink_part_default + $(this).val());
+    });
+  };
+});

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

@@ -1,6 +1,6 @@
 handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
   $.jstree.rollback(last_rollback)
-  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br />" + taxonomy_tree_error)
+  $("#ajax_error").show().html("<strong>" + Spree.translations.server_error + "</strong><br />" + Spree.translations.taxonomy_tree_error)
 
 handle_move = (e, data) ->
   last_rollback = data.rlbk
@@ -109,7 +109,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             theme: "spree",
             url: Spree.url(Spree.routes.jstree_theme_path)
           strings:
-            new_node: new_taxon,
+            new_node: Spree.translations.new_taxon,
             loading: Spree.translations.loading + "..."
           crrm:
             move:

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

@@ -21,7 +21,7 @@ $(document).ready ->
       dropdownCssClass: "taxon_select_box",
       placeholder: Spree.translations.find_a_taxon,
       ajax:
-        url: Spree.routes.taxons_search,
+        url: Spree.routes.taxons_api,
         datatype: 'json',
         data: (term, page) ->
           per_page: 50,

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

@@ -9,14 +9,15 @@ $.fn.userAutocomplete = function () {
     minimumInputLength: 1,
     multiple: true,
     initSelection: function (element, callback) {
-      $.get(Spree.routes.user_search, {
-        ids: element.val()
+      $.get(Spree.routes.users_api, {
+        ids: element.val(),
+        token: Spree.api_key
       }, function (data) {
         callback(data.users);
       });
     },
     ajax: {
-      url: Spree.routes.user_search,
+      url: Spree.routes.users_api,
       datatype: 'json',
       data: function (term) {
         return {

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

@@ -24,11 +24,9 @@
 //= require spree/backend/handlebar_extensions
 //= require spree/backend/line_items
 //= require spree/backend/line_items_on_order_edit
-//= require spree/backend/nested-attribute
 //= require spree/backend/option_type_autocomplete
 //= require spree/backend/option_value_picker
 //= require spree/backend/orders/edit
-//= require spree/backend/orders/edit_form
 //= require spree/backend/payments/edit
 //= require spree/backend/payments/new
 //= require spree/backend/product_picker
@@ -38,14 +36,17 @@
 //= require spree/backend/returns/return_item_selection
 //= require spree/backend/shipments
 //= require spree/backend/states
+//= require spree/backend/stock_location
 //= require spree/backend/stock_management
 //= 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/user_picker
+//= require spree/backend/tag_picker
 //= require spree/backend/variant_autocomplete
 //= require spree/backend/variant_management
 //= require spree/backend/zone
@@ -53,17 +54,17 @@
 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_type_search = Spree.pathFor('api/v1/option_types')
-Spree.routes.option_value_search = Spree.pathFor('api/v1/option_values')
+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.product_search = Spree.adminPathFor('search/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_search = Spree.pathFor('api/v1/taxons')
-Spree.routes.user_search = Spree.adminPathFor('search/users')
+Spree.routes.taxons_api = Spree.pathFor('api/v1/taxons')
+Spree.routes.users_api = Spree.pathFor('api/v1/users')
+Spree.routes.tags_api = Spree.pathFor('api/v1/tags')
 Spree.routes.variants_api = Spree.pathFor('api/v1/variants')
 
 Spree.routes.edit_product = function(product_id) {

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

@@ -5,7 +5,11 @@
   }
 }
 
+.logo.navbar-brand {
+  padding: 5px 15px;
+}
+
 #logo {
   width: auto;
-  height: 20px;
+  height: 40px;
 }

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

@@ -71,6 +71,13 @@
       }
     }
   }
+
+  .spree-version {
+    position: absolute;
+    z-index: -1;
+    left: 15px;
+    bottom: 15px;
+  }
 }
 
 #wrapper.sidebar-minimized #main-sidebar {

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

@@ -30,7 +30,7 @@ input.form-control {
 .form-group {
   &.withError {
     label, .formError, .required {
-      color: $brand-danger
+      color: $brand-danger;
     }
 
     input,

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

@@ -22,7 +22,6 @@
 
 @import 'plugins/select2';
 @import 'plugins/jquery_ui';
-@import 'plugins/js_tree';
 
 @import 'shared/base';
 @import 'shared/forms';

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

@@ -2,7 +2,6 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
-      helper 'spree/admin/tables'
       layout '/spree/layouts/admin'
 
       before_action :authorize_admin
@@ -42,16 +41,6 @@ module Spree
         render partial: '/spree/admin/shared/destroy'
       end
 
-      # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
-      def check_json_authenticity
-        return unless request.format.js? || request.format.json?
-        return unless protect_against_forgery?
-        auth_token = params[request_forgery_protection_token]
-        unless auth_token && form_authenticity_token == URI.unescape(auth_token)
-          raise(ActionController::InvalidAuthenticityToken)
-        end
-      end
-
       def config_locale
         Spree::Backend::Config[:locale]
       end

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

@@ -4,7 +4,7 @@ module Spree
       before_action :setup_new_option_value, only: :edit
 
       def update_values_positions
-        ActiveRecord::Base.transaction do
+        ApplicationRecord.transaction do
           params[:positions].each do |id, index|
             Spree::OptionValue.where(id: id).update_all(position: index)
           end
@@ -12,7 +12,7 @@ module Spree
 
         respond_to do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js { render text: 'Ok' }
+          format.js { render plain: 'Ok' }
         end
       end
 
@@ -28,21 +28,9 @@ module Spree
 
 
       private
-        def load_product
-          @product = Product.friendly.find(params[:product_id])
-        end
-
         def setup_new_option_value
           @option_type.option_values.build if @option_type.option_values.empty?
         end
-
-        def set_available_option_types
-          @available_option_types = if @product.option_type_ids.any?
-            OptionType.where.not(id: @product.option_type_ids)
-          else
-            OptionType.all
-          end
-        end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Spree
       def destroy
         option_value = Spree::OptionValue.find(params[:id])
         option_value.destroy
-        render text: nil
+        render plain: nil
       end
     end
   end

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

@@ -41,7 +41,7 @@ module Spree
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).
           page(params[:page]).
-          per(params[:per_page] || Spree::Config[:orders_per_page])
+          per(params[:per_page] || Spree::Config[:admin_orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -85,26 +85,26 @@ module Spree
       def cancel
         @order.canceled_by(try_spree_current_user)
         flash[:success] = Spree.t(:order_canceled)
-        redirect_to :back
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
       def resume
         @order.resume!
         flash[:success] = Spree.t(:order_resumed)
-        redirect_to :back
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
       def approve
         @order.approved_by(try_spree_current_user)
         flash[:success] = Spree.t(:order_approved)
-        redirect_to :back
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
       def resend
         OrderMailer.confirm_email(@order.id, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
-        redirect_to :back
+        redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
       def open_adjustments
@@ -112,7 +112,7 @@ module Spree
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
-        respond_with(@order) { |format| format.html { redirect_to :back } }
+        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
       end
 
       def close_adjustments
@@ -120,7 +120,7 @@ module Spree
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 
-        respond_with(@order) { |format| format.html { redirect_to :back } }
+        respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
       end
 
       private

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

@@ -52,6 +52,10 @@ module Spree
 
       private
 
+      def collection
+        @collection = super.order(position: :asc)
+      end
+      
       def load_data
         @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
       end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController
-      belongs_to 'spree/product', :find_by => :slug
+      belongs_to 'spree/product', find_by: :slug
       before_action :find_properties
       before_action :setup_property, only: :index
 

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

@@ -105,7 +105,7 @@ module Spree
         return @collection if @collection.present?
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= "1"
-        params[:q][:not_discontinued] ||= "1"
+        params[:q][:discontinue_on_null] ||= "1"
 
         params[:q][:s] ||= "name asc"
         @collection = super