solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -3,7 +3,8 @@
 var ShipmentAddVariantView = Backbone.View.extend({
   events: {
     "change #add_variant_id": "onSelect",
-    "click .add_variant": "onAdd"
+    "click .add_variant": "onAdd",
+    "submit form": "onAdd"
   },
   onSelect: function(e) {
     var variant_id = this.$("#add_variant_id").val();
@@ -29,7 +30,7 @@ var ShipmentAddVariantView = Backbone.View.extend({
   }
 });
 
-$(function(){
+Spree.ready(function(){
   $(".js-shipment-add-variant").each(function(){
     new ShipmentAddVariantView({el: this});
   });
@@ -57,18 +58,6 @@ var ShipShipmentView = Backbone.View.extend({
   }
 });
 
-updateShipment = function(shipment_number, attributes) {
-  var url = Spree.routes.shipments_api + '/' + shipment_number;
-
-  return Spree.ajax({
-    type: 'PUT',
-    url: url,
-    data: {
-      shipment: attributes
-    }
-  });
-};
-
 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});
@@ -144,6 +133,7 @@ var ShipmentSplitItemView = Backbone.View.extend({
   events: {
     "click .cancel-split": "cancelItemSplit",
     "click .save-split": "completeItemSplit",
+    "submit form": "completeItemSplit",
   },
 
   cancelItemSplit: function(e){
@@ -213,7 +203,7 @@ var ShipmentSplitItemView = Backbone.View.extend({
 
     this.$('[name="item_stock_location"]').select2({
       width: 'resolve',
-      placeholder: Spree.translations.item_stock_placeholder,
+      placeholder: Spree.t('choose_location'),
       minimumResultsForSearch: 8
     });
   }
@@ -269,9 +259,10 @@ var ShipmentItemView = Backbone.View.extend({
 
 var ShipmentEditView = Backbone.View.extend({
   initialize: function(){
-    var tbody = this.$("tbody[data-order-number][data-shipment-number]");
-    this.shipment_number = tbody.data("shipment-number");
-    this.order_number = tbody.data("order-number");
+    this.shipment_number = this.model.get('number')
+    this.order_number = this.model.collection.parent.get('number')
+
+    var shipment = this.model;
 
     var shipmentView = this;
     this.$("form.admin-ship-shipment").each(function(el){
@@ -287,59 +278,35 @@ var ShipmentEditView = Backbone.View.extend({
         order_number: shipmentView.order_number
       });
     });
-  },
-
-  events: {
-    "click button.edit-method": "toggleMethodEdit",
-    "click button.cancel-method": "toggleMethodEdit",
-    "click button.save-method": "saveMethod",
-
-    "click button.edit-tracking": "toggleTrackingEdit",
-    "click button.cancel-tracking": "toggleTrackingEdit",
-    "click button.save-tracking": "saveTracking",
-  },
-
-  toggleMethodEdit: function(e){
-    e.preventDefault();
-    this.$('tr.edit-method').toggle();
-    this.$('tr.show-method').toggle();
-  },
-
-  saveMethod: function(e) {
-    e.preventDefault();
-    var selected_shipping_rate_id = this.$("select#selected_shipping_rate_id").val();
-    updateShipment(this.shipment_number, {
-      selected_shipping_rate_id: selected_shipping_rate_id
-    }).done(function () {
-      window.location.reload();
+    this.$(".edit-shipping-method").each(function(el){
+      new Spree.Views.Order.ShippingMethod({
+        el: this,
+        model: shipment,
+        shipment_number: shipmentView.shipment_number
+      });
     });
-  },
-
-  toggleTrackingEdit: function(e) {
-    e.preventDefault();
-    this.$("tr.edit-tracking").toggle();
-    this.$("tr.show-tracking").toggle();
-  },
-
-  saveTracking: function(e) {
-    e.preventDefault();
-    var tracking = this.$('[name="tracking"]').val();
-    var _this = this;
-    updateShipment(this.shipment_number, {
-      tracking: tracking
-    }).done(function (data) {
-      _this.$('tr.edit-tracking').toggle();
-
-      var show = _this.$('tr.show-tracking');
-      show.toggle()
-        .find('.tracking-value')
-        .text(data.tracking);
+    this.$(".edit-tracking").each(function(el){
+      new Spree.Views.Order.ShipmentTracking({
+        el: this,
+        model: shipment
+      });
     });
   }
 });
 
-$(function(){
-  $(".js-shipment-edit").each(function(){
-    new ShipmentEditView({ el: this });
-  });
+Spree.ready(function(){
+  if($('.js-shipment-edit [data-order-number]').length) {
+    $('.js-shipment-edit').hide();
+    var orderNumber = $('.js-shipment-edit [data-order-number]').data('orderNumber');
+    var order = Spree.Models.Order.fetch(orderNumber, {
+      success: function(order){
+        $('.js-shipment-edit').show();
+        $(".js-shipment-edit").each(function(){
+          var shipmentNumber = $('[data-shipment-number]', this).data('shipmentNumber')
+          var shipment = order.get("shipments").find({number: shipmentNumber})
+          new ShipmentEditView({ el: this, model: shipment });
+        });
+      }
+    });
+  }
 });

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

@@ -0,0 +1,23 @@
+//= require 'spree/backend/views/state_select'
+
+Spree.ready(function() {
+  "use strict";
+
+  _.each(document.querySelectorAll('.js-stock-locations-form'), function(el) {
+    var countrySelect = el.querySelector('.js-country_id');
+    var model = new Backbone.Model({
+      country_id: countrySelect.value
+    });
+
+    countrySelect.addEventListener('change', function() {
+      model.set({
+        country_id: countrySelect.value
+      });
+    });
+
+    new Spree.Views.StateSelect({
+      el: el,
+      model: model
+    });
+  });
+});

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

@@ -0,0 +1,22 @@
+Spree.ready(function() {
+  $('.js-edit-stock-item').each(function() {
+    var $el = $(this);
+    var model = new Spree.Models.StockItem($el.data('stock-item'));
+    new Spree.Views.Stock.EditStockItemRow({
+      el: $el,
+      stockLocationName: $el.data('stock-location-name'),
+      model: model
+    });
+  });
+
+  $('.js-add-stock-item').each(function() {
+    var $el = $(this)
+    var model = new Spree.Models.StockItem({
+      variant_id: $el.data('variant-id')
+    });
+    new Spree.Views.Stock.AddStockItem({
+      el: $el,
+      model: model
+    });
+  });
+});

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

@@ -0,0 +1,25 @@
+Spree.ready(function() {
+  $('.store-credit-memo-row').each(function() {
+    var row = this;
+    var field = row.querySelector('[name="store_credit[memo]"]')
+    var textDisplay = row.querySelector('.store-credit-memo-text')
+
+    $(row).on('ajax:success', function(event, data) {
+      row.classList.remove('editing');
+      field.defaultValue = field.value;
+      textDisplay.textContent = field.value;
+
+      show_flash('success', data.message);
+    }).on('ajax:error', function(event, xhr, status, error) {
+      show_flash('error', xhr.responseJSON.message);
+    });
+
+    row.querySelector('.edit-memo').addEventListener('click', function() {
+      row.classList.add('editing');
+    });
+
+    row.querySelector('.cancel-memo').addEventListener('click', function() {
+      row.classList.remove('editing');
+    });
+  });
+});

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

@@ -0,0 +1,3 @@
+Spree.ready(function() {
+  $(".style-guide-nav, .style-guide-sidebar").stick_in_parent();
+});

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

@@ -52,6 +52,6 @@ $.fn.taxonAutocomplete = function () {
     });
 };
 
-$(document).ready(function () {
+Spree.ready(function () {
   $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
 });

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

@@ -0,0 +1,121 @@
+//= require 'solidus_admin/Sortable'
+
+Handlebars.registerHelper('isRootTaxon', function() {
+  return this.parent_id == null;
+});
+
+var TaxonTreeView = Backbone.View.extend({
+  create_taxon: function(attributes) {
+    Spree.ajax({
+      type: "POST",
+      dataType: "json",
+      url: this.model.url() + "/taxons",
+      data: {
+        taxon: attributes
+      },
+      complete: this.redraw_tree
+    });
+  },
+
+  update_taxon: function(id, attributes) {
+    Spree.ajax({
+      type: "PUT",
+      dataType: "json",
+      url: this.model.url() + "/taxons/" + id,
+      data: {
+        taxon: attributes
+      },
+      error: this.redraw_tree
+    });
+  },
+
+  delete_taxon: function(id) {
+    Spree.ajax({
+      type: "DELETE",
+      dataType: "json",
+      url: this.model.url() + "/taxons/" + id,
+      error: this.redraw_tree
+    });
+  },
+
+  render: function() {
+    var taxons_template = HandlebarsTemplates["taxons/tree"];
+    this.$el.html(taxons_template({
+      taxons: [this.model.get("root")]
+    }));
+
+    var sortableOptions = {
+      group: {
+        name: this.cid,
+        pull: true,
+        put: true
+      },
+      forceFallback: true,
+      onEnd: this.handle_move.bind(this)
+    };
+
+    var lists = this.$('ul');
+    for(var i = 0; i < lists.length; i++) {
+      new Sortable(lists[i], sortableOptions);
+    }
+  },
+
+  redraw_tree: function() {
+    this.model.fetch({
+      url: this.model.url() + '?set=nested'
+    });
+  },
+
+  handle_move: function(e) {
+    var el = $(e.item);
+    this.update_taxon(el.data('taxon-id'), {
+      parent_id: el.parent().closest('li').data('taxon-id'),
+      child_index: el.index()
+    });
+  },
+
+  handle_delete: function(e) {
+    var el;
+    el = $(e.target).closest('li');
+    if (confirm(Spree.translations.are_you_sure_delete)) {
+      this.delete_taxon(el.data('taxon-id'));
+      el.remove();
+    }
+  },
+
+  handle_add_child: function(e) {
+    var el = $(e.target).closest('li');
+    var parent_id = el.data('taxon-id');
+    this.create_taxon({name: 'New node', parent_id: parent_id, child_index: 0});
+  },
+
+  handle_create: function(e) {
+    e.preventDefault();
+    var parent_id = this.model.get("root").id;
+    this.create_taxon({name: 'New node', parent_id: parent_id, child_index: 0});
+  },
+
+  events: {
+    'click .js-taxon-delete': 'handle_delete',
+    'click .js-taxon-add-child': 'handle_add_child'
+  },
+
+  initialize: function() {
+    _.bindAll(this, 'redraw_tree', 'handle_create');
+    $('.add-taxon-button').on('click', this.handle_create);
+    this.listenTo(this.model, 'sync', this.render);
+    this.redraw_tree();
+  }
+});
+
+Spree.ready(function() {
+  if ($('#taxonomy_tree').length) {
+    var model = new Spree.Models.Taxonomy({
+      id: $('#taxonomy_tree').data("taxonomy-id")
+    });
+    new TaxonTreeView({
+      el: $('#taxonomy_tree'),
+      model: model
+    });
+  }
+});

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

@@ -0,0 +1,75 @@
+//= require solidus_admin/Sortable
+
+Spree.ready(function() {
+  var productTemplate = HandlebarsTemplates['products/sortable'];
+  var productListTemplate = function(products) {
+    return _.map(products, productTemplate).join('') || "<h4>" + Spree.translations.no_results + "</h4>";
+  };
+
+  var saveSort = function(e) {
+    var item = e.item;
+    Spree.ajax({
+      url: Spree.routes.classifications_api,
+      method: 'PUT',
+      data: {
+        product_id: item.getAttribute('data-product-id'),
+        taxon_id: $('#taxon_id').val(),
+        position: e.newIndex
+      }
+    });
+  };
+
+  var formatTaxon = function(taxon) {
+    return Select2.util.escapeMarkup(taxon.pretty_name);
+  };
+
+  $('#taxon_id').select2({
+    dropdownCssClass: "taxon_select_box",
+    placeholder: Spree.translations.find_a_taxon,
+    ajax: {
+      url: Spree.routes.taxons_search,
+      params: {
+        "headers": {
+          "X-Spree-Token": Spree.api_key
+        }
+      },
+      data: function(term, page) {
+        return {
+          per_page: 50,
+          page: page,
+          q: {
+            name_cont: term
+          }
+        };
+      },
+      results: function(data) {
+        return {
+          results: data['taxons'],
+          more: data.current_page < data.pages
+        };
+      }
+    },
+    formatResult: formatTaxon,
+    formatSelection: formatTaxon
+  });
+
+  $('#taxon_id').on("change", function(e) {
+    Spree.ajax({
+      url: Spree.routes.taxon_products_api,
+      data: {
+        id: e.val,
+        simple: 1
+      },
+      success: function(data) {
+        $('#taxon_products').html(productListTemplate(data.products));
+
+        var el = document.querySelector('#taxon_products')
+
+        new Sortable(el, {
+          draggable: ".sort_item",
+          onEnd: saveSort
+        });
+      }
+    });
+  });
+});

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

@@ -2,14 +2,14 @@
 //= require spree/backend/templates/orders/customer_details/autocomplete
 //= require spree/backend/templates/orders/details_adjustment_row
 //= require spree/backend/templates/orders/line_item
+//= require spree/backend/templates/orders/shipment_tracking
+//= require spree/backend/templates/orders/shipping_method
 //= require spree/backend/templates/products/sortable
 //= require spree/backend/templates/products/upload_progress
 //= require spree/backend/templates/promotions/calculators/fields/tiered_flat_rate
 //= require spree/backend/templates/promotions/calculators/fields/tiered_percent
 //= require spree/backend/templates/promotions/rules/option_values
-//= require spree/backend/templates/promotions/rules/option_values_select
 //= require spree/backend/templates/stock_items/stock_location_stock_item
-//= require spree/backend/templates/stock_transfers/transfer_item
 //= require spree/backend/templates/taxons/_tree
 //= require spree/backend/templates/taxons/tree
 //= require spree/backend/templates/variants/autocomplete