solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -13,6 +13,7 @@ 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')
 
 Spree.routes.line_items_api = function(order_id) {
   return Spree.pathFor('api/orders/' + order_id + '/line_items')

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

@@ -0,0 +1,314 @@
+// Shipments AJAX API
+
+var ShipmentAddVariantView = Backbone.View.extend({
+  events: {
+    "change #add_variant_id": "onSelect",
+    "click .add_variant": "onAdd"
+  },
+  onSelect: function(e) {
+    var variant_id = this.$("#add_variant_id").val();
+    var template = HandlebarsTemplates["variants/autocomplete_stock"];
+    var $stock_details = this.$('#stock_details');
+    Spree.ajax({
+      url: Spree.routes.variants_api + "/" + variant_id,
+      success: function(variant){
+        $stock_details.html(template({variant: variant})).show()
+      }
+    });
+  },
+  onAdd: function(e){
+    e.preventDefault();
+
+    this.$('#stock_details').hide();
+
+    var variant_id = this.$('input.variant_autocomplete').val();
+    var stock_location_id = $(e.target).data('stock-location-id');
+    var quantity = this.$("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
+
+    addVariantFromStockLocation(stock_location_id, variant_id, quantity)
+  }
+});
+
+$(function(){
+  $(".js-shipment-add-variant").each(function(){
+    new ShipmentAddVariantView({el: this});
+  });
+});
+
+var ShipShipmentView = Backbone.View.extend({
+  initialize: function(options){
+    this.shipment_number = options.shipment_number;
+  },
+  events: {
+    "submit": "onSubmit"
+  },
+  onSubmit: function(e){
+    Spree.ajax({
+      type: "PUT",
+      url: Spree.routes.shipments_api + "/" + this.shipment_number + "/ship",
+      data: {
+        send_mailer: this.$("[name='send_mailer']").val()
+      },
+      success: function(){
+        window.location.reload()
+      }
+    });
+    return false;
+  }
+});
+
+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});
+
+  var url = Spree.routes.shipments_api + "/" + shipment_number;
+
+  var new_quantity = 0;
+  if(inventory_units.length<quantity){
+    url += "/add";
+    new_quantity = (quantity - inventory_units.length);
+  }else if(inventory_units.length>quantity){
+    url += "/remove";
+    new_quantity = (inventory_units.length - quantity);
+  }
+
+  if(new_quantity!=0){
+    Spree.ajax({
+      type: "PUT",
+      url: url,
+      data: {
+        variant_id: variant_id,
+        quantity: new_quantity,
+      },
+      success: function() {
+        window.location.reload();
+      },
+      error: function(response) {
+        window.show_flash('error', response.responseJSON.message);
+      }
+    });
+  }
+};
+
+startItemSplit = function(event){
+  event.preventDefault();
+  var link = $(this);
+  link.parent().find('a.split-item').toggle();
+  link.parent().find('a.delete-item').toggle();
+  var variant_id = link.data('variant-id');
+
+  Spree.ajax({
+    type: "GET",
+    url: Spree.routes.variants_api + "/" + variant_id,
+  }).success(function(variant){
+    var max_quantity = link.closest('tr').data('item-quantity');
+    var split_item_template = HandlebarsTemplates['variants/split'];
+    link.closest('tr').after(split_item_template({ variant: variant, shipments: shipments, max_quantity: max_quantity }));
+
+    $('#item_stock_location').select2({
+      width: 'resolve',
+      placeholder: Spree.translations.item_stock_placeholder,
+      minimumResultsForSearch: 8
+    });
+  });
+};
+
+completeItemSplit = function(event) {
+  event.preventDefault();
+
+  if($('#item_stock_location').val() === ""){
+    alert('Please select the split destination.');
+    return false;
+  }
+
+  var link = $(this);
+  var stock_item_row = link.closest('tr');
+  var variant_id = stock_item_row.data('variant-id');
+  var quantity = stock_item_row.find('#item_quantity').val();
+
+  var stock_location_id = stock_item_row.find('#item_stock_location').val();
+  var original_shipment_number = link.closest('tbody').data('shipment-number');
+
+  var selected_shipment = stock_item_row.find($('#item_stock_location').select2('data').element);
+  var target_shipment_number = selected_shipment.data('shipment-number');
+  var new_shipment = selected_shipment.data('new-shipment');
+
+  if (stock_location_id != 'new_shipment') {
+    if (new_shipment != undefined) {
+      // TRANSFER TO A NEW LOCATION
+      Spree.ajax({
+        type: "POST",
+        url: Spree.routes.shipments_api + "/transfer_to_location",
+        data: {
+          original_shipment_number: original_shipment_number,
+          variant_id: variant_id,
+          quantity: quantity,
+          stock_location_id: stock_location_id
+        }
+      }).error(function(msg) {
+        alert(msg.responseJSON['message']);
+      }).done(function() {
+        window.Spree.advanceOrder();
+      });
+    } else {
+      // TRANSFER TO AN EXISTING SHIPMENT
+      Spree.ajax({
+        type: "POST",
+        url: Spree.routes.shipments_api + "/transfer_to_shipment",
+        data: {
+          original_shipment_number: original_shipment_number,
+          target_shipment_number: target_shipment_number,
+          variant_id: variant_id,
+          quantity: quantity
+        }
+      }).error(function(msg) {
+        alert(msg.responseJSON['message']);
+      }).done(function() {
+        window.Spree.advanceOrder();
+      });
+    }
+  }
+};
+
+addVariantFromStockLocation = function(stock_location_id, variant_id, quantity) {
+  var shipment = _.find(shipments, function(shipment){
+    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
+  });
+
+  if(shipment==undefined){
+    Spree.ajax({
+      type: "POST",
+      url: Spree.routes.shipments_api,
+      data: {
+        shipment: {
+          order_id: order_number
+        },
+        variant_id: variant_id,
+        quantity: quantity,
+        stock_location_id: stock_location_id,
+      }
+    }).done(function(){
+      window.location.reload();
+    });
+  }else{
+    //add to existing shipment
+    adjustShipmentItems(shipment.number, variant_id, quantity);
+  }
+};
+
+var ShipmentEditView = Backbone.View.extend({
+  initialize: function(){
+    var tbody = this.$("tbody[data-order-number][data-shipment-number]");
+    var shipment_number = tbody.data("shipment-number");
+    this.shipment_number = shipment_number;
+    this.order_number = tbody.data("order-number");
+
+    this.$("form.admin-ship-shipment").each(function(){
+      new ShipShipmentView({
+        el: this,
+        shipment_number: shipment_number
+      });
+    });
+  },
+
+  events: {
+    "click a.delete-item": "deleteItem",
+
+    "click a.split-item": "startItemSplit",
+    "click a.cancel-split": "cancelItemSplit",
+    "click a.save-split": "completeItemSplit",
+
+    "click a.edit-method": "toggleMethodEdit",
+    "click a.cancel-method": "toggleMethodEdit",
+    "click a.save-method": "saveMethod",
+
+    "click a.edit-tracking": "toggleTrackingEdit",
+    "click a.cancel-tracking": "toggleTrackingEdit",
+    "click a.save-tracking": "saveTracking",
+  },
+
+  deleteItem: function(e){
+    e.preventDefault();
+    if (confirm(Spree.translations.are_you_sure_delete)) {
+      var del = $(e.currentTarget);
+      var variant_id = del.data('variant-id');
+
+      adjustShipmentItems(this.shipment_number, variant_id, 0);
+    }
+  },
+
+  startItemSplit: function(e){
+    e.preventDefault();
+    startItemSplit.apply(e.currentTarget, [e]);
+  },
+
+  cancelItemSplit: function(e){
+    e.preventDefault();
+
+    this.$('tr.stock-item-split').remove();
+    this.$('a.split-item').show();
+    this.$('a.delete-item').show();
+  },
+
+  completeItemSplit: function(e){
+    completeItemSplit.apply(e.currentTarget, [e]);
+  },
+
+  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();
+    });
+  },
+
+  toggleTrackingEdit: function(e) {
+    e.preventDefault();
+    this.$("tr.edit-tracking").toggle();
+    this.$("tr.show-tracking").toggle();
+  },
+
+  saveTracking: function(e) {
+    e.preventDefault();
+    var tracking = this.$('input#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')
+          .html($("<strong>")
+          .html(Spree.translations.tracking + ": "))
+          .append(document.createTextNode(data.tracking));
+    });
+  }
+});
+
+$(function(){
+  $(".js-shipment-edit").each(function(){
+    new ShipmentEditView({ el: this });
+  });
+});

data/app/assets/javascripts/spree/backend/{spree-select2.js.erb → spree-select2.js}

@@ -3,21 +3,12 @@ jQuery(function($) {
   // Make select beautiful
   $('select.select2').select2({
     allowClear: true,
-    dropdownAutoWidth: true
+    dropdownAutoWidth: true,
+    minimumResultsForSearch: 8
   });
 
   function format_taxons(taxon) {
     new_taxon = taxon.text.replace('->', '<i class="fa fa-arrow-right">')
     return new_taxon;
   }
-
-  $("#product_taxon_ids").on({
-    change: function(e){
-      $('.select2-search-choice .with-tip').powerTip({
-        smartPlacement: true,
-        fadeInTime: 50,
-        fadeOutTime: 50
-      })
-    }
-  })
 })

data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee

@@ -1,82 +1,61 @@
-class IndexAddForms
-  @beginListening: ->
-    $('body').on 'click', '#listing_product_stock .fa-plus', (ev) =>
-      ev.preventDefault()
-      variantId = $(ev.currentTarget).data('variant-id')
-      countInput = $("#variant-count-on-hand-#{variantId}")
-      locationSelect = $("#variant-stock-location-#{variantId}")
-      locationSelectContainer = locationSelect.siblings('.select2-container')
-      resetErrors(locationSelectContainer, countInput)
-      validate(locationSelect, locationSelectContainer, countInput)
-      return if hasErrors(locationSelectContainer, countInput)
+Spree.AddStockItemView = Backbone.View.extend
+  initialize: ->
+    @$countInput = @$("[name='count_on_hand']")
+    @$locationSelect = @$("[name='stock_location_id']")
+    @$backorderable = @$("[name='backorderable']")
 
-      stockLocationId = locationSelect.val()
-      backorderable = $("#variant-backorderable-#{variantId}").prop("checked")
-      stockItem = new Spree.StockItem
-        variantId: variantId
-        backorderable: backorderable
-        countOnHand: countInput.val()
-        stockLocationId: stockLocationId
-      stockItem.save(successHandler, errorHandler)
+  events:
+    "click .submit": "onSubmit"
 
-  resetErrors = (locationSelectContainer, countInput) ->
-    countInput.removeClass('error')
-    locationSelectContainer.removeClass('error')
+  validate: ->
+    locationSelectContainer = @$locationSelect.siblings('.select2-container')
+    locationSelectContainer.toggleClass('error', !@$locationSelect.val())
+    @$countInput.toggleClass('error', !@$countInput.val())
 
-  validate = (locationSelect, locationSelectContainer, countInput) ->
-    if locationSelect.val() is ""
-      locationSelectContainer.addClass('error')
+    locationSelectContainer.hasClass('error') || @$countInput.hasClass('error')
 
-    if isNaN(parseInt(countInput.val(), 10))
-      countInput.addClass('error')
-
-  hasErrors = (locationSelectContainer, countInput) ->
-    locationSelectContainer.hasClass('error') or countInput.hasClass('error')
-
-  successHandler = (stockItem) =>
-    variantId = stockItem.variant_id
-    stockLocationId = stockItem.stock_location_id
-    stockLocationSelect = $("#variant-stock-location-#{variantId}")
-
-    selectedStockLocationOption = stockLocationSelect.find("option[value='#{stockLocationId}']")
+  onSuccess: ->
+    selectedStockLocationOption = @$locationSelect.find('option:selected')
     stockLocationName = selectedStockLocationOption.text().trim()
     selectedStockLocationOption.remove()
 
-    rowTemplate = HandlebarsTemplates['stock_items/stock_location_stock_item']
-    $("tr[data-variant-id='#{variantId}']:last").before(
-      rowTemplate
-        id: stockItem.id
-        variantId: variantId
-        stockLocationId: stockLocationId
-        stockLocationName: stockLocationName
-        countOnHand: stockItem.count_on_hand
-        backorderable: stockItem.backorderable
-    )
-    resetTableRowStyling(variantId)
-
-    if stockLocationSelect.find('option').length is 1 # blank value
-      stockLocationSelect.parents('tr:first').remove()
-    else
-      stockLocationSelect.select2()
-      $("#variant-count-on-hand-#{variantId}").val("")
-      $("#variant-backorderable-#{variantId}").prop("checked", false)
+    editView = new Spree.EditStockItemView
+      model: @model
+      stockLocationName: stockLocationName
+    editView.$el.insertBefore(@$el)
 
-    resetParentRowspan(variantId)
-    show_flash("success", Spree.translations.created_successfully)
+    @model = new Spree.StockItem
+      variant_id: @model.get('variant_id')
+      stock_location_id: @model.get('stock_location_id')
 
-  errorHandler = (errorData) =>
-    show_flash("error", errorData.responseText)
-
-  resetTableRowStyling = (variantId) ->
-    tableRows = $("tr[data-variant-id='#{variantId}']")
-    tableRows.removeClass('even odd')
-    for i in [0..tableRows.length]
-      rowClass = if (i + 1) % 2 is 0 then 'even' else 'odd'
-      tableRows.eq(i).addClass(rowClass)
-
-  resetParentRowspan = (variantId) ->
-    newRowspan = $("tr[data-variant-id='#{variantId}']").length + 1
-    $("#spree_variant_#{variantId} > td").attr('rowspan', newRowspan)
-
-Spree.StockManagement ?= {}
-Spree.StockManagement.IndexAddForms = IndexAddForms
+    if @$locationSelect.find('option').length is 1 # blank value
+      @remove()
+    else
+      @$locationSelect.select2()
+      @$countInput.val("")
+      @$backorderable.prop("checked", false)
+
+  onSubmit: (ev) ->
+    ev.preventDefault()
+    return if @validate()
+
+    @model.set
+      backorderable: @$backorderable.prop("checked")
+      count_on_hand: @$countInput.val()
+      stock_location_id: @$locationSelect.val()
+    options =
+      success: =>
+        @onSuccess()
+        show_flash("success", Spree.translations.created_successfully)
+      error: (model, response, options) =>
+        show_flash("error", response.responseText)
+    @model.save(null, options)
+
+$ ->
+  $('.js-add-stock-item').each ->
+    $el = $(this)
+    model = new Spree.StockItem
+      variant_id: $el.data('variant-id')
+    new Spree.AddStockItemView
+      el: $el
+      model: model