spree 0.6.0 → 0.7.0

data/config/locales/ru-RU_rails.yml

@@ -0,0 +1,154 @@
+ru-RU:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+      
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u%n"
+        unit: "$"
+        # These three are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+        
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        # precision: 
+        
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        precision: 1
+      storage_units: [Bytes, KB, MB, GB, TB]
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "half a minute"
+      less_than_x_seconds:
+        one:   "less than 1 second"
+        other: "less than {{count}} seconds"
+      x_seconds:
+        one:   "1 second"
+        other: "{{count}} seconds"
+      less_than_x_minutes:
+        one:   "less than a minute"
+        other: "less than {{count}} minutes"
+      x_minutes:
+        one:   "1 minute"
+        other: "{{count}} minutes"
+      about_x_hours:
+        one:   "about 1 hour"
+        other: "about {{count}} hours"
+      x_days:
+        one:   "1 day"
+        other: "{{count}} days"
+      about_x_months:
+        one:   "about 1 month"
+        other: "about {{count}} months"
+      x_months:
+        one:   "1 month"
+        other: "{{count}} months"
+      about_x_years:
+        one:   "about 1 year"
+        other: "about {{count}} years"
+      over_x_years:
+        one:   "over 1 year"
+        other: "over {{count}} years"
+    prompts:
+      year:   "Year"
+      month:  "Month"
+      day:    "Day"
+      hour:   "Hour"
+      minute: "Minute"
+      second: "Seconds"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this {{model}} from being saved"
+          other:  "{{count}} errors prohibited this {{model}} from being saved"
+        # The variable :count is also available
+        body: "There were problems with the following fields:"
+    
+      # The values :model, :attribute and :value are always available for interpolation
+      # The value :count is available when applicable. Can be used for pluralization.
+      messages:
+        inclusion: "is not included in the list"
+        exclusion: "is reserved"
+        invalid: "is invalid"
+        confirmation: "doesn't match confirmation"
+        accepted: "must be accepted"
+        empty: "can't be empty"
+        blank: "can't be blank"
+        too_long: "is too long (maximum is {{count}} characters)"
+        too_short: "is too short (minimum is {{count}} characters)"
+        wrong_length: "is the wrong length (should be {{count}} characters)"
+        taken: "has already been taken"
+        not_a_number: "is not a number"
+        greater_than: "must be greater than {{count}}"
+        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
+        equal_to: "must be equal to {{count}}"
+        less_than: "must be less than {{count}}"
+        less_than_or_equal_to: "must be less than or equal to {{count}}"
+        odd: "must be odd"
+        even: "must be even"
+    
+    date:
+      formats:
+        # Use the strftime parameters for formats.
+        # When no format has been given, it uses default.
+        # You can provide other formats here if you like!
+        default: "%Y-%m-%d"
+        short: "%b %d"
+        long: "%B %d, %Y"
+
+      day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+      abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+      # Don't forget the nil at the beginning; there's no such thing as a 0th month
+      month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+      abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+      # Used in date_select and datime_select.
+      order: [ :year, :month, :day ]
+
+    time:
+      formats:
+        default: "%a, %d %b %Y %H:%M:%S %z"
+        short: "%d %b %H:%M"
+        long: "%B %d, %Y %H:%M"
+      am: "am"
+      pm: "pm"
+
+    # Used in array.to_sentence.
+    support:
+      array:
+        words_connector: ", "
+        two_words_connector: " and "
+        last_word_connector: ", and "

data/config/routes.rb

@@ -18,17 +18,23 @@ ActionController::Routing::Routes.draw do |map|
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
+  #map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # map.connect '/locale/:new_locale', :controller => 'locale', :action => 'set_session_locale'
 
   map.root :controller => "products", :action => "index"
+  
   # login mappings should appear before all others
   map.login '/login', :controller => 'account', :action => 'login'
   map.logout '/logout', :controller => 'account', :action => 'logout'
   map.signup '/signup', :controller => 'users', :action => 'new'
   map.admin '/admin', :controller => 'admin/overview', :action => 'index'  
-
+  
+  # custom route for checkout since its not really a resource
+  map.checkout 'orders/:order_number/checkout', :controller => 'checkout', :action => 'new'
+  map.checkout 'orders/:order_number/complete', :controller => 'checkout', :action => 'create'
+  map.checkout 'orders/:order_number/checkout/:action', :controller => 'checkout'
+  
   map.resources :tax_categories
   map.resources :countries, :has_many => :states, :only => :index
   map.resources :states, :only => :index
@@ -62,6 +68,7 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :prototypes, :member => {:select => :post}, :collection => {:available => :get}
     admin.resource :mail_settings
     admin.resource :inventory_settings
+    admin.resources :google_analytics
     admin.resources :orders, :has_many => [:payments, :creditcards], :member => {:fire => :put, :resend => :post}
     admin.resources :orders do |order|
       order.resources :creditcard_payments, :member => {:capture => :get}
@@ -71,8 +78,8 @@ ActionController::Routing::Routes.draw do |map|
       taxonomy.resources :taxons
     end 
     admin.resources :reports, :only => [:index, :show], :collection => {:sales_total => :get}
-  end
-      
+  end                   
+  
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'  
   

data/db/migrate/20090204200045_add_order_permalink.rb

@@ -0,0 +1,13 @@
+class AddOrderPermalink < ActiveRecord::Migration
+  def self.up
+    add_index :orders, :number
+    Order.all.each do |order|
+      next unless order.number.is_integer? || order.number.starts_with?("0")
+      order.update_attribute("number", "R#{order.number}")  
+    end      
+  end
+
+  def self.down
+    remove_index :orders, :number
+  end
+end

data/db/migrate/20090225231119_add_more_needed_keys_items_and_conf.rb

@@ -0,0 +1,19 @@
+class AddMoreNeededKeysItemsAndConf < ActiveRecord::Migration
+  def self.up
+    add_index :line_items, [:order_id]
+    add_index :line_items, [:variant_id]
+
+    add_index :configurations, [:name, :type]
+    add_index :creditcards, [:order_id]
+    add_index :orders, [:checkout_complete]
+  end
+
+  def self.down
+    remove_index :orders, :column => [:checkout_complete]
+    remove_index :creditcards, :column => [:order_id]
+    remove_index :configurations, :column => [:name, :type]
+
+    remove_index :line_items, :column => [:variant_id]
+    remove_index :line_items, :column => [:order_id]
+  end
+end

data/db/migrate/20090302221152_give_all_users_user_role.rb

@@ -0,0 +1,13 @@
+class GiveAllUsersUserRole < ActiveRecord::Migration
+  def self.up
+    user_role = Role.find_by_name("user")
+    users = User.find(:all)
+    users.each{|u|
+      u.roles << user_role
+      u.save
+      }
+  end
+
+  def self.down
+  end
+end

data/db/sample/orders.yml

@@ -1,7 +1,7 @@
 <% 1.upto(30) do |i| %>
 order_<%= i %>:
   user: frank
-  number: <%= Array.new(9){rand(9)}.join %>
+  number: <%= "R#{Array.new(9){rand(9)}.join}" %>
   state: new
   ship_amount: 5.00
   tax_amount: 2.78

data/lib/generators/instance/instance_generator.rb

@@ -69,7 +69,7 @@ class InstanceGenerator < Rails::Generator::Base
       files.map! { |f| f = $1 if f =~ %r{^#{root}/(.+)$}; f }
       
       # hack to add specification (we're ignoring other hidden files)
-      files << "vendor/gems/active_presenter-0.0.4/.specification"
+      files << "vendor/gems/active_presenter-0.0.6/.specification"
       files.sort!
       
       files.each do |file|

data/lib/spree.rb

@@ -8,7 +8,7 @@ unless defined? Spree::Version
   module Spree
     module Version
       Major = '0'
-      Minor = '6'
+      Minor = '7'
       Tiny  = '0'
 
       class << self

data/lib/spree/setup.rb

@@ -1,7 +1,7 @@
 #######################################################################################################
 # Substantial portions of this code were adapted from the Radiant CMS project (http://radiantcms.org) #
 #######################################################################################################
-require "highline"
+require 'highline/import' 
 require 'custom_fixtures'
 require 'find'
 

data/lib/tasks/database.rake

@@ -1,9 +1,10 @@
-require 'activerecord'
-require 'highline/import'       
+require 'activerecord'              
 
 namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
   task :remigrate => :environment do
+    require 'highline/import'       
+    
     if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Drop all tables
@@ -29,6 +30,8 @@ namespace :db do
   
   desc "Bootstrap your database for Spree."
   task :bootstrap  => :environment do
+    require 'highline/import'       
+
     raise "Cannot bootstrap in production mode (for saftey reasons.)" unless %w[demo development test].include? RAILS_ENV    
     if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 

data/lib/tasks/release.rake

@@ -57,7 +57,7 @@ namespace 'spree' do
     #files.include 'log/.keep'
     files.exclude /^pkg/
     files.include 'public/.htaccess.example'
-    files.include 'vendor/gems/active_presenter-0.0.4/.specification'
+    files.include 'vendor/gems/active_presenter-0.0.6/.specification'
     files.exclude 'public/images/products'
     files.exclude 'tmp/'
     s.files = files.to_a

data/lib/tasks/upgrade.rake

@@ -0,0 +1,11 @@
+namespace :spree do
+  desc "Assistance for upgrading an existing Spree deployment.  WARNING: Will replace certain javascript and stylesheet assets."
+  task :upgrade => :environment do
+                                   
+    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/javascripts", "#{RAILS_ROOT}/public/javascripts"
+    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/stylesheets", "#{RAILS_ROOT}/public/stylesheets"
+    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/public/images", "#{RAILS_ROOT}/public/images"
+    Spree::FileUtilz.mirror_files "#{SPREE_ROOT}/config/initializers", "#{RAILS_ROOT}/config/initializers"
+  end
+end  
+

data/public/javascripts/checkout.js

@@ -0,0 +1,284 @@
+var regions = new Array('billing', 'shipping', 'shipping_method', 'creditcard', 'confirm_order');
+
+$(document).ajaxSend(function(event, request, settings) {
+  if (typeof(AUTH_TOKEN) == "undefined") return;
+  // settings.data is a serialized string like "foo=bar&baz=boink" (or null)
+  settings.data = settings.data || "";
+  settings.data += (settings.data ? "&" : "") + "authenticity_token=" + encodeURIComponent(AUTH_TOKEN);
+});
+
+// public/javascripts/application.js
+jQuery.ajaxSetup({ 
+  'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")}
+})
+
+jQuery.fn.submitWithAjax = function() {
+  this.change(function() {
+    $.post('select_country', $(this).serialize(), null, "script");
+    return false;
+  })
+  return this;
+};
+
+jQuery.fn.sameAddress = function() {
+  this.click(function() {
+    if(!$(this).attr('checked')) {
+      //Clear ship values?
+      return;
+    }
+    $('input#hidden_sstate').val($('input#hidden_bstate').val());
+    $("#billing input, #billing select").each(function() {
+      $("#shipping #"+ $(this).attr('id').replace('bill', 'ship')).val($(this).val());
+    })
+    update_state('s');
+  })
+}
+
+//On page load
+$(function() {  
+  //$("#checkout_presenter_bill_address_country_id").submitWithAjax();  
+  $('#checkout_presenter_same_address').sameAddress();
+  $('span#bcountry select').change(function() { update_state('b'); });
+  $('span#scountry select').change(function() { update_state('s'); });
+  get_states();
+
+  $('#validate_billing').click(function() { if(validate_section('billing')) { submit_billing(); }});
+  $('#validate_shipping').click(function() { if(validate_section('shipping')) { submit_shipping(); }});
+  $('#select_shipping_method').click(function() { submit_shipping_method(); });  
+  $('#confirm_payment').click(function() { if(validate_section('creditcard')) { confirm_payment(); }});
+  $('form#checkout_form').submit(function() { return !($('div#confirm_order').hasClass('checkout_disabled')); }); 
+})
+
+//Initial state mapper on page load
+var state_mapper;
+var get_states = function() {
+  $.getJSON('/states.js', function(json) {
+    state_mapper = json;
+    $('span#bcountry select').val($('input#hidden_bcountry').val());
+    update_state('b');
+    $('span#bstate :only-child').val($('input#hidden_bstate').val());
+    $('span#scountry select').val($('input#hidden_scountry').val());
+    update_state('s');
+    $('span#sstate :only-child').val($('input#hidden_sstate').val());
+  });
+};
+
+// replace the :only child of the parent with the given html, and transfer
+//   {name,id} attributes over, returning the new child
+var chg_state_input_element = function (parent, html) {
+  var child = parent.find(':only-child');
+  var name = child.attr('name');
+  var id = child.attr('id');
+  //Toggle back and forth between id and name
+  if(html.attr('type') == 'text' && child.attr('type') != 'text') {
+    name = name.replace('_id', '_name');
+    id = id.replace('_id', '_name');
+  } else if(html.attr('type') != 'text' && child.attr('type') == 'text') {
+    name = name.replace('_name', '_id');
+    id = id.replace('_name', '_id');
+  }
+  html.addClass('required')
+      .attr('name', name)
+      .attr('id',   id);
+  child.remove();		// better as parent-relative?
+  parent.append(html);
+  return html;
+};
+
+
+// TODO: better as sibling dummy state ?
+// Update the input method for address.state 
+//
+var update_state = function(region) {
+  var country        = $('span#' + region + 'country :only-child').val();
+  var states         = state_mapper[country];
+  var hidden_element = $('input#hidden_' + region + 'state');
+
+  var replacement;
+  if(states) {
+    // recreate state selection list
+    replacement = $(document.createElement('select'));
+    $.each(states, function(id,nm) {
+      var opt = $(document.createElement('option'))
+                .attr('value', id)
+                .html(nm);
+      replacement.append(opt)
+      if (id == hidden_element.val()) { opt.attr('selected', 'true') }
+        // set this directly IFF the old value is still valid
+    });
+  } else {
+    // recreate an input box
+    replacement = $(document.createElement('input'));
+    if (! hidden_element.val().match(/^\d+$/)) { replacement.val(hidden_element.val()) }
+  }
+
+  chg_state_input_element($('span#' + region + 'state'), replacement);
+  hidden_element.val(replacement.val());
+
+  // callback to update val when form object is changed
+  // This is only needed if we want to preserve state when someone refreshes the checkout page
+  // Or... if someone changes between countries with no given states
+  replacement.change(function() {
+    $('input#hidden_' + region + 'state').val($(this).val());
+  });
+};
+
+
+var validate_section = function(region) {
+  var validator = $('form#checkout_form').validate();
+  var valid = true;
+  $('div#' + region + ' input, div#' + region + ' select, div#' + region + ' textarea').each(function() {
+    if(!validator.element(this)) {
+      valid = false;
+    }
+  });
+  return valid;
+};
+
+var shift_to_region = function(active) {
+  $('div#flash-errors').remove();  
+  var found = 0;
+  for(var i=0; i<regions.length; i++) {
+    if(!found) {
+      if(active == regions[i]) {
+        $('div#' + regions[i] + ' h2').unbind('click').css('cursor', 'default');
+        $('div#' + regions[i] + ' div.inner').show('fast');
+        $('div#' + regions[i]).removeClass('checkout_disabled');
+        found = 1;
+      }
+      else {
+        $('div#' + regions[i] + ' h2').unbind('click').css('cursor', 'pointer').click(function() {shift_to_region($(this).parent().attr('id'));});
+        $('div#' + regions[i] + ' div.inner').hide('fast');
+      }
+    } else {
+      $('div#' + regions[i] + ' h2').unbind('click').css('cursor', 'default');
+      $('div#' + regions[i] + ' div.inner').hide('fast');
+      $('div#' + regions[i]).addClass('checkout_disabled');
+    }
+  }                                                                         
+  if (active == 'confirm_order') {
+    $("input#final_answer").attr("value", "yes");    
+  } else {
+    // indicates order is ready to be processed (as opposed to simply updated)
+    $("input#final_answer").attr("value", "");    
+  }
+  return;
+};
+
+var submit_billing = function() {
+  shift_to_region('shipping');
+  build_address('Billing Address', 'b');
+  return;
+};
+
+var build_address = function(title, region) {
+  var address = '<h3>' + title + '</h3>';
+  address += $('p#' + region + 'fname input').val() + ' ' + $('p#blname input').val() + '<br />';
+  address += $('p#' + region + 'address input').val() + '<br />';
+  if($('p#' + region + 'address2').val() != '') {
+    address += $('p#' + region + 'address2').val() + '<br />';
+  }
+  address += $('p#' + region + 'city input').val() + ', ';
+  if($('span#' + region + 'state input').length > 0) {
+    address += $('span#' + region + 'state input').val();
+  } else {
+    address += $('span#' + region + 'state :selected').html();
+  }
+  address += ' ' + $('p#' + region + 'zip input').val() + '<br />';
+  address += $('p#' + region + 'country :selected').html() + '<br />';
+  address += $('p#' + region + 'phone input').val();
+  $('div#' + region + 'display').html(address);
+  return;
+};
+
+var submit_shipping = function() {
+  $('div#methods :child').remove();
+  $('div#methods').append($(document.createElement('img')).attr('src', '/images/ajax_loader.gif').attr('id', 'shipping_loader'));
+  // Save what we have so far and get the list of shipping methods via AJAX
+  $.ajax({
+    type: "POST",
+    url: 'complete',                                 
+    beforeSend : function (xhr) {
+      xhr.setRequestHeader('Accept-Encoding', 'identity');
+    },      
+    dataType: "json",
+    data: $('#checkout_form').serialize(),
+    success: function(json) {  
+      update_shipping_methods(json.available_methods); 
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      // TODO - put some real error handling in here
+      $("#error").html(XMLHttpRequest.responseText);
+    }
+  });  
+  shift_to_region('shipping_method');
+  build_address('Shipping Address', 's');
+  return;
+};
+                     
+var submit_shipping_method = function() {
+  //TODO: Move to validate_section('shipping_method'), but must debug how to validate radio buttons
+  var valid = false;
+  $('div#methods :child input').each(function() {
+    if($(this).attr('checked')) {
+      valid = true;
+    }
+  });
+  if(valid) {
+    // Save what we have so far and get the updated order totals via AJAX
+    $.ajax({
+      type: "POST",
+      url: 'complete',                                 
+      beforeSend : function (xhr) {
+        xhr.setRequestHeader('Accept-Encoding', 'identity');
+      },      
+      dataType: "json",
+      data: $('#checkout_form').serialize(),
+      success: function(json) {  
+        update_confirmation(json.order); 
+      },
+      error: function (XMLHttpRequest, textStatus, errorThrown) {
+        // TODO - put some real error handling in here
+        //$("#error").html(XMLHttpRequest.responseText);
+      }
+    });  
+    shift_to_region('creditcard');
+  } else {
+    var p = document.createElement('p');
+    $(p).append($(document.createElement('label')).addClass('error').html('Please select a shipping method').css('width', '300px').css('top', '0px'));
+    $('div#methods').append(p);
+  }
+}; 
+
+var update_shipping_methods = function(methods) {
+  $(methods).each( function(i) {
+    $('div$methods img#shipping_loader').remove();
+    var p = document.createElement('p');
+    var s = this.name + ' ' + this.rate;
+    $(p).append($(document.createElement('input'))
+                .attr('id', s)
+                .attr('type', 'radio')
+                .attr('name', 'method_id')
+                .attr(1 == $(methods).length ? 'checked' : 'notchecked', 'foo')
+                .val(this.id)
+                );
+    $(p).append($(document.createElement('label'))
+                .attr('for', s)
+                .html(s)
+                .css('top', '-1px'));
+    $('div#methods').append(p);
+  });
+  $('div#methods input:first').attr('validate', 'required:true');
+  return;
+}                                     
+
+var update_confirmation = function(order) {
+  $('span#order_total').html(order.order_total);
+  $('span#ship_amount').html(order.ship_amount);
+  $('span#tax_amount').html(order.tax_amount);                                  
+  $('span#ship_method').html(order.ship_method);                                    
+}
+
+var confirm_payment = function() {
+  shift_to_region('confirm_order');
+};