spree_backend 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5d1d087b80b4d4ccb804eb2282ee51a8abdb20
-  data.tar.gz: 821bef1778e272492e163c1e983fcddbd9fec6fe
+  metadata.gz: 1f934ea7b74849f1c8eeef773b4de7db93103009
+  data.tar.gz: 47e055d89c1c186254ddb60eaecbed7b422c0cbc
 SHA512:
-  metadata.gz: a2a653988067c0e6dc42a69ebfe7f95074f93caa8217a32fc0684c2dc79406d546961743b17e6fa1365325d5d79b3a322f498d951e18b3e15e2c839a2cefc11b
-  data.tar.gz: 72f6eec30e2ab2bcd16718c65fc91d71d0e820e7e9120e3a9a26c46983e584746b238e7a239b0f0316459c4e5daadcdf2a366944107863bd70c1ba7e4757865b
+  metadata.gz: 9aec6aad45c261c02bb7d2024fbc33cf824d0fc1024bfa63fe4a1d6f7e4b4a8d85bafdab323e35302f40620a6704907016dad6f6ecdcb447d758da906840dba0
+  data.tar.gz: dd42ef7b330a7bee18080f7839d88a70b311eabcc6d17465671772fc9636cb74e3abf89758a1d14641a55072b8dc27eed14123b9f791238082880e3a0f0c771f

data/app/assets/javascripts/admin/admin.js.erb

@@ -31,18 +31,16 @@ jQuery(function($) {
     smartPlacement: true,
     fadeInTime: 50,
     fadeOutTime: 50,
-    intentPollInterval: 300
   });
 
-  $('.with-tip').on({
-    powerTipPreRender: function(){
-      $('#powerTip').addClass($(this).attr("data-action"));
-      $('#powerTip').addClass($(this).attr("data-tip-color"));
-    },
-    powerTipClose: function(){
-      $('#powerTip').removeClass($(this).attr("data-action"))
-    }
-  });
+  $('body')
+    .on('powerTipPreRender', '.with-tip', function() {
+      $('#powerTip').addClass($(this).data('action'));
+      $('#powerTip').addClass($(this).data('tip-color'));
+    })
+    .on('powerTipClose', '.with-tip', function() {
+      $('#powerTip').removeClass($(this).data('action'));
+    })
 
   // Make flash messages dissapear
   setTimeout('$(".flash").fadeOut()', 5000);
@@ -81,17 +79,12 @@ jQuery(function($) {
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
 show_flash_error = function(message) {
-  error_div = $('.flash.error');
-  if (error_div.length > 0) {
-    error_div.html(message);
-    error_div.show();
-  } else {
-    if ($("#content .toolbar").length > 0) {
-      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
-    } else {
-      $("#content h1").before('<div class="flash error">' + message + '</div>');
-    }
+  var error_div = $('.flash.error');
+  if (error_div.length == 0) {
+    error_div = $('<div class="flash error" />');
+    $('#wrapper').prepend(error_div);
   }
+  error_div.html(message).show().fadeOut(5000);
 }
 
 // Apply to individual radio button that makes another element visible when checked

data/app/assets/javascripts/admin/payments/edit.js.coffee

@@ -0,0 +1,148 @@
+jQuery ($) ->
+  # Payment model
+  class Payment
+    constructor: (id) ->
+      @url  = Spree.url("#{Spree.routes.payments_api}/#{id}.json")
+      @json = $.getJSON @url.toString(), (data) =>
+        @data = data
+
+    if_pending: (callback) ->
+      @json.done (data) ->
+        callback() if data.state is 'pending'
+
+    update: (attributes, success) ->
+      jqXHR = $.ajax
+        type: 'PUT'
+        url:  @url.toString()
+        data: { payment: attributes }
+      jqXHR.done (data) =>
+        @data = data
+      jqXHR.fail ->
+        response = $.parseJSON(jqXHR.responseText)
+        show_flash_error(response.error)
+
+    amount:         -> @data.amount
+    display_amount: -> @data.display_amount
+
+  # Payment base view
+  class PaymentView
+    constructor: (@$el, @payment) ->
+      @render()
+
+    render: ->
+      @add_action_button()
+
+    show: ->
+      @remove_buttons()
+      new ShowPaymentView(@$el, @payment)
+
+    edit: ->
+      @remove_buttons()
+      new EditPaymentView(@$el, @payment)
+
+    add_action_button: ->
+      @$actions().prepend @$new_button(@action)
+
+    remove_buttons: ->
+      @$buttons().remove()
+
+    $new_button: (action) ->
+      $('<a />')
+        .attr
+          class: "icon-#{action} icon_link no-text with-tip"
+          title: Spree.translations[action]
+        .data
+          action: action
+        .one
+          click: (event) ->
+            event.preventDefault()
+          mousedown: ->
+            $(@).data('clicked', true)
+          mouseup: =>
+            @[action]()
+        .powerTip
+          smartPlacement: true
+          fadeInTime:     50
+          fadeOutTime:    50
+
+    $buttons: ->
+      @$actions().find(".icon-#{@action}, .icon-cancel")
+
+    $actions: ->
+      @$el.find('.actions')
+
+    $amount: ->
+      @$el.find('td.amount')
+
+  # Payment show view
+  class ShowPaymentView extends PaymentView
+    action: 'edit'
+
+    render: ->
+      super
+      @set_actions_display()
+      @show_actions()
+      @show_amount()
+
+    set_actions_display: ->
+      width = @$actions().width()
+      @$actions().width(width).css('text-align', 'left')
+
+    show_actions: ->
+      @$actions().find('a').show()
+
+    show_amount: ->
+      amount = $('<span />')
+        .html(@payment.display_amount())
+        .one('click', => @edit().$input().focus())
+      @$amount().html(amount)
+
+  # Payment edit view
+  class EditPaymentView extends PaymentView
+    action: 'save'
+
+    render: ->
+      super
+      @hide_actions()
+      @edit_amount()
+      @add_cancel_button()
+
+    add_cancel_button: ->
+      @$actions().append @$new_button('cancel')
+
+    hide_actions: ->
+      @$actions().find('a').not(@$buttons()).hide()
+
+    edit_amount: ->
+      amount = @$amount()
+      amount.html(@$new_input(amount.find('span').width()))
+
+    save: (event) ->
+      @payment.update(amount: @$input().val())
+        .done(=> @show())
+
+    cancel: @::show
+
+    $new_input: (width) ->
+      amount = @constructor.normalize_amount(@payment.display_amount())
+      $('<input />')
+        .attr(id: 'amount', value: amount)
+        .width(width)
+        .one
+          blur: =>
+            clicked = (@$buttons().filter -> $(@).data('clicked')).length
+            @save() unless clicked
+        .css('text-align': 'right')
+
+    $input: ->
+      @$amount().find('input')
+
+    @normalize_amount: (amount) ->
+      separator = Spree.translations.currency_separator
+      amount.replace(///[^\d#{separator}]///g, '')
+
+  # Attach ShowPaymentView to each pending payment in the table
+  $('.admin tr[data-hook=payments_row]').each ->
+    $el = $(@)
+    payment = new Payment($el.attr('id').match(/\d+$/))
+    payment.if_pending -> new ShowPaymentView($el, payment)

data/app/assets/javascripts/admin/progress.coffee

@@ -16,12 +16,12 @@ $(document).ready ->
     top: 'auto'
     left: 'auto'
 
-  target = document.getElementById("spinner")  
+  target = document.getElementById("spinner")
 
   $(document).ajaxStart ->
-    $("#progress").fadeIn()
-    spinner = new Spinner(opts).spin(target)    
+    $("#progress").stop(true, true).fadeIn()
+    spinner = new Spinner(opts).spin(target)
 
   $(document).ajaxStop ->
-    $("#progress").fadeOut()    
+    $("#progress").fadeOut()
 

data/app/assets/javascripts/admin/stock_movement.js.coffee

@@ -0,0 +1,17 @@
+jQuery ->
+  $('#stock_movement_stock_item_id').select2
+    placeholder: "Find a stock item" # translate
+    ajax:
+      url: Spree.url(Spree.routes.stock_items_api)
+      data: (term, page) ->
+        q:
+          variant_product_name_cont: term
+        per_page: 50
+        page: page
+      results: (data, page) ->
+        more = (page * 50) < data.count
+        return { results: data.stock_items, more: more }
+    formatResult: (stock_item) ->
+      variantTemplate({ variant: stock_item.variant })
+    formatSelection: (stock_item) ->
+      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

data/app/assets/javascripts/admin/stock_transfer.js.coffee

@@ -30,7 +30,7 @@ $ ->
 
       $('#transfer_receive_stock').change (event) => @receive_stock_change(event)
 
-      $.getJSON Spree.routes.stock_locations_api, (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api), (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -92,13 +92,13 @@ $ ->
       if @cached_variants?
         @populate_select @cached_variants
       else
-        $.getJSON Spree.routes.variants_api, (data) =>
+        $.getJSON Spree.url(Spree.routes.variants_api), (data) =>
           @cached_variants = _.map(data.variants, (variant) -> new TransferVariant(variant))
           @populate_select @cached_variants
 
     _refresh_transfer_stock_items: ->
       stock_location_id = $('#transfer_source_location_id').val()
-      $.getJSON Spree.routes.stock_locations_api + "/#{stock_location_id}/stock_items", (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api + "/#{stock_location_id}/stock_items"), (data) =>
         @populate_select _.map(data.stock_items, (stock_item) -> new TransferStockItem(stock_item))
 
     populate_select: (variants) ->
@@ -177,5 +177,3 @@ $ ->
     transfer_locations = new TransferLocations
     transfer_variants = new TransferVariants
     transfer_add_variants = new TransferAddVariants
-
-

data/app/assets/javascripts/admin/variant_autocomplete.js.erb

@@ -54,14 +54,15 @@ $(document).ready(function() {
 
     //handle delete click
     $('a.delete-item').click(function(){
-      var del = $(this);
-      var shipment_number = del.data('shipment-number');
-      var variant_id = del.data('variant-id');
+      if (confirm(Spree.translations.are_you_sure_delete)) {
+        var del = $(this);
+        var shipment_number = del.data('shipment-number');
+        var variant_id = del.data('variant-id');
 
-      toggleItemEdit();
-
-      adjustItems(shipment_number, variant_id, 0);
+        toggleItemEdit();
 
+        adjustItems(shipment_number, variant_id, 0);
+      }
     });
   }
 });

data/app/assets/stylesheets/admin/components/_navigation.scss

@@ -63,12 +63,18 @@ nav.menu {
 #admin-menu {
   background-color: $color-3;
 
+  ul{
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+  }
+
   li {
-    min-width: 90px;
+    display: table-cell;
 
     a {
       display: block;
-      padding: 25px 20px;
+      padding: 25px 15px;
       color: $color-1 !important;
       text-transform: uppercase;
       position: relative;

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -105,6 +105,11 @@
   li {
     font-size: 85% !important;
 
+
+    &:nth-child(odd) {
+      background: #efefef;
+    }
+
     &.select2-highlighted {
       .select2-result-label {
         &, h6 {
@@ -131,7 +136,7 @@
   }
 
   .select2-highlighted {
-    background-color: $color-sel-bg;
+    background-color: $color-sel-bg !important;
   }
 }
 

data/app/assets/stylesheets/admin/shared/_forms.scss

@@ -62,6 +62,7 @@ button, .button {
   color: $color-btn-text;
   text-transform: uppercase;
   font-weight: 600 !important;
+  white-space: nowrap;
 
   &:before {
     font-weight: normal !important;

data/app/assets/stylesheets/admin/shared/_layout.scss

@@ -75,6 +75,7 @@
   }
   .page-actions {
     text-align: right;
+    line-height: 38px;
     form {
       display: inline-block;
     }

data/app/assets/stylesheets/admin/shared/_tables.scss

@@ -84,7 +84,7 @@ table {
         background-color: $color-notice;
         color: $color-1;
       }
-      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover {
+      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover, .icon-save:hover {
         background-color: $color-success;
         color: $color-1;
       }

data/app/controllers/spree/admin/base_controller.rb

@@ -19,7 +19,7 @@ module Spree
           if respond_to?(:model_class, true) && model_class
             record = model_class
           else
-            record = Object
+            record = controller_name.to_sym
           end
           authorize! :admin, record
           authorize! action, record

data/app/controllers/spree/admin/orders_controller.rb

@@ -83,7 +83,7 @@ module Spree
         # TODO - possible security check here but right now any admin can before any transition (and the state machine
         # itself will make sure transitions are not applied in the wrong state)
         event = params[:e]
-        if @order.send("#{event}")
+        if @order.state_events.include?(event.to_sym) && @order.send("#{event}")
           flash[:success] = Spree.t(:order_updated)
         else
           flash[:error] = Spree.t(:cannot_perform_operation)

data/app/helpers/spree/admin/base_helper.rb

@@ -24,7 +24,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, :format => Spree.t('date_picker.format'))
+          l(date, :format => Spree.t('date_picker.format', default: '%Y/%m/%d'))
         else
           nil
         end

data/app/helpers/spree/admin/stock_movements_helper.rb

@@ -8,6 +8,13 @@ module Spree
           ""
         end
       end
+
+      def display_variant(stock_movement)
+        variant = stock_movement.stock_item.variant
+        output = variant.name
+        output += "<br>(#{variant.options_text})" unless variant.options_text.blank?
+        output.html_safe
+      end
     end
   end
 end

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -1,4 +1,5 @@
 <%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
+<%= render :partial => "spree/admin/variants/autocomplete_stock", :formats => :js %>
 
 <div id="add-line-item" data-hook>
   <fieldset class="no-border-bottom">

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -25,7 +25,7 @@
           <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
           <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
           <%= link_to '', '#', :class => 'split-item icon_link icon-resize-horizontal no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-          <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove', :confirm => Spree.t(:are_you_sure)}, :title => Spree.t('delete') %>
+          <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove' }, :title => Spree.t('delete') %>
         <% end %>
       </td>
     <% end %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -10,9 +10,9 @@
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
         <td><%= pretty_time(payment.created_at) %></td>
-        <td class='align-center'><%= payment.display_amount.to_html %></td>
+        <td class="align-center amount"><%= payment.display_amount.to_html %></td>
         <td class="align-center"><%= link_to payment_method_name(payment), spree.admin_order_payment_path(@order, payment) %></td>
         <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
         <td class="actions">

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -2,28 +2,18 @@
   <legend align="center"><%= Spree.t(:credit_card) %></legend>
 
   <div class="row">
-    <div class="alpha six columns">      
+    <div class="alpha six columns">
       <dl>
+        <dt><%= Spree.t(:card_type) %>:</dt>
+        <dd><%= payment.source.cc_type %></dd>
+
         <dt><%= Spree.t(:card_number) %>:</dt>
         <dd><%= payment.source.display_number %></dd>
 
         <dt><%= Spree.t(:expiration) %>:</dt>
         <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
-
-        <dt><%= Spree.t(:card_code) %>:</dt>
-        <dd><%= payment.source.verification_value %></dd>
       </dl>
     </div>
-
-    <div class="omega six columns">
-      <dl>
-        <dt><%= Spree.t(:maestro_or_solo_cards) %>:</dt>
-        <dd><%= payment.source.issue_number %></dd>
-
-        <dt><%= Spree.t(:start_date) %>:</dt>
-        <dd><%= payment.source.start_month %>/<%= payment.source.start_year %></dd>
-      </dl>
-    </div>    
   </div>
 
-</fieldset>
+</fieldset>

data/app/views/spree/admin/products/new.html.erb

@@ -34,7 +34,7 @@
       <div class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :class => 'fullwidth' %>
+          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -5,3 +5,4 @@ $('.product_picker').productAutocomplete();
 $('.user_picker').userAutocomplete();
 
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
+$('#promotion_rule_type').select2();

data/app/views/spree/admin/prototypes/show.html.erb

@@ -1,5 +1,5 @@
 <% if @prototype.option_types.present? %>
-  <h2>Variants</h2>
+  <h2><%= Spree.t(:variants) %></h2>
 
   <ul class="product-prototype-options">
     <% @prototype.option_types.each do |ot| %>

data/app/views/spree/admin/shared/_routes.html.erb

@@ -9,5 +9,6 @@
   Spree.routes.checkouts_api = "<%= spree.api_checkouts_url(:format => 'json') %>";
   Spree.routes.stock_locations_api = "<%= spree.api_stock_locations_url(:format => 'json') %>";
   Spree.routes.variants_api = "<%= spree.api_variants_url(:format => 'json') %>";
-
+  Spree.routes.payments_api = "<%= spree.api_order_payments_url(:format => 'json') if params[:order_id] %>";
+  Spree.routes.stock_items_api = "<%= spree.api_stock_location_stock_items_url(:format => 'json') if params[:stock_location_id] %>";
 </script>

data/app/views/spree/admin/shared/_translations.html.erb

@@ -10,8 +10,10 @@
     :choose_a_customer        => Spree.t(:choose_a_customer),
     :confirm_delete           => Spree.t(:confirm_delete),
     :cut                      => Spree.t(:cut),
-    :destroy                  => Spree.t(:destroy),
-    :edit                     => Spree.t(:edit),
+    :destroy                  => Spree.t(:destroy, :scope => :actions),
+    :edit                     => Spree.t(:edit,    :scope => :actions),
+    :save                     => Spree.t(:save,    :scope => :actions),
+    :cancel                   => Spree.t(:cancel,  :scope => :actions),
     :first_day                => Spree.t(:first_day,
                                          :scope => 'date_picker',
                                          :default => 0).to_i,
@@ -31,7 +33,8 @@
     :type_to_search           => Spree.t(:type_to_search),
     :taxon_placeholder        => Spree.t(:taxon_placeholder),
     :variant_placeholder      => Spree.t(:variant_placeholder),
-    :value                    => Spree.t(:value)
+    :value                    => Spree.t(:value),
+    :currency_separator       => I18n.t('number.currency.format.separator'),
   }.to_json
 %>
 </script>

data/app/views/spree/admin/stock_movements/_form.html.erb

@@ -1,13 +1,14 @@
 <div data-hook="admin_stock_movements_form_fields" class="row">
-  <div class="alpha four columns">
+  <div class="alpha twelve columns">
     <%= f.field_container :quantity do %>
       <%= f.label :quantity, Spree.t(:quantity) %>
-      <%= f.text_field :quantity, :class => 'fullwidth' %>
+      <%= f.text_field :quantity %>
     <% end %>
     <%= f.field_container :stock_item_id do %>
       <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-      <%= collection_select 'stock_movement', 'stock_item_id', stock_location.stock_items, :id, :variant_name,
-        { selected: @stock_movement.stock_item_id }, class: 'select2 fullwidth' %>
+      <%= f.text_field 'stock_item_id', :class => 'fullwidth' %>
     <% end %>
   </div>
 </div>
+
+<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>

data/app/views/spree/admin/stock_movements/index.html.erb

@@ -30,7 +30,9 @@
   <tbody>
     <% @stock_movements.each do |stock_movement|%>
       <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%= stock_movement.stock_item.variant_name %></td>
+        <td class="align-center">
+          <%= display_variant(stock_movement) %>
+        </td>
         <td class="align-center"><%= stock_movement.quantity %></td>
         <td class="align-center"><%= pretty_originator(stock_movement) %></td>
       </tr>

data/app/views/spree/admin/taxons/edit.html.erb

@@ -10,7 +10,7 @@
   </li>
 <% end %>
 
-<% # Because otherwise the form would attempt to use to_param of @taxon %>
+<%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 <%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
   <%= render 'form', :f => f %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -12,59 +12,14 @@
 
       <h6 class="variant-name">{{variant.name}}</h6>
 
-      <ul class='variant-data'>
-        <li class='variant-sku'><strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}</li>
-      </ul>
-
       {{#if variant.option_values}}
-        <ul class='variant-options'>
-          {{#each variant.option_values}}
-            <li><strong>{{this.option_type.presentation}}:</strong> {{this.presentation}}</li>
-          {{/each}}
-        </ul>
+        {{#each variant.option_values}}
+          <strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br>
+        {{/each}}
       {{/if}}
+      
+      <strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}
 
     </div>
   </div>
-</script>
-
-<script type='text/template' id='variant_autocomplete_stock_template'>
-  <fieldset>
-    <legend align="center"><%= Spree.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><%= Spree.t(:location) %></th>
-          <th><%= Spree.t(:count_on_hand) %></th>
-          <th><%= Spree.t(:quantity) %></th>
-          <th class="actions"></th>
-        </thead>
-        <tbody>
-          {{#each variant.stock_items}}
-            <tr>
-              <td>{{this.stock_location_name}}</td>
-              {{#if this.available}}
-                <td>
-                  {{this.count_on_hand}}
-                  {{#if this.backorderable}} (<%= Spree.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 icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
-                </td>
-              {{else}}
-                <td><%= Spree.t(:out_of_stock) %></td>
-                <td>0</td>
-              {{/if}}
-            </tr>
-          {{/each}}
-        </tbody>
-  </fieldset>
-</script>
+</script>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -0,0 +1,41 @@
+
+<script type='text/template' id='variant_autocomplete_stock_template'>
+  <fieldset>
+    <legend align="center"><%= Spree.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><%= Spree.t(:location) %></th>
+          <th><%= Spree.t(:count_on_hand) %></th>
+          <th><%= Spree.t(:quantity) %></th>
+          <th class="actions"></th>
+        </thead>
+        <tbody>
+          {{#each variant.stock_items}}
+            <tr>
+              <td>{{this.stock_location_name}}</td>
+              {{#if this.available}}
+                <td>
+                  {{this.count_on_hand}}
+                  {{#if this.backorderable}} (<%= Spree.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 icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+                </td>
+              {{else}}
+                <td><%= Spree.t(:out_of_stock) %></td>
+                <td>0</td>
+              {{/if}}
+            </tr>
+          {{/each}}
+        </tbody>
+  </fieldset>
+</script>

data/app/views/spree/layouts/admin.html.erb

@@ -45,7 +45,7 @@
       <nav id="admin-menu" data-hook>
         <div class="container">
           <div class="sixteen columns main-menu-wrapper">
-            <ul data-hook="admin_tabs" class="inline-menu fullwidth-menu">
+            <ul data-hook="admin_tabs" class="fullwidth-menu">
               <%= render :partial => 'spree/admin/shared/tabs' %>
             </ul>
           </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - app/assets/javascripts/admin/option_type_autocomplete.js.erb
 - app/assets/javascripts/admin/orders/edit.js
 - app/assets/javascripts/admin/orders/edit_form.js
+- app/assets/javascripts/admin/payments/edit.js.coffee
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/product_picker.js
 - app/assets/javascripts/admin/progress.coffee
@@ -157,6 +158,7 @@ files:
 - app/assets/javascripts/admin/spree_backend.js
 - app/assets/javascripts/admin/states.js
 - app/assets/javascripts/admin/stock_management.js.coffee
+- app/assets/javascripts/admin/stock_movement.js.coffee
 - app/assets/javascripts/admin/stock_transfer.js.coffee
 - app/assets/javascripts/admin/taxon_autocomplete.js.erb
 - app/assets/javascripts/admin/taxon_tree_menu.js.coffee
@@ -436,6 +438,7 @@ files:
 - app/views/spree/admin/trackers/index.html.erb
 - app/views/spree/admin/trackers/new.html.erb
 - app/views/spree/admin/variants/_autocomplete.js.erb
+- app/views/spree/admin/variants/_autocomplete_stock.js.erb
 - app/views/spree/admin/variants/_form.html.erb
 - app/views/spree/admin/variants/_split.js.erb
 - app/views/spree/admin/variants/edit.html.erb