solidus_backend 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9df78b7913dca36ad841e5e4365ebb2626b7e9f2ff34649a86312285d6cce16
-  data.tar.gz: 14b34e0d7528a0f53d2655b86259f1bdfd07a20fb6474ef9b203526abc12744b
+  metadata.gz: 3dbcdf9e9703176fcce09d9a18c80c599bef4e00cad4596227147ecaf10e87d8
+  data.tar.gz: ea64fd9b016d984994fb3c5cf85a1c9686238e40e866a6dbdc1c78886330bdc6
 SHA512:
-  metadata.gz: 8781ce3451099cfd24d0d58911d3b2351d3df5daeaf392b522398910c8ced82355a32ba7ed32b9230da84aafec4d5439d9f7aab6967ee9b2c7c8a3c2934f2a30
-  data.tar.gz: 0b4e2af28213a51aced9d7eeab0ec26995953ab6dd941ccbaea54928d1d432c207be279d462e403fb67af4a87201ae6b5bb095f98c056a28e4669463338ad605
+  metadata.gz: 9c75cb7b2700aa34e75d7089661ee78f7dd0d242982bd8c8690d56b99a65ea2698ed4fe37f4343a3d64c16770295afc5e3e6a1d89af3df7256a37c36df900888
+  data.tar.gz: 248117bd08c0e93f947b3fb742a3184970454cd9b6ebe7589c91eacc9826fba287866756e9342f196e5cf7d0211e41608b6583676423ee82339c9ed3206abdfb

data/README.md

@@ -1,25 +1,25 @@
 # solidus\_backend
 
-Backend contains the controllers, views, and assets making up the admin interface of solidus.
+Backend contains the controllers, views, and assets making up the admin interface of Solidus.
 
 ## Assets
 
-### Javascript
+### JavaScript
 
 Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/)
 
-Our scripts are written in a mix of coffeescript and javascript (ES5). We can't
+Our scripts are written in a mix of CoffeeScript and JavaScript (ES5). We can't
 easily use a transpiler for ECMAScript >= 6 without adding additional steps for
 applications using solidus\_admin.
 
 Though we have existing CoffeeScript files, any new files should be in
-javascript (ES5).
+JavaScript (ES5).
 
 ### Stylesheets
 
 Can be found in [app/assets/stylesheets/spree/backend/](./app/assets/stylesheets/spree/backend/)
 
-The stylesheets are written in SCSS and include all of [bourbon](http://bourbon.io/docs/) and [bootstrap 4 alpha](http://v4-alpha.getbootstrap.com/).
+The stylesheets are written in SCSS and include all of [Bourbon](http://bourbon.io/docs/) and [Bootstrap 4 alpha](http://v4-alpha.getbootstrap.com/).
 
 When running the application there is a styleguide available at:
 
@@ -31,8 +31,12 @@ When running the application there is a styleguide available at:
 
 Run the tests
 
-    bundle exec rspec
+```bash
+bundle exec rspec
+```
 
-Run the javascript tests (must have chromedriver installed)
+Run the JavaScript tests (must have [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) installed)
 
-    bundle exec teaspoon
+```bash
+bundle exec teaspoon
+```

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

@@ -1,7 +1,5 @@
 //= require solidus_admin/bind-polyfill
 //= require handlebars
-//= require jquery
-//= require jquery_ujs
 //= require jquery.sticky-kit.min
 //= require solidus_admin/select2
 //= require solidus_admin/underscore

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

@@ -5,7 +5,7 @@ Spree.ready(function() {
     }
 
     Spree.ajax({
-      type: 'PUT',
+      type: 'POST',
       url: Spree.routes.apply_coupon_code(window.order_number),
       data: {
         coupon_code: $("#coupon_code").val(),

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

@@ -3,26 +3,30 @@ Spree.ready(function(){
 
   $('body').tooltip({selector: '.with-tip'});
 
+  /*
+   * Poll tooltips to hide them if they are no longer being hovered.
+   *
+   * This is necessary to fix tooltips hanging around after their attached
+   * element has been removed from the DOM (and will therefore receive no
+   * mouseleave event). This may be unnecessary in a future version of
+   * bootstrap, which intends to solve this using MutationObserver.
+   */
+  var removeDesyncedTooltip = function(tooltip) {
+    var interval = setInterval(function(){
+      if(!$(tooltip.element).is(":hover")) {
+        tooltip.dispose();
+        clearInterval(interval);
+      }
+    }, 200);
+    $(tooltip.element).on('hidden.bs.tooltip', function(){
+      clearInterval(interval);
+    });
+  };
+
   $('body').on('inserted.bs.tooltip', function(e){
     var $target = $(e.target);
     var tooltip = $target.data('bs.tooltip');
-
-    /*
-     * Observe target changes to understand if we need to remove tooltips.
-     *
-     * This is necessary to fix tooltips hanging around after their attached
-     * element has been removed from the DOM (and will therefore receive no
-     * mouseleave event).
-     */
-    var observer = new MutationObserver(function(mutations) {
-      // disconnect itself when content is changed, a new observer will
-      // be attached to this element when the new tooltip is created.
-      this.disconnect();
-
-      tooltip.hide();
-    });
-    observer.observe($target.get(0), { attributes: true });
-
+    removeDesyncedTooltip(tooltip);
     var $tooltip = $("#" + $target.attr("aria-describedby"));
     $tooltip.addClass("action-" + $target.data("action"));
   });

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

@@ -23,7 +23,7 @@ Spree.ready(function () {
         url: Spree.routes.option_type_search,
         quietMillis: 200,
         datatype: 'json',
-        params: { "headers": { "X-Spree-Token": Spree.api_key } },
+        params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
         data: function (term) {
           return {
             q: { name_cont: term }

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

@@ -23,7 +23,7 @@ $.fn.productAutocomplete = function (options) {
     ajax: {
       url: Spree.routes.admin_product_search,
       datatype: 'json',
-      params: { "headers": { "X-Spree-Token": Spree.api_key } },
+      params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
       data: function (term, page) {
         return {
           q: {

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

@@ -85,7 +85,12 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         window.location.reload();
       },
       error: function(response) {
-        window.show_flash('error', response.responseJSON.message);
+        json = response.responseJSON;
+        message = json.error;
+        for (error in json.errors) {
+          message += '<br />' + json.errors[error].join();
+        }
+        window.show_flash('error', message);
       }
     });
   }

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

@@ -2,11 +2,20 @@ Spree.ready(function() {
   $('.js-edit-stock-item').each(function() {
     var $el = $(this);
     var model = new Spree.Models.StockItem($el.data('stock-item'));
+    var trackInventory = $el.data('track-inventory');
     new Spree.Views.Stock.EditStockItemRow({
       el: $el,
       stockLocationName: $el.data('stock-location-name'),
       model: model
     });
+
+    if (trackInventory === false) {
+      $('.js-edit-stock-item input').attr({
+        disabled: true,
+        class: 'with-tip',
+        title: '"Track inventory" option disabled for this variant'
+      });
+    }
   });
 
   $('.js-add-stock-item').each(function() {

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

@@ -9,9 +9,25 @@ Spree.ready(function() {
       field.defaultValue = field.value;
       textDisplay.textContent = field.value;
 
-      show_flash('success', data.message);
+      if (typeof data !== "undefined") {
+        // we are using jquery_ujs
+        message = data.message
+      } else {
+        // we are using rails-ujs
+        message = event.detail[0].message
+      }
+
+      show_flash('success', message);
     }).on('ajax:error', function(event, xhr, status, error) {
-      show_flash('error', xhr.responseJSON.message);
+      if (typeof xhr !== "undefined") {
+        // we are using jquery_ujs
+        message = xhr.responseJSON.message
+      } else {
+        // we are using rails-ujs
+        message = event.detail[0].message
+      }
+
+      show_flash('error', message);
     });
 
     row.querySelector('.edit-memo').addEventListener('click', function() {

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

@@ -30,7 +30,7 @@ Spree.ready(function() {
       url: Spree.routes.taxons_search,
       params: {
         "headers": {
-          "X-Spree-Token": Spree.api_key
+          'Authorization': 'Bearer ' + Spree.api_key
         }
       },
       data: function(term, page) {

data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs

@@ -1,36 +1,35 @@
-<td>{{stockLocationName}}</td>
-<td>
+<td class="stock-location-name">{{stockLocationName}}</td>
+<td class="align-center">
   <input id="backorderable-{{id}}"
          name="backorderable"
          type="checkbox"
          value="backorderable"
-         {{#unless editing}} disabled="disabled" {{/unless}}
          {{#if backorderable}} checked="checked" {{/if}}
    >
 </td>
+<td class="align-center">
+  <span
+    {{#if negative}}
+    class="negative count-on-hand-display"
+    {{else}}
+    class="count-on-hand-display"
+    {{/if}}
+    >{{count_on_hand}}</span>
+</td>
 <td>
-  {{#if editing}}
-    <form>
-      <input
-      {{#if negative}}
-        class="fullwidth negative"
-      {{else}}
-        class="fullwidth"
-      {{/if}}
-      name="count_on_hand"
-      type="number"
-      value="{{count_on_hand}}"
-    >
-    </form>
-  {{else}}
-    <span {{#if negative}}class="negative"{{/if}}>{{count_on_hand}}</span>
-  {{/if}}
+  <form>
+    <input
+    {{#if negative}}
+      class="fullwidth negative"
+    {{else}}
+      class="fullwidth"
+    {{/if}}
+    name="count_on_hand"
+    type="number"
+    value="0">
+  </form>
 </td>
 <td class="actions">
-  {{#if editing}}
-    <a class="submit fa fa-check icon_link with-tip no-text" data-action="save" href="#"></a>
-    <a class="cancel fa fa-cancel icon_link with-tip no-text" data-action="cancel" href="#"></a>
-  {{else}}
-    <a class="edit fa fa-edit icon_link with-tip no-text" data-action="edit" href="#"></a>
-  {{/if}}
+  <a class="submit fa fa-check icon_link with-tip no-text" data-action="save" href="#"></a>
+  <a class="cancel fa fa-cancel icon_link with-tip no-text" data-action="cancel" href="#"></a>
 </td>

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

@@ -22,7 +22,7 @@ $.fn.userAutocomplete = function () {
     ajax: {
       url: Spree.routes.users_api,
       datatype: 'json',
-      params: { "headers": { "X-Spree-Token": Spree.api_key } },
+      params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
       data: function (term) {
         return {
           q: {

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

@@ -26,7 +26,7 @@
         quietMillis: 500,
         params: {
           "headers": {
-            "X-Spree-Token": Spree.api_key
+            'Authorization': 'Bearer ' + Spree.api_key
           }
         },
         data: function(term, page) {

data/app/assets/javascripts/spree/backend/views/order/customer_select.js

@@ -27,7 +27,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
       placeholder: Spree.translations.choose_a_customer,
       ajax: {
         url: Spree.routes.users_api,
-        params: { "headers": { "X-Spree-Token": Spree.api_key } },
+        params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
         datatype: 'json',
         data: function(term, page) {
           return {

data/app/assets/javascripts/spree/backend/views/order/summary.js

@@ -20,10 +20,10 @@ Spree.Views.Order.Summary = Backbone.View.extend({
     this.$('dd.order-additional_tax_total').text(this.model.get("display_additional_tax_total"))
 
     this.$('.order-shipment_state').toggleClass("hidden", !this.model.get("completed_at"))
-    this.$('dd.order-shipment_state').html(this.renderState('shipment_state', this.model.get("shipment_state")))
+    this.$('dd.order-shipment_state').html(this.renderState('shipment_states', this.model.get("shipment_state")))
 
     this.$('.order-payment_state').toggleClass("hidden", !this.model.get("completed_at"))
-    this.$('dd.order-payment_state').html(this.renderState('payment_state', this.model.get("payment_state")))
+    this.$('dd.order-payment_state').html(this.renderState('payment_states', this.model.get("payment_state")))
   },
 
   renderState: function(translation_key, value) {

data/app/assets/javascripts/spree/backend/views/stock/add_stock_item.js

@@ -6,14 +6,23 @@ Spree.Views.Stock.AddStockItem = Backbone.View.extend({
   },
 
   events: {
-    "click .submit": "onSubmit"
+    "click .submit": "onSubmit",
+    "submit form": "onSubmit",
+    'input [name="count_on_hand"]': "onChange",
+    'change [name="stock_location_id"]': "onChange",
+    'click [name="backorderable"]': "onChange"
   },
 
   validate: function() {
-    var locationSelectContainer = this.$locationSelect.siblings('.select2-container');
-    locationSelectContainer.toggleClass('error', !this.$locationSelect.val());
+    this.$locationSelect.toggleClass('error', !this.$locationSelect.val());
     this.$countInput.toggleClass('error', !this.$countInput.val());
-    return locationSelectContainer.hasClass('error') || this.$countInput.hasClass('error');
+    return this.$locationSelect.hasClass('error') || this.$countInput.hasClass('error');
+  },
+
+  onChange: function (event) {
+    var $target = $(event.target)
+    if ($target.val() !== '') $target.removeClass('error');
+    this.$el.addClass('changed');
   },
 
   onSuccess: function() {
@@ -25,6 +34,7 @@ Spree.Views.Stock.AddStockItem = Backbone.View.extend({
       stockLocationName: stockLocationName
     });
     editView.$el.insertBefore(this.$el);
+    editView.$el.addClass('stock-item-edit-row');
     this.model = new Spree.Models.StockItem({
       variant_id: this.model.get('variant_id'),
       stock_location_id: this.model.get('stock_location_id')
@@ -58,6 +68,7 @@ Spree.Views.Stock.AddStockItem = Backbone.View.extend({
       success: this.onSuccess.bind(this),
       error: this.onError.bind(this)
     };
+    this.$el.removeClass('changed');
     this.model.save(null, options);
   }
 });

data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js

@@ -3,16 +3,17 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
 
   initialize: function(options) {
     this.stockLocationName = options.stockLocationName;
-    this.editing = false;
     this.negative = this.model.attributes.count_on_hand < 0;
+    this.previousAttributes = _.clone(this.model.attributes);
+    this.listenTo(this.model, 'sync', this.onSuccess);
     this.render();
   },
 
   events: {
-    "click .edit": "onEdit",
     "click .submit": "onSubmit",
     "submit form": "onSubmit",
-    "click .cancel": "onCancel"
+    "click .cancel": "onCancel",
+    'input [name="count_on_hand"]': "countOnHandChanged"
   },
 
   template: HandlebarsTemplates['stock_items/stock_location_stock_item'],
@@ -26,26 +27,43 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
     _.extend(renderAttr, this.model.attributes);
     this.$el.attr("data-variant-id", this.model.get('variant_id'));
     this.$el.html(this.template(renderAttr));
+    this.$count_on_hand_display = this.$('.count-on-hand-display');
     return this;
   },
 
   onEdit: function(ev) {
     ev.preventDefault();
-    this.editing = true;
     this.render();
   },
 
   onCancel: function(ev) {
     ev.preventDefault();
-    this.model.set(this.model.previousAttributes());
-    this.editing = false;
+    this.model.set(this.previousAttributes);
+    this.$el.removeClass('changed');
     this.render();
   },
 
+  countOnHandChanged: function(ev) {
+    var diff = parseInt(ev.currentTarget.value), newCount;
+    if (isNaN(diff)) diff = 0;
+    newCount = this.previousAttributes.count_on_hand + diff;
+    ev.preventDefault();
+    // Do not allow negative stock values
+    if (newCount < 0) {
+      ev.currentTarget.value = -1 * this.previousAttributes.count_on_hand;
+      this.$count_on_hand_display.text(0);
+    } else {
+      this.model.set("count_on_hand", newCount);
+      this.$count_on_hand_display.text(newCount);
+    }
+    this.$el.toggleClass('changed', diff !== 0);
+  },
+
   onSuccess: function() {
-    this.editing = false;
+    this.$el.removeClass('changed');
+    this.previousAttributes = _.clone(this.model.attributes);
     this.render();
-    show_flash("success", Spree.translations.updated_successfully);
+    this.$('[name="count_on_hand"]').focus();
   },
 
   onError: function(model, response, options) {
@@ -62,9 +80,11 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
       backorderable: backorderable
     });
     var options = {
-      success: this.onSuccess.bind(this),
+      success: function() {
+        show_flash("success", Spree.translations.updated_successfully);
+      },
       error: this.onError.bind(this)
     };
-    this.model.save({ force: true }, options);
+    this.model.save({}, options);
   }
 });