spree_backend 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 401402f4f58935c9dfcd62001630f34dff182a4f
-  data.tar.gz: 752f24939efdc9c9c9530a2c8d788d0ce0112437
+  metadata.gz: 1edfef75f84d807cf8c95f2859bc483117a9d906
+  data.tar.gz: 0b68a358dfefe75da826cc499a6f452a4e15a46d
 SHA512:
-  metadata.gz: 4bf575fd3b79608ea266746992e1cb97abdc798ea9120b3aa4a335ca612556453364fae30546fda58c84a37382b34f74e6afef6d9f8f8e822be74b79170eebea
-  data.tar.gz: ab22128ba1a143a037fb79b2b3f4a48b2e6c94e30349c8c7376f261d2c7bf520bdd5fcb41af96dbfacc7929dcaa2f9e187cecc82699bd51ec3ea7f1787086476
+  metadata.gz: 0899662385e5da0455968e7b1c39f5bae6e50fbaa78ed448231ecdca68cd083c3187ba7cf699e31efe2eb618daab65da2423148699324aebcbdce57558c5196d
+  data.tar.gz: 0cf2af22c6bbcf29dde8eac4612a1f0aa0ed226b6a1d8c65e0d04f6e85e12b16aa508caca779ec539f39cc1e37a00515dcb9fc58c1a34f4b27d85b8ce9db9314

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/taxonomy.js.coffee

@@ -86,7 +86,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
                 base_url.path() + '/' + e.attr('id') + '/jstree'
           themes:
             theme: "apple",
-            url: "/assets/jquery.jstree/themes/apple/style.css"
+            url: Spree.url(Spree.routes.jstree_theme_path)
           strings:
             new_node: new_taxon,
             loading: Spree.translations.loading + "..."

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/_font-awesome.scss

@@ -27,8 +27,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: font-url('fontawesome-webfont.eot?v=3.2.1');
-  src: font-url('fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), font-url('fontawesome-webfont.woff?v=3.2.1') format('woff'), font-url('fontawesome-webfont.ttf?v=3.2.1') format('truetype'), font-url('fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: font-url('fontawesome-webfont.eot');
+  src: font-url('fontawesome-webfont.eot?#iefix') format('embedded-opentype'), font-url('fontawesome-webfont.woff') format('woff'), font-url('fontawesome-webfont.ttf') format('truetype'), font-url('fontawesome-webfont.svg#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

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

@@ -70,7 +70,7 @@
   input {
     @extend input[type="text"];
     margin-top: 5px;
-    margin-left: -6px;
+    margin-left: 4px;
     padding-left: 25px;
     padding-top: 6px;
     padding-bottom: 6px;
@@ -107,6 +107,11 @@
   li {
     font-size: 85% !important;
 
+
+    &:nth-child(odd) {
+      background: #efefef;
+    }
+
     &.select2-highlighted {
       .select2-result-label {
         &, h6 {
@@ -133,7 +138,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/customer_details_controller.rb

@@ -13,6 +13,9 @@ module Spree
           country_id = Address.default.country.id
           @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
           @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
+
+          @order.bill_address.country_id = country_id if @order.bill_address.country.nil?
+          @order.ship_address.country_id = country_id if @order.ship_address.country.nil?
         end
 
         def update

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/controllers/spree/admin/payments_controller.rb

@@ -71,7 +71,7 @@ module Spree
         if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
           params[:payment][:source_attributes] = source_params
         end
-        params.require(:payment).permit(:amount, :payment_method_id, :source_attributes)
+        params.require(:payment).permit(:amount, :payment_method_id, source_attributes: [:number, :expiry, :verification_value])
       end
 
       def load_data
@@ -86,7 +86,7 @@ module Spree
       end
 
       def can_transition_to_payment
-        unless @order.billing_address.present? 
+        unless @order.billing_address.present?
           flash[:notice] = Spree.t(:fill_in_customer_info)
           redirect_to edit_admin_order_customer_url(@order)
         end

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

@@ -5,7 +5,9 @@ module Spree
       helper_method :stock_location
 
       def index
-        @stock_movements = stock_location.stock_movements.recent.page(params[:page])
+        @stock_movements = stock_location.stock_movements.recent.
+          includes(:stock_item => { :variant => :product }).
+          page(params[:page])
       end
 
       def new

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

@@ -3,11 +3,18 @@ module Spree
     module StockMovementsHelper
       def pretty_originator(stock_movement)
         if stock_movement.originator.respond_to?(:number)
-          stock_movement.originator.number
+          link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
         else
           ""
         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/countries/index.html.erb

@@ -4,6 +4,14 @@
   <%= Spree.t(:listing_countries) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <ul class="actions inline-menu">
+    <li>
+      <%= button_link_to Spree.t(:new_country), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_country' } %>
+    </li>
+  </ul>
+<% end %>
+
 <table class="index" id='listing_countries' data-hook>
   <colgroup>
     <col style="width: 35%" />
@@ -27,8 +35,9 @@
         <td class="align-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <%= link_to_edit country, :no_text => true %>
+          <%= link_to_delete country, :no_text => true %>
         </td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

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

@@ -0,0 +1,16 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:new_country) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_countries_list), admin_countries_path, :class => 'button' %></li>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @countries } %>
+
+<%= form_for [:admin, @country] do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% 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 => { :confirm => Spree.t(:are_you_sure), 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :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/orders/customer_details/_form.html.erb

@@ -40,7 +40,7 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:billing_address) %></legend>
       <%= f.fields_for :bill_address do |ba_form| %>
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false } %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
       <% end %>
     </fieldset>
   </div>
@@ -49,7 +49,14 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <%= f.fields_for :ship_address do |sa_form| %>
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => Spree.t(:shipping_address), :use_billing => true } %>
+        <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
+          <span data-hook="use_billing">
+            <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
+            <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+          </span>
+        </div>
+
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => 'shipping' } %>
       <% end %>
     </fieldset>
   </div>

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/_address_form.html.erb

@@ -1,54 +1,51 @@
-<% if use_billing %>
-  <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
-    <span data-hook="use_billing">
-      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
-      <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
-    </span>
-  </div>
-<% end %>
-
-<% is_shipping_address = name == Spree.t(:shipping_address) %>
-<% shipping_or_billing = is_shipping_address ? 'shipping' : 'billing' %>
-<% s_or_b = is_shipping_address ? 's' : 'b' %>
+<% s_or_b = type.chars.first %>
 
-<div id="<%= is_shipping_address ? 'shipping' : 'billing' %>" style="display: <%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block' %>" data-hook="address_fields">
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+<div id="<%= type %>" data-hook="address_fields">
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :firstname, Spree.t(:first_name) %>
     <%= f.text_field :firstname, :class => 'fullwidth' %>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :lastname, Spree.t(:last_name) %>
     <%= f.text_field :lastname, :class => 'fullwidth' %>
   </div>
+
   <% if Spree::Config[:company] %>
-    <div class="field <%= "#{shipping_or_billing}-row" %>">
+    <div class="field <%= "#{type}-row" %>">
       <%= f.label :company, Spree.t(:company) %>
       <%= f.text_field :company, :class => 'fullwidth' %>
     </div>
   <% end %>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :address1, Spree.t(:street_address) %>
     <%= f.text_field :address1, :class => 'fullwidth' %>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :address2, Spree.t(:street_address_2) %>
     <%= f.text_field :address2, :class => 'fullwidth' %>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :city, Spree.t(:city) %>
     <%= f.text_field :city, :class => 'fullwidth' %>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :zipcode, Spree.t(:zip) %>
     <%= f.text_field :zipcode, :class => 'fullwidth' %>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :country_id, Spree.t(:country) %>
     <span id="<%= s_or_b %>country">
       <%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %>
     </span>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :state_id, Spree.t(:state) %>
     <span id="<%= s_or_b %>state">
       <%= f.text_field :state_name,
@@ -57,7 +54,8 @@
       <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
     </span>
   </div>
-  <div class="field <%= "#{shipping_or_billing}-row" %>">
+
+  <div class="field <%= "#{type}-row" %>">
     <%= f.label :phone, Spree.t(:phone) %>
     <%= f.phone_field :phone, :class => 'fullwidth' %>
   </div>

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

@@ -1,7 +1,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>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:order) %> #<%= @order.number %>
+  <%= link_to "#{Spree.t(:order)} ##{@order.number}", spree.edit_admin_order_path(@order) %>
 <% end %>
 
 <% content_for :sidebar_title do %>

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/taxonomies/edit.erb

@@ -22,6 +22,7 @@
       <script>
         Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
         Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
+        Spree.routes.jstree_theme_path = "<%= stylesheet_path("jquery.jstree/themes/apple/style.css") %>";
       </script>
       <div id="taxonomy_tree" class="tree"></div>
     </div>

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/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.draw do
+Spree::Core::Engine.add_routes do
   get '/admin', :to => 'admin/orders#index', :as => :admin
 
   namespace :admin do

data/lib/spree/backend/engine.rb

@@ -5,16 +5,6 @@ module Spree
 
       config.autoload_paths += %W(#{config.root}/lib)
 
-      # We need to reload the routes here due to how Spree sets them up.
-      # The different facets of Spree (auth, promo, etc.) append/prepend routes to Backend
-      # *after* Backend has been loaded.
-      #
-      # So we wait until after initialization is complete to do one final reload.
-      # This then makes the appended/prepended routes available to the application.
-      config.after_initialize do
-        Rails.application.routes_reloader.reload!
-      end
-
       initializer "spree.backend.environment", :before => :load_config_initializers do |app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end

data/vendor/assets/javascripts/jquery.jstree/themes/apple/{style.css → style.scss}

@@ -4,9 +4,9 @@
  * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
  */
 
-.jstree-apple > ul { background:url("bg.jpg") left top repeat; }
-.jstree-apple li, 
-.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-apple > ul { background:image-url("jquery.jstree/themes/apple/bg.jpg") left top repeat; }
+.jstree-apple li,
+.jstree-apple ins { background-image:image-url("jquery.jstree/themes/apple/d.png"); background-repeat:no-repeat; background-color:transparent; }
 .jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }
 .jstree-apple li.jstree-last { background:transparent; }
 .jstree-apple .jstree-open > ins { background-position:-72px 0; }
@@ -17,11 +17,11 @@
 .jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
 .jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
 .jstree-apple a .jstree-icon { background-position:-56px -20px; }
-.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+.jstree-apple a.jstree-loading .jstree-icon { background:image-url("jquery.jstree/themes/apple/throbber.gif") center center no-repeat !important; }
 
 .jstree-apple.jstree-focused { background:white; }
 
-.jstree-apple .jstree-no-dots li, 
+.jstree-apple .jstree-no-dots li,
 .jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
 .jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
 .jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
@@ -40,22 +40,22 @@
 .jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
 
 #vakata-dragged.jstree-apple ins { background:transparent !important; }
-/*#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }*/
-/*#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }*/
-/*#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }*/
+/*#vakata-dragged.jstree-apple .jstree-ok { background:image-url("jquery.jstree/themes/apple/d.png") -2px -53px no-repeat !important; }*/
+/*#vakata-dragged.jstree-apple .jstree-invalid { background:image-url("jquery.jstree/themes/apple/d.png") -18px -53px no-repeat !important; }*/
+/*#jstree-marker.jstree-apple { background:image-url("jquery.jstree/themes/apple/d.png") -41px -57px no-repeat !important; text-indent:-100px; }*/
 
 .jstree-apple a.jstree-search { color:aqua; }
 .jstree-apple .jstree-locked a { color:silver; cursor:default; }
 
-#vakata-contextmenu.jstree-apple-context, 
+#vakata-contextmenu.jstree-apple-context,
 #vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
 #vakata-contextmenu.jstree-apple-context li { }
 #vakata-contextmenu.jstree-apple-context a { color:black; }
-#vakata-contextmenu.jstree-apple-context a:hover, 
+#vakata-contextmenu.jstree-apple-context a:hover,
 #vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a,
 #vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
 #vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
 #vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
 
-/* TODO: IE6 support - the `>` selectors */
+/* TODO: IE6 support - the `>` selectors */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-15 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.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,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
@@ -143,6 +144,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
@@ -256,6 +258,7 @@ files:
 - app/views/spree/admin/countries/_form.html.erb
 - app/views/spree/admin/countries/edit.html.erb
 - app/views/spree/admin/countries/index.html.erb
+- app/views/spree/admin/countries/new.html.erb
 - app/views/spree/admin/general_settings/edit.html.erb
 - app/views/spree/admin/image_settings/edit.html.erb
 - app/views/spree/admin/images/_form.html.erb
@@ -429,6 +432,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
@@ -477,7 +481,7 @@ files:
 - vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg
 - vendor/assets/javascripts/jquery.jstree/themes/apple/d.png
 - vendor/assets/javascripts/jquery.jstree/themes/apple/dot_for_ie.gif
-- vendor/assets/javascripts/jquery.jstree/themes/apple/style.css
+- vendor/assets/javascripts/jquery.jstree/themes/apple/style.scss
 - vendor/assets/javascripts/jquery.jstree/themes/apple/throbber.gif
 - vendor/assets/javascripts/jquery.powertip.js
 - vendor/assets/javascripts/jquery.vAlign.js