spree_core 0.70.0.rc2 → 0.70.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+Copyright (c) 2007-2011, Rails Dog LLC and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

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

@@ -1,6 +1,6 @@
 var handle_ajax_error = function(XMLHttpRequest, textStatus, errorThrown){
   $.jstree.rollback(last_rollback);
-  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br/>" + taxonomy_tree_error);
+  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br />" + taxonomy_tree_error);
 };
 
 //var handle_move = function(li, target, droppped, tree, rb) {

data/app/controllers/admin/tax_rates_controller.rb

@@ -5,11 +5,11 @@ class Admin::TaxRatesController < Admin::ResourceController
   create.after :create_after
 
   private
-  
+
   def load_data
     @available_zones = Zone.order(:name)
     @available_categories = TaxCategory.order(:name)
-    @calculators = TaxRate.calculators
+    @calculators = TaxRate.calculators.sort_by(&:name)
   end
 
   def update_after

data/app/helpers/admin/base_helper.rb

@@ -13,7 +13,7 @@ module Admin::BaseHelper
     obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
     if obj && obj.errors[method].present?
-      errors = obj.errors[method].map{|err| h(err)}.join('<br/>').html_safe
+      errors = obj.errors[method].map{|err| h(err)}.join('<br />').html_safe
       content_tag(:span, errors, :class => 'formError')
     else
       ''

data/app/helpers/spree/base_helper.rb

@@ -146,7 +146,7 @@ module Spree::BaseHelper
   def format_price(price, options={})
     options.assert_valid_keys(:show_vat_text)
     options.reverse_merge! :show_vat_text => Spree::Config[:show_price_inc_vat]
-    formatted_price = number_to_currency(price)
+    formatted_price = number_to_currency price
     if options[:show_vat_text]
       I18n.t(:price_with_vat_included, :price => formatted_price)
     else

data/app/mailers/order_mailer.rb

@@ -1,18 +1,18 @@
 class OrderMailer < ActionMailer::Base
-  helper "spree/base"
+  helper 'spree/base'
 
   def confirm_email(order, resend=false)
     @order = order
-    subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope =>'order_mailer.confirm_email')} ##{order.number}"
+    subject = (resend ? "[#{t(:resend).upcase}] " : "")
+    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
     mail(:to => order.email,
          :subject => subject)
   end
 
   def cancel_email(order, resend=false)
     @order = order
-    subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope => 'order_mailer.cancel_email')} ##{order.number}"
+    subject = (resend ? "[#{t(:resend).upcase}] " : "")
+    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
     mail(:to => order.email,
          :subject => subject)
   end

data/app/mailers/shipment_mailer.rb

@@ -1,10 +1,10 @@
 class ShipmentMailer < ActionMailer::Base
-  helper "spree/base"
+  helper 'spree/base'
 
   def shipped_email(shipment, resend=false)
     @shipment = shipment
-    subject = (resend ? "[RESEND] " : "")
-    subject += "#{Spree::Config[:site_name]} #{t('subject', :scope => 'shipment_mailer.shipped_email')} ##{shipment.order.number}"
+    subject = (resend ? "[#{t(:resend).upcase}] " : "")
+    subject += "#{Spree::Config[:site_name]} #{t('shipment_mailer.shipped_email.subject')} ##{shipment.order.number}"
     mail(:to => shipment.order.email,
          :subject => subject)
   end

data/app/mailers/test_mailer.rb

@@ -2,7 +2,7 @@ class TestMailer < ActionMailer::Base
 
   def test_email(mail_method, user)
     @mail_method = mail_method
-    subject = "#{Spree::Config[:site_name]} #{t('subject', :scope => 'test_mailer.test_email')}"
+    subject = "#{Spree::Config[:site_name]} #{t('test_mailer.test_email.subject')}"
     mail(:to => user.email,
          :subject => subject)
   end

data/app/models/calculator.rb

@@ -15,21 +15,19 @@ class Calculator < ActiveRecord::Base
 
   ###################################################################
 
-  @@calculators = Set.new
-  # Registers calculator to be used with selected kinds of operations
   def self.register(*klasses)
-    @@calculators.add(self)
-    klasses.each do |klass|
-      klass = klass.constantize if klass.is_a?(String)
-      klass.register_calculator(self)
-    end
-    self
+    # @@calculators.add(self)
+    # klasses.each do |klass|
+    #   klass = klass.constantize if klass.is_a?(String)
+    #   klass.register_calculator(self)
+    # end
+    # self
   end
 
   # Returns all calculators applicable for kind of work
   # If passed nil, will return only general calculators
   def self.calculators
-    @@calculators.to_a
+    Rails.application.config.spree.calculators.all
   end
 
   def to_s

data/app/models/calculator/flat_percent_item_total.rb

@@ -5,11 +5,6 @@ class Calculator::FlatPercentItemTotal < Calculator
     I18n.t("flat_percent")
   end
 
-  def self.register
-    super
-    ShippingMethod.register_calculator(self)
-  end
-
   def compute(object)
     return unless object.present? and object.line_items.present?
     item_total = object.line_items.map(&:amount).sum

data/app/models/calculator/flat_rate.rb

@@ -5,11 +5,6 @@ class Calculator::FlatRate < Calculator
     I18n.t("flat_rate_per_order")
   end
 
-  def self.register
-    super
-    ShippingMethod.register_calculator(self)
-  end
-
   def compute(object=nil)
     self.preferred_amount
   end

data/app/models/calculator/flexi_rate.rb

@@ -11,11 +11,6 @@ class Calculator::FlexiRate < Calculator
     true
   end
 
-  def self.register
-    super
-    ShippingMethod.register_calculator(self)
-  end
-
   def compute(object)
     sum = 0
     max = self.preferred_max_items

data/app/models/calculator/per_item.rb

@@ -5,11 +5,6 @@ class Calculator::PerItem < Calculator
     I18n.t("flat_rate_per_item")
   end
 
-  def self.register
-    super
-    ShippingMethod.register_calculator(self)
-  end
-
   def compute(object=nil)
     self.preferred_amount * object.line_items.length
   end

data/app/models/calculator/price_bucket.rb

@@ -7,12 +7,6 @@ class Calculator::PriceBucket < Calculator
     I18n.t("price_bucket")
   end
 
-  def self.register
-    super
-    #Promotion.register_calculator(self)
-    ShippingMethod.register_calculator(self)
-  end
-
   # as object we always get line items, as calculable we have Coupon, ShippingMethod
   def compute(object)
     if object.is_a?(Array)

data/app/models/calculator/sales_tax.rb

@@ -4,11 +4,6 @@ class Calculator::SalesTax < Calculator
     I18n.t("sales_tax")
   end
 
-  def self.register
-    super
-    TaxRate.register_calculator(self)
-  end
-
   def self.calculate_tax(order, rates)
     ActiveSupport::Deprecation.warn("please use Calculator::SalesTax#compute instead", caller)
 
@@ -45,4 +40,4 @@ class Calculator::SalesTax < Calculator
       sum += line_item.total * rate.amount
     }
   end
-end
+end

data/app/models/calculator/vat.rb

@@ -4,18 +4,13 @@ class Calculator::Vat < Calculator
     I18n.t("vat")
   end
 
-  def self.register
-    super
-    TaxRate.register_calculator(self)
+  def self.calculate_tax_on(taxable)
+    # taxable may be product or variant
+    taxable = taxable.product if taxable.respond_to?(:product)
+    (taxable.price * taxable.effective_tax_rate).round(2, BigDecimal::ROUND_HALF_UP)
   end
 
-  def self.calculate_tax_on(product_or_variant)
-    product = product_or_variant.try(:product) || product_or_variant
-
-    (product_or_variant.price * product.effective_tax_rate).round(2, BigDecimal::ROUND_HALF_UP)
-  end
-
-  # computes vat for line_items associated with order, and tax rate and 
+  # computes vat for line_items associated with order, and tax rate and
   # now coupon discounts are taken into account in tax calcs
   # and tax is added to shipment if :shipment_inc_vat is set
   # coupons and shipment are applied if this object is the rate for the default category
@@ -24,7 +19,7 @@ class Calculator::Vat < Calculator
     rate = self.calculable
     tax = 0
 
-    if rate.tax_category.is_default 
+    if rate.tax_category.is_default
       order.adjustments.each do | adjust |
         next if adjust.originator_type == "TaxRate"
         next if adjust.originator_type == "ShippingMethod" and not Spree::Config[:shipment_inc_vat]

data/app/models/creditcard.rb

@@ -89,8 +89,8 @@ class Creditcard < ActiveRecord::Base
       payment.failure
       gateway_error(response)
     end
-  rescue ActiveMerchant::ConnectionError
-    gateway_error I18n.t(:unable_to_connect_to_gateway)
+  rescue ActiveMerchant::ConnectionError => e
+    gateway_error e
   end
 
   def purchase(amount, payment)
@@ -109,8 +109,8 @@ class Creditcard < ActiveRecord::Base
       payment.failure
       gateway_error(response) unless response.success?
     end
-  rescue ActiveMerchant::ConnectionError
-    gateway_error I18n.t(:unable_to_connect_to_gateway)
+  rescue ActiveMerchant::ConnectionError => e
+    gateway_error e
   end
 
   def capture(payment)
@@ -136,8 +136,8 @@ class Creditcard < ActiveRecord::Base
       payment.failure
       gateway_error(response)
     end
-  rescue ActiveMerchant::ConnectionError
-    gateway_error I18n.t(:unable_to_connect_to_gateway)
+  rescue ActiveMerchant::ConnectionError => e
+    gateway_error e
   end
 
   def void(payment)
@@ -153,8 +153,8 @@ class Creditcard < ActiveRecord::Base
     else
       gateway_error(response)
     end
-  rescue ActiveMerchant::ConnectionError
-    gateway_error I18n.t(:unable_to_connect_to_gateway)
+  rescue ActiveMerchant::ConnectionError => e
+    gateway_error e
   end
 
   def credit(payment)
@@ -180,8 +180,8 @@ class Creditcard < ActiveRecord::Base
     else
       gateway_error(response)
     end
-  rescue ActiveMerchant::ConnectionError
-    gateway_error I18n.t(:unable_to_connect_to_gateway)
+  rescue ActiveMerchant::ConnectionError => e
+    gateway_error e
   end
 
   def actions
@@ -217,6 +217,8 @@ class Creditcard < ActiveRecord::Base
   def gateway_error(error)
     if error.is_a? ActiveMerchant::Billing::Response
       text = error.params['message'] || error.params['response_reason_text'] || error.message
+    elsif error.is_a? ActiveMerchant::ConnectionError
+      text = I18n.t(:unable_to_connect_to_gateway)  
     else
       text = error.to_s
     end

data/app/models/order.rb

@@ -272,7 +272,7 @@ class Order < ActiveRecord::Base
           rate.zone.country_list.collect{|c| c.id}.include?(Spree::Config[:default_country_id]) }
     end
     matching_rates.each do |rate|
-      rate.create_adjustment( "#{I18n.t(:vat)} #{rate.amount*100}%" , self, self, true)
+      rate.create_adjustment( "#{rate.calculator.description} #{rate.amount*100}%" , self, self, true)
     end
   end
 

data/app/models/payment.rb

@@ -102,7 +102,7 @@ class Payment < ActiveRecord::Base
       return unless source.is_a?(Creditcard) && source.number && !source.has_payment_profile?
       payment_method.create_profile(self)
     rescue ActiveMerchant::ConnectionError => e
-      gateway_error I18n.t(:unable_to_connect_to_gateway)
+      gateway_error e
     end
 
     def update_order

data/app/models/payment_method.rb

@@ -2,14 +2,8 @@ class PaymentMethod < ActiveRecord::Base
   DISPLAY =  [:both, :front_end, :back_end]
   default_scope where(:deleted_at => nil)
 
-  @provider = nil
-  @@providers = Set.new
-  def self.register
-    @@providers.add(self)
-  end
-
   def self.providers
-    @@providers.to_a
+    Rails.application.config.spree.payment_methods
   end
 
   def provider_class

data/app/views/admin/adjustments/_adjustments_table.html.erb

@@ -1,8 +1,8 @@
 <table class="index" data-hook="adjustments">
   <tr data-hook="adjustmment_head">
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t("description") %></th>
-    <th><%= t("amount") %></th>
+    <th><%= t(:description) %></th>
+    <th><%= t(:amount) %></th>
     <th></th>
   </tr>
   <% @order.adjustments.each do |adjustment|
@@ -12,7 +12,7 @@
     <tr id="<%= dom_id(adjustment) %>" data-hook="adjustment_row">
       <td><%= adjustment.created_at.to_s(:date_time24) %></td>
       <td><%= adjustment.label %></td>
-      <td><%= number_to_currency(adjustment.amount) %></td>
+      <td><%= number_to_currency adjustment.amount %></td>
       <td class='actions'>
         <%= link_to_edit adjustment, :class => 'edit' %>
         &nbsp;

data/app/views/admin/adjustments/_form.html.erb

@@ -1,12 +1,12 @@
 <%= f.field_container :amount do %>
-  <%= f.label :amount, t("amount")%> <span class="required">*</span><br />
-  <%= text_field :adjustment, :amount, {:style => "width:80px;"} %>
+  <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
+  <%= text_field :adjustment, :amount, {:style => 'width:80px;'} %>
   <%= f.error_message_on :amount %>
 <% end %>
 
 <%= f.field_container :label do %>
-  <%= f.label :label, t("description")%> <span class="required">*</span><br />
-  <%= text_field :adjustment, :label, {:style => "width:180px;"} %>
+  <%= f.label :label, t(:description) %> <span class="required">*</span><br />
+  <%= text_field :adjustment, :label, {:style => 'width:180px;'} %>
   <%= f.error_message_on :label %>
 <% end %>
 

data/app/views/admin/adjustments/edit.html.erb

@@ -1,13 +1,13 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 
-<h2><%= t("adjustment")%></h2>
+<h2><%= t(:adjustment) %></h2>
 
-<%= render "shared/error_messages", :target => @adjustment %>
-<%= form_for(@adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put}) do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
+<%= render 'shared/error_messages', :target => @adjustment %>
+<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
 
   <p class="form-buttons" data-hook="buttons">
-    <%= button t('continue') %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_adjustments_url(@order) %>
+    <%= button t(:continue) %>
+    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_adjustments_url(@order) %>
   </p>
 <% end %>

data/app/views/admin/adjustments/index.html.erb

@@ -1,4 +1,4 @@
 <%= render 'admin/shared/new_adjustment_button' %>
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 <%= render 'adjustments_table' %>
-<%= button_link_to t('continue'), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>
+<%= button_link_to t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>

data/app/views/admin/adjustments/new.html.erb

@@ -1,14 +1,14 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 
-<h2><%= t("new_adjustment")%></h2>
+<h2><%= t(:new_adjustment) %></h2>
 
-<%= render "shared/error_messages", :target => @adjustment %>
+<%= render 'shared/error_messages', :target => @adjustment %>
 
 <%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
 
   <p class="form-buttons" data-hook="buttons">
-    <%= button t('continue') %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_adjustments_url(@order) %>
+    <%= button t(:continue) %>
+    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_adjustments_url(@order) %>
   </p>
 <% end %>

data/app/views/admin/configurations/index.html.erb

@@ -1,64 +1,64 @@
-<h1><%= t("configurations") %></h1>
+<h1><%= t(:configurations) %></h1>
 
 <table class="index" data-hook="configuration">
   <thead>
     <tr>
-      <th><%= t("system") %></th>
-      <th><%= t("description") %></th>
+      <th><%= t(:system) %></th>
+      <th><%= t(:description) %></th>
     </tr>
   </thead>
   <tbody data-hook="admin_configurations_menu">
     <tr>
-      <td><%= link_to t("general_settings"), admin_general_settings_path %></td>
-      <td><%= t("general_settings_description") %></td>
+      <td><%= link_to t(:general_settings), admin_general_settings_path %></td>
+      <td><%= t(:general_settings_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("mail_methods"), admin_mail_methods_path %></td>
-      <td><%= t("email_server_settings_description") %></td>
+      <td><%= link_to t(:mail_methods), admin_mail_methods_path %></td>
+      <td><%= t(:email_server_settings_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("tax_categories"), admin_tax_categories_path %></td>
-      <td><%= t("tax_categories_setting_description") %></td>
+      <td><%= link_to t(:tax_categories), admin_tax_categories_path %></td>
+      <td><%= t(:tax_categories_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("zones"), admin_zones_path %></td>
-      <td><%= t("zone_setting_description") %></td>
+      <td><%= link_to t(:zones), admin_zones_path %></td>
+      <td><%= t(:zone_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></td>
-      <td><%= t("state_setting_description") %></td>
+      <td><%= link_to t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %></td>
+      <td><%= t(:state_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("payment_methods"), admin_payment_methods_path %></td>
-      <td><%= t("payment_methods_setting_description") %></td>
+      <td><%= link_to t(:payment_methods), admin_payment_methods_path %></td>
+      <td><%= t(:payment_methods_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("taxonomies"), admin_taxonomies_path %></td>
-      <td><%= t("taxonomies_setting_description") %></td>
+      <td><%= link_to t(:taxonomies), admin_taxonomies_path %></td>
+      <td><%= t(:taxonomies_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("shipping_methods"), admin_shipping_methods_path %></td>
-      <td><%= t("shipping_methods_description") %></td>
+      <td><%= link_to t(:shipping_methods), admin_shipping_methods_path %></td>
+      <td><%= t(:shipping_methods_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("shipping_categories"), admin_shipping_categories_path %></td>
-      <td><%= t("shipping_categories_description") %></td>
+      <td><%= link_to t(:shipping_categories), admin_shipping_categories_path %></td>
+      <td><%= t(:shipping_categories_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("inventory_settings"), admin_inventory_settings_path %></td>
-      <td><%= t("inventory_setting_description") %></td>
+      <td><%= link_to t(:inventory_settings), admin_inventory_settings_path %></td>
+      <td><%= t(:inventory_setting_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("tax_rates"), admin_tax_rates_path %></td>
-      <td><%= t("tax_rates_description") %></td>
+      <td><%= link_to t(:tax_rates), admin_tax_rates_path %></td>
+      <td><%= t(:tax_rates_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("tax_settings"), admin_tax_settings_path %></td>
-      <td><%= t("tax_settings_description") %></td>
+      <td><%= link_to t(:tax_settings), admin_tax_settings_path %></td>
+      <td><%= t(:tax_settings_description) %></td>
     </tr>
     <tr>
-      <td><%= link_to t("analytics_trackers"), admin_trackers_path %></td>
-      <td><%= t("google_analytics_setting_description") %></td>
+      <td><%= link_to t(:analytics_trackers), admin_trackers_path %></td>
+      <td><%= t(:google_analytics_setting_description) %></td>
     </tr>
   </tbody>
 </table>