spree_core 1.0.4 → 1.0.6

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

@@ -1,3 +1,4 @@
+<%# encoding: utf-8 %>
 //= require_self
 
 /**
@@ -59,8 +60,10 @@ format_product_autocomplete = function(item){
     }
 
     html += "<div><h4>" + product['name'] + "</h4>";
-    html += "<span><strong>Sku: </strong>" + product['master']['sku'] + "</span>";
-    html += "<span><strong>On Hand: </strong>" + product['count_on_hand'] + "</span></div>";
+    if (product['master']) {
+      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
+    }
+    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
     var variant = item.data['variant'];
@@ -75,12 +78,12 @@ format_product_autocomplete = function(item){
     }
 
     name += " - " + $.map(variant['option_values'], function(option_value){
-      return option_value["option_type"]["presentation"] + ": " + option_value['name'];
+      return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
     }).join(", ")
 
     html += "<div><h4>" + name + "</h4>";
-    html += "<span><strong>Sku: </strong>" + variant['sku'] + "</span>";
-    html += "<span><strong>On Hand: </strong>" + variant['count_on_hand'] + "</span></div>";
+    html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + variant['sku'] + "</span>";
+    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
   return html
@@ -97,7 +100,7 @@ prep_product_autocomplete_data = function(data){
 
         var name = product['name'];
         name += " - " + $.map(variant['option_values'], function(option_value){
-          return option_value["option_type"]["presentation"] + ": " + option_value['name'];
+          return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
         }).join(", ");
 
         return {
@@ -120,7 +123,7 @@ $.fn.product_autocomplete = function(){
   return this.each(function() {
     $(this).autocomplete({
       source: function(request, response) {
-        $.get("/admin/products.json?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(ajax_urls.product_search_json + "?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_product_autocomplete_data(data)
           response(result);
         });
@@ -171,8 +174,9 @@ $.fn.objectPicker = function(url){
 $.fn.productPicker = function(){
   $(this).objectPicker(ajax_urls.product_search_basic_json);
 }
+
 $.fn.userPicker = function(){
-  $(this).objectPicker(ajax_urls.user_search_basic_json);
+  $(this).objectPicker(ajax_urls.user_search_json);
 }
 
 // Possible defunct
@@ -206,7 +210,12 @@ $(".observe_field").live('change', function() {
 
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    dateFormat: 'yy/mm/dd',
+    dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
+    dayNames: ["<%= ::I18n.t(:day_names, :scope => :date).join('","') %>"],
+    dayNamesMin: ["<%= ::I18n.t(:abbr_day_names, :scope => :date).join('","') %>"],
+    monthNames: ["<%= ::I18n.t(:month_names, :scope => :date).join('","') %>"],
+    prevText: '<%= ::I18n.t(:previous) %>',
+    nextText: '<%= ::I18n.t(:next) %>',
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -46,7 +46,7 @@ $(document).ready(function(){
       minChars: 5,
       delay: 1500,
       source: function(request, response) {
-        $.get("/admin/users.json?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.get(ajax_urls.user_search_json + "&q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });
@@ -78,6 +78,7 @@ $(document).ready(function(){
         $('#user_id').val(ui.item.data['id']);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
+        $('#guest_checkout_false').prop("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {
@@ -107,7 +108,6 @@ $(document).ready(function(){
     $('#customer_search').val("");
     $('#user_id').val("");
     $('#checkout_email').val("");
-    $('#guest_checkout_false').prop("disabled", true);
 
     $('#order_bill_address_attributes_firstname').val("");
     $('#order_bill_address_attributes_lastname').val("");

data/app/assets/stylesheets/admin/admin.css.erb

@@ -313,7 +313,7 @@ body {
       width: 24px; }
     button.small {
       font-size: 1em;
-      padding: 0 10px 0 10px;
+      padding: 0 20px 0 0;
     }
   input.title,
   textarea {
@@ -597,7 +597,9 @@ span.handle{
   border: 1px solid #000;
 }
 
-.ac_results li h4 { width: 100% }
+.ac_results li div { max-width: 90%; }
+
+.ac_results li h4 { width: 100%; }
 
 .ac_results li:last-child { border: none; }
 

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -10,8 +10,8 @@ module Spree
         end
 
         def edit
-          @order.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @order.bill_address.nil?
-          @order.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @order.ship_address.nil?
+          @order.bill_address = Address.default if @order.bill_address.nil?
+          @order.ship_address = Address.default if @order.ship_address.nil?
         end
 
         def update

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

@@ -46,7 +46,7 @@ module Spree
 
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
-          respond_with(@payment) { |format| format.html { redirect_to new_admin_payment_path(@order) } }
+          respond_with(@payment) { |format| format.html { redirect_to new_admin_order_payment_path(@order) } }
         end
       end
 

data/app/models/spree/address.rb

@@ -8,6 +8,11 @@ module Spree
     validates :firstname, :lastname, :address1, :city, :zipcode, :country, :phone, :presence => true
     validate :state_validate
 
+    attr_accessible :firstname, :lastname, :address1, :address2,
+                    :city, :zipcode, :country_id, :state_id,
+                    :country, :state, :phone, :state_name,
+                    :company, :alternative_phone
+
     # disconnected since there's no code to display error messages yet OR matching client-side validation
     def phone_validate
       return if phone.blank?
@@ -60,7 +65,7 @@ module Spree
 
     def self.default
       country = Spree::Country.find_by_id(Spree::Config[:default_country_id])
-      new :country_id => country.try(:id) || Country.first.id
+      new(:country => country || Country.first)
     end
 
     # can modify an address if it's not been used in an order (but checkouts controller has finer control)

data/app/models/spree/adjustment.rb

@@ -22,6 +22,8 @@
 #
 module Spree
   class Adjustment < ActiveRecord::Base
+    attr_accessible :amount, :label
+
     belongs_to :adjustable, :polymorphic => true
     belongs_to :source, :polymorphic => true
     belongs_to :originator, :polymorphic => true
@@ -31,7 +33,7 @@ module Spree
 
     scope :tax, lambda { where(:originator_type => 'Spree::TaxRate', :adjustable_type => 'Spree::Order') }
     scope :price, lambda { where(:adjustable_type => 'Spree::LineItem') }
-    scope :shipping, lambda { where(:label => I18n.t(:shipping)) }
+    scope :shipping, lambda { where(:originator_type => 'Spree::ShippingMethod') }
     scope :optional, where(:mandatory => false)
     scope :eligible, where(:eligible => true)
     scope :charge, where("amount >= 0")
@@ -74,7 +76,7 @@ module Spree
     private
 
     def update_adjustable
-      adjustable.update! if adjustable.is_a? Order
+      adjustable.update! if adjustable.is_a? Spree::Order
     end
 
   end

data/app/models/spree/calculator/default_tax.rb

@@ -1,3 +1,5 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::DefaultTax < Calculator
     def self.description

data/app/models/spree/calculator/flat_percent_item_total.rb

@@ -1,7 +1,11 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlatPercentItemTotal < Calculator
     preference :flat_percent, :decimal, :default => 0
 
+    attr_accessible :preferred_flat_percent
+
     def self.description
       I18n.t(:flat_percent)
     end

data/app/models/spree/calculator/flat_rate.rb

@@ -1,7 +1,11 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, :default => 0
 
+    attr_accessible :preferred_amount
+
     def self.description
       I18n.t(:flat_rate_per_order)
     end

data/app/models/spree/calculator/flexi_rate.rb

@@ -1,9 +1,13 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::FlexiRate < Calculator
     preference :first_item,      :decimal, :default => 0.0
     preference :additional_item, :decimal, :default => 0.0
     preference :max_items,       :integer, :default => 0
 
+    attr_accessible :preferred_first_item, :preferred_additional_item, :preferred_max_items
+
     def self.description
       I18n.t(:flexible_rate)
     end

data/app/models/spree/calculator/per_item.rb

@@ -1,7 +1,11 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::PerItem < Calculator
     preference :amount, :decimal, :default => 0
 
+    attr_accessible :preferred_amount
+
     def self.description
       I18n.t(:flat_rate_per_item)
     end

data/app/models/spree/calculator/price_sack.rb

@@ -1,9 +1,15 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::PriceSack < Calculator
     preference :minimal_amount, :decimal, :default => 0
     preference :normal_amount, :decimal, :default => 0
     preference :discount_amount, :decimal, :default => 0
 
+    attr_accessible :preferred_minimal_amount,
+                    :preferred_normal_amount,
+                    :preferred_discount_amount
+
     def self.description
       I18n.t(:price_sack)
     end

data/app/models/spree/creditcard.rb

@@ -11,6 +11,9 @@ module Spree
     validates :number, :presence => true, :unless => :has_payment_profile?, :on => :create
     validates :verification_value, :presence => true, :unless => :has_payment_profile?, :on => :create
 
+    attr_accessible :first_name, :last_name, :number, :verification_value, :year,
+                :month, :gateway_customer_profile_id, :gateway_payment_profile_id
+
     def process!(payment)
       if Spree::Config[:auto_capture]
         purchase(payment.amount.to_f, payment)
@@ -171,12 +174,12 @@ module Spree
       record_log payment, response
 
       if response.success?
-        Payment.create(:order => payment.order,
-                              :source => payment,
-                              :payment_method => payment.payment_method,
-                              :amount => amount.abs * -1,
-                              :response_code => response.authorization,
-                              :state => 'completed')
+        Payment.create({ :order => payment.order,
+                         :source => payment,
+                         :payment_method => payment.payment_method,
+                         :amount => amount.abs * -1,
+                         :response_code => response.authorization,
+                         :state => 'completed'}, :without_protection => true)
       else
         gateway_error(response)
       end

data/app/models/spree/gateway.rb

@@ -7,6 +7,8 @@ module Spree
     preference :server, :string, :default => 'test'
     preference :test_mode, :boolean, :default => true
 
+    attr_accessible :preferred_server, :preferred_test_mode
+
     def payment_source_class
       Creditcard
     end

data/app/models/spree/image.rb

@@ -1,6 +1,9 @@
 module Spree
   class Image < Asset
     validate :no_attachment_errors
+
+    attr_accessible :alt, :attachment, :position, :viewable_type, :viewable_id
+
     has_attached_file :attachment,
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },
                       :default_style => :product,

data/app/models/spree/mail_method.rb

@@ -16,6 +16,13 @@ module Spree
     preference :mail_bcc, :string, :default => 'spree@example.com'
     preference :intercept_email, :string, :default => nil
 
+    attr_accessible :environment, :preferred_enable_mail_delivery,
+                :preferred_mails_from, :preferred_mail_bcc,
+                :preferred_intercept_email, :preferred_mail_domain,
+                :preferred_mail_host, :preferred_mail_port,
+                :preferred_secure_connection_type, :preferred_mail_auth_type,
+                :preferred_smtp_username, :preferred_smtp_password
+
     validates :environment, :presence => true
 
     def self.current

data/app/models/spree/option_type.rb

@@ -4,6 +4,8 @@ module Spree
     has_many :product_option_types, :dependent => :destroy
     has_and_belongs_to_many :prototypes, :join_table => 'spree_option_types_prototypes'
 
+    attr_accessible :name, :presentation, :option_values_attributes
+
     validates :name, :presentation, :presence => true
     default_scope :order => "#{self.table_name}.position"
 

data/app/models/spree/option_value.rb

@@ -3,5 +3,7 @@ module Spree
     belongs_to :option_type
     acts_as_list :scope => :option_type
     has_and_belongs_to_many :variants, :join_table => 'spree_option_values_variants'
+
+    attr_accessible :name, :presentation
   end
 end

data/app/models/spree/order.rb

@@ -1,7 +1,7 @@
 module Spree
   class Order < ActiveRecord::Base
     attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes, :payments_attributes,
-                    :ship_address, :bill_address, :line_items_attributes,
+                    :ship_address, :bill_address, :line_items_attributes, :number,
                     :shipping_method_id, :email, :use_billing, :special_instructions
 
     belongs_to :user

data/app/models/spree/payment.rb

@@ -15,6 +15,8 @@ module Spree
     attr_accessor :source_attributes
     after_initialize :build_source
 
+    attr_accessible :amount, :payment_method_id, :source_attributes
+
     scope :from_creditcard, where(:source_type => 'Spree::Creditcard')
     scope :with_state, lambda { |s| where(:state => s) }
     scope :completed, with_state('completed')

data/app/models/spree/payment_method.rb

@@ -5,6 +5,8 @@ module Spree
 
     scope :production, where(:environment => 'production')
 
+    attr_accessible :name, :description, :environment, :display_on, :active
+
     def self.providers
       Rails.application.config.spree.payment_methods
     end

data/app/models/spree/preference.rb

@@ -1,4 +1,5 @@
 class Spree::Preference < ActiveRecord::Base
+  attr_accessible :name, :key, :value_type, :value
 
   validates :key, :presence => true
   validates :value_type, :presence => true

data/app/models/spree/product.rb

@@ -64,6 +64,14 @@ module Spree
 
     validates :name, :price, :permalink, :presence => true
 
+    attr_accessible :name, :description, :available_on, :permalink, :meta_description,
+                    :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
+                    :option_values_hash, :on_hand, :weight, :height, :width, :depth,
+                    :shipping_category_id, :tax_category_id, :product_properties_attributes,
+                    :variants_attributes, :taxon_ids
+
+    attr_accessible :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')
+
     accepts_nested_attributes_for :product_properties, :allow_destroy => true, :reject_if => lambda { |pp| pp[:property_name].blank? }
 
     make_permalink
@@ -119,7 +127,7 @@ module Spree
     def add_properties_and_option_types_from_prototype
       if prototype_id && prototype = Spree::Prototype.find_by_id(prototype_id)
         prototype.properties.each do |property|
-          product_properties.create(:property => property)
+          product_properties.create({:property => property}, :without_protection => true)
         end
         self.option_types = prototype.option_types
       end

data/app/models/spree/product/scopes.rb

@@ -1,5 +1,14 @@
 module Spree
   class Product < ActiveRecord::Base
+    cattr_accessor :search_scopes do
+      []
+    end
+
+    def self.add_search_scope(name, &block)
+      self.singleton_class.send(:define_method, name.to_sym, &block)
+      search_scopes << name.to_sym
+    end
+
     def self.simple_scopes
       [
         :ascend_by_updated_at,
@@ -22,37 +31,34 @@ module Spree
       self.scope(name.to_s, relation.order(order_text))
     end
 
-    def self.ascend_by_master_price
+    add_search_scope :ascend_by_master_price do
       joins(:variants_with_only_master).order("#{variant_table_name}.price ASC")
     end
 
-    def self.descend_by_master_price
+    add_search_scope :descend_by_master_price do
       joins(:variants_with_only_master).order("#{variant_table_name}.price DESC")
     end
 
     # Ryan Bates - http://railscasts.com/episodes/112
     # general merging of conditions, names following the searchlogic pattern
-    scope :conditions, lambda { |*args| { :conditions => args } }
+    add_search_scope :conditions do |*args|
+      where(args)
+    end
 
     # conditions_all is a more descriptively named enhancement of the above
-    scope :conditions_all, lambda { |*args| { :conditions => [args].flatten } }
-
-    # forming the disjunction of a list of conditions (as strings)
-    scope :conditions_any, lambda { |*args|
-      args = [args].flatten
-      raise "non-strings in conditions_any" unless args.all? { |s| s.is_a? String }
-      { :conditions => args.map { |c| "(#{c})"}.join(" OR ") }
-    }
+    add_search_scope :conditions_all do |*args|
+      where([args].flatten)
+    end
 
-    def self.price_between(low, high)
+    add_search_scope :price_between do |low, high|
       joins(:master).where(Variant.table_name => { :price => low..high })
     end
 
-    def self.master_price_lte(price)
+    add_search_scope :master_price_lte do |price|
       joins(:master).where("#{variant_table_name}.price <= ?", price)
     end
 
-    def self.master_price_gte(price)
+    add_search_scope :master_price_gte do |price|
       joins(:master).where("#{variant_table_name}.price >= ?", price)
     end
 
@@ -60,7 +66,7 @@ module Spree
     # If you need products only within one taxon use
     #
     #   Spree::Product.taxons_id_eq(x)
-    def self.in_taxon(taxon)
+    add_search_scope :in_taxon do |taxon|
       joins(:taxons).where(Taxon.table_name => { :id => taxon.self_and_descendants.map(&:id) })
     end
 
@@ -68,8 +74,7 @@ module Spree
     # If you need products only within one taxon use
     #
     #   Spree::Product.taxons_id_eq([x,y])
-    #
-    def self.in_taxons(*taxons)
+    add_search_scope :in_taxons do |*taxons|
       taxons = get_taxons(taxons)
       taxons.first ? prepare_taxon_conditions(taxons) : scoped
     end
@@ -79,7 +84,7 @@ module Spree
     end
 
     # a scope that finds all products having property specified by name, object or id
-    def self.with_property(property)
+    add_search_scope :with_property do |property|
       properties = Property.table_name
       conditions = case property
       when String   then { "#{properties}.name" => property }
@@ -92,7 +97,7 @@ module Spree
 
     # a simple test for product with a certain property-value pairing
     # note that it can test for properties with NULL values, but not for absent values
-    def self.with_property_value(property, value)
+    add_search_scope :with_property_value do |property, value|
       properties = Spree::Property.table_name
       conditions = case property
       when String   then ["#{properties}.name = ?", property]
@@ -104,8 +109,7 @@ module Spree
       joins(:properties).where(conditions)
     end
 
-    # a scope that finds all products having an option_type specified by name, object or id
-    def self.with_option(option)
+    add_search_scope :with_option do |option|
       option_types = OptionType.table_name
       conditions = case option
       when String     then { "#{option_types}.name" => option }
@@ -116,8 +120,7 @@ module Spree
       joins(:option_types).where(conditions)
     end
 
-    # a scope that finds all products having an option value specified by name, object or id
-    def self.with_option_value(option, value)
+    add_search_scope :with_option_value do |option, value|
       option_values = OptionValue.table_name
       option_type_id = case option
         when String then OptionType.find_by_name(option) || option.to_i
@@ -132,30 +135,30 @@ module Spree
     # Finds all products which have either:
     # 1) have an option value with the name matching the one given
     # 2) have a product property with a value matching the one given
-    def self.with(value)
+    add_search_scope :with do |value|
       includes(:variants_including_master => :option_values).
       includes(:product_properties).
       where("#{OptionValue.table_name}.name = ? OR #{ProductProperty.table_name}.value = ?", value, value)
     end
 
     # Finds all products that have a name containing the given words.
-    def self.in_name(words)
+    add_search_scope :in_name do |words|
       like_any([:name], prepare_words(words))
     end
 
     # Finds all products that have a name or meta_keywords containing the given words.
-    def self.in_name_or_keywords(words)
+    add_search_scope :in_name_or_keywords do |words|
       like_any([:name, :meta_keywords], prepare_words(words))
     end
 
     # Finds all products that have a name, description, meta_description or meta_keywords containing the given keywords.
-    def self.in_name_or_description(words)
+    add_search_scope :in_name_or_description do |words|
       like_any([:name, :description, :meta_description, :meta_keywords], prepare_words(words))
     end
 
     # Finds all products that have the ids matching the given collection of ids.
     # Alternatively, you could use find(collection_of_ids), but that would raise an exception if one product couldn't be found
-    def self.with_ids(*ids)
+    add_search_scope :with_ids do |*ids|
       where(:id => ids)
     end
 
@@ -167,7 +170,7 @@ module Spree
     #
     # :joins => "LEFT OUTER JOIN (SELECT line_items.variant_id as vid, COUNT(*) as cnt FROM line_items GROUP BY line_items.variant_id) AS popularity_count ON variants.id = vid",
     # :order => 'COALESCE(cnt, 0) DESC'
-    def self.descend_by_popularity
+    add_search_scope :descend_by_popularity do
       joins(:master).
       order(%Q{
            COALESCE((
@@ -185,25 +188,26 @@ module Spree
         })
     end
 
-    def self.not_deleted
+    add_search_scope :not_deleted do
       where(:deleted_at => nil)
     end
 
+    # Can't use add_search_scope for this as it needs a default argument
     def self.available(available_on = nil)
       where('available_on <= ?', available_on || Time.now)
     end
+    search_scopes << :available
 
-    #RAILS 3 TODO - this scope doesn't match the original 2.3.x version, needs attention (but it works)
-    def self.active
+    add_search_scope :active do
       not_deleted.available
     end
 
-    def self.on_hand
+    add_search_scope :on_hand do
       variants_table = Variant.table_name
       where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
     end
 
-    def self.taxons_name_eq(name)
+    add_search_scope :taxons_name_eq do |name|
       joins(:taxons).where(Taxon.arel_table[:name].eq(name))
     end
 
@@ -215,6 +219,7 @@ module Spree
       scope :group_by_products_id, { :group => "#{self.quoted_table_name}.id" }
     end
     search_methods :group_by_products_id
+    search_scopes << :group_by_products_id
 
     private
       def self.variant_table_name