solidus_backend 1.3.2 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35a5646a9e54c8c3109d89eca00d3689f165469
-  data.tar.gz: d6d5cbe7b9ab1caa6c68ade18b346907304e7338
+  metadata.gz: c121c41301d41542d9b3fe3941b3acdd6a3e29d1
+  data.tar.gz: 8293cff794592075ee3638aa926873579d906541
 SHA512:
-  metadata.gz: cae53aa43344b986b9dd963a3d3ecc59cceab5ff47fbe7605983f12a82b0e609cb0e865adacfd5d431bbc02e9fe6dffc9bfcfaefca3da145865b2fb21d4bc0d3
-  data.tar.gz: 58e63502a176b46b582d8248a885c86ad527ea86d1a39974fc084df910e7b767b5289c78995f3b529e58790f9a37695678c344e778add6e6f8092a4ef41d5956
+  metadata.gz: 1f8ea23a0cf50a9688efacb4a0b653e88544cb53b0eae2779267e0044ede4cf7c4888b13205f762f4d27f25c357bae56c2acad46daf0f5bf7c4c444dc95b748d
+  data.tar.gz: 04c77a3933e864fad64848f820b311ca8c0ce8014e417bac20735536835cb4ff98d5c9e1305dcceb459d1acacf9e5e26eb89fcbb9f75f16bb763cb2d5e764636

data/README.md

@@ -0,0 +1,38 @@
+# solidus\_backend
+
+Backend contains the controllers, views, and assets making up the admin interface of solidus.
+
+## Assets
+
+### Javascript
+
+Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/)
+
+Out scripts are written in a mix of coffeescript and javascript. We can't
+easily use a transpiler for ECMAScript >= 6 without adding additional steps for
+applications using solidus\_admin.
+
+As a result, we accept contributions in either plain-ol javascript or
+CoffeeScript, and discourage converting existing files.
+
+### 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/).
+
+When running the application there is a styleguide available at:
+
+```
+/admin/style_guide
+```
+
+## Testing
+
+Create the test site
+
+    bundle exec rake test_app
+
+Run the tests
+
+    bundle exec rake spec

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

@@ -1,4 +1,6 @@
 $(function(){
+  $('body').popover({selector: '.hint-tooltip', html: true, trigger: 'hover', placement: 'top'});
+
   $('body').tooltip({selector: '.with-tip'});
 
   /*

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

@@ -28,9 +28,9 @@ $.fn.productAutocomplete = function (options) {
         return {
           q: {
             name_cont: term,
-            sku_cont: term
+            variants_including_master_sku_start: term,
+            m: 'or'
           },
-          m: 'OR',
           token: Spree.api_key,
           page: page
         };

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

@@ -1,6 +1,5 @@
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
 Spree.routes.classifications_api = Spree.pathFor('api/classifications')
-Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
 Spree.routes.option_value_search = Spree.pathFor('api/option_values')
 Spree.routes.option_type_search = Spree.pathFor('api/option_types')
 Spree.routes.orders_api = Spree.pathFor('api/orders')

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

@@ -102,86 +102,6 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
   }
 };
 
-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');
@@ -193,7 +113,7 @@ addVariantFromStockLocation = function(stock_location_id, variant_id, quantity)
       url: Spree.routes.shipments_api,
       data: {
         shipment: {
-          order_id: order_number
+          order_id: window.order_number
         },
         variant_id: variant_id,
         quantity: quantity,
@@ -208,62 +128,171 @@ addVariantFromStockLocation = function(stock_location_id, 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");
+var ShipmentSplitItemView = Backbone.View.extend({
+  tagName: 'tr',
+  className: 'stock-item-split',
 
-    this.$("form.admin-ship-shipment").each(function(){
-      new ShipShipmentView({
-        el: this,
-        shipment_number: shipment_number
-      });
-    });
+  initialize: function(options) {
+    this.variant = options.variant;
+    this.shipments = options.shipments;
+    this.shipment_number = options.shipment_number;
+    this.max_quantity = options.max_quantity;
+    this.shipmentItemView = options.shipmentItemView;
+    this.render()
   },
 
   events: {
-    "click a.delete-item": "deleteItem",
-
-    "click a.split-item": "startItemSplit",
-    "click a.cancel-split": "cancelItemSplit",
-    "click a.save-split": "completeItemSplit",
+    "click .cancel-split": "cancelItemSplit",
+    "click .save-split": "completeItemSplit",
+  },
 
-    "click a.edit-method": "toggleMethodEdit",
-    "click a.cancel-method": "toggleMethodEdit",
-    "click a.save-method": "saveMethod",
+  cancelItemSplit: function(e){
+    e.preventDefault();
 
-    "click a.edit-tracking": "toggleTrackingEdit",
-    "click a.cancel-tracking": "toggleTrackingEdit",
-    "click a.save-tracking": "saveTracking",
+    this.shipmentItemView.removeSplit();
+    this.remove();
   },
 
-  deleteItem: function(e){
+  completeItemSplit: 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);
+    var quantity = this.$('.quantity').val();
+    var target = this.$('[name="item_stock_location"]').val().split(':');
+    var target_type = target[0];
+    var target_id = target[1];
+
+    var split_attr = {
+      original_shipment_number: this.shipment_number,
+      variant_id: this.variant.id,
+      quantity: quantity
+    };
+    var jqXHR;
+    if (target_type == 'stock_location') {
+      // transfer to a new location
+      split_attr.stock_location_id = target_id;
+      jqXHR = Spree.ajax({
+        type: "POST",
+        url: Spree.routes.shipments_api + "/transfer_to_location",
+        data: split_attr
+      });
+    } else if (target_type == 'shipment') {
+      // transfer to an existing shipment
+      split_attr.target_shipment_number = target_id;
+      jqXHR = Spree.ajax({
+        type: "POST",
+        url: Spree.routes.shipments_api + "/transfer_to_shipment",
+        data: split_attr
+      });
+    } else {
+      alert('Please select the split destination.');
+      return false;
     }
+    jqXHR.error(function(msg) {
+      alert(msg.responseJSON['message']);
+    }).done(function() {
+      window.Spree.advanceOrder();
+    });
+  },
+
+  template: HandlebarsTemplates['variants/split'],
+
+  render: function() {
+    /* Only display other shipments */
+    var shipments = _.reject(this.shipments, _.matcher({'number': this.shipment_number}))
+
+    var renderAttr = {
+      variant: this.variant,
+      shipments: shipments,
+      max_quantity: this.max_quantity
+    };
+    this.$el.html(this.template(renderAttr));
+
+    this.$('[name="item_stock_location"]').select2({
+      width: 'resolve',
+      placeholder: Spree.translations.item_stock_placeholder,
+      minimumResultsForSearch: 8
+    });
+  }
+});
+
+var ShipmentItemView = Backbone.View.extend({
+  initialize: function(options) {
+    this.shipment_number = options.shipment_number
+    this.order_number = options.order_number
+    this.quantity = this.$el.data('item-quantity')
+    this.variant_id = this.$el.data('variant-id')
+  },
+
+  events: {
+    "click .delete-item": "onDelete",
+    "click .split-item": "onSplit",
   },
 
-  startItemSplit: function(e){
+  removeSplit: function() {
+    this.$('.split-item').show();
+    this.$('.delete-item').show();
+  },
+
+  onSplit: function(e) {
     e.preventDefault();
-    startItemSplit.apply(e.currentTarget, [e]);
+    this.$('.split-item').toggle();
+    this.$('.delete-item').toggle();
+
+    var _this = this;
+    Spree.ajax({
+      type: "GET",
+      url: Spree.routes.variants_api + "/" + this.variant_id,
+    }).success(function(variant){
+      var split = new ShipmentSplitItemView({
+        shipmentItemView: _this,
+        shipment_number: _this.shipment_number,
+        variant: variant,
+        shipments: window.shipments,
+        max_quantity: _this.quantity
+      });
+
+      _this.$el.after(split.$el);
+    });
   },
 
-  cancelItemSplit: function(e){
+  onDelete: function(e){
     e.preventDefault();
+    if (confirm(Spree.translations.are_you_sure_delete)) {
+      adjustShipmentItems(this.shipment_number, this.variant_id, 0);
+    }
+  },
+});
 
-    this.$('tr.stock-item-split').remove();
-    this.$('a.split-item').show();
-    this.$('a.delete-item').show();
+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");
+
+    var shipmentView = this;
+    this.$("form.admin-ship-shipment").each(function(el){
+      new ShipShipmentView({
+        el: this,
+        shipment_number: shipmentView.shipment_number
+      });
+    });
+    this.$(".stock-item").each(function(){
+      new ShipmentItemView({
+        el: this,
+        shipment_number: shipmentView.shipment_number,
+        order_number: shipmentView.order_number
+      });
+    });
   },
 
-  completeItemSplit: function(e){
-    completeItemSplit.apply(e.currentTarget, [e]);
+  events: {
+    "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",
   },
 
   toggleMethodEdit: function(e){
@@ -290,7 +319,7 @@ var ShipmentEditView = Backbone.View.extend({
 
   saveTracking: function(e) {
     e.preventDefault();
-    var tracking = this.$('input#tracking').val();
+    var tracking = this.$('[name="tracking"]').val();
     var _this = this;
     updateShipment(this.shipment_number, {
       tracking: tracking

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

@@ -1,12 +1,7 @@
-'use strict';
+$.fn.taxonAutocomplete = function () {
+  'use strict';
 
-var set_taxon_select = function(){
-  function formatTaxon(taxon) {
-    return Select2.util.escapeMarkup(taxon.pretty_name);
-  }
-
-  if ($('#product_taxon_ids').length > 0) {
-    $('#product_taxon_ids').select2({
+  this.select2({
       placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
@@ -24,7 +19,6 @@ var set_taxon_select = function(){
       },
       ajax: {
         url: Spree.routes.taxons_search,
-        params: { "headers": { "X-Spree-Token": Spree.api_key } },
         datatype: 'json',
         data: function (term, page) {
           return {
@@ -45,12 +39,20 @@ var set_taxon_select = function(){
           };
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
+      formatResult: function (taxon, container, query, escapeMarkup) {
+        return escapeMarkup(taxon.pretty_name);
+      },
+      formatSelection: function (taxon, container, escapeMarkup) {
+        return escapeMarkup(taxon.pretty_name);
+      }
     });
-  }
-}
+};
 
 $(document).ready(function () {
-  set_taxon_select()
+  $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
 });
+
+// for backwards compat...
+var set_taxon_select = function() {
+  $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
+}

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

@@ -1,6 +1,6 @@
 <div class='customer-autocomplete-item'>
   <div class='customer-details'>
-    <h5>{{customer.email}}</h5>
+    <span class="customer-email">{{customer.email}}</span>
     {{#if bill_address.firstname }}
       <strong>{{t 'bill_address' }}</strong>
       {{bill_address.firstname}} {{bill_address.lastname}}<br>

data/app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs.erb

@@ -9,7 +9,7 @@
 
   <div class="media-body">
     <h6 class="media-heading">{{variant.name}}</h6>
-    <dl class="dl-collapse">
+    <dl class="media-content dl-collapse">
       {{#if variant.option_values}}
         {{#each variant.option_values}}
           <dt>{{this.option_type_presentation}}:</dt>