solidus_backend 2.4.2 → 2.5.0.beta1

data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs

@@ -19,7 +19,9 @@
 </td>
 {{#if editing}}
   <td class="line-item-qty-edit">
-    <input type="number" name="quantity" value="{{ line_item.quantity }}" min="0" class="line_item_quantity" size="5">
+    <form>
+      <input type="number" name="quantity" value="{{ line_item.quantity }}" min="0" class="line_item_quantity" size="5">
+    </form>
   </td>
 {{else}}
   <td class="line-item-qty-show">
@@ -31,12 +33,12 @@
 </td>
 <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
   {{#if editing}}
-    <a class="save-line-item fa fa-ok no-text with-tip" href="#" title="{{ t "actions.save" }}"></a>
+    <button class="save-line-item fa fa-ok no-text with-tip" data-action="save" title="{{ t "actions.save" }}"></button>
     {{#unless noCancel}}
-      <a class="cancel-line-item fa fa-cancel no-text with-tip" href="#" title="{{ t "actions.cancel" }}"></a>
+      <button class="cancel-line-item fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "actions.cancel" }}"></button>
     {{/unless}}
   {{else}}
-    <a class="edit-line-item fa fa-edit no-text with-tip" href="#" title="{{ t "actions.edit" }}"></a>
-    <a class="delete-line-item fa fa-trash no-text with-tip" href="#" title="{{ t "actions.delete" }}"></a>
+    <button class="edit-line-item fa fa-edit no-text with-tip" data-action="edit" title="{{ t "actions.edit" }}"></button>
+    <button class="delete-line-item fa fa-trash no-text with-tip" data-action="remove" title="{{ t "actions.delete" }}"></button>
   {{/if}}
 </td>

data/app/assets/javascripts/spree/backend/templates/orders/shipment_tracking.hbs

@@ -0,0 +1,24 @@
+<th>
+  {{ human_attribute_name "spree/shipment" "tracking" }}
+</th>
+<td colspan="4">
+  {{#if editing}}
+    <form>
+      <input type="text" name="tracking" class="fullwidth" value="{{tracking}}">
+    </form>
+  {{else}}
+    {{#if tracking}}
+      {{ tracking }}
+    {{else}}
+      {{ t "no_tracking_present" }}
+    {{/if}}
+  {{/if}}
+</td>
+<td class="actions">
+  {{#if editing}}
+    <button class="js-save fa fa-check no-text with-tip" data-action="save" title="{{ t "actions.save" }}"></button>
+    <button class="js-cancel fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "actions.cancel" }}"></button>
+  {{else}}
+    <button class="js-edit fa fa-edit no-text with-tip" data-action="edit" title=""{{ t "actions.edit" }}"></button>
+  {{/if}}
+</td>

data/app/assets/javascripts/spree/backend/templates/orders/shipping_method.hbs

@@ -0,0 +1,34 @@
+<th>
+  {{ human_model_name "spree/shipping_method" }}
+</th>
+{{#if editing}}
+<td colspan="4">
+{{#if shipping_rates}}
+  <form>
+    <select class="custom-select fullwidth" name="selected_shipping_method_id">
+      {{#each shipping_rates}}
+      <option value="{{ shipping_method_id }}">{{name}} {{display_cost}}</option>
+      {{/each}}
+    </select>
+  </form>
+{{/if}}
+</td>
+{{else}}
+<td colspan="3">
+  {{ selected_shipping_rate.name }}
+</td>
+<td class="total">
+  {{ format_money selected_shipping_rate.cost order.currency }}
+</td>
+{{/if}}
+
+<td class="actions">
+  {{#if editing}}
+    {{#if shipping_rates}}
+    <button class="js-save fa fa-check no-text with-tip" data-action="save" title="{{ t "actions.save" }}"></button>
+    {{/if}}
+    <button class="js-cancel fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "actions.cancel" }}"></button>
+  {{else}}
+    <button class="js-edit fa fa-edit no-text with-tip" data-action="edit" title=""{{ t "actions.edit" }}"></button>
+  {{/if}}
+</td>

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs

@@ -1,15 +1,19 @@
 <div class="fullwidth tier">
+  <a class="fa fa-trash remove js-remove-tier"></a>
   <div class="row">
     <div class="col-6">
-      <a class="fa fa-trash remove js-remove-tier"></a>
       <div class="input-group">
-        <span class="input-group-addon">$</span>
+        <div class="input-group-prepend">
+          <span class="input-group-text">$</span>
+        </div>
         <input class="js-base-input form-control" type="text" value={{baseField.value}}>
       </div>
     </div>
     <div class="col-6">
       <div class="input-group">
-        <span class="input-group-addon">$</span>
+        <div class="input-group-prepend">
+          <span class="input-group-text">$</span>
+        </div>
         <input class="js-value-input form-control"
           name="{{valueField.name}}" type="text" value={{valueField.value}}>
       </div>

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs

@@ -3,7 +3,9 @@
   <div class="row">
     <div class="col-6">
       <div class="input-group">
-        <span class="input-group-addon">$</span>
+        <div class="input-group-prepend">
+          <span class="input-group-text">$</span>
+        </div>
         <input class="js-base-input form-control" type="text" value={{baseField.value}}>
       </div>
     </div>
@@ -11,7 +13,9 @@
       <div class="input-group">
         <input class="js-value-input form-control right-align"
           name="{{valueField.name}}" type="text" value={{valueField.value}}>
-        <span class="input-group-addon">%</span>
+        <div class="input-group-append">
+          <span class="input-group-text">%</span>
+        </div>
       </div>
     </div>
   </div>

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

@@ -10,7 +10,9 @@
 </td>
 <td>
   {{#if editing}}
-    <input class="fullwidth" name="count_on_hand" type="number" value="{{count_on_hand}}">
+    <form>
+      <input class="fullwidth" name="count_on_hand" type="number" value="{{count_on_hand}}">
+    </form>
   {{else}}
     <span>{{count_on_hand}}</span>
   {{/if}}

data/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs

@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset class="no-border-bottom">
   <legend align="center">{{ t "select_stock" }}</legend>
     <table class="stock-levels" data-hook="stock-levels">
       <colgroup>
@@ -15,14 +15,16 @@
       </thead>
       <tbody>
         {{#each variant.stock_items}}
-          <tr>
+          <tr class="vertical-middle">
             <td>{{this.stock_location_name}}</td>
             {{#unless ../variant.track_inventory}}
               <td>
                 It doesn't track inventory
               </td>
               <td>
-                <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                <form>
+                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                </form>
               </td>
               <td class="actions">
                 <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
@@ -34,14 +36,17 @@
                   {{#if this.backorderable}} ({{ t "backorders_allowed" }}) {{/if}}
                 </td>
                 <td>
-                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                  <form>
+                    <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                  </form>
                 </td>
                 <td class="actions">
                   <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
                 </td>
               {{else}}
-              <td>{{ t "out_of_stock" }}</td>
+                <td>{{ t "out_of_stock" }}</td>
                 <td>0</td>
+                <td></td>
               {{/if}}
             {{/unless}}
           </tr>

data/app/assets/javascripts/spree/backend/templates/variants/split.hbs

@@ -17,9 +17,11 @@
   </select>
 </td>
 <td>
-  <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
+  <form>
+    <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
+  </form>
 </td>
 <td class='actions'>
-  <button class="save-split icon_link fa fa-ok no-text with-tip" data-action="save" title="{{ t "save" }}" data-original-title="{{ t "save" }}"></button>
-  <button class="cancel-split icon_link fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "cancel" }}" data-original-title="{{ t "cancel" }}"></button>
+  <button class="save-split icon_link fa fa-ok no-text with-tip" data-action="save" title="{{ t "actions.save" }}"></button>
+  <button class="cancel-split icon_link fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "actions.cancel" }}"></button>
 </td>

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

@@ -17,6 +17,8 @@
     var translation = resolveObject(key, Spree.translations);
     if (translation) {
       return translation;
+    } else if(options.default) {
+      return options.default;
     } else {
       console.warn("No translation found for " + key + ".");
       return key;
@@ -26,4 +28,13 @@
   Spree.human_attribute_name = function(model, attr) {
     return Spree.t("activerecord.attributes." + model + '.' + attr);
   }
+
+  Spree.human_model_name = function(model) {
+    var model_name = Spree.t("activerecord.models." + model);
+    if(_.isString(model_name)) {
+      return model_name;
+    } else {
+      return model_name.one;
+    }
+  }
 })();

data/app/assets/javascripts/spree/backend/turbolinks-integration.js

@@ -0,0 +1,21 @@
+// Require this file if you plan to use Turbolinks in the Solidus admin
+// It is necessary because extensions may use JS libs that make use of
+// jQuery.ready instead of Spree.ready
+
+Spree.jQueryReady = $.fn.ready;
+
+// override jQuery.ready to use Spree.ready even if it was not used explicitly
+$.fn.ready = function (callback) {
+  console.warn("Using jQuery.ready() in Solidus is deprecated. Use Spree.ready() instead. Called from: ", callback);
+  Spree.ready(callback);
+};
+
+Spree.ready = function(callback) {
+  if (Turbolinks.supported) {
+    jQuery(document).on('turbolinks:load', function() {
+      callback(jQuery);
+    });
+  } else {
+    Spree.jQueryReady(callback);
+  }
+};

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

@@ -45,6 +45,6 @@ $.fn.userAutocomplete = function () {
   });
 };
 
-$(document).ready(function () {
+Spree.ready(function () {
   $('.user_picker').userAutocomplete();
 });

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

@@ -0,0 +1,60 @@
+(function() {
+  var variantTemplate = HandlebarsTemplates["variants/autocomplete"];
+
+  var formatVariantResult = function(variant) {
+    return variantTemplate({
+      variant: variant
+    });
+  };
+
+  $.fn.variantAutocomplete = function(searchOptions) {
+    if (searchOptions == null) {
+      searchOptions = {};
+    }
+    this.select2({
+      placeholder: Spree.translations.variant_placeholder,
+      minimumInputLength: 3,
+      initSelection: function(element, callback) {
+        Spree.ajax({
+          url: Spree.routes.variants_api + "/" + element.val(),
+          success: callback
+        });
+      },
+      ajax: {
+        url: Spree.routes.variants_api,
+        datatype: "json",
+        quietMillis: 500,
+        params: {
+          "headers": {
+            "X-Spree-Token": Spree.api_key
+          }
+        },
+        data: function(term, page) {
+          var searchData = {
+            q: {
+              product_name_or_sku_cont: term
+            },
+            token: Spree.api_key
+          };
+          return _.extend(searchData, searchOptions);
+        },
+
+        results: function(data, page) {
+          window.variants = data["variants"];
+          return {
+            results: data["variants"]
+          };
+        }
+      },
+
+      formatResult: formatVariantResult,
+      formatSelection: function(variant, container, escapeMarkup) {
+        if (variant.options_text) {
+          return Select2.util.escapeMarkup(variant.name + " (" + variant.options_text + ")");
+        } else {
+          return Select2.util.escapeMarkup(variant.name);
+        }
+      }
+    });
+  };
+})();

data/app/assets/javascripts/spree/backend/views/calculators/tiered.js

@@ -0,0 +1,54 @@
+Spree.Views.Calculators.Tiered = Backbone.View.extend({
+  initialize: function() {
+    this.calculatorName = this.$('.js-tiers').data('calculator');
+    this.tierFieldsTemplate = HandlebarsTemplates["promotions/calculators/fields/" + this.calculatorName];
+    this.originalTiers = this.$('.js-tiers').data('original-tiers');
+    this.formPrefix = this.$('.js-tiers').data('form-prefix');
+
+    for (var base in this.originalTiers) {
+      var value = this.originalTiers[base];
+      this.$('.js-tiers').append(
+        this.tierFieldsTemplate({
+          baseField: {
+            value: base
+          },
+          valueField: {
+            name: this.tierInputName(base),
+            value: value
+          }
+        })
+      );
+    }
+  },
+
+  events: {
+    'click .js-add-tier': 'onAdd',
+    'click .js-remove-tier': 'onRemove',
+    'change .js-base-input': 'onChange'
+  },
+
+  tierInputName: function(base) {
+    return this.formPrefix + "[calculator_attributes][preferred_tiers][" + base + "]";
+  },
+
+  onAdd: function(event) {
+    event.preventDefault();
+    this.$('.js-tiers').append(
+      this.tierFieldsTemplate({
+        valueField: {
+          name: null
+        }
+      })
+    );
+  },
+
+  onRemove: function(event) {
+    event.preventDefault();
+    $(event.target).parents('.tier').remove();
+  },
+
+  onChange: function(event) {
+    var valueInput = $(event.target).parents('.tier').find('.js-value-input');
+    valueInput.attr('name', this.tierInputName($(event.target).val()));
+  }
+});

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

@@ -11,6 +11,7 @@ Spree.Views.Cart.LineItemRow = Backbone.View.extend({
     'click .edit-line-item': 'onEdit',
     'click .cancel-line-item': 'onCancel',
     'click .save-line-item': 'onSave',
+    'submit form': 'onSave',
     'click .delete-line-item': 'onDelete',
     'change .js-select-variant': 'onChangeVariant',
   },
@@ -83,6 +84,6 @@ Spree.Views.Cart.LineItemRow = Backbone.View.extend({
       noCancel: this.model.isNew() && this.model.collection.length == 1
     });
     this.$el.html(html);
-    this.$("[name=variant_id]").variantAutocomplete({ in_stock_only: true });
+    this.$("[name=variant_id]").variantAutocomplete({ suppliable_only: true });
   }
 });

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

@@ -1,3 +1,4 @@
+//= require 'spree/backend/views/calculators/tiered'
 //= require 'spree/backend/views/cart/add_line_item_button'
 //= require 'spree/backend/views/cart/line_item_row'
 //= require 'spree/backend/views/cart/line_item_table'
@@ -8,11 +9,17 @@
 //= require 'spree/backend/views/order/details_total'
 //= require 'spree/backend/views/order/customer_details'
 //= require 'spree/backend/views/order/customer_select'
+//= require 'spree/backend/views/order/shipment_tracking'
+//= require 'spree/backend/views/order/shipping_method'
 //= require 'spree/backend/views/order/summary'
 //= require 'spree/backend/views/state_select'
+//= require 'spree/backend/views/stock/add_stock_item'
+//= require 'spree/backend/views/stock/edit_stock_item_row'
 //= require 'spree/backend/views/zones/form'
 //= require 'spree/backend/views/number_with_currency'
 //= require 'spree/backend/views/payment/new'
+//= require 'spree/backend/views/payment/payment_row'
 //= require 'spree/backend/views/payment/edit_credit_card'
+//= require 'spree/backend/views/promotions/option_values_rule'
 //= require 'spree/backend/views/tables/editable_table'
 //= require 'spree/backend/views/tables/editable_table_row'

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

@@ -0,0 +1,46 @@
+Spree.Views.Order.ShipmentTracking = Backbone.View.extend({
+  tagName: 'tr',
+  className: 'edit-tracking',
+
+  events: {
+    "click .js-edit":   "onEdit",
+    "click .js-save":   "onSave",
+    "submit form":      "onSave",
+    "click .js-cancel": "onCancel",
+  },
+
+  initialize: function(options) {
+    this.render();
+  },
+
+  onEdit: function(event) {
+    this.editing = true;
+    this.render();
+  },
+
+  onSave: function(event) {
+    this.editing = false;
+    this.model.save({
+      tracking: this.$('input[type="text"]').val()
+    }, {
+      patch: true
+    });
+    this.render();
+
+    return false;
+  },
+
+  onCancel: function(event) {
+    this.editing = false;
+    this.render();
+  },
+
+  render: function() {
+    var html = HandlebarsTemplates['orders/shipment_tracking']({
+      editing: this.editing,
+      tracking: this.model.get("tracking"),
+    });
+
+    this.$el.html(html);
+  }
+});