spree_core 1.3.5 → 2.0.0.rc1

data/app/views/spree/shared/_order_details.html.erb

@@ -1,107 +0,0 @@
-<div class="row steps-data">
-
-  <% if order.has_step?("address") %>
-    <div class="columns alpha four">
-      <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-      <div class="address">
-        <%= order.ship_address %>
-      </div>
-    </div>
-
-    <div class="columns alpha four">
-      <h6><%= t(:billing_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-      <div class="address">
-        <%= order.bill_address %>
-      </div>
-    </div>
-
-    <% if @order.has_step?("delivery") %>
-      <div class="columns alpha four">
-        <h6><%= t(:shipping_method) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
-        <div class="delivery">
-          <%= order.shipping_method.name %>
-        </div>
-      </div>
-    <% end %>
-  <% end %>
-
-  <div class="columns omega four">
-    <h6><%= t(:payment_information) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:payment) unless @order.completed? %></h6>
-    <div class="payment-info">
-      <%= render order.payments.valid %>
-    </div>
-  </div>
-
-</div>
-
-<hr />
-
-<table id='line-items' class="index columns alpha omega sixteen" data-hook="order_details">
-  <col width="15%" valign="middle" halign="center">
-  <col width="70%" valign="middle">
-  <col width="5%" valign="middle" halign="center">
-  <col width="5%" valign="middle" halign="center">
-  <col width="5%" valign="middle" halign="center">
-
-  <thead data-hook>
-    <tr data-hook="order_details_line_items_headers">
-      <th colspan="2"><%= t(:item) %></th>
-      <th class="price"><%= t(:price) %></th>
-      <th class="qty"><%= t(:qty) %></th>
-      <th class="total"><span><%= t(:total) %></span></th>
-    </tr>
-  </thead>
-
-  <tbody data-hook>
-    <% @order.line_items.each do |item| %>
-      <tr data-hook="order_details_line_item_row">
-        <td data-hook="order_item_image">
-          <% if item.variant.images.length == 0 %>
-            <%= link_to small_image(item.variant.product), item.variant.product %>
-          <% else %>
-            <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
-          <% end %>
-        </td>
-        <td data-hook="order_item_description">
-          <h4><%= item.variant.product.name %></h4>
-          <%= truncated_product_description(item.variant.product) %>
-          <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
-        </td>
-        <td data-hook="order_item_price" class="price"><span><%= item.single_money.to_html %></span></td>
-        <td data-hook="order_item_qty"><%= item.quantity %></td>
-        <td data-hook="order_item_total" class="total"><span><%= item.display_amount.to_html %></span></td>
-      </tr>
-    <% end %>
-  </tbody>
-  <tfoot id="order-total" data-hook="order_details_total">
-    <tr class="total">
-      <td colspan="4"><b><%= t(:order_total) %>:</b></td>
-      <td class="total"><span id="order_total"><%= @order.display_total.to_html %></span></td>
-    </tr>
-  </tfoot>
-  <% if order.price_adjustment_totals.present? %>
-    <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.price_adjustment_totals.each do |key, total| %>
-        <tr class="total">
-          <td colspan="4"><strong><%= key %></strong></td>
-          <td class="total"><span><%= total %></span></td>
-        </tr>
-      <% end %>
-    </tfoot>
-  <% end %>
-  <tfoot id="subtotal" data-hook="order_details_subtotal">
-    <tr class="total" id="subtotal-row">
-      <td colspan="4"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= @order.display_item_total.to_html %></span></td>
-    </tr>
-  </tfoot>
-  <tfoot id="order-charges" data-hook="order_details_adjustments">
-    <% @order.adjustments.eligible.each do |adjustment| %>
-    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
-      <tr class="total">
-        <td colspan="4"><strong><%= adjustment.label %></strong></td>
-        <td class="total"><span><%= adjustment.display_amount.to_html %></span></td>
-      </tr>
-    <% end %>
-  </tfoot>
-</table>

data/app/views/spree/shared/_products.html.erb

@@ -1,30 +0,0 @@
-<%
-  paginated_products = @searcher.retrieve_products if params.key?(:keywords)
-  paginated_products ||= products
-%>
-<% if products.empty? %>
-  <%= t(:no_products_found) %>
-<% elsif params.key?(:keywords) %>
-  <h6 class="search-results-title"><%= t(:search_results, :keywords => h(params[:keywords])) %></h6>
-<% end %>
-
-<% if products.any? %>
-<ul id="products" class="inline product-listing" data-hook>
-  <% products.each do |product| %>
-    <% if product.on_display? %>
-      <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
-        <div class="product-image">
-          <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
-        </div>
-        <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
-        <span class="price selling" itemprop="price"><%= display_price(product) %></span>
-      </li>
-    <% end %>
-  <% end %>
-  <% reset_cycle("classes") %>
-</ul>
-<% end %>
-
-<% if paginated_products.respond_to?(:num_pages) %>
-  <%= paginate paginated_products %>
-<% end %>

data/app/views/spree/shared/_search.html.erb

@@ -1,9 +0,0 @@
-<% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
-<%= form_tag spree.products_path, :method => :get do %>
-  <%= select_tag :taxon,
-        options_for_select([[t(:all_departments), '']] +
-                              @taxons.map {|t| [t.name, t.id]},
-                            @taxon ? @taxon.id : params[:taxon]) %>
-  <%= search_field_tag :keywords, params[:keywords], :placeholder => t(:search) %>
-  <%= submit_tag t(:search), :name => nil %>
-<% end %>

data/app/views/spree/shared/_sidebar.html.erb

@@ -1,3 +0,0 @@
-<aside id="sidebar" class="columns four" data-hook>
-  <%= yield :sidebar %>
-</aside>

data/app/views/spree/shared/_taxonomies.html.erb

@@ -1,6 +0,0 @@
-<nav id="taxonomies" class="sidebar-item" data-hook>
-  <% get_taxonomies.each do |taxonomy| %>
-    <h6 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h6>
-    <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
-  <% end %>
-</nav>

data/app/views/spree/states/index.js.erb

@@ -1 +0,0 @@
-state_mapper = <%== @state_info %>

data/app/views/spree/taxons/_taxon.html.erb

@@ -1,4 +0,0 @@
-<div class="taxon" data-hook="taxon">
-  <h5 class="subtaxon-title"><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h5>
-  <%= render :partial => 'spree/shared/products', :locals => { :products => taxon_preview(taxon), :taxon => taxon } %>
-</div>

data/app/views/spree/taxons/show.html.erb

@@ -1,19 +0,0 @@
-<h1 class="taxon-title"><%= @taxon.name %></h1>
-
-<% content_for :sidebar do %>
-  <div data-hook="taxon_sidebar_navigation">
-    <%= render :partial => 'spree/shared/taxonomies' %>
-    <%= render :partial => 'spree/shared/filters' if @taxon.children.empty? %>
-  </div>
-<% end %>
-
-<div data-hook="taxon_products">
-  <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
-</div>
-
-<% unless params[:keyword].present? %>
-  <div data-hook="taxon_children">
-    <%= render :partial => 'taxon', :collection => @taxon.children %>
-  </div>
-<% end %>
-

data/app/views/spree/test_mailer/test_email.text.erb

@@ -1,4 +0,0 @@
-<%= t('test_mailer.test_email.greeting') %>
-================
-
-<%= t('test_mailer.test_email.message') %>

data/config/initializers/check_for_orphaned_preferences.rb

@@ -1,9 +0,0 @@
-begin
-  required_column_names = ["owner_id", "owner_type", "name"]     
-  if (Spree::Preference.column_names & required_column_names) == required_column_names
-     ActiveRecord::Base.connection.execute("SELECT owner_id, owner_type, name, value FROM spree_preferences WHERE 'key' IS NULL").each do |pref|
-       warn "[WARNING] Orphaned preference `#{pref[2]}` with value `#{pref[3]}` for #{pref[1]} with id of: #{pref[0]}, you should reset the preference value manually."
-     end
-  end
-rescue
-end

data/config/initializers/deprecation_checker.rb

@@ -1,7 +0,0 @@
-
-
-# check for incorect product assets path in public directory
-if File.exist?(Rails.root.join("public/assets/products")) ||  File.exist?(Rails.root.join("public/assets/taxons"))
-  puts %q{[DEPRECATION] Your applications public directory contains an assets/products and/or assets/taxons subdirectory. 
-    Run `rake spree:assets:relocate_images` to relocate the images.}
-end

data/config/initializers/form_builder.rb

@@ -1,15 +0,0 @@
-#
-# Allow some application_helper methods to be used in the scoped form_for manner
-#
-class ActionView::Helpers::FormBuilder
-  def field_container(method, options = {}, &block)
-    @template.field_container(@object_name,method,options,&block)
-  end
-
-  def error_message_on(method, options = {})
-    @template.error_message_on(@object_name, method, objectify_options(options))
-  end
-end
-
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
-

data/config/initializers/rails_5868.rb

@@ -1,8 +0,0 @@
-# Temporary fix for
-# NoMethodError: undefined method `gsub' for #<Arel::Nodes::Ascending:...>
-# See https://github.com/rails/rails/issues/5868
-class Arel::Nodes::Ordering
-  def gsub(*a, &b)
-    to_sql.gsub(*a, &b)
-  end
-end

data/config/initializers/spree.rb

@@ -1,6 +0,0 @@
-require 'mail'
-
-# Spree Configuration
-SESSION_KEY = '_spree_session_id'
-
-LIKE = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'

data/config/routes.rb

@@ -1,188 +0,0 @@
-Spree::Core::Engine.routes.draw do
-
-  root :to => 'home#index'
-
-  resources :products
-
-  match '/locale/set', :to => 'locale#set'
-
-  resources :states, :only => :index
-  resources :countries, :only => :index
-
-  # non-restful checkout stuff
-  put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
-  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-  get '/checkout', :to => 'checkout#edit' , :as => :checkout
-
-  populate_redirect = redirect do |params, request|
-    request.flash[:error] = I18n.t(:populate_get_error)
-    request.referer || '/cart'
-  end
-
-  get '/orders/populate', :via => :get, :to => populate_redirect
-  match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
-
-  resources :orders, :except => [:new, :create] do
-    post :populate, :on => :collection
-  end
-
-  get '/cart', :to => 'orders#edit', :as => :cart
-  put '/cart', :to => 'orders#update', :as => :update_cart
-  put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
-
-  # route globbing for pretty nested taxon and product paths
-  match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
-
-  namespace :admin do
-    get '/search/users', :to => "search#users", :as => :search_users
-
-    resources :adjustments
-    resources :zones
-    resources :banners do
-      member do
-        post :dismiss
-      end
-    end
-    resources :countries do
-      resources :states
-    end
-    resources :states
-    resources :tax_categories
-
-    resources :products do
-      collection do
-        get :search
-      end
-
-      resources :product_properties do
-        collection do
-          post :update_positions
-        end
-      end
-      resources :images do
-        collection do
-          post :update_positions
-        end
-      end
-      member do
-        get :clone
-      end
-      resources :variants do
-        collection do
-          post :update_positions
-        end
-      end
-    end
-
-    get '/variants/search', :to => "variants#search", :as => :search_variants
-
-    resources :option_types do
-      collection do
-        post :update_positions
-        post :update_values_positions
-      end
-    end
-
-    delete '/option_values/:id', :to => "option_values#destroy", :as => :option_value
-
-    resources :properties do
-      collection do
-        get :filtered
-      end
-    end
-
-    delete '/product_properties/:id', :to => "product_properties#destroy", :as => :product_property
-
-    resources :prototypes do
-      member do
-        get :select
-      end
-
-      collection do
-        get :available
-      end
-    end
-
-    resource :inventory_settings
-    resource :image_settings
-    resources :google_analytics
-
-    resources :orders do
-      member do
-        put :fire
-        get :fire
-        post :resend
-      end
-
-      resource :customer, :controller => "orders/customer_details"
-
-      resources :adjustments
-      resources :line_items
-      resources :shipments do
-        member do
-          put :fire
-        end
-      end
-      resources :return_authorizations do
-        member do
-          put :fire
-        end
-      end
-      resources :payments do
-        member do
-          put :fire
-        end
-      end
-    end
-
-    resource :general_settings do
-      collection do
-        post :dismiss_alert
-      end
-    end
-
-    resources :taxonomies do
-      collection do
-        post :update_positions
-      end
-      member do
-        get :get_children
-      end
-
-      resources :taxons
-    end
-
-    resources :taxons, :only => [] do
-      collection do
-        get :search
-      end
-    end
-
-    resources :reports, :only => [:index, :show] do
-      collection do
-        get :sales_total
-        post :sales_total
-      end
-    end
-
-    resources :shipping_methods
-    resources :shipping_categories
-    resources :tax_rates
-    resource  :tax_settings
-    resources :calculators
-
-    resources :trackers
-    resources :payment_methods
-    resources :mail_methods do
-      member do
-        post :testmail
-      end
-    end
-  end
-
-  match '/admin', :to => 'admin/orders#index', :as => :admin
-
-  match '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
-  match '/content/cvv', :to => 'content#cvv', :as => :cvv
-  match '/content/*path', :to => 'content#show', :via => :get, :as => :content
-end

data/db/migrate/20130226054936_add_variant_id_index_to_spree_prices.rb

@@ -1,5 +0,0 @@
-class AddVariantIdIndexToSpreePrices < ActiveRecord::Migration
-  def change
-    add_index :spree_prices, :variant_id
-  end
-end

data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb

@@ -1,6 +0,0 @@
-class AddCvvResultCodeAndCvvResultMessageToSpreePayments < ActiveRecord::Migration
-  def change
-    add_column :spree_payments, :cvv_response_code, :string
-    add_column :spree_payments, :cvv_response_message, :string
-  end
-end

data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb

@@ -1,5 +0,0 @@
-class AddUniqueIndexToPermalinkOnSpreeProducts < ActiveRecord::Migration
-  def change
-    add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
-  end
-end

data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb

@@ -1,6 +0,0 @@
-class AddUniqueIndexToOrdersShipmentsAndStockTransfers < ActiveRecord::Migration
-  def add
-    add_index "spree_orders", ["number"], :name => "number_idx_unique", :unique => true
-    add_index "spree_shipments", ["number"], :name => "number_idx_unique", :unique => true
-  end
-end

data/db/migrate/20130813140619_expand_order_number_size.rb

@@ -1,9 +0,0 @@
-class ExpandOrderNumberSize < ActiveRecord::Migration
-  def up
-    change_column :spree_orders, :number, :string, :limit => 32
-  end
-
-  def down
-    change_column :spree_orders, :number, :string, :limit => 15
-  end
-end

data/db/migrate/20131113035136_add_channel_to_spree_orders.rb

@@ -1,5 +0,0 @@
-class AddChannelToSpreeOrders < ActiveRecord::Migration
-  def change
-    add_column :spree_orders, :channel, :string, default: "spree"
-  end
-end

data/lib/spree/core/action_callbacks.rb

@@ -1,26 +0,0 @@
-module Spree
-  class ActionCallbacks
-    attr_reader :before_methods
-    attr_reader :after_methods
-    attr_reader :fails_methods
-
-    def initialize
-      @before_methods = []
-      @after_methods = []
-      @fails_methods = []
-    end
-
-    def before(method)
-      @before_methods << method
-    end
-
-    def after(method)
-      @after_methods << method
-    end
-
-    def fails(method)
-      @fails_methods << method
-    end
-  end
-
-end

data/lib/spree/core/custom_fixtures.rb

@@ -1,70 +0,0 @@
-require 'active_record/fixtures'
-
-module Spree
-  module Core
-    class Fixtures < ActiveRecord::Fixtures
-      # Replace this method to prevent the table being emptied on each call. Needed
-      # when both core & auth have user fixtures, see below for code commented out.
-      #
-      def self.create_fixtures(fixtures_directory, table_names, class_names = {})
-        table_names = [table_names].flatten.map { |n| n.to_s }
-        table_names.each { |n|
-          class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
-        }
-
-        # FIXME: Apparently JK uses this.
-        connection = block_given? ? yield : ActiveRecord::Base.connection
-
-        files_to_read = table_names.reject { |table_name|
-          fixture_is_cached?(connection, table_name)
-        }
-
-        unless files_to_read.empty?
-          connection.disable_referential_integrity do
-            fixtures_map = {}
-
-            fixture_files = files_to_read.map do |path|
-              table_name = path.tr '/', '_'
-
-              fixtures_map[path] = ActiveRecord::Fixtures.new(
-                connection,
-                table_name,
-                class_names[table_name.to_sym] || table_name.classify,
-                ::File.join(fixtures_directory, path))
-            end
-
-            all_loaded_fixtures.update(fixtures_map)
-
-            connection.transaction(:requires_new => true) do
-              fixture_files.each do |ff|
-                conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
-                table_rows = ff.table_rows
-
-                # REMOVED BY SPREE
-                # table_rows.keys.each do |table|
-                #   conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
-                # end
-
-                table_rows.each do |table_name,rows|
-                  rows.each do |row|
-                    conn.insert_fixture(row, table_name)
-                  end
-                end
-              end
-
-              # Cap primary key sequences to max(pk).
-              if connection.respond_to?(:reset_pk_sequence!)
-                table_names.each do |table_name|
-                  connection.reset_pk_sequence!(table_name.tr('/', '_'))
-                end
-              end
-            end
-
-            cache_fixtures(connection, fixtures_map)
-          end
-        end
-        cached_fixtures(connection, table_names)
-      end
-    end
-  end
-end

data/lib/spree/core/middleware/redirect_legacy_product_url.rb

@@ -1,18 +0,0 @@
-module Spree
-  module Core
-    module Middleware
-      class RedirectLegacyProductUrl
-        def initialize(app)
-          @app = app
-        end
-
-        def call(env)
-          if env["PATH_INFO"] =~ %r{/t/.+/p/(.+)}
-            return [301, {'Location'=> "/products/#{$1}" }, []]
-          end
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/spree/core/middleware/seo_assist.rb

@@ -1,51 +0,0 @@
-# Make redirects for SEO needs
-module Spree
-  module Core
-    module Middleware
-      class SeoAssist
-        def initialize(app)
-          @app = app
-        end
-
-        def call(env)
-          request = Rack::Request.new(env)
-          params = request.params
-
-          taxon_id = params['taxon']
-
-          #redirect requests using taxon id's to their permalinks
-          if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
-            params.delete('taxon')
-
-            return build_response(params, "#{request.script_name}t/#{taxon.permalink}" )
-          elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
-            #ensures no trailing / for taxon and product urls
-
-            return build_response(params, env["PATH_INFO"][0...-1])
-          end
-
-          @app.call(env)
-        end
-
-        private
-
-        def build_response(params, location)
-          query = build_query(params)
-          location += '?' + query unless query.blank?
-          [301, { 'Location'=> location }, []]
-        end
-
-        def build_query(params)
-          params.map { |k, v|
-            if v.class == Array
-              build_query(v.map { |x| ["#{k}[]", x] })
-            else
-              k + "=" + Rack::Utils.escape(v)
-            end
-          }.join("&")
-        end
-
-      end
-    end
-  end
-end