spree_core 1.1.6 → 1.2.0.rc1

data/app/assets/javascripts/admin/images/index.js

@@ -1,10 +0,0 @@
-$(document).ready(function(){
-
-  $('#new_image_link').click(function (event) {
-    event.preventDefault();
-    $(this).hide();
-    $.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}),
-            success: function(r){ $('#images').html(r);} });
-  });
-
-});

data/app/assets/javascripts/admin/images/new.js

@@ -1,5 +0,0 @@
-$('#cancel_link').click(function (event) {
-  event.preventDefault();
-  $('#new_image_link').show();
-  $('#images').html('');
-});

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

@@ -1,2 +0,0 @@
-$(function() {
-});

data/app/assets/javascripts/store/cart.js

@@ -1,11 +0,0 @@
-(function($){
-  $(document).ready(function(){
-    if($('form#update-cart').is('*')){
-      $('form#update-cart a.delete').show().on('click', function(e){
-        $(this).parents('.line-item').first().find('input.line_item_quantity').val(0);
-        $(this).parents('form').first().submit();
-        e.preventDefault();
-      });
-    }
-  });
-})(jQuery);

data/app/assets/javascripts/store/checkout.js

@@ -1,78 +0,0 @@
-(function($){
-  $(document).ready(function(){
-    if($('#checkout_form_address').is('*')){
-
-      $('#checkout_form_address').validate();
-
-      var get_states = function(region){
-        country = $('p#' + region + 'country' + ' span#' + region + 'country :only-child').val();
-        return state_mapper[country];
-      }
-
-      var update_state = function(region) {
-        states = get_states(region);
-
-        state_select = $('p#' + region + 'state select');
-        state_input = $('p#' + region + 'state input');
-
-        if(states) {
-          selected = parseInt(state_select.val());
-          state_select.html('');
-          states_with_blank = [["",""]].concat(states);
-          $.each(states_with_blank, function(pos,id_nm) {
-            var opt = $(document.createElement('option'))
-                      .attr('value', id_nm[0])
-                      .html(id_nm[1]);
-            if(selected==id_nm[0]){
-              opt.prop("selected", true);
-            }
-            state_select.append(opt);
-          });
-          state_select.prop("disabled", false).show();
-          state_input.hide().prop("disabled", true);
-
-        } else {
-          state_input.prop("disabled", false).show();
-          state_select.hide().prop("disabled", true);
-        }
-
-      };
-
-      $('p#bcountry select').change(function() { update_state('b'); });
-      $('p#scountry select').change(function() { update_state('s'); });
-      update_state('b');
-      update_state('s');
-
-      $('input#order_use_billing').click(function() {
-        if($(this).is(':checked')) {
-          $('#shipping .inner').hide();
-          $('#shipping .inner input, #shipping .inner select').prop("disabled", true);
-        } else {
-          $('#shipping .inner').show();
-          $('#shipping .inner input, #shipping .inner select').prop("disabled", false);
-          //only want to enable relevant field
-          if(get_states('s')){
-            $('span#sstate input').hide().prop("disabled", true);
-          }else{
-            $('span#sstate select').hide().prop("disabled", true);
-          }
-
-        }
-      }).triggerHandler('click');
-    }
-
-    if($('#checkout_form_payment').is('*')){
-      // Show fields for the selected payment method
-      $("input[type='radio'][name='order[payments_attributes][][payment_method_id]']").click(function(){
-        $('#payment-methods li').hide();
-        if(this.checked){ $('#payment_method_'+this.value).show(); }
-      }).triggerHandler('click');
-    }
-  });
-})(jQuery);
-
-function disableSaveOnClick() {
-  $('form.edit_order').submit(function() {
-    $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
-  });
-}

data/app/assets/javascripts/store/product.js

@@ -1,49 +0,0 @@
-var add_image_handlers = function() {
-  $("#main-image").data('selectedThumb', $('#main-image img').attr('src'));
-  $('ul.thumbnails li').eq(0).addClass('selected');
-
-  $('ul.thumbnails a').on('click', function(event) {
-    $("#main-image").data('selectedThumb', $(event.currentTarget).attr('href'));
-    $("#main-image").data('selectedThumbId', $(event.currentTarget).parent().attr('id'));
-    $(this).mouseout(function() {
-      $('ul.thumbnails li').removeClass('selected');
-      $(event.currentTarget).parent('li').addClass('selected');
-    });
-    return false;
-  });
-  $('ul.thumbnails li').on('mouseenter', function(event) {
-    $('#main-image img').attr('src', $(event.currentTarget).find('a').attr('href'));
-  });
-  $('ul.thumbnails li').on('mouseleave', function(event) {
-    $('#main-image img').attr('src', $("#main-image").data('selectedThumb'));
-  });
-};
-
-var show_variant_images = function(variant_id) {
-  $('li.vtmb').hide();
-  $('li.vtmb-' + variant_id).show();
-  var currentThumb = $('#' + $("#main-image").data('selectedThumbId'));
-  // if currently selected thumb does not belong to current variant, nor to common images,
-  // hide it and select the first available thumb instead.
-  if(!currentThumb.hasClass('vtmb-' + variant_id) && !currentThumb.hasClass('tmb-all')) {
-    var thumb = $($('ul.thumbnails li:visible').eq(0));
-    var newImg = thumb.find('a').attr('href');
-    $('ul.thumbnails li').removeClass('selected');
-    thumb.addClass('selected');
-    $('#main-image img').attr('src', newImg);
-    $("#main-image").data('selectedThumb', newImg);
-    $("#main-image").data('selectedThumbId', thumb.attr('id'));
-  }
-}
-
-$(document).ready(function() {
-  add_image_handlers();
-  if($('#product-variants input[type=radio]').length > 0) {
-    show_variant_images($('#product-variants input[type=radio]').eq(0).attr('value'));
-  }
-
-  $('#product-variants input[type=radio]').click(function (event) {
-    show_variant_images(this.value);
-  });
-});
-

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

@@ -1,68 +0,0 @@
-module Spree
-  module Admin
-    class UsersController < ResourceController
-
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
-
-      def index
-        respond_with(@collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
-      end
-
-      def dismiss_banner
-        if request.xhr? and params[:banner_id]
-          current_user.dismiss_banner(params[:banner_id])
-          render :nothing => true
-        end
-      end
-
-      protected
-
-        def collection
-          return @collection if @collection.present?
-          unless request.xhr?
-            @search = Spree::User.registered.ransack(params[:q])
-            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-          else
-            #disabling proper nested include here due to rails 3.1 bug
-            #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
-            @collection = Spree::User.includes(:bill_address, :ship_address).
-                              where("spree_users.email #{LIKE} :search
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
-              { :search => "#{params[:q].strip}%" }).
-                limit(params[:limit] || 100)
-            end
-          end
-
-      private
-
-        # handling raise from Admin::ResourceController#destroy
-        def user_destroy_with_orders_error
-          invoke_callbacks(:destroy, :fails)
-          render :status => :forbidden, :text => t(:error_user_destroy_with_orders)
-        end
-
-        # Allow different formats of json data to suit different ajax calls
-        def json_data
-          json_format = params[:json_format] or 'default'
-          case json_format
-          when 'basic'
-            collection.map { |u| { 'id' => u.id, 'name' => u.email } }.to_json
-          else
-            address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
-            includes = { :only => address_fields , :include => { :state => { :only => :name }, :country => { :only => :name } } }
-
-            collection.to_json(:only => [:id, :email], :include =>
-                               { :bill_address => includes, :ship_address => includes })
-          end
-        end
-
-    end
-  end
-end

data/app/views/spree/admin/option_types/_available.html.erb

@@ -1,28 +0,0 @@
-<h4><%= t(:add_option_types) %></h4>
-<table class="index">
-  <tr data-hook="option_type_header">
-    <th><%= t(:name) %></th>
-    <th><%= t(:presentation) %></th>
-    <th></th>
-  </tr>
-  <% @available_option_types.each do |ot| %>
-  <tr data-hook="option_type_row">
-    <td><%= ot.name %></td>
-    <td><%= ot.presentation %></td>
-    <td class="actions"><%= link_to icon('add') + ' ' + t(:select),
-                            url_for(:controller => 'admin/option_types',
-                                    :id => ot,
-                                    :product_id => @product.permalink,
-                                    :action => 'select',
-                                    :option_type_id =>  ot),
-                                    :remote => true,
-                                    :class => 'iconlink' %>
-    </td>
-  </tr>
-  <% end %>
-  <% if @available_option_types.empty? %>
-  <tr data-hook="option_type_empty">
-    <td colspan="3"><%= t(:none_available) %></td>
-  </tr>
-  <% end %>
-</table>

data/app/views/spree/admin/option_types/_selected.html.erb

@@ -1,26 +0,0 @@
-<table class="index">
-  <tr data-hook="selected_head">
-    <th><%= t(:name) %></th>
-    <th><%= t(:presentation) %></th>
-    <th>&nbsp;</th>
-  </tr>
-  <% @option_types.each do |option_type| %>
-    <tr data-hook="selected_row">
-      <td><%= option_type.name %></td>
-      <td><%= option_type.presentation %></td>
-      <td class="actions">
-      <%= link_to_with_icon 'delete', t(:remove), remove_admin_product_option_type_url(@product, option_type) %>
-      </td>
-    </tr>
-  <% end %>
-  <% if @option_types.empty? %>
-   <tr data-hook="selected_none"><td colspan="3"><%= t(:none) %></td></tr>
-  <% end %>
-</table>
-
-<div id="option-types" data-hook></div>
-<% if @product.variants.empty? %>
-  <span id="new_opt_link" data-hook="links">
-    <%= link_to icon('add') + ' ' + t(:add_option_type), available_admin_product_option_types_url(@product), :remote => :true, :class => 'iconlink' %>
-  </span>
-<% end %>

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

@@ -1,2 +0,0 @@
-$("#option-types").html("<%= escape_javascript(render 'available') %>");
-$("#new_opt_link").hide();

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

@@ -1,3 +0,0 @@
-$("#selected-options").html("<%= escape_javascript(render 'selected') %>");
-$("#option-types").html("");
-$("#new_opt_link").show();

data/app/views/spree/admin/option_types/selected.html.erb

@@ -1,6 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Option Types' } %>
-
-<div id="selected-options" data-hook>
-  <%= render :partial => 'selected' %>
-</div>

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

@@ -1,29 +0,0 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'History' } %>
-
-<h2><%= t(:history) %></h2>
-
-<table class="index">
-  <tr data-hook="history_header">
-    <th><%= t(:event) %></th>
-    <th><%= t(:from_state) %></th>
-    <th><%= t(:to_state) %></th>
-    <th><%= t(:user) %></th>
-    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-  </tr>
-  <% @order.state_changes.sort.each do |event| %>
-    <tr data-hook="history_row">
-      <td><%=t("#{event.name}") if event.name.present? %></td>
-      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.previous_state}") %></td>
-      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.next_state}") %></td>
-      <td><%=event.user.email if event.user %></td>
-      <td><%=event.created_at.to_s(:date_time24) %></td>
-    </tr>
-  <% end %>
-  <% if @order.state_changes.empty? %>
-    <tr data-hook="history_none">
-      <td colspan="5"><%= t(:none_available) %></td>
-    </tr>
-  <% end %>
-</table>
-
-<%= button_link_to t(:continue), admin_orders_url %>

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

@@ -1,40 +0,0 @@
-<h2><%= t(:selected_option_types) %></h2>
-<table class="option-types" data-hook="option_types">
-  <thead>
-    <tr data-hook="option_types_header">
-      <th><%= t(:name) %></th>
-      <th><%= t(:display) %></th>
-      <th><%= t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @product.selected_options.each do |so| %>
-      <tr data-hook="option_types_row">
-        <td><%= so.option_type.name%></td>
-        <td><%= so.option_type.presentation%></td>
-        <td>
-          <%= link_to_remote t(:remove),
-                             :url => {:action => 'remove_option_type', :id => @product, :product_option_type_id => so},
-                             :before => "$('#select-link').hide(); $('#busy_indicator').show()", 
-                             :complete => "$('#busy_indicator').hide()",
-                             :update => 'option-type-listing' %>
-        </td>
-      </tr>
-    <% end %>
-    <% if @product.selected_options.empty? %>
-      <tr>
-        <td colspan="3"><%= t(:none) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<% unless @product.new_record? %>
-  <span id="select-link" data-hook>
-    <%= link_to_remote icon('delete') + ' ' + t(:select_option_type), {
-                       :url => {:controller => 'option_types', :action => 'select', :id => @product},
-                       :update => 'new-option-type'}, :class => 'iconlink' %>
-  </span>
-  <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
-<% end %>
-<br />
-<div id="new-option-type" data-hook></div>

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

@@ -1,5 +0,0 @@
-<p>
-  <%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
-  <%= additional_field_for(controller, field) %>
-  <%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
-</p>

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

@@ -1,8 +0,0 @@
-<script>
-  Spree.routes = <%== {
-    :product_search       => spree.admin_products_path(:format => 'json'),
-    :product_search_basic => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
-    :user_search          => spree.admin_users_path(:format => 'json', :limit => 10)
-  }.to_json 
-%>
-</script>

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

@@ -1,17 +0,0 @@
-<script>
-  Spree.translations = <%==
-  { :date_picker    => I18n.t(:format, 
-                              :scope => 'spree.date_picker',
-                              :default => 'yy/mm/dd'),
-    :abbr_day_names => I18n.t(:abbr_day_names, :scope => :date),
-    :month_names    => I18n.t(:month_names, :scope => :date).delete_if(&:blank?),
-    :previous       => I18n.t(:previous),
-    :next           => I18n.t(:next),
-    :no_results     => I18n.t(:no_results),
-    :type_to_search => I18n.t(:type_to_search),
-    :searching      => I18n.t(:searching),
-    :sku            => I18n.t(:sku),
-    :on_hand        => I18n.t(:on_hand)
-  }.to_json
-%>
-</script>

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

@@ -1,26 +0,0 @@
-<h4><%= t(:available_taxons) %></h4>
-<table class="index">
-  <thead>
-    <tr>
-      <th><%= t(:name) %></th>
-      <th><%= t(:path) %></th>
-      <th><%= t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @taxons.each do |taxon| %>
-      <tr id="<%= dom_id(taxon, :sel) %>">
-        <td><%= taxon.name %></td>
-        <td><%= taxon_path taxon %></td>
-        <td class="actions">
-          <%= link_to icon(:add) + ' ' + t(:select),
-                            select_admin_product_taxon_path(@product, taxon),
-                           :remote => true, :class => 'iconlink' %>
-        </td>
-      </tr>
-    <% end %>
-    <% if @taxons.empty? %>
-     <tr><td colspan="3"><%= t(:no_match_found) %>.</td></tr>
-    <% end %>
-  </tbody>
-</table>