solidus_backend 2.10.3 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a44006c8a414995f44ea675646bb2d37ef5b6dd79d809c80d09195043cd9c0
-  data.tar.gz: 4af8f15758e57c36c62535e3912d2aa5d2d3fc4f8e0497f4685d7d3fd42bcf16
+  metadata.gz: f154797f26add4a007c753f802918666a17c1c8e22ca45ec121387f26ae6dc58
+  data.tar.gz: 2d6574a272cf0ae1667f9bdb5bab5a7058ac9f6050f955cf98b6e778818c78c4
 SHA512:
-  metadata.gz: a3a5ac0fdb89ead2f7ed0e650e07fa938a8d07e690a6ab461cf88d3b016e23d77dabcf3fd5ea89942003c48a87618ada3c1f9eb99332c7a8e57627b9335a1612
-  data.tar.gz: 443f0ffe66056c8baf94e20a6947245fe391eb380d90edae9cc3ef4d5017699cb5fd4b8e758ff191713696acd2efc316c3fe1e6b2dda6d558d37adc5018d2d65
+  metadata.gz: a1fdd05a1bbda7bf56ba8855d73d7dfe02a664b44529a5e098228784745d40c21b36e1c40a40407d56650a1e0c774b066bb4e90fab48d53dbe932f0b1654a87c
+  data.tar.gz: ff314cb4ffcdb0a9dce6d0981656e4ecc96909b409486b73c467867510090de7b84bf46b8982da76488c8be0bf9e8a6c8dbb8e6e099b980c745cfa04a319efc3

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

@@ -29,6 +29,9 @@
 //= require spree/backend/components/tabs
 //= require spree/backend/components/tooltips
 //= require spree/backend/components/editable_table
+//= require spree/backend/components/selectable_table
+//= require spree/backend/components/selectable_table/summary
+//= require spree/backend/components/selectable_table/return_items
 //= require spree/backend/components/sortable_table
 //= require spree/backend/components/admin_nav
 //= require spree/backend/datepicker
@@ -48,7 +51,6 @@
 //= require spree/backend/progress
 //= require spree/backend/promotions
 //= require spree/backend/promotions/activation
-//= require spree/backend/returns/return_item_selection
 //= require spree/backend/routes
 //= require spree/backend/shipments
 //= require spree/backend/spree-select2
@@ -61,3 +63,4 @@
 //= require spree/backend/user_picker
 //= require spree/backend/variant_autocomplete
 //= require spree/backend/zone
+//= require spree/backend/shipping_methods/stock_locations_picker

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

@@ -6,7 +6,7 @@ Spree.ready(function() {
 
     Spree.ajax({
       type: 'POST',
-      url: Spree.routes.apply_coupon_code(window.order_number),
+      url: Spree.pathFor('api/orders/' + window.order_number + '/coupon_codes'),
       data: {
         coupon_code: $("#coupon_code").val(),
         token: Spree.api_key

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

@@ -58,6 +58,14 @@ Spree.ready(function(){
   $('.spree_add_fields').click(function() {
     var target = $(this).data("target");
     var new_table_row = $(target + ' tr:visible:last').clone();
+
+    // remove id
+    new_table_row.attr("id", "");
+
+    // Remove sort handle
+    new_table_row.find("td").first().empty();
+
+    // set unique form ids and names of new item
     var new_id = new Date().getTime() + (uniqueId++);
     new_table_row.find("input, select").each(function () {
       var el = $(this);
@@ -66,14 +74,11 @@ Spree.ready(function(){
       el.prop("id", el.prop("id").replace(/\d+(?=[^\d]*$)/, new_id))
       el.prop("name", el.prop("name").replace(/\d+(?=[^\d]*$)/, new_id))
     })
-    // 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
-    new_table_row.find("a").each(function () {
-      var el = $(this);
-      el.prop('href', '#');
-    })
-    $(target).prepend(new_table_row);
+
+    // Add a remove button to the actions column of the new row
+    new_table_row.find("td").last().empty().append('<a class="spree_remove_fields no-text with-tip fa fa-trash icon_link with-tip" data-action="remove" href="#" data-original-title="Remove"><span class="text"></span></a>');
+
+    $(target).append(new_table_row);
   })
 
   $('body').on('click', '.delete-resource', function() {
@@ -101,26 +106,10 @@ Spree.ready(function(){
 
   $('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) == '#') {
-      el.parents("tr").fadeOut('hide');
-    }else if (el.prop("href")) {
-      Spree.ajax({
-        type: 'POST',
-        url: el.prop("href"),
-        data: {
-          _method: 'delete',
-        },
-        success: function(response) {
-          el.parents("tr").fadeOut('hide');
-        },
-        error: function(response, textStatus, errorThrown) {
-          show_flash('error', response.responseText);
-        }
-
-      })
-    }
+    var table_row = el.parents("tr").first();
+    table_row.fadeOut("hide", function() {
+      table_row.remove();
+    });
     return false;
   });
 
@@ -131,7 +120,7 @@ Spree.ready(function(){
       data: {
         token: Spree.api_key
       },
-      url: Spree.routes.checkouts_api + "/" + window.order_number + "/advance"
+      url: Spree.pathFor('api/checkouts/' + window.order_number + '/advance')
     }).done(function() {
       window.location.reload();
     });

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

@@ -4,7 +4,7 @@ Spree.Collections.States = Backbone.Collection.extend({
   },
 
   url: function () {
-    return Spree.routes.states_search + "?country_id=" + this.country_id
+    return Spree.pathFor('api/states?country_id=' + this.country_id)
   },
 
   parse: function(resp, options) {

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

@@ -0,0 +1,5 @@
+Spree.ready(function() {
+  $('table.selectable-table').each(function() {
+    new Spree.Views.Tables.SelectableTable({el: this})
+  })
+});

data/app/assets/javascripts/spree/backend/components/selectable_table/return_items.js

@@ -0,0 +1,5 @@
+Backbone.on('selectableTable:init', function(selectableTable){
+  if(selectableTable.$el.hasClass('return-items-table')) {
+    new Spree.Views.Tables.ReturnItems({el: selectableTable.el, model: selectableTable.model});
+  }
+})

data/app/assets/javascripts/spree/backend/components/selectable_table/summary.js

@@ -0,0 +1,7 @@
+Backbone.on('selectableTable:init', function(selectableTable){
+  if(selectableTable.$el.find('.selectable').length > 0) {
+    var tr = document.createElement('tr')
+    new Spree.Views.Tables.SelectableTable.Summary({el: tr, model: selectableTable.model , columns: selectableTable.maxColumns()});
+    selectableTable.$el.find('thead').prepend(tr);
+  }
+})

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

@@ -1,30 +1,36 @@
 //= require solidus_admin/Sortable
 /* eslint no-unused-vars: "off" */
 
-Spree.ready(function() {
-  var sortable_tables = document.querySelectorAll('table.sortable');
+Spree.SortableTable = {
+  refresh: function() {
+    var sortable_tables = document.querySelectorAll('table.sortable');
 
-  _.each(sortable_tables, function(table) {
-    var url = table.getAttribute('data-sortable-link');
-    var tbody = table.querySelector('tbody');
-    var sortable = Sortable.create(tbody,{
-      handle: ".handle",
-      onEnd: function(e) {
-        var positions = {};
-        _.each(e.to.querySelectorAll('tr'), function(el, index) {
-          var idAttr = el.id;
-          if (idAttr) {
-            var objId = idAttr.split('_').slice(-1);
-            positions['positions['+objId+']'] = index + 1;
-          }
-        });
-        Spree.ajax({
-          type: 'POST',
-          dataType: 'json',
-          url: url,
-          data: positions,
-        });
-      }
+    _.each(sortable_tables, function(table) {
+      var url = table.getAttribute('data-sortable-link');
+      var tbody = table.querySelector('tbody');
+      var sortable = Sortable.create(tbody,{
+        handle: ".handle",
+        onEnd: function(e) {
+          var positions = {};
+          _.each(e.to.querySelectorAll('tr'), function(el, index) {
+            var idAttr = el.id;
+            if (idAttr) {
+              var objId = idAttr.split('_').slice(-1);
+              if (!isNaN(objId)) {
+                positions['positions['+objId+']'] = index + 1;
+              }
+            }
+          });
+          Spree.ajax({
+            type: 'POST',
+            dataType: 'json',
+            url: url,
+            data: positions,
+          });
+        }
+      });
     });
-  });
-});
+  }
+};
+
+Spree.ready(Spree.SortableTable.refresh);

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

@@ -4,7 +4,7 @@
 //= require spree/backend/models/address
 
 Spree.Models.Order = Backbone.Model.extend({
-  urlRoot: Spree.routes.orders_api,
+  urlRoot: Spree.pathFor('api/orders'),
   idAttribute: "number",
 
   relations: {
@@ -16,7 +16,7 @@ Spree.Models.Order = Backbone.Model.extend({
 
   advance: function(opts) {
     var options = {
-      url: Spree.routes.checkouts_api + "/" + this.id + "/advance",
+      url: Spree.pathFor('api/checkouts/' + this.id + '/advance'),
       type: 'PUT',
     };
     _.extend(options, opts);
@@ -25,7 +25,7 @@ Spree.Models.Order = Backbone.Model.extend({
 
   empty: function (opts) {
     var options = {
-      url: Spree.routes.orders_api + "/" + this.id + "/empty",
+      url: Spree.pathFor('api/orders/' + this.id + '/empty'),
       type: 'PUT',
     };
     _.extend(options, opts);

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

@@ -1,5 +1,5 @@
 Spree.Models.Payment = Backbone.Model.extend({
   urlRoot: function() {
-    return Spree.routes.payments_api(this.get('order_id'));
+    return Spree.pathFor('api/orders/' + this.get('order_id') + '/payments')
   }
 });

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

@@ -1,7 +1,7 @@
 Spree.Models.Shipment = Backbone.Model.extend({
   idAttribute: "number",
   paramRoot: "shipment",
-  urlRoot: Spree.routes.shipments_api,
+  urlRoot: Spree.pathFor('api/shipments'),
 
   relations: {
     "selected_shipping_rate": Backbone.Model,

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

@@ -1,6 +1,6 @@
 Spree.Models.StockItem = Backbone.Model.extend({
   paramRoot: 'stock_item',
   urlRoot: function() {
-    return Spree.routes.stock_items_api(this.get('stock_location_id'));
+    return Spree.pathFor('api/stock_locations/' + this.get('stock_location_id') + '/stock_items');
   }
 });

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

@@ -11,7 +11,7 @@ Spree.ready(function () {
       multiple: true,
       initSelection: function (element, callback) {
         return Spree.ajax({
-          url: Spree.routes.option_type_search,
+          url: Spree.pathFor('api/option_types'),
           data: { ids: element.val() },
           type: 'get',
           success: function(data) {
@@ -20,7 +20,7 @@ Spree.ready(function () {
         });
       },
       ajax: {
-        url: Spree.routes.option_type_search,
+        url: Spree.pathFor('api/option_types'),
         quietMillis: 200,
         datatype: 'json',
         params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },

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

@@ -14,7 +14,7 @@ $.fn.optionValueAutocomplete = function (options) {
     minimumInputLength: 3,
     multiple: multiple,
     initSelection: function (element, callback) {
-      $.get(Spree.routes.option_value_search, {
+      $.get(Spree.pathFor('api/option_values'), {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
@@ -22,7 +22,7 @@ $.fn.optionValueAutocomplete = function (options) {
       });
     },
     ajax: {
-      url: Spree.routes.option_value_search,
+      url: Spree.pathFor('api/option_values'),
       datatype: 'json',
       data: function (term, page) {
         // Note: This doesn't work. variants_product_id isn't an allowed filter

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.admin_product_search, {
+      $.get(Spree.pathFor('admin/search/products'), {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
@@ -21,7 +21,7 @@ $.fn.productAutocomplete = function (options) {
       });
     },
     ajax: {
-      url: Spree.routes.admin_product_search,
+      url: Spree.pathFor('admin/search/products'),
       datatype: 'json',
       params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
       data: function (term, page) {

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

@@ -1,27 +1,46 @@
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.classifications_api = Spree.pathFor('api/classifications')
-Spree.routes.option_value_search = Spree.pathFor('api/option_values')
-Spree.routes.option_type_search = Spree.pathFor('api/option_types')
-Spree.routes.orders_api = Spree.pathFor('api/orders')
-Spree.routes.product_search = Spree.pathFor('api/products')
-Spree.routes.admin_product_search = Spree.pathFor('admin/search/products')
-Spree.routes.shipments_api = Spree.pathFor('api/shipments')
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
-Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
-Spree.routes.taxons_search = Spree.pathFor('api/taxons')
-Spree.routes.user_search = Spree.pathFor('admin/search/users')
-Spree.routes.variants_api = Spree.pathFor('api/variants')
-Spree.routes.users_api = Spree.pathFor('api/users')
+/**
+ * @deprecated Spree.routes will be removed in a future release. Please use Spree.pathFor instead.
+ * See: https://github.com/solidusio/solidus/issues/3405
+ */
 
-Spree.routes.line_items_api = function(order_id) {
-  return Spree.pathFor('api/orders/' + order_id + '/line_items')
+var admin_routes = {
+  classifications_api: Spree.pathFor('api/classifications'),
+  option_value_search: Spree.pathFor('api/option_values'),
+  option_type_search: Spree.pathFor('api/option_types'),
+  orders_api: Spree.pathFor('api/orders'),
+  product_search: Spree.pathFor('api/products'),
+  admin_product_search: Spree.pathFor('admin/search/products'),
+  shipments_api: Spree.pathFor('api/shipments'),
+  checkouts_api: Spree.pathFor('api/checkouts'),
+  stock_locations_api: Spree.pathFor('api/stock_locations'),
+  taxon_products_api: Spree.pathFor('api/taxons/products'),
+  taxons_search: Spree.pathFor('api/taxons'),
+  user_search: Spree.pathFor('admin/search/users'),
+  variants_api: Spree.pathFor('api/variants'),
+  users_api: Spree.pathFor('api/users'),
+
+  line_items_api: function(order_id) {
+    return Spree.pathFor('api/orders/' + order_id + '/line_items')
+  },
+
+  payments_api: function(order_id) {
+    return Spree.pathFor('api/orders/' + order_id + '/payments')
+  },
+
+  stock_items_api: function(stock_location_id) {
+    return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
+  }
 }
 
-Spree.routes.payments_api = function(order_id) {
-  return Spree.pathFor('api/orders/' + order_id + '/payments')
+var frontend_routes = {
+  states_search: Spree.pathFor('api/states'),
+  apply_coupon_code: function(order_id) {
+    return Spree.pathFor("api/orders/" + order_id + "/coupon_codes");
+  }
 }
 
-Spree.routes.stock_items_api = function(stock_location_id) {
-  return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
+if(typeof Proxy == "function") {
+  Spree.routes = new Proxy(Object.assign(admin_routes, frontend_routes), Spree.routesDeprecationProxy);
+} else {
+  Object.assign(Spree.routes, admin_routes)
 }

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

@@ -11,7 +11,7 @@ var ShipShipmentView = Backbone.View.extend({
   onSubmit: function(e){
     Spree.ajax({
       type: "PUT",
-      url: Spree.routes.shipments_api + "/" + this.shipment_number + "/ship",
+      url: Spree.pathFor('api/shipments/' + this.shipment_number + '/ship'),
       data: {
         send_mailer: this.$("[name='send_mailer']").is(":checked")
       },
@@ -27,7 +27,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
   var shipment = _.findWhere(shipments, {number: shipment_number});
   var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
 
-  var url = Spree.routes.shipments_api + "/" + shipment_number;
+  var url = Spree.pathFor('api/shipments/' + shipment_number);
 
   var new_quantity = 0;
   if(inventory_units.length<quantity){
@@ -106,7 +106,7 @@ var ShipmentSplitItemView = Backbone.View.extend({
       split_attr.stock_location_id = target_id;
       jqXHR = Spree.ajax({
         type: "POST",
-        url: Spree.routes.shipments_api + "/transfer_to_location",
+        url: Spree.pathFor('api/shipments/transfer_to_location'),
         data: split_attr
       });
     } else if (target_type == 'shipment') {
@@ -114,7 +114,7 @@ var ShipmentSplitItemView = Backbone.View.extend({
       split_attr.target_shipment_number = target_id;
       jqXHR = Spree.ajax({
         type: "POST",
-        url: Spree.routes.shipments_api + "/transfer_to_shipment",
+        url: Spree.pathFor('api/shipments/transfer_to_shipment'),
         data: split_attr
       });
     } else {
@@ -179,7 +179,7 @@ var ShipmentItemView = Backbone.View.extend({
     var _this = this;
     Spree.ajax({
       type: "GET",
-      url: Spree.routes.variants_api + "/" + this.variant_id,
+      url: Spree.pathFor('api/variants/' + this.variant_id),
     }).success(function(variant){
       var split = new ShipmentSplitItemView({
         shipmentItemView: _this,

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

@@ -0,0 +1,18 @@
+Spree.ready(function() {
+  var $stockLocationsSelect = $('#shipping_method_stock_location_ids'),
+      $availableToAllCheckbox = $('#shipping_method_available_to_all');
+
+  if ($stockLocationsSelect.length === 0 || $availableToAllCheckbox.length === 0) {
+    return;
+  }
+
+  function toggleLocationSelectVisibility() {
+    $stockLocationsSelect.toggleClass('hidden', $availableToAllCheckbox[0].checked);
+  }
+
+  $availableToAllCheckbox.on('click', function() {
+    toggleLocationSelectVisibility();
+  });
+
+  toggleLocationSelectVisibility();
+})