solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -0,0 +1,57 @@
+Spree.Views.Order.ShippingMethod = Backbone.View.extend({
+  tagName: 'tr',
+  className: 'edit-shipping-method',
+
+  events: {
+    "click .js-edit":   "onEdit",
+    "click .js-save":   "onSave",
+    "submit form":      "onSave",
+    "click .js-cancel": "onCancel"
+  },
+
+  initialize: function(options) {
+    this.shippingMethodId = this.model.get('selected_shipping_rate').get('shipping_method_id');
+    this.shippingRates = new Backbone.Collection();
+    this.render();
+  },
+
+  onEdit: function(event) {
+    this.editing = true;
+    this.shippingRates = this.model.estimatedRates();
+    this.listenTo(this.shippingRates, "sync", this.render);
+    this.render();
+  },
+
+  onSave: function(event) {
+    this.editing = false;
+    this.shippingMethodId = this.$('select').val();
+    this.shippingRates = new Backbone.Collection();
+    this.model.selectShippingMethodId(this.shippingMethodId, {
+      success: function() {
+        window.location.reload();
+      }
+    });
+    this.render();
+
+    return false;
+  },
+
+  onCancel: function(event) {
+    this.editing = false;
+    this.shippingRates = new Backbone.Collection();
+    this.render();
+  },
+
+  render: function() {
+    var html = HandlebarsTemplates['orders/shipping_method']({
+      editing: this.editing,
+      order: this.model.collection.parent.toJSON(),
+      shipment: this.model.toJSON(),
+      selected_shipping_rate: this.model.get("selected_shipping_rate").toJSON(),
+      shipping_rates: this.shippingRates.toJSON()
+    });
+
+    this.$el.html(html);
+    this.$('select').val(this.shippingMethodId);
+  }
+})

data/app/assets/javascripts/spree/backend/views/payment/payment_row.js

@@ -0,0 +1,36 @@
+Spree.Views.Payment.PaymentRow = Backbone.View.extend({
+  events: {
+    "click .js-edit": "onEdit",
+    "click .js-save": "onSave",
+    "submit form": "onSave",
+    "click .js-cancel": "onCancel"
+  },
+
+  onEdit: function(e) {
+    e.preventDefault();
+    this.$el.addClass("editing");
+  },
+
+  onCancel: function(e) {
+    e.preventDefault();
+    this.$el.removeClass("editing");
+  },
+
+  onSave: function(e) {
+    var view = this;
+    var amount = this.$(".js-edit-amount").val();
+    var options = {
+      success: function(model, response, options) {
+        view.$(".js-display-amount").text(model.attributes.display_amount);
+        view.$el.removeClass("editing");
+      },
+      error: function(model, response, options) {
+        show_flash('error', response.responseJSON.error);
+      }
+    };
+    e.preventDefault();
+    this.model.save({
+      amount: amount
+    }, options);
+  }
+});

data/app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js

@@ -0,0 +1,79 @@
+Spree.Views.Promotions.OptionValuesRuleRow = Backbone.View.extend({
+  optionValueTemplate: HandlebarsTemplates['promotions/rules/option_values'],
+
+  events: {
+    'click .js-remove-promo-rule-option-value': 'onRemove',
+    'change .js-promo-rule-option-value-product-select': 'onSelectProduct'
+  },
+
+  initialize: function(options) {
+    this.productId = options.productId;
+    this.values = options.values;
+    this.paramPrefix = options.paramPrefix;
+  },
+
+  render: function() {
+    this.$el.html(
+      this.optionValueTemplate({
+        productSelect: { value: this.productId },
+        optionValuesSelect: { value: this.values },
+        paramPrefix: this.paramPrefix
+      })
+    );
+
+    this.$('.js-promo-rule-option-value-product-select').productAutocomplete({multiple: false});
+
+    // Note: This doesn't work. This always selects the first product select on the page.
+    // optionValueAutocomplete also doesn't work, so this cancels out.
+    this.$('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({productSelect: '.js-promo-rule-option-value-product-select'})
+
+    if(this.productId == null) {
+      this.$('.js-promo-rule-option-value-option-values-select').prop('disabled', true);
+    }
+  },
+
+  onSelectProduct: function(e) {
+    this.productId = this.$('input.js-promo-rule-option-value-product-select').val();
+    this.render();
+  },
+
+  onRemove: function(e) {
+    this.remove();
+  },
+});
+
+Spree.Views.Promotions.OptionValuesRule = Backbone.View.extend({
+  initialize: function() {
+    _.bindAll(this, 'addOptionValue')
+    this.$optionValues = this.$('.js-promo-rule-option-values');
+    this.paramPrefix = this.$('.param-prefix').data('param-prefix');
+
+    var originalOptionValues = this.$optionValues.data('original-option-values')
+    if ($.isEmptyObject(originalOptionValues)) {
+      this.addOptionValue(null, null);
+    } else {
+      $.each(originalOptionValues, this.addOptionValue);
+    }
+  },
+
+  events: {
+    'click .js-add-promo-rule-option-value': 'onAdd'
+  },
+
+  addOptionValue: function(product, values) {
+    var row = new Spree.Views.Promotions.OptionValuesRuleRow({
+      productId: product,
+      values: values,
+      paramPrefix: this.paramPrefix
+    });
+
+    this.$optionValues.append(row.el);
+
+    row.render();
+  },
+
+  onAdd: function(e) {
+    e.preventDefault();
+    this.addOptionValue(null, null);
+  },
+});

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

@@ -34,16 +34,16 @@ Spree.Views.StateSelect = Backbone.View.extend({
     if (country_id) {
       this.states = Spree.Views.StateSelect.stateCache(country_id);
       this.listenTo(this.states, "sync", this.render);
-      this.render();
     }
+    this.render();
   },
 
   render: function() {
-    this.$state_select.empty().hide();
-    this.$state_input.hide();
+    this.$state_select.empty().hide().prop('disabled', true);
+    this.$state_input.hide().prop('disabled', true);
 
-    if (!this.states.fetched) {
-      this.$state_select.show().prop("disabled", true);
+    if (!this.model.get('country_id') || !this.states.fetched) {
+      this.$state_select.show();
     } else if (this.states.length) {
       var $state_select = this.$state_select;
       this.states.each(function(state) {
@@ -54,7 +54,7 @@ Spree.Views.StateSelect = Backbone.View.extend({
       this.$state_select.val(this.model.get("state_id"))
       this.$state_select.show().prop("disabled", false);
     } else {
-      this.$state_input.prop('disabled', false).show();
+      this.$state_input.show().prop('disabled', false);
     }
   }
 })

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

@@ -0,0 +1,63 @@
+Spree.Views.Stock.AddStockItem = Backbone.View.extend({
+  initialize: function() {
+    this.$countInput = this.$("[name='count_on_hand']");
+    this.$locationSelect = this.$("[name='stock_location_id']");
+    this.$backorderable = this.$("[name='backorderable']");
+  },
+
+  events: {
+    "click .submit": "onSubmit"
+  },
+
+  validate: function() {
+    var locationSelectContainer = this.$locationSelect.siblings('.select2-container');
+    locationSelectContainer.toggleClass('error', !this.$locationSelect.val());
+    this.$countInput.toggleClass('error', !this.$countInput.val());
+    return locationSelectContainer.hasClass('error') || this.$countInput.hasClass('error');
+  },
+
+  onSuccess: function() {
+    var selectedStockLocationOption = this.$locationSelect.find('option:selected');
+    var stockLocationName = selectedStockLocationOption.text().trim();
+    selectedStockLocationOption.remove();
+    var editView = new Spree.Views.Stock.EditStockItemRow({
+      model: this.model,
+      stockLocationName: stockLocationName
+    });
+    editView.$el.insertBefore(this.$el);
+    this.model = new Spree.Models.StockItem({
+      variant_id: this.model.get('variant_id'),
+      stock_location_id: this.model.get('stock_location_id')
+    });
+    if (this.$locationSelect.find('option').length === 1) { // blank value
+      this.remove();
+    } else {
+      this.$locationSelect.select2();
+      this.$countInput.val("");
+      this.$backorderable.prop("checked", false);
+    }
+
+    show_flash("success", Spree.translations.created_successfully);
+  },
+
+  onError: function(model, response, options) {
+    show_flash("error", response.responseText);
+  },
+
+  onSubmit: function(ev) {
+    ev.preventDefault();
+    if (this.validate()) {
+      return;
+    }
+    this.model.set({
+      backorderable: this.$backorderable.prop("checked"),
+      count_on_hand: this.$countInput.val(),
+      stock_location_id: this.$locationSelect.val()
+    });
+    var options = {
+      success: this.onSuccess.bind(this),
+      error: this.onError.bind(this)
+    };
+    this.model.save(null, options);
+  }
+});

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

@@ -0,0 +1,68 @@
+Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
+  tagName: 'tr',
+
+  initialize: function(options) {
+    this.stockLocationName = options.stockLocationName;
+    this.editing = false;
+    this.render();
+  },
+
+  events: {
+    "click .edit": "onEdit",
+    "click .submit": "onSubmit",
+    "submit form": "onSubmit",
+    "click .cancel": "onCancel"
+  },
+
+  template: HandlebarsTemplates['stock_items/stock_location_stock_item'],
+
+  render: function() {
+    var renderAttr = {
+      stockLocationName: this.stockLocationName,
+      editing: this.editing
+    };
+    _.extend(renderAttr, this.model.attributes);
+    this.$el.attr("data-variant-id", this.model.get('variant_id'));
+    this.$el.html(this.template(renderAttr));
+    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.render();
+  },
+
+  onSuccess: function() {
+    this.editing = false;
+    this.render();
+    show_flash("success", Spree.translations.updated_successfully);
+  },
+
+  onError: function(model, response, options) {
+    show_flash("error", response.responseText);
+  },
+
+  onSubmit: function(ev) {
+    ev.preventDefault();
+    var backorderable = this.$('[name=backorderable]').prop("checked");
+    var countOnHand = parseInt(this.$("input[name='count_on_hand']").val(), 10);
+
+    this.model.set({
+      count_on_hand: countOnHand,
+      backorderable: backorderable
+    });
+    var options = {
+      success: this.onSuccess.bind(this),
+      error: this.onError.bind(this)
+    };
+    this.model.save({ force: true }, options);
+  }
+});

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

@@ -0,0 +1,15 @@
+Spree.Views.Tables.EditableTable = {
+  add: function($el) {
+    return new Spree.Views.Tables.EditableTableRow({
+      el: $el
+    });
+  },
+
+  append: function(html) {
+    var $row = $(html);
+    $('#images-table').removeClass('hidden').find('tbody').append($row);
+    $row.find('.select2').select2();
+    $('.no-objects-found').hide();
+    return this.add($row);
+  }
+};

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

@@ -0,0 +1,61 @@
+Spree.Views.Tables.EditableTableRow = Backbone.View.extend({
+  events: {
+    "select2-open": "onEdit",
+    "focus input": "onEdit",
+    "click [data-action=save]": "onSave",
+    "click [data-action=cancel]": "onCancel",
+    'keyup input': 'onKeypress'
+  },
+
+  onEdit: function(e) {
+    if (this.$el.hasClass('editing')) {
+      return;
+    }
+    this.$el.addClass('editing');
+    this.$el.find('input, select').each(function() {
+      var $input = $(this);
+      $input.data('original-value', $input.val());
+    });
+  },
+
+  onCancel: function(e) {
+    e.preventDefault();
+    this.$el.removeClass("editing");
+    this.$el.find('input, select').each(function() {
+      var $input = $(this);
+      var originalValue = $input.data('original-value');
+      $input.val(originalValue).change();
+    });
+  },
+
+  onSave: function(e) {
+    e.preventDefault();
+    var view = this;
+    Spree.ajax(this.$el.find('.actions [data-action=save]').attr('href'), {
+      data: this.$el.find('select, input').serialize(),
+      dataType: 'json',
+      method: 'put',
+      success: function(response) {
+        view.$el.removeClass("editing");
+      },
+      error: function(response) {
+        show_flash('error', response.responseJSON.error);
+      }
+    });
+  },
+
+  ENTER_KEY: 13,
+  ESC_KEY: 27,
+
+  onKeypress: function(e) {
+    var key = e.keyCode || e.which;
+    switch (key) {
+      case this.ENTER_KEY:
+        this.onSave(e);
+        break;
+      case this.ESC_KEY:
+        this.onCancel(e);
+        break;
+    }
+  }
+});

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

@@ -1,4 +1,4 @@
-$(function(){
+Spree.ready(function(){
   if($('.js-zones-form').length) {
     var view = new Spree.Views.Zones.Form({
       el: $('.js-zones-form')

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

@@ -3,9 +3,8 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
 
- *= require jquery-ui/datepicker
- *= require jquery-ui/autocomplete
  *= require solidus_admin/select2
+ *= require solidus_admin/flatpickr/flatpickr
  *= require prism
 
  *= require spree/backend/spree_admin

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

@@ -26,7 +26,10 @@
 }
 
 .flash-wrapper {
-  @include position(fixed, null 0 0 $width-sidebar);
+  position: fixed;
+  bottom: 0;
+  left: $width-sidebar;
+  right: 0;
   z-index: 1000;
 }