solidus_backend 1.0.7 → 1.1.0.beta1

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

@@ -1,10 +1,6 @@
 '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({
       placeholder: Spree.translations.taxon_placeholder,
@@ -41,8 +37,12 @@ var set_taxon_select = function(){
           };
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
+      formatResult: function (taxon) {
+        return taxon.pretty_name;
+      },
+      formatSelection: function (taxon) {
+        return taxon.pretty_name;
+      }
     });
   }
 }

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

@@ -1,5 +1,5 @@
-$(document).ready ->
-  window.productTemplate = Handlebars.compile($('#product_template_sortable').text());
+$ ->
+  productTemplate = HandlebarsTemplates['products/sortable']
 
   productListTemplate = (products) ->
     products.map(productTemplate).join('') ||
@@ -45,9 +45,6 @@ $(document).ready ->
     sortable.trigger('sortupdate', item: draggable)
   , 250
 
-  formatTaxon = (taxon) ->
-    Select2.util.escapeMarkup(taxon.pretty_name)
-
   $('#taxon_id').select2
     dropdownCssClass: "taxon_select_box",
     placeholder: Spree.translations.find_a_taxon,
@@ -62,8 +59,10 @@ $(document).ready ->
       results: (data) ->
         results: data['taxons'],
         more: data.current_page < data.pages
-    formatResult: formatTaxon,
-    formatSelection: formatTaxon
+    formatResult: (taxon) ->
+      taxon.pretty_name
+    formatSelection: (taxon) ->
+      taxon.pretty_name
 
   $('#taxon_id').on "change", (e) ->
     Spree.ajax

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

@@ -0,0 +1,17 @@
+<div class='customer-autocomplete-item'>
+  <div class='customer-details'>
+    <h5>{{customer.email}}</h5>
+    {{#if bill_address.firstname }}
+      <strong>{{t 'bill_address' }}</strong>
+      {{bill_address.firstname}} {{bill_address.lastname}}<br>
+      {{bill_address.address1}}, {{bill_address.address2}}<br>
+      {{bill_address.city}}<br>
+      {{#if bill_address.state_id }}
+        {{bill_address.state.name}}
+      {{else}}
+        {{bill_address.state_name}}
+      {{/if}}
+      {{bill_address.country.name}}
+    {{/if}}
+  </div>
+</div>

data/app/assets/javascripts/spree/backend/templates/products/sortable.hbs

@@ -0,0 +1,5 @@
+<a href="#" id="product_{{ id }}" data-product-id="{{ id }}" class="sort_item list-group-item">
+  <i class="fa fa-sort"></i>
+  <span class="product_name">{{ name }}</span>
+  <span class="right">{{ display_price }}</span>
+</a>

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

@@ -0,0 +1,17 @@
+<div class="fullwidth tier">
+  <a class="fa fa-trash remove js-remove-tier"></a>
+  <div class="two columns alpha omega">
+    <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="two columns alpha omega right">
+    <div class="input-group">
+      <span class="input-group-addon">$</span>
+      <input class="js-value-input form-control"
+        name="{{valueField.name}}" type="text" value={{valueField.value}}>
+    </div>
+  </div>
+  <div class="clear"></div>
+</div>

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

@@ -0,0 +1,17 @@
+<div class="fullwidth tier">
+  <a class="fa fa-trash remove js-remove-tier"></a>
+  <div class="two columns alpha omega">
+    <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="two columns alpha omega right">
+    <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>
+  </div>
+  <div class="clear"></div>
+</div>

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

@@ -0,0 +1,10 @@
+<div class="fullwidth promo-rule-option-value">
+  <div class="four columns alpha">
+    <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
+  </div>
+  <div class="three columns omega">
+    <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+  </div>
+  <a class="fa fa-trash remove js-remove-promo-rule-option-value"></a>
+  <div class="clear"></div>
+</div>

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

@@ -0,0 +1 @@
+{{ param_prefix }}[preferred_eligible_values][{{product_id}}]

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

@@ -0,0 +1,19 @@
+<tr data-variant-id="{{variantId}}">
+  <td class="align-center location-name-cell">{{stockLocationName}}</td>
+  <td class="align-center">
+    {{#if backorderable}}
+      <input id="backorderable-{{id}}" name="backorderable" type="checkbox" value="backorderable" disabled="disabled" checked="checked">
+    {{else}}
+      <input id="backorderable-{{id}}" name="backorderable" type="checkbox" value="backorderable" disabled="disabled">
+    {{/if}}
+  </td>
+  <td class="align-center" id="number-update-{{id}}">
+    <span class="js-number-update-text">{{countOnHand}}</span>
+    <input class="fullwidth js-number-update-input" name="count_on_hand" type="number" value="">
+  </td>
+  <td class="actions">
+    <a class="fa fa-edit icon_link with-tip no-text" data-action="edit" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-check icon_link with-tip no-text" data-action="green" data-id="{{id}}" data-location-id="{{stockLocationId}}" href="#"></a>
+    <a class="fa fa-void icon_link with-tip no-text" data-action="red" data-id="{{id}}" href="#"></a>
+  </td>
+</tr>

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

@@ -0,0 +1,52 @@
+<tr class='new-row' data-transfer-item-id="{{id}}">
+  <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}}
+      </div>
+      <div class='variant-details'>
+        <table class='stock-variant-field-table'>
+          <tbody>
+            {{#each variantDisplayAttributes}}
+              <tr>
+                <td>{{this.label}}</td>
+                <td class="fullwidth">{{this.value}}</td>
+              </tr>
+            {{/each}}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </td>
+  <td class="align-center">
+    <table class='stock-variant-field-table'>
+      {{#each variantOptions}}
+        <tr>
+          <td>{{this.option_type}}</td>
+          <td>{{this.option_value}}</td>
+        </tr>
+      {{/each}}
+    </table>
+  </td>
+  <td class='align-center' id="number-update-{{id}}">
+    {{#if isReceiving }}
+      <span class='js-number-update-text'>{{receivedQuantity}}</span>
+      <input class="fullwidth js-number-update-input" name="received_quantity" type="number" value="">
+    {{ else }}
+      <span class='js-number-update-text'>{{expectedQuantity}}</span>
+      <input class="fullwidth js-number-update-input" name="expected_quantity" type="number" value="">
+    {{/if}}
+  </td>
+  <td class="actions">
+    <a class="fa fa-edit icon_link with-tip no-text" data-action="edit" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-check icon_link with-tip no-text" data-action="green" data-id="{{id}}" href="#"></a>
+    <a class="fa fa-void icon_link with-tip no-text" data-action="red" data-id="{{id}}" href="#"></a>
+    {{#unless isReceiving }}
+      <a class="fa fa-trash icon_link with-tip no-text" data-action="remove" data-id="{{id}}" href="#"></a>
+    {{/unless}}
+  </td>
+</tr>

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

@@ -0,0 +1,23 @@
+<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}}
+  </div>
+
+  <div class="media-body">
+    <h6 class="media-heading">{{variant.name}}</h6>
+    <dl class="dl-collapse">
+      {{#if variant.option_values}}
+        {{#each variant.option_values}}
+          <dt>{{this.option_type_presentation}}:</dt>
+          <dd>{{this.presentation}}</dd>
+        {{/each}}
+      {{/if}}
+      <dt>{{ t "sku" }}</dt>
+      <dd>{{variant.sku}}</dd>
+    </dl>
+  </div>
+</div>

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

@@ -0,0 +1,51 @@
+<fieldset>
+  <legend align="center">{{ t "select_stock" }}</legend>
+    <table class="stock-levels" data-hook="stock-levels">
+      <colgroup>
+        <col style="width: 30%;" />
+        <col style="width: 40%;" />
+        <col style="width: 20%;" />
+        <col style="width: 10%;" />
+      </colgroup>
+      <thead>
+        <th>{{ t "location" }}</th>
+        <th>{{ t "count_on_hand" }}</th>
+        <th>{{ t "quantity" }}</th>
+        <th class="actions"></th>
+      </thead>
+      <tbody>
+        {{#each variant.stock_items}}
+          <tr>
+            <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">
+              </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}}
+              {{#if this.available}}
+                <td>
+                  {{this.count_on_hand}}
+                  {{#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">
+                </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>0</td>
+              {{/if}}
+            {{/unless}}
+          </tr>
+        {{/each}}
+      </tbody>
+    </table>
+</fieldset>

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

@@ -0,0 +1,67 @@
+<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}}
+
+
+  <fieldset class="no-border-bottom">
+    <legend align="center" class="stock-location">
+      <button class="add_variant no-text fa fa-plus icon_link"  title="{{ t "add" }}" data-action="add">{{ t "add" }}</button>
+    </legend>
+  </fieldset>
+</fieldset>

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

@@ -0,0 +1,27 @@
+<tr class='stock-item-split' data-variant-id='{{variant.id}}'>
+  <td colspan='2'>
+    Move {{variant.name}} to
+  </td>
+  <td colspan='2'>
+  <select name="item_stock_location" id='item_stock_location' style='width:100%;'>
+    <option></option>
+    <optgroup label="{{ t "existing_shipments" }}">
+      {{#each shipments}}
+      <option data-shipment-number='{{this.number}}' value='{{this.stock_location_id}}'>{{this.stock_location.name}}({{this.number}})</option>
+      {{/each}}
+    </optgroup>
+    <optgroup label="{{ t "new_shipment_at_location" }}">
+      {{#each variant.stock_items}}
+        <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}&nbsp;({{this.count_on_hand}} on hand)</option>
+      {{/each}}
+    </optgroup>
+    </select>
+  </td>
+  <td>
+    <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
+  </td>
+  <td class='actions'>
+    <a href='#' class='save-split icon_link fa fa-ok no-text with-tip' title='Save'></a>
+    <a href='#' class='cancel-split icon_link fa fa-cancel no-text with-tip' title='Cancel'></a>
+  </td>
+</tr>

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

@@ -1,10 +1,6 @@
 $.fn.userAutocomplete = function () {
   'use strict';
 
-  function formatUser(user) {
-    return Select2.util.escapeMarkup(user.email);
-  }
-
   this.select2({
     minimumInputLength: 1,
     multiple: true,
@@ -12,7 +8,7 @@ $.fn.userAutocomplete = function () {
       $.get(Spree.routes.user_search, {
         ids: element.val()
       }, function (data) {
-        callback(data.users);
+        callback(data);
       });
     },
     ajax: {
@@ -27,12 +23,16 @@ $.fn.userAutocomplete = function () {
       },
       results: function (data) {
         return {
-          results: data.users
+          results: data
         };
       }
     },
-    formatResult: formatUser,
-    formatSelection: formatUser
+    formatResult: function (user) {
+      return user.email;
+    },
+    formatSelection: function (user) {
+      return user.email;
+    }
   });
 };
 

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

@@ -1,10 +1,8 @@
 # variant autocompletion
 $(document).ready ->
-  if $("#variant_autocomplete_template").length > 0
-    window.variantTemplate = Handlebars.compile($("#variant_autocomplete_template").text())
-    window.variantStockTemplate = Handlebars.compile($("#variant_autocomplete_stock_template").text())
-    window.variantLineItemTemplate = Handlebars.compile($("#variant_line_items_autocomplete_stock_template").text())
-  return
+  window.variantTemplate = HandlebarsTemplates["variants/autocomplete"]
+  window.variantStockTemplate = HandlebarsTemplates["variants/autocomplete_stock"]
+  window.variantLineItemTemplate = HandlebarsTemplates["variants/line_items_autocomplete_stock"]
 
 formatVariantResult = (variant) ->
   variant.image = variant.images[0].mini_url  if variant["images"][0] isnt `undefined` and variant["images"][0].mini_url isnt `undefined`
@@ -35,8 +33,8 @@ $.fn.variantAutocomplete = (searchOptions = {}) ->
         results: data["variants"]
 
     formatResult: formatVariantResult
-    formatSelection: (variant, container, escapeMarkup) ->
+    formatSelection: (variant) ->
       if !!variant.options_text
-        Select2.util.escapeMarkup("#{variant.name} (#{variant.options_text}")
+        variant.name + " (#{variant.options_text})"
       else
-        Select2.util.escapeMarkup(variant.name)
+        variant.name