solidus_backend 2.10.5 → 2.11.0

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

@@ -7,11 +7,13 @@ Spree.ready(function() {
     new Spree.Views.Stock.EditStockItemRow({
       el: $el,
       stockLocationName: $el.data('stock-location-name'),
+      stockLocationId: $el.data("stock-item").stock_location_id,
+      variantSku: $el.data("variant-sku"),
       model: model
     });
 
     if (trackInventory === false) {
-      $('.js-edit-stock-item input').attr({
+      $el.find('input').attr({
         disabled: true,
         class: 'with-tip',
         title: '"Track inventory" option disabled for this variant'
@@ -19,7 +21,7 @@ Spree.ready(function() {
     }
 
     if (canEdit == false) {
-      $('.js-edit-stock-item input').attr({
+      $el.find('input').attr({
         disabled: true,
         class: 'with-tip',
         title: 'You do not have permission to manage stock'

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

@@ -10,7 +10,7 @@ $.fn.taxonAutocomplete = function () {
 
         Spree.ajax({
           type: "GET",
-          url: Spree.routes.taxons_search,
+          url: Spree.pathFor('api/taxons'),
           data: {
             ids: ids,
             per_page: count,
@@ -22,7 +22,7 @@ $.fn.taxonAutocomplete = function () {
         });
       },
       ajax: {
-        url: Spree.routes.taxons_search,
+        url: Spree.pathFor('api/taxons'),
         datatype: 'json',
         data: function (term, page) {
           return {

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

@@ -9,7 +9,7 @@ Spree.ready(function() {
   var saveSort = function(e) {
     var item = e.item;
     Spree.ajax({
-      url: Spree.routes.classifications_api,
+      url: Spree.pathFor('api/classifications'),
       method: 'PUT',
       data: {
         product_id: item.getAttribute('data-product-id'),
@@ -27,7 +27,7 @@ Spree.ready(function() {
     dropdownCssClass: "taxon_select_box",
     placeholder: Spree.translations.find_a_taxon,
     ajax: {
-      url: Spree.routes.taxons_search,
+      url: Spree.pathFor('api/taxons'),
       params: {
         "headers": {
           'Authorization': 'Bearer ' + Spree.api_key
@@ -55,7 +55,7 @@ Spree.ready(function() {
 
   $('#taxon_id').on("change", function(e) {
     Spree.ajax({
-      url: Spree.routes.taxon_products_api,
+      url: Spree.pathFor('api/taxons/products'),
       data: {
         id: e.val,
         simple: 1

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

@@ -1,4 +1,6 @@
 //= require spree/backend/templates/_image
+//= require spree/backend/templates/tables/selectable_label
+//= require spree/backend/templates/tables/return_item_sum_amount
 //= require spree/backend/templates/orders/customer_details/autocomplete
 //= require spree/backend/templates/orders/details_adjustment_row
 //= require spree/backend/templates/orders/line_item

data/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs

@@ -1,9 +1,9 @@
 <div class='customer-autocomplete-item'>
   <div class='customer-details'>
     <span class="customer-email">{{customer.email}}</span>
-    {{#if bill_address.firstname }}
+    {{#if bill_address.name }}
       <strong>{{t 'bill_address' }}</strong>
-      {{bill_address.firstname}} {{bill_address.lastname}}<br>
+      {{bill_address.name}}<br>
       {{bill_address.address1}}, {{bill_address.address2}}<br>
       {{bill_address.city}}<br>
       {{#if bill_address.state_id }}

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

@@ -1,4 +1,8 @@
-<td class="stock-location-name">{{stockLocationName}}</td>
+<td class="stock-location-name">
+  <a href="/admin/stock_locations/{{stockLocationId}}/stock_movements?q%5Bvariant_sku_eq%5D={{variantSku}}">
+    {{stockLocationName}}
+  </a>
+</td>
 <td class="align-center">
   <input id="backorderable-{{id}}"
          name="backorderable"

data/app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs

@@ -0,0 +1,7 @@
+<tr class="selectable-header">
+  <th class="selectable-table-summary" colspan="2">
+  </th>
+  <td colspan="7" class="text-right">
+    {{total_pre_tax_refund}} <span id="total_pre_tax_refund">{{total_selected_item_amount}}</span>
+  </td>
+</tr>

data/app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs

@@ -0,0 +1,6 @@
+<th>
+  <input type="checkbox" {{#if all_items_selected}}checked="checked"{{/if}} name="select-all" class="selectAll" id="select-all" value="1">
+</th>
+<th colspan="{{colspan}}">
+  {{item_selected_label}}
+</th>

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

@@ -10,7 +10,7 @@ $.fn.userAutocomplete = function () {
     multiple: true,
     initSelection: function (element, callback) {
       Spree.ajax({
-        url: Spree.routes.users_api,
+        url: Spree.pathFor('api/users'),
         data: {
           ids: element.val()
         },
@@ -20,7 +20,7 @@ $.fn.userAutocomplete = function () {
       });
     },
     ajax: {
-      url: Spree.routes.users_api,
+      url: Spree.pathFor('api/users'),
       datatype: 'json',
       params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
       data: function (term) {
@@ -28,8 +28,7 @@ $.fn.userAutocomplete = function () {
           q: {
             m: 'or',
             email_start: term,
-            addresses_firstname_start: term,
-            addresses_lastname_start: term
+            firstname_or_lastname_start: term
           }
         };
       },

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

@@ -16,12 +16,12 @@
       minimumInputLength: 3,
       initSelection: function(element, callback) {
         Spree.ajax({
-          url: Spree.routes.variants_api + "/" + element.val(),
+          url: Spree.pathFor('api/variants/' + element.val()),
           success: callback
         });
       },
       ajax: {
-        url: Spree.routes.variants_api,
+        url: Spree.pathFor('api/variants'),
         datatype: "json",
         quietMillis: 500,
         params: {

data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js

@@ -15,10 +15,10 @@ Spree.Views.Cart.EmptyCartButton = Backbone.View.extend({
     }
 
     this.model.empty({
-      success: () => {
+      success: function () {
         this.collection.reset()
         this.collection.push({})
-      }
+      }.bind(this)
     })
   },
 

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

@@ -24,3 +24,7 @@
 //= require 'spree/backend/views/promotions/option_values_rule'
 //= require 'spree/backend/views/tables/editable_table'
 //= require 'spree/backend/views/tables/editable_table_row'
+//= require 'spree/backend/views/tables/return_items'
+//= require 'spree/backend/views/tables/selectable_table'
+//= require 'spree/backend/views/tables/selectable_table/summary'
+//= require 'spree/backend/views/tables/selectable_table/sum_return_item_amount'

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

@@ -23,7 +23,7 @@ Spree.Views.Order.Address = Backbone.View.extend({
 
   eachField: function(callback){
     var view = this;
-    var fields = ["firstname", "lastname", "company", "address1", "address2",
+    var fields = ["name", "company", "address1", "address2",
       "city", "zipcode", "phone", "country_id", "state_name"];
     _.each(fields, function(field) {
       var el = view.$('[name$="[' + field + ']"]');

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

@@ -26,7 +26,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
     this.$el.select2({
       placeholder: Spree.translations.choose_a_customer,
       ajax: {
-        url: Spree.routes.users_api,
+        url: Spree.pathFor('api/users'),
         params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
         datatype: 'json',
         data: function(term, page) {
@@ -34,8 +34,7 @@ Spree.Views.Order.CustomerSelect = Backbone.View.extend({
             q: {
               m: 'or',
               email_start: term,
-              addresses_firstname_start: term,
-              addresses_lastname_start: term
+              firstname_or_lastname_start: term
             }
           }
         },

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

@@ -8,7 +8,10 @@ Spree.Views.Order.DetailsAdjustments = Backbone.View.extend({
     var totals = {};
     var collection = this.collection ? this.collection.chain() : _.chain([this.model]);
     collection
-      .map(function(item){ return item.get("adjustments") || [] })
+      .map(function(item) {
+        return (item.get("adjustments") || [])
+          .filter(function(adjustment) { return (adjustment.eligible === true); });
+      })
       .flatten(true)
       .each(function(adjustment){
         var label = adjustment.label;

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

@@ -3,6 +3,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
 
   initialize: function(options) {
     this.stockLocationName = options.stockLocationName;
+    this.stockLocationId = options.stockLocationId;
+    this.variantSku = options.variantSku;
     this.negative = this.model.attributes.count_on_hand < 0;
     this.previousAttributes = _.clone(this.model.attributes);
     this.listenTo(this.model, 'sync', this.onSuccess);
@@ -22,6 +24,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
   render: function() {
     var renderAttr = {
       stockLocationName: this.stockLocationName,
+      stockLocationId: this.stockLocationId,
+      variantSku: this.variantSku,
       editing: this.editing,
       negative: this.negative
     };

data/app/assets/javascripts/spree/backend/views/tables/return_items.js

@@ -0,0 +1,9 @@
+Spree.Views.Tables.ReturnItems = Backbone.View.extend({
+  initialize: function() {
+    if(this.$el.hasClass('return-items-table')) {
+      var tfoot = document.createElement('tfoot')
+      new Spree.Views.Tables.SelectableTable.SumReturnItemAmount({el: tfoot, model: this.model});
+      this.$el.append(tfoot);
+    }
+  },
+})

data/app/assets/javascripts/spree/backend/views/tables/selectable_table.js

@@ -0,0 +1,70 @@
+Spree.Views.Tables.SelectableTable = Backbone.View.extend({
+  events: {
+    'change .selectable': 'onSelectedItem',
+  },
+
+  initialize: function() {
+    this.model = new Backbone.Model({
+      allSelected: false,
+      selectedItems: []
+    });
+
+    this.listenTo(this.model, 'change', this.detectChanges)
+
+    this.render();
+    Backbone.trigger("selectableTable:init", this)
+  },
+
+  onSelectedItem: function(event) {
+    var item = event.currentTarget;
+    if(item.checked) {
+      this.addItem(item)
+    }else{
+      this.$el.find('input[name="select-all"]').prop('checked', false);
+      this.removeItem(item)
+    }
+  },
+
+  addItem: function(item) {
+    var items = _(this.model.get('selectedItems')).clone();
+    if(items.indexOf(item) === -1) {
+      items.push(item);
+      this.model.set('selectedItems', items);
+    }
+  },
+
+  removeItem: function(item) {
+    var items = _(this.model.get('selectedItems')).clone();
+    items.splice(items.indexOf(item), 1);
+    this.model.set('selectedItems', items);
+    this.model.set('allSelected', false);
+  },
+
+  maxColumns: function() {
+    var max = 0;
+    this.$el.find('tr').each(function(){
+      var inTr = 0;
+      $('td,th', this).each(function() { inTr += parseInt($(this).attr('colspan')) || 1 });
+      max = Math.max(max,inTr);
+    });
+
+    return max;
+  },
+
+  detectChanges: function(model) {
+    var selectableTable = this;
+    if(model.changed.allSelected == true) {
+      $('.selectable').each(function(_, item) { selectableTable.addItem(item) })
+    }
+
+    this.render();
+  },
+
+  render: function(){
+    var model = this.model;
+
+    this.$el.find('.selectable').each(function(_i, checkbox){
+      checkbox.checked = model.get('allSelected') || model.get('selectedItems').includes(checkbox);
+    })
+  }
+});

data/app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js

@@ -0,0 +1,32 @@
+Spree.Views.Tables.SelectableTable.SumReturnItemAmount = Backbone.View.extend({
+  initialize: function(options) {
+    this.listenTo(this.model, 'change', this.render);
+
+    this.render();
+  },
+
+  render: function() {
+    var html = HandlebarsTemplates['tables/return_item_sum_amount']({
+      total_pre_tax_refund: Spree.t("total_pre_tax_refund"),
+      total_selected_item_amount: this.totalSelectedReturnItemAmount()
+    });
+
+    this.$el.html(html);
+  },
+
+  totalSelectedReturnItemAmount: function () {
+    var totalAmount = 0.00;
+    var selectedItems = [];
+
+    if(this.model.get('allSelected')) {
+      selectedItems = $('.selectable');
+    } else {
+      selectedItems = $(this.model.attributes.selectedItems);
+    }
+    selectedItems.each(function(_, selectedItem){
+      totalAmount += $(selectedItem).data('price');
+    })
+
+    return totalAmount;
+  },
+});

data/app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js

@@ -0,0 +1,45 @@
+Spree.Views.Tables.SelectableTable.Summary = Backbone.View.extend({
+  events: {
+    'click input[name="select-all"]': 'onSelectedAll'
+  },
+
+  onSelectedAll: function(event) {
+    this.model.set('allSelected', event.currentTarget.checked);
+    if(event.currentTarget.checked == false) {
+      this.model.set('selectedItems', []);
+    }
+  },
+
+  initialize: function(options) {
+    this.listenTo(this.model, 'change', this.render)
+
+    this.colspan = options.columns - 1;
+
+    this.render();
+  },
+
+  render: function() {
+    var selectedItemLength = this.model.get('selectedItems').length;
+    var all_items_selected = this.model.get('allSelected');
+
+    var html = HandlebarsTemplates['tables/selectable_label']({
+      colspan: this.colspan,
+      item_selected_label: this.selectedItemLabel(all_items_selected, selectedItemLength),
+      all_items_selected: all_items_selected
+    });
+
+    this.$el.html(html);
+  },
+
+  selectedItemLabel: function(all_selected, selected_item_length) {
+    if(all_selected) {
+      return Spree.t('items_selected.all');
+    } else if(selected_item_length == 0) {
+      return Spree.t('items_selected.none');
+    } else if(selected_item_length == 1) {
+      return Spree.t('items_selected.one');
+    } else {
+      return selected_item_length + " " + Spree.t('items_selected.custom');
+    }
+  }
+});

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

@@ -64,10 +64,6 @@ $padding-y-navbar-submenu: 9px;
 
   .brand-link {
     overflow: hidden;
-
-    img {
-      max-width: 125px;
-    }
   }
 
   .admin-nav-menu {
@@ -355,8 +351,11 @@ nav.menu {
 
 .brand-link {
   display: block;
+  height: $main-header-height - 1px;
+  overflow: hidden;
 
   img {
-    max-width: 125px;
+    max-height: 100%;
+    max-width: 100%;
   }
 }

data/app/assets/stylesheets/spree/backend/sections/_orders.scss

@@ -65,7 +65,11 @@
 }
 
 label[for="order_bill_address_attributes_firstname"] {
-  margin-top: 45px;
+  margin-top: 53.5px;
+}
+
+label[for="order_bill_address_attributes_name"] {
+  margin-top: 53.5px;
 }
 
 #risk_analysis legend {