spree_core 1.3.5 → 2.0.0.rc1

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

@@ -1,16 +0,0 @@
-<div data-hook="admin_property_form" class="align-center row">
-  <div class="alpha eight columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
-      <%= f.error_message_on :name %>
-    <% end %>
-  </div>
-  <div class="eight columns omega">
-    <%= f.field_container :presentation do %>
-      <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
-      <%= f.text_field :presentation, :class => 'fullwidth' %>
-      <%= f.error_message_on :presentation %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,18 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<% content_for :page_title do %>
-  <%= t(:editing_property) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to t(:back_to_properties_list), admin_properties_url, :icon => 'icon-arrow-left'%></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
-
-<%= form_for [:admin, @property] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
-<% end %>

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

@@ -1 +0,0 @@
-<%= auto_complete_result @properties, :name %>

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

@@ -1,41 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:properties) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li id="new_property_link">
-    <%= button_link_to t(:new_property), new_admin_property_url, { :remote => true, :icon => 'icon-plus', 'data-update' => 'new_property', :id => 'new_property_link' } %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<div id="new_property"></div>
-
-<table class="index" id='listing_properties' data-hook>
-  <colgroup>
-    <col style="width: 45%">
-    <col style="width: 45%">
-    <col style="width: 10%">
-  </colgroup>
-  <thead>
-    <tr data-hook="listing_properties_header">
-      <th><%= t(:name) %></th>
-      <th><%= t(:presentation) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @properties.each do |property| %>
-      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= property.name %></td>
-        <td><%= property.presentation %></td>
-        <td class="actions">
-          <%= link_to_edit(property, :no_text => true) %>
-          <%= link_to_delete(property, :no_text => true) %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-

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

@@ -1,13 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
-
-<%= form_for [:admin, @property] do |f| %>
-<fieldset data-hook="new_property">
-  <legend align="center"><%= t(:new_property) %></legend>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <div class="filter-actions">
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-  </div>
-</fieldset>
-<% end %>

data/app/views/spree/admin/properties/new.js.erb

@@ -1,2 +0,0 @@
-$("#new_property").html('<%= escape_javascript(render :template => "spree/admin/properties/new", :formats => [:html], :handlers => [:erb]) %>');
-$("#new_property_link").parent().hide();

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

@@ -1,25 +0,0 @@
-<div data-hook="admin_prototype_form_fields" class="row">
-  <div class="alpha four columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, t(:name) %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
-      <%= f.error_message_on :name %>
-    <% end %>
-  </div>
-
-  <div class="six columns">
-    <div id='properties' data-hook>
-      <%= f.field_container :property_ids do %>
-        <%= f.label :property_ids, t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="six columns omega">
-    <%= f.field_container :option_type_ids do %>
-      <%= f.label :option_type_ids, t(:option_types) %><br>
-      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
-    <% end %>
-  </div>
-</div>

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

@@ -1,25 +0,0 @@
-<table class="index">
-  <colgroup>
-    <col style="width: 80%" />
-    <col style="width: 20%" />
-  </colgroup>
-  <thead>
-    <tr data-hook="avilable_header">
-      <th><%= t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @prototypes.each do |prototype| %>
-      <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= prototype.name %></td>
-        <td class="actions">
-          <%= link_to t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype icon-ok' %>
-        </td>
-      </tr>
-    <% end %>
-    <% if @prototypes.empty? %>
-     <tr data-hook="available_none"><td colspan="2"><% t(:none) %>.</td></tr>
-    <% end %>
-  </tbody>
-</table>

data/app/views/spree/admin/prototypes/available.js.erb

@@ -1,2 +0,0 @@
-$("#prototypes").html('<%= escape_javascript(render :partial => "spree/admin/prototypes/prototypes") %>');
-$("#new_ptype_link").hide();

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

@@ -1,20 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<% content_for :page_title do %>
-  <%= t(:editing_prototype) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'icon-arrow-left' %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
-
-<%= form_for [:admin, @prototype] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
-<% end %>

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

@@ -1,40 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:prototypes) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li id="new_prototype_link">
-    <%= button_link_to t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'icon-plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
-
-<%# Placeholder for new prototype form %>
-<div id="new_prototype"></div>
-
-<table class="index" id='listing_prototypes' data-hook>
-  <colgroup>
-    <col style="width: 90%">
-    <col style="width: 10%">
-  </colgroup>
-  <thead>
-    <tr data-hook="prototypes_header">
-      <th><%= t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @prototypes.each do |prototype| %>
-      <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= prototype.name %></td>
-        <td class="actions">
-          <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
-          <%= link_to_delete(prototype, :no_text => true) %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

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

@@ -1,11 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
-
-<%= form_for [:admin, @prototype] do |f| %>
-<fieldset data-hook="new_prototype">
-  <legend align="center"><%= t(:new_prototype) %></legend>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-</fieldset>
-<% end %>

data/app/views/spree/admin/prototypes/new.js.erb

@@ -1,5 +0,0 @@
-$("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
-<% unless Rails.env.test? %>
-  $('.select2').select2();
-<% end %>
-$("#new_prototype_link").parent().hide();

data/app/views/spree/admin/prototypes/select.js.erb

@@ -1,4 +0,0 @@
-<% @prototype_properties.sort_by{ |prop| -prop[:id] }.each do |prop| %>
-  $("a.add_fields").click();
-  $(".product_property.fields:first input:first").val("<%= prop.name %>");
-<% end %>

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

@@ -1,42 +0,0 @@
-<% if @prototype.option_types.present? %>
-  <h2>Variants</h2>
-
-  <ul class="product-prototype-options">
-    <% @prototype.option_types.each do |ot| %>
-      <li class="option-type-field">
-        <b>
-          <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
-          <%= label_tag "option_type_#{ot.id}", ot.presentation %>
-        </b>      
-        <ul class="option-type-values">
-        <% ot.option_values.each do |ov| %>
-          <li>
-            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
-            <%= label_tag "option_value_#{ov.id}", ov.presentation %>
-          </li>
-        <% end %>
-        </ul>
-      </li>
-    <% end %>
-  </ul>
-
-  <script type="text/javascript">
-  //<![CDATA[
-    (function($){
-
-      $("input.option-type").change(function() {
-        $(this).parents("li").find("input.option-value").attr("checked", this.checked);
-      });
-
-      $("input.option-value").change(function() {
-        var any_checked = false;
-        $(this).parents(".option-type-values").find("input.option-value").each(function(i, el) {
-          any_checked = any_checked || el.checked;
-        });
-        $(this).parents(".option-type-field").find("input.option-type").attr("checked", any_checked);
-      });
-
-    })(jQuery);
-  //]]>
-  </script>
-<% end %>

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

@@ -1,21 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:listing_reports) %>
-<% end %>
-
-<table class="index">
-  <thead>
-    <tr data-hook="reports_header">
-      <th><%= t(:name) %></th>
-      <th><%= t(:description) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @reports.each do |key, value| %>
-    <tr data-hook="reports_row">
-      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= value[:description] %></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
-

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,37 +0,0 @@
-<% content_for :page_title do %>
-  <%= t(:sales_totals) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
-<% end %>
-
-
-<% content_for :table_filter_title do %>
-  <%= t(:date_range) %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
-<% end %>
-
-<table class="admin-report" data-hook="sales_total">
-  <thead>
-    <tr>
-      <th><%= t(:currency) %></th>
-      <th><%= t(:item_total) %></th>
-      <th><%= t(:adjustment_total) %></th>
-      <th><%= t(:sales_total) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @totals.each do |key, row| %>
-      <tr class="align-center">
-        <td><%= key %></td>
-        <td><%= row[:item_total].format %></td>
-        <td><%= row[:adjustment_total].format %></td>
-        <td><%= row[:sales_total].format %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

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

@@ -1,72 +0,0 @@
-<div data-hook="admin_return_authorization_form_fields">
-  <table class="index">
-    <thead>
-      <tr data-hook="rma_header">
-        <th><%= t(:product) %></th>
-        <th><%= t(:quantity_shipped) %></th>
-        <th><%= t(:quantity_returned) %></th>
-        <th><%= t(:return_quantity) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
-        <tr id="<%= dom_id(variant) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
-          <td>
-            <div class="variant-name"><%= variant.name %></div>
-            <div class="variant-options"><%= variant.options_text %></div>
-          </td>
-          <td class="align-center"><%= units.select(&:shipped?).size %></td>
-          <td class="align-center"><%= units.select(&:returned?).size %></td>
-          <td class="return_quantity align-center">
-            <% if @return_authorization.received? %>
-              <%= @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0 %>
-            <% elsif units.select(&:shipped?).empty? %>
-              0
-            <% else %>
-              <%= number_field_tag "return_quantity[#{variant.id}]",
-                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:100px;', :min => 0} %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-
-  <%= f.field_container :amount do %>
-    <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
-    <% if @return_authorization.received? %>
-      <%= @return_authorization.display_amount %>
-    <% else %>
-      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value">0.00</span>
-      <%= f.error_message_on :amount %>
-    <% end %>
-  <% end %>
-
-  <%= f.field_container :reason do %>
-    <%= f.label :reason, t(:reason) %>
-    <%= f.text_area :reason, {:style => 'height:100px;', :class => 'fullwidth'} %>
-    <%= f.error_message_on :reason %>
-  <% end %>
-</div>
-
-<script>
-  var line_item_prices = {};
-  <% @return_authorization.order.line_items.group_by(&:variant).each do | variant, items| %>
-    line_item_prices[<%= variant.id.to_s %>] = <%= items.first.price %>;
-  <% end %>
-
-  $(document).ready(function(){
-    var rma_amount = 0;
-    $("td.return_quantity input").on('change', function() {
-      var rma_amount = 0;
-      $.each($("td.return_quantity input"), function(i, input) {
-        var variant_id = $(input).attr('id').replace("return_quantity_", "");
-         rma_amount += line_item_prices[variant_id] * $(input).val()
-      });
-
-      if(!isNaN(rma_amount)){
-        $("span#rma_value").html(rma_amount.toFixed(2));
-      }
-    })
-  });
-</script>

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

@@ -1,32 +0,0 @@
-<% content_for :page_actions do %>
-  <li>
-    <% if @return_authorization.can_receive? %>
-      <%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => t(:are_you_sure) }, :icon => 'icon-download-alt' %>
-    <% end %>
-  </li>
-  <li>
-    <% if @return_authorization.can_cancel? %>
-      <%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => t(:are_you_sure) }, :icon => 'icon-remove' %>
-    <% end %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
-
-<% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= t(:return_authorization) %> <%= @return_authorization.number %> (<%= t(@return_authorization.state.downcase) %>)
-<% end %>
-
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
-<%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t(:update), 'icon-repeat' %>
-      <span class="or"><%= t(:or) %></span>
-      <%= button_link_to t(:cancel), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
-    </div>
-  </fieldset>
-<% end %>

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

@@ -1,52 +0,0 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
-
-<% content_for :page_actions do %>
-  <% if @order.inventory_units.any? &:shipped? %>
-    <li>
-      <%= button_link_to t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'icon-plus' %>
-    </li>
-  <% end %>
-  <li><%= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left' %></li>
-<% end %>
-
-<% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= t(:return_authorizations) %>
-<% end %>
-
-<% if @order.inventory_units.any? &:shipped? %>
-  <table class="index">
-    <thead data-hook="rma_header">
-      <tr>
-        <th><%= t(:rma_number) %></th>
-        <th><%= t(:status) %></th>
-        <th><%= t(:amount) %></th>
-        <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @return_authorizations.each do |return_authorization| %>
-        <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
-          <td><%= return_authorization.number %></td>
-          <td><%= t(return_authorization.state.downcase) %></td>
-          <td><%= return_authorization.display_amount.to_html %></td>
-          <td><%= pretty_time(return_authorization.created_at) %></td>
-          <td class="actions">
-            <%= link_to_edit return_authorization %>
-            <% unless return_authorization.received? %>
-              &nbsp;
-              <%= link_to_delete return_authorization %>
-            <% end %>
-          </td>
-
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <div data-hook="rma_cannont_create" class="no-objects-found">
-    <%= t(:cannot_create_returns) %>
-  </div>
-<% end %>
-
-<%= button_link_to t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>

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

@@ -1,22 +0,0 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
-
-<% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= t(:new_return_authorization) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'icon-arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
-<%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button t(:continue), 'icon-arrow-right' %>
-      <span class="or"><%= t(:or) %></span>
-      <%= button_link_to t(:cancel), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
-    </div>
-  </fieldset>
-<% end %>

data/app/views/spree/admin/search/users.rabl

@@ -1,30 +0,0 @@
-collection(@users)
-attributes :email, :id
-address_fields = [:firstname, :lastname,
-                  :address1, :address2,
-                  :city, :zipcode,
-                  :phone, :state_name,
-                  :state_id, :country_id,
-                  :company]
-
-child :ship_address => :ship_address do
-  attributes *address_fields
-  child :state do
-    attributes :name
-  end
-
-  child :country do
-    attributes :name
-  end
-end
-
-child :bill_address => :bill_address do
-  attributes *address_fields
-  child :state do
-    attributes :name
-  end
-
-  child :country do
-    attributes :name
-  end
-end

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

@@ -1,6 +0,0 @@
-<div data-hook="address">
-  <%="#{address.firstname} #{address.lastname} "%><%= address.company unless address.company.blank? %>
-  <%="(#{address.phone}" %><%= address.alternative_phone unless address.alternative_phone.blank? %>)<br />
-  <%= address.address1 %> <%= ", #{address.address2}" unless address.address2.blank? %>
-  <%= ", #{address.city}, #{address.state_text}, #{address.zipcode}, #{address.country.name}" %>
-</div>

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

@@ -1,65 +0,0 @@
-<% 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]', t(:use_billing_address) %>
-    </span>
-  </div>
-  
-<% end %>
-  
-<div id="<%= name == t(: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 <%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">    
-    <%= f.label :firstname, t(:first_name) + ':' %>    
-    <%= f.text_field :firstname, :class => 'fullwidth' %>
-  </div>
-  <div class="field">
-    <%= f.label :lastname, t(:last_name) + ':' %>
-    <%= f.text_field :lastname, :class => 'fullwidth' %>
-  </div>  
-  <% if Spree::Config[:company] %>
-    <div class="field <%= name == t(:company) ? 'shipping-row' : 'billing-row' %>">
-      <%= f.label :company, t(:company) + ':' %>
-      <%= f.text_field :company, :class => 'fullwidth' %>
-    </div>
-  <% end %>
-  <div class="field <%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">    
-    <%= f.label :address1, t(:street_address) + ':' %>
-    <%= f.text_field :address1, :class => "fullwidth" %>
-  </div>
-  <div class="field">
-    <%= f.label :address2, t(:street_address_2) + ':' %>
-    <%= f.text_field :address2, :class => "fullwidth" %>
-  </div>
-  <div class="field <%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">    
-    <%= f.label :city, t(:city) + ':' %>
-    <%= f.text_field :city, :class => 'fullwidth' %>
-  </div>
-  <div class="field">
-    <%= f.label :zipcode, t(:zip) + ':' %>
-    <%= f.text_field :zipcode, :class => 'fullwidth' %>
-  </div>  
-  <div class="field">
-    <%= f.label :country_id, t(:country) + ':' %>
-    <span id="<%= name == t(:shipping_address) ? 's' : 'b' %>country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %></span>
-  </div>
-  <div class="field <%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">    
-    <%= f.label :state_id, t(:state) + ':' %>
-    <span id="<%= name == t(:shipping_address) ? 's' : 'b' %>state">
-      <%= f.text_field :state_name, :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty?, :class => 'fullwidth' %>
-      <%= 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 <%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
-    <%= f.label :phone, t(:phone) + ':' %>
-    <%= f.phone_field :phone, :class => 'fullwidth' %>
-  </div>
-</div>
-
-<% content_for :head do %>
-  <%= javascript_tag do -%>
-    $(document).ready(function(){
-      $('span#<%= name == t(:shipping_address) ? 's' : 'b' %>country .select2').on('change', function() { update_state('<%= name == t(:shipping_address) ? 's' : 'b' %>'); });
-    });
-  <% end -%>
-<% end %>

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

@@ -1,5 +0,0 @@
-<div class="alert <%= alert.severity.downcase %>">
-  <%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
-  <%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
-              :remote => true, :method => :post, :class => 'dismiss' %>
-</div>