solidus_backend 2.1.1 → 2.2.0.beta1

data/app/assets/javascripts/spree/backend/templates/_image.hbs

@@ -0,0 +1,5 @@
+{{#if image }}
+  <img src='{{ lookup image (concat size "_url") }}' alt="{{ alt }}" />
+{{ else }}
+  <span class="image-placeholder {{ size }}"></span>
+{{/if}}

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

@@ -1,4 +1,7 @@
+//= require spree/backend/templates/_image
 //= 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/products/sortable
 //= require spree/backend/templates/products/upload_progress
 //= require spree/backend/templates/promotions/calculators/fields/tiered_flat_rate

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

@@ -0,0 +1,4 @@
+<tr>
+  <td><strong>{{ label }}:</strong></td>
+  <td class="total align-center"><span>{{ amount }}</span></td>
+</tr>

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

@@ -0,0 +1,42 @@
+{{#if isNew}}
+  <td class="line-item-select-variant" colspan="2">
+    <input type="hidden" name="variant_id" class="js-select-variant select-variant fullwidth">
+  </td>
+{{else}}
+  <td class="line-item-image">
+    {{> _image image=line_item.variant.images.[0] size="mini" }}
+  </td>
+  <td class="line-item-name">
+    {{ line_item.variant.name }}<br>
+    {{#if line_item.variant.options_text }}
+      {{ line_item.variant.options_text }}<br/>
+    {{/if}}
+    <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }}
+  </td>
+{{/if}}
+<td class="line-item-price align-center">
+  {{ line_item.single_display_amount }}
+</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">
+  </td>
+{{else}}
+  <td class="line-item-qty-show align-center">
+    {{ line_item.quantity }}
+  </td>
+{{/if}}
+<td class="line-item-total align-center">
+  {{ line_item.display_amount }}
+</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>
+    {{#unless noCancel}}
+      <a class="cancel-line-item fa fa-cancel no-text with-tip" href="#" title="{{ t "actions.cancel" }}"></a>
+    {{/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>
+  {{/if}}
+</td>

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

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

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

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

data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs

@@ -1,9 +1,9 @@
 <div class="fullwidth promo-rule-option-value">
   <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
       <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
     </div>
-    <div class="col-xs-5">
+    <div class="col-5">
       <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
     </div>
   </div>

data/app/assets/javascripts/spree/backend/templates/stock_transfers/{transfer_item.hbs.erb → transfer_item.hbs}

@@ -2,11 +2,7 @@
   <td class="align-center no-padding">
     <div class='variant-container' data-variant-id="{{variantId}}">
       <div class='variant-image'>
-        {{#if variantImageURL }}
-          <img alt="{{variantName}}" src="{{variantImageURL}}">
-        {{ else }}
-          <img alt='{{variant.name}}' src='<%= image_path("noimage/small.png") %>' />
-        {{/if}}
+        {{> _image image=variantImage size="small" alt=variantName }}
       </div>
       <div class='variant-details'>
         <table class='stock-variant-field-table'>

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

@@ -1,10 +1,6 @@
 <div class="variant-autocomplete-item media">
   <div class="media-left">
-    {{#if variant.image }}
-      <img class="media-object" src='{{variant.image}}' />
-    {{ else }}
-      <img class="media-object" src='<%= image_path("noimage/mini.png") %>' />
-    {{/if}}
+    {{> _image image=variant.images.[0] size="mini" }}
   </div>
 
   <div class="media-body">

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

@@ -1,63 +1,22 @@
 <fieldset>
-  <legend align="center">{{ t "select_stock" }}</legend>
-  {{#if variant.track_inventory}}
-    <table class="stock-levels" data-hook="stock-levels">
-      <colgroup>
-        <col style="width: 30%;" />
-        <col style="width: 40%;" />
-        <col style="width: 30%;" />
-      </colgroup>
-      <thead>
-        <th>{{ t "name" }}</th>
-        <th>{{ t "location" }}</th>
-        <th>{{ t "count_on_hand" }}</th>
-        <th>{{ t "quantity" }}</th>
-      </thead>
-      <tbody>
-        {{#each variant.stock_items}}
-          <tr>
-            <td>{{#unless @index}}{{../../variant.name}}{{/unless}}</td>
-            <td>
-              {{stock_location_name}}
-            </td>
-            <td>
-              {{count_on_hand}}
-            </td>
-            <td>
-              <input class="quantity variant_quantity" id="quantity_{{@index}}" data-variant-id="{{../variant.id}}" data-stock-location-id="{{stock_location_id}}" type="number" min="0" value="0">
-            </td>
-            </tr>
-        {{/each}}
-      </tbody>
-    </table>
-  {{else}}
-    <table class="stock-levels untracked-inventory" data-hook="stock-levels">
-      <colgroup>
-        <col style="width: 30%;" />
-        <col style="width: 40%;" />
-        <col style="width: 30%;" />
-      </colgroup>
-      <thead>
-        <th>{{ t "name" }}</th>
-        <th>{{ t "count_on_hand" }}</th>
-        <th>{{ t "quantity" }}</th>
-      </thead>
-      <tbody>
-        <tr>
-          <td>
-            {{variant.name}}
-          </td>
-          <td>
-            No inventory necessary
-          </td>
-          <td>
-            <input class="quantity" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="0" value="0">
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  {{/if}}
-
+  <table class="stock-levels" data-hook="stock-levels">
+    <colgroup>
+      <col style="width: 50%;" />
+      <col style="width: 50%;" />
+    </colgroup>
+    <thead>
+      <th>{{ t "name" }}</th>
+      <th><label for="variant_quantity">{{ t "quantity" }}</label></th>
+    </thead>
+    <tbody>
+      <tr>
+        <td>{{variant.name}}</td>
+        <td>
+          <input class="quantity variant_quantity" id="variant_quantity" data-variant-id="{{../variant.id}}" type="number" min="0" value="0">
+        </td>
+      </tr>
+    </tbody>
+  </table>
 
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location">

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

@@ -0,0 +1,29 @@
+(function() {
+  // Resolves string keys with dots in a deeply nested object
+  // http://stackoverflow.com/a/22129960/4405214
+  var resolveObject = function(path, obj) {
+    return path
+      .split('.')
+      .reduce(function(prev, curr) {
+        return prev && prev[curr];
+      }, obj || self);
+  }
+
+  Spree.t = function(key, options) {
+    options = (options || {});
+    if(options.scope) {
+      key = options.scope + "." + key;
+    }
+    var translation = resolveObject(key, Spree.translations);
+    if (translation) {
+      return translation;
+    } else {
+      console.warn("No translation found for " + key + ".");
+      return key;
+    }
+  }
+
+  Spree.human_attribute_name = function(model, attr) {
+    return Spree.t("activerecord.attributes." + model + '.' + attr);
+  }
+})();

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

@@ -3,8 +3,9 @@
 variantTemplate = HandlebarsTemplates["variants/autocomplete"]
 
 formatVariantResult = (variant) ->
-  variant.image = variant.images[0].mini_url  if variant["images"][0] isnt `undefined` and variant["images"][0].mini_url isnt `undefined`
-  variantTemplate variant: variant
+  variantTemplate(
+    variant: variant
+  )
 
 $.fn.variantAutocomplete = (searchOptions = {}) ->
   @select2
@@ -32,7 +33,7 @@ $.fn.variantAutocomplete = (searchOptions = {}) ->
 
     formatResult: formatVariantResult
     formatSelection: (variant, container, escapeMarkup) ->
-      if !!variant.options_text
-        Select2.util.escapeMarkup("#{variant.name} (#{variant.options_text}")
+      if variant.options_text
+        Select2.util.escapeMarkup("#{variant.name} (#{variant.options_text})")
       else
         Select2.util.escapeMarkup(variant.name)

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

@@ -0,0 +1,19 @@
+Spree.Views.Cart.AddLineItemButton = Backbone.View.extend({
+  initialize: function() {
+    this.listenTo(this.collection, 'update', this.render);
+    this.render();
+  },
+
+  events: {
+    "click": "onClick"
+  },
+
+  onClick: function() {
+    this.collection.push({});
+  },
+
+  render: function() {
+    var isNew = function(item) { return item.isNew() };
+    this.$el.prop("disabled", !this.collection.length || this.collection.some(isNew));
+  }
+});

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

@@ -0,0 +1,88 @@
+Spree.Views.Cart.LineItemRow = Backbone.View.extend({
+  tagName: 'tr',
+  className: 'line-item',
+
+  initialize: function(options) {
+    this.listenTo(this.model, "change", this.render);
+    this.editing = options.editing || this.model.isNew();
+  },
+
+  events: {
+    'click .edit-line-item': 'onEdit',
+    'click .cancel-line-item': 'onCancel',
+    'click .save-line-item': 'onSave',
+    'click .delete-line-item': 'onDelete',
+    'change .js-select-variant': 'onChangeVariant',
+  },
+
+  onEdit: function(e) {
+    e.preventDefault()
+    this.editing = true
+    this.render()
+  },
+
+  onCancel: function(e) {
+    e.preventDefault();
+    if (this.model.isNew()) {
+      this.remove();
+      this.model.destroy();
+    } else {
+      this.editing = false;
+      this.render();
+    }
+  },
+
+  validate: function () {
+    this.$('[name=quantity]').toggleClass('error', !this.$('[name=quantity]').val());
+    this.$('.select2-container').toggleClass('error', !this.$('[name=variant_id]').val());
+
+    return !this.$('.select2-container').hasClass('error') && !this.$('[name=quantity]').hasClass('error')
+  },
+
+  onSave: function(e) {
+    e.preventDefault()
+    if(!this.validate()) {
+      return;
+    }
+    var attrs = {
+      quantity: parseInt(this.$('input.line_item_quantity').val())
+    }
+    if (this.model.isNew()) {
+      attrs['variant_id'] = this.$("[name=variant_id]").val()
+    }
+    var model = this.model;
+    this.model.save(attrs, {
+      patch: true,
+      success: function() {
+        model.order.advance()
+      }
+    });
+    this.editing = false;
+    this.render();
+  },
+
+  onDelete: function(e) {
+    e.preventDefault()
+    if(!confirm(Spree.translations.are_you_sure_delete)) {
+      return;
+    }
+    this.remove()
+    var model = this.model;
+    this.model.destroy({
+      success: function() {
+        model.order.advance()
+      }
+    })
+  },
+
+  render: function() {
+    var html = HandlebarsTemplates['orders/line_item']({
+      line_item: this.model.toJSON(),
+      editing: this.editing,
+      isNew: this.model.isNew(),
+      noCancel: this.model.isNew() && this.model.collection.length == 1
+    });
+    this.$el.html(html);
+    this.$("[name=variant_id]").variantAutocomplete({ in_stock_only: true });
+  }
+});

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

@@ -0,0 +1,11 @@
+Spree.Views.Cart.LineItemTable = Backbone.View.extend({
+  initialize: function() {
+    this.listenTo(this.collection, 'add', this.add);
+  },
+
+  add: function(line_item) {
+    var view = new Spree.Views.Cart.LineItemRow({model: line_item});
+    view.render();
+    this.$el.append(view.el);
+  }
+});

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

@@ -0,0 +1,12 @@
+//= 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'
+//= require 'spree/backend/views/order/address'
+//= require 'spree/backend/views/order/details_adjustments'
+//= 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/summary'
+//= require 'spree/backend/views/state_select'
+//= require 'spree/backend/views/zones/form'
+//= require 'spree/backend/views/number_with_currency'

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

@@ -0,0 +1,31 @@
+Spree.Views.NumberWithCurrency = Backbone.View.extend({
+  events: {
+    'change input,select': "render"
+  },
+
+  initialize: function() {
+    this.$currencySelector = this.$('.number-with-currency-select');
+  },
+
+  getCurrency: function() {
+    if (this.$currencySelector.length) {
+      return this.$currencySelector.find('option:selected').val();
+    } else {
+      return this.$('[data-currency]').data("currency");
+    }
+  },
+
+  getCurrencySymbol: function() {
+    var currency = this.getCurrency();
+    if (currency) {
+      var currencyInfo = Spree.currencyInfo[currency];
+      return currencyInfo[0];
+    } else {
+      return '';
+    }
+  },
+
+  render: function() {
+    this.$('.number-with-currency-symbol').text(this.getCurrencySymbol());
+  }
+});