spree_backend 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c28791d3f7243ffae36fe5fa92d3d8ac759d88b
-  data.tar.gz: 1407c077a4ff761036dfc7c4db6cb045d39e9093
+  metadata.gz: 141a054dae5dabb9b0419390a14925ab30b09091
+  data.tar.gz: 79f1e35967bc67ca1601f3651d5124d2c78a23dc
 SHA512:
-  metadata.gz: f31473246ca26399b5436fe419204235fdb2576da21b0b9a3a3273f669c72cee56edd4f7591ea3448e4affac1ea59a1bc37655553a92c0b5985f039117e268cb
-  data.tar.gz: dc5cb36da3effc2be58c104e3abeb4e24a4dada50c14fa5ae8eb8458cf10ec573bf244f561cd3ff567f8f6250e3f00c8eb7c5bb68c6aa90796001ae49ba56b9a
+  metadata.gz: 87a7898e914acab3eaa8258652c218814a91956937cda7c46ae970efb1338a36958fddbbace23ecc070905113bceb7758f94c8ba4f9be35af6b0e4432bc3f4c7
+  data.tar.gz: 0d9fc6a1aa1427f8c972c337de690268010e745223e10946ca68806b01fc3e9a6d15db13cf92569c6df7e9b049d2009d1dbbaaff1747e2bdb3370c4e8d361b9d

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

@@ -82,33 +82,48 @@ $ ->
 
     refresh_variants: ->
       if @receiving_stock()
-        @_refresh_transfer_variants()
+        @_search_transfer_variants()
       else
-        @_refresh_transfer_stock_items()
+        @_search_transfer_stock_items()
 
-    _refresh_transfer_variants: ->
-      if @cached_variants?
-        @populate_select @cached_variants
-      else
-        $.getJSON Spree.url(Spree.routes.variants_api), (data) =>
-          @cached_variants = _.map(data.variants, (variant) -> new TransferVariant(variant))
-          @populate_select @cached_variants
+    _search_transfer_variants: ->
+      @build_select(Spree.url(Spree.routes.variants_api), 'product_name_or_sku_cont')
 
-    _refresh_transfer_stock_items: ->
+    _search_transfer_stock_items: ->
       stock_location_id = $('#transfer_source_location_id').val()
-      $.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) ->
-      $('#transfer_variant').children('option').remove()
-
-      for variant in variants
-        $('#transfer_variant').append($('<option></option>')
-                                    .text(variant.name)
-                                    .prop('value', variant.id)
-                                    .data('variant', variant))
+      @build_select(Spree.url(Spree.routes.stock_locations_api + "/#{stock_location_id}/stock_items"),
+        'variant_product_name_or_variant_sku_cont')
+
+    format_variant_result: (result) ->
+      "#{result.name} - #{result.sku}"
+
+    build_select: (url, query) ->
+      $('#transfer_variant').select2
+        minimumInputLength: 3
+        ajax:
+          url: url
+          datatype: "json"
+          data: (term, page) ->
+            query_object = {}
+            query_object[query] = term
+            q: query_object
+
+          results: (data, page) ->
+            result = data["variants"] || data["stock_items"]
+            # Format stock items as variants
+            if data["stock_items"]?
+              result = _(result).map (variant) ->
+                variant.variant
+            window.variants = result
+            results: result
+
+        formatResult: @format_variant_result
+        formatSelection: (variant) ->
+          if !!variant.options_text
+            variant.name + " (#{variant.options_text})" + " - #{variant.sku}"
+          else
+            variant.name + " - #{variant.sku}"
 
-      $('#transfer_variant').select2()
 
   # Add/Remove variant line items
   class TransferAddVariants
@@ -120,7 +135,10 @@ $ ->
 
       $('button.transfer_add_variant').click (event) =>
         event.preventDefault()
-        @add_variant()
+        if $('#transfer_variant').select2('data')?
+          @add_variant()
+        else
+          alert('Please select a variant first')
 
       $('#transfer-variants-table').on 'click', '.transfer_remove_variant', (event) =>
         event.preventDefault()
@@ -132,7 +150,7 @@ $ ->
           false
 
     add_variant: ->
-      variant = $('#transfer_variant option:selected').data('variant')
+      variant = $('#transfer_variant').select2('data')
       quantity = parseInt $('#transfer_variant_quantity').val()
 
       variant = @find_or_add(variant)
@@ -143,7 +161,7 @@ $ ->
       if existing = _.find(@variants, (v) -> v.id == variant.id)
         return existing
       else
-        variant = $.extend({}, variant)
+        variant = new TransferVariant($.extend({}, variant))
         @variants.push variant
         return variant
 

data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss

@@ -2,15 +2,16 @@
   > ul, .jstree-icon {
     background-image: none;
   }
-  
+
   .jstree-icon {
     @extend [class^="icon-"]:before;
+    @extend .fa;
   }
 
-  .jstree-open > .jstree-icon {    
+  .jstree-open > .jstree-icon {
     @extend .fa-caret-down;
   }
-  .jstree-closed > .jstree-icon {    
+  .jstree-closed > .jstree-icon {
     @extend .fa-caret-right;
   }
 
@@ -31,24 +32,27 @@
 
       .jstree-icon {
         padding-left: 0px;
-        @extend .fa-arrows;   
+        @extend .fa;
+        @extend .fa-arrows;
       }
     }
   }
 }
 
-#vakata-dragged.jstree-apple .jstree-invalid, 
+#vakata-dragged.jstree-apple .jstree-invalid,
 #vakata-dragged.jstree-apple .jstree-ok,
 #jstree-marker {
   background-image: none !important;
   background-color: transparent !important;
-  @extend [class^="icon-"]:before;   
+  @extend [class^="icon-"]:before;
 }
 #vakata-dragged.jstree-apple .jstree-invalid {
-  @extend .fa-bars;  
+  @extend .fa;
+  @extend .fa-bars;
   color: $color-5;
 }
 #vakata-dragged.jstree-apple .jstree-ok {
+  @extend .fa;
   @extend .fa-check;
   color: $color-2;
 }
@@ -71,7 +75,7 @@
   -webkit-box-shadow: none !important;
      -moz-box-shadow: none !important;
           box-shadow: none !important;
-  
+
 }
 
 #vakata-contextmenu {
@@ -109,7 +113,7 @@
       -webkit-box-shadow: none !important;
       line-height: inherit !important;
       padding: 5px 10px !important;
-      margin: 0 !important;      
+      margin: 0 !important;
     }
   }
 
@@ -128,4 +132,4 @@
   li.vakata-separator {
     display: none;
   }
-}
+}

data/app/assets/stylesheets/spree/backend/plugins/_select2.scss

@@ -173,9 +173,12 @@
         background-image: none !important;
         font-size: 85% !important;
         @extend .fa;
-        @extend .fa-bars;
+        @extend .fa-void;
         margin-left: 2px;
         color: $color-1;
+        &:before {
+          font-size: 11px;
+        }
       }
     }
   }

data/app/assets/stylesheets/spree/backend/shared/_icons.scss

@@ -14,22 +14,35 @@
   }
 }
 
-.fa-email:before    { @extend .fa-envelope:before }
-.fa-resume:before   { @extend .fa-refresh:before  }
-.fa-approve:before  { @extend .fa-check:before    }
+.fa-email:before     { @extend .fa-envelope:before }
+.fa-resume:before    { @extend .fa-refresh:before  }
+.fa-approve:before   { @extend .fa-check:before    }
 
+.fa-remove:before,
 .fa-cancel:before,
-.fa-void:before     { @extend .fa-times:before   }
+.fa-void:before      { @extend .fa-times:before    }
 
-.fa-trash:before    { @extend .fa-trash-o:before }
-
-.fa-capture:before  { @extend .fa-check:before       }
-.fa-credit:before   { @extend .fa-check:before       }
-.fa-approve:before  { @extend .fa-check:before       }
+.fa-trash:before     { @extend .fa-trash-o:before  }
 
+.fa-capture:before   { @extend .fa-check:before    }
+.fa-credit:before    { @extend .fa-check:before    }
+.fa-approve:before   { @extend .fa-check:before    }
+.fa-icon-cogs:before { @extend .fa-cogs:before     }
+.fa-ok:before,
+.fa-icon-ok:before   { @extend .fa-check:before    }
 
 button, a {
   &.fa:before {
     padding-right: 5px;
   }
 }
+
+// Admin navigation fixes
+.icon-user,
+.icon-signout,
+.icon-external-link {
+  @extend .fa;
+}
+.icon-user          { @extend .fa-user; }
+.icon-signout       { @extend .fa-sign-out; }
+.icon-external-link { @extend .fa-external-link; }

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -105,6 +105,7 @@ table {
 
     .handle {
       @extend [class^="icon-"]:before;
+      @extend .fa;
       @extend .fa-bars;
       cursor: move;
     }

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

@@ -1,16 +1,18 @@
 module Spree
   module Admin
     class AdjustmentsController < ResourceController
-      belongs_to 'spree/order', :find_by => :number
-      destroy.after :reload_order
-      destroy.after :update_totals
+
+      belongs_to 'spree/order', find_by: :number
+
       create.after :update_totals
+      destroy.after :update_totals
       update.after :update_totals
 
-      skip_before_filter :load_resource, :only => [:toggle_state, :edit, :update, :destroy]
+      skip_before_filter :load_resource, only: [:toggle_state, :edit, :update, :destroy]
 
-      def index
-        @adjustments = @order.all_adjustments.order("created_at ASC")
+      def destroy
+        find_adjustment
+        super
       end
 
       def edit
@@ -18,30 +20,26 @@ module Spree
         super
       end
 
-      def update
-        find_adjustment
-        super
+      def index
+        @adjustments = @order.all_adjustments.order("created_at ASC")
       end
 
-      def destroy
-        find_adjustment 
+      def update
+        find_adjustment
         super
       end
 
       private
+
       def find_adjustment
         # Need to assign to @object here to keep ResourceController happy
         @adjustment = @object = parent.all_adjustments.find(params[:id])
       end
 
-      def reload_order
-        @order.reload
-      end
-
       def update_totals
-        @order.updater.update_adjustment_total
-        @order.persist_totals
+        @order.reload.update!
       end
+
     end
   end
 end

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

@@ -31,7 +31,9 @@ module Spree
             invoke_callbacks(:create, :after)
             # Transition order as far as it will go.
             while @order.next; end
-            @payment.process! if @order.completed?
+            # If "@order.next" didn't trigger payment processing already (e.g. if the order was
+            # already complete) then trigger it manually now
+            @payment.process! if @order.completed? && @payment.checkout?
             flash[:success] = flash_message_for(@payment, :successfully_created)
             redirect_to admin_order_payments_path(@order)
           else

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

@@ -1,11 +1,24 @@
 module Spree
   module Admin
     class PropertiesController < ResourceController
+      def index
+        respond_with(@collection)
+      end
+
+      private
+
+      def collection
+        return @collection if @collection.present?
+        # params[:q] can be blank upon pagination
+        params[:q] = {} if params[:q].blank?
+
+        @collection = super
+        @search = @collection.ransack(params[:q])
+        @collection = @search.result.
+              page(params[:page]).
+              per(Spree::Config[:properties_per_page])
 
-      # Looks like this action is unused
-      def filtered
-        @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%").order(:name)
-        render :template => "spree/admin/properties/filtered", :layout => false
+        @collection
       end
     end
   end

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

@@ -10,10 +10,10 @@
         <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
           <tr class="total">
             <td><strong><%= label %>:</strong></td>
-            <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount)) %></span></td>
+            <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: adjustments.first.order.try(:currency)) %></span></td>
           </tr>
         <% end %>
       </tbody>
     </table>
   </fieldset>
-<% end %>
+<% end %>

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

@@ -2,7 +2,7 @@
   <div class="alpha three columns">
     <div class="field">
       <%= f.label :amount, Spree.t(:amount) %>
-      <%= f.text_field :amount, :value => @order.outstanding_balance, :class => 'fullwidth' %>
+      <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'fullwidth' %>
     </div>
   </div>
   <div class="omega nine columns">

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

@@ -1,11 +1,11 @@
 <%= render 'spree/admin/shared/product_sub_menu' %>
-<%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
-<%= render 'spree/shared/error_messages', :target => @product %>
+<%= render 'spree/admin/shared/product_tabs', current: 'Product Properties' %>
+<%= render 'spree/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
   <ul class="tollbar inline-menu">
     <li>
-      <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
+      <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', class: 'plus button' %>
     </li>
     <li>
       <span id="new_ptype_link">

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

@@ -1,40 +1,48 @@
 <div data-hook="admin_product_form_fields">
-  
-  <div class="left eight columns alpha" data-hook="admin_product_form_left">    
-    <%= f.field_container :name do %>
-      <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-      <%= f.text_field :name, :class => 'fullwidth title' %>
-      <%= f.error_message_on :name %>
-    <% end %>
 
-    <%= f.field_container :slug do %>
-      <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
-      <%= f.text_field :slug, :class => 'fullwidth title' %>
-      <%= f.error_message_on :slug %>
-    <% end %>
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">
+    <div data-hook="admin_product_form_name">
+      <%= f.field_container :name do %>
+        <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+        <%= f.text_field :name, :class => 'fullwidth title' %>
+        <%= f.error_message_on :name %>
+      <% end %>
+    </div>
 
-    <%= f.field_container :description do %>
-      <%= f.label :description, Spree.t(:description) %>
-      <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
-      <%= f.error_message_on :description %>
-    <% end %>
+    <div data-hook="admin_product_form_slug">
+      <%= f.field_container :slug do %>
+        <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
+        <%= f.text_field :slug, :class => 'fullwidth title' %>
+        <%= f.error_message_on :slug %>
+      <% end %>
+    </div>
+
+    <div data-hook="admin_product_form_description">
+      <%= f.field_container :description do %>
+        <%= f.label :description, Spree.t(:description) %>
+        <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
+        <%= f.error_message_on :description %>
+      <% end %>
+    </div>
   </div>
 
   <div class="right four columns omega" data-hook="admin_product_form_right">
+    <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
       <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
       <%= f.error_message_on :price %>
     <% end %>
+    </div>
 
-    <div class="alpha two columns">
+    <div data-hook="admin_product_form_cost_price" class="alpha two columns">
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
-    <div class="omega two columns">
+    <div data-hook="admin_product_form_cost_currency" class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>
         <%= f.text_field :cost_currency %>
@@ -44,73 +52,89 @@
 
     <div class="clear"></div>
 
-    <%= f.field_container :available_on do %>
-      <%= f.label :available_on, Spree.t(:available_on) %>
-      <%= f.error_message_on :available_on %>
-      <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
-    <% end %>
+    <div data-hook="admin_product_form_available_on">
+      <%= f.field_container :available_on do %>
+        <%= f.label :available_on, Spree.t(:available_on) %>
+        <%= f.error_message_on :available_on %>
+        <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
+      <% end %>
+    </div>
 
     <% unless @product.has_variants? %>
-      <%= f.field_container :sku do %>
-        <%= f.label :sku, Spree.t(:sku) %>
-        <%= f.text_field :sku, :size => 16 %>
-      <% end %>
+      <div data-hook="admin_product_form_sku">
+        <%= f.field_container :sku do %>
+          <%= f.label :sku, Spree.t(:sku) %>
+          <%= f.text_field :sku, :size => 16 %>
+        <% end %>
+      </div>
 
       <ul id="shipping_specs">
-        <li id="shipping_specs_weight_field" class="field alpha two columns">
+        <li id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field alpha two columns">
           <%= f.label :weight, Spree.t(:weight) %>
           <%= f.text_field :weight, :size => 4 %>
         </li>
-        <li id="shipping_specs_height_field" class="field omega two columns">
+        <li id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field omega two columns">
           <%= f.label :height, Spree.t(:height) %>
           <%= f.text_field :height, :size => 4 %>
         </li>
-        <li id="shipping_specs_width_field" class="field alpha two columns">
+        <li id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field alpha two columns">
           <%= f.label :width, Spree.t(:width) %>
           <%= f.text_field :width, :size => 4 %>
         </li>
-        <li id="shipping_specs_depth_field" class="field omega two columns">
+        <li id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field omega two columns">
           <%= f.label :depth, Spree.t(:depth) %>
           <%= f.text_field :depth, :size => 4 %>
         </li>
       </ul>
     <% end %>
 
-    <%= f.field_container :shipping_categories do %>
-      <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
-      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
-      <%= f.error_message_on :shipping_category %>
-    <% end %>
+    <div data-hook="admin_product_form_shipping_categories">
+      <%= f.field_container :shipping_categories do %>
+        <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
+        <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+        <%= f.error_message_on :shipping_category %>
+      <% end %>
+    </div>
 
-    <%= f.field_container :tax_category do %>
-      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
-      <%= f.error_message_on :tax_category %>
-    <% end %>
+    <div data-hook="admin_product_form_tax_category">
+      <%= f.field_container :tax_category do %>
+        <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+        <%= f.error_message_on :tax_category %>
+      <% end %>
+    </div>
   </div>
 
   <div class="twelve columns alpha omega">
-    <%= f.field_container :taxons do %>
-      <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
-      <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
-    <% end %>
+    <div data-hook="admin_product_form_taxons">
+      <%= f.field_container :taxons do %>
+        <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
+        <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
+      <% end %>
+    </div>
 
-    <%= f.field_container :option_types do %>
-      <%= f.label :option_type_ids, Spree.t(:option_types) %>
-      <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
-    <% end %>
+    <div data-hook="admin_product_form_option_types">
+      <%= f.field_container :option_types do %>
+        <%= f.label :option_type_ids, Spree.t(:option_types) %>
+        <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
+      <% end %>
+    </div>
   </div>
 
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
-    <%= f.field_container :meta_keywords do %>
-      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
-      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
-    <% end %>
+    <div data-hook="admin_product_form_meta_keywords">
+      <%= f.field_container :meta_keywords do %>
+        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+        <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
+      <% end %>
+    </div>
 
-    <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description, Spree.t(:meta_description) %>
-      <%= f.text_field :meta_description, :class => 'fullwidth' %>
-    <% end %>
+    <div data-hook="admin_product_form_meta_description">
+      <%= f.field_container :meta_description do %>
+        <%= f.label :meta_description, Spree.t(:meta_description) %>
+        <%= f.text_field :meta_description, :class => 'fullwidth' %>
+      <% end %>
+    </div>
   </div>
 
   <div class="clear"></div>

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

@@ -15,7 +15,7 @@
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
-        <div class="alpha four columns">
+        <div data-hook="new_product_sku" class="alpha four columns">
           <%= f.field_container :sku do %>
             <%= f.label :sku, Spree.t(:sku) %><br />
             <%= f.text_field :sku, :size => 16, :class => 'fullwidth' %>
@@ -24,14 +24,14 @@
         </div>
       <% end %>
 
-      <div class="four columns">
+      <div data-hook="new_product_prototype" class="four columns">
         <%= f.field_container :prototype do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %><br />
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
         <% end %>
       </div>
 
-      <div class="four columns">
+      <div data-hook="new_product_price" class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
           <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <div class="omega four columns">
+      <div data-hook="new_product_available_on" class="omega four columns">
         <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
@@ -50,7 +50,7 @@
     </div>
 
     <div class='row'>
-      <div class="alpha four columns">
+      <div data-hook="new_product_shipping_category" class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>

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

@@ -10,6 +10,35 @@
 
 <%= render 'spree/admin/shared/product_sub_menu' %>
 
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_property_sidebar">
+
+    <%= search_form_for [:admin, @search] do |f| %>
+
+        <%- locals = {:f => f} %>
+
+        <div data-hook="admin_property_index_search">
+          <div class="alpha eight columns">
+            <div class="field">
+              <%= f.label :name_cont, Spree.t(:name) %>
+              <%= f.text_field :name_cont, :size => 15 %>
+            </div>
+          </div>
+        </div>
+
+        <div class="clear"></div>
+
+        <div class="form-buttons actions filter-actions" data-hook="admin_properties_index_search_buttons">
+          <%= button Spree.t(:search), 'search' %>
+        </div>
+    <% end %>
+  </div>
+<% end %>
+
 <div id="new_property"></div>
 
 <% if @properties.any? %>
@@ -46,3 +75,4 @@
   </div>
 <% end %>
 
+<%= paginate @collection %>

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

@@ -4,7 +4,7 @@
     <col style="width: 20%" />
   </colgroup>
   <thead>
-    <tr data-hook="avilable_header">
+    <tr data-hook="available_header">
       <th><%= Spree.t(:name) %></th>
       <th class="actions"></th>
     </tr>

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

@@ -2,24 +2,24 @@
   <dl class="additional-info">
     <dt id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
     <dd><span class="state <%= @order.state %>"><%= Spree.t(@order.state, :scope => :order_state) %></span></dd>
-    <dt data-hook><%= Spree.t(:subtotal) %>:</dt>
+    <dt data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %>:</dt>
     <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
     <% if checkout_steps.include?("delivery") && @order.ship_total > 0 %>
-      <dt data-hook><%= Spree.t(:ship_total) %>:</dt>
-      <dd id='item_total'><%= @order.display_ship_total.to_html %></dd>
+      <dt data-hook='admin_order_tab_ship_total_title'><%= Spree.t(:ship_total) %>:</dt>
+      <dd id='ship_total'><%= @order.display_ship_total.to_html %></dd>
     <% end %>
 
     <% if @order.included_tax_total != 0 %>
-      <dt data-hook><%= Spree.t(:tax_included) %>:</dt>
+      <dt data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %>:</dt>
       <dd id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
     <% end %>
 
     <% if @order.additional_tax_total != 0 %>
-      <dt data-hook><%= Spree.t(:tax) %>:</dt>
-      <dd id='item_total'><%= @order.display_additional_tax_total.to_html %></dd>
+      <dt data-hook='admin_order_tab_additional_tax_title'><%= Spree.t(:tax) %>:</dt>
+      <dd id='additional_tax_total'><%= @order.display_additional_tax_total.to_html %></dd>
     <% end %>
 
-    <dt data-hook><%= Spree.t(:total) %>:</dt>
+    <dt data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %>:</dt>
     <dd id='order_total'><%= @order.display_total.to_html %></dd>
 
     <% if @order.completed? %>
@@ -27,7 +27,7 @@
       <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
       <dt><%= Spree.t(:payment) %>: </dt>
       <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
-      <dt data-hook><%= Spree.t(:date_completed) %>:</dt>
+      <dt data-hook='admin_order_tab_date_completed_title'><%= Spree.t(:date_completed) %>:</dt>
       <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
     <% end %>
 

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

@@ -13,7 +13,7 @@
         <%= link_to_with_icon 'edit', Spree.t(:product_details), edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, :class => ('active' if current == 'Images') do %>
-        <%= link_to_with_icon 'picture', Spree.t(:images), admin_product_images_url(@product) %>
+        <%= link_to_with_icon 'picture-o', Spree.t(:images), admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) %>
       <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
         <%= link_to_with_icon 'th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>

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

@@ -64,7 +64,7 @@
       <div class="alpha eight columns">
         <div class="field" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree.t(:variant) %>
-          <%= select_tag 'transfer_variant', {}, class: 'fullwidth' %>
+          <%= hidden_field_tag 'transfer_variant', {}, class: 'fullwidth' %>
         </div>
       </div>
       <div class="two columns">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -529,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.