spree_core 0.40.4 → 0.50.0

data/config/initializers/form_builder.rb

@@ -2,10 +2,6 @@
 # Allow some application_helper methods to be used in the scoped form_for manner
 #
 class ActionView::Helpers::FormBuilder
-  def label(method, text = nil, options={})
-    @template.label(@object_name,method,text,options)
-  end
-
   def field_container(method, options = {}, &block)
     @template.field_container(@object_name,method,options,&block)
   end
@@ -13,7 +9,7 @@ class ActionView::Helpers::FormBuilder
   def error_message_on(method, options = {})
     @template.error_message_on(@object_name, method, objectify_options(options))
   end
-  
+
   def spree_date_picker(method, options = {}, html_options = {})
     @template.spree_date_picker(@object_name, method, options, html_options)
   end

data/config/initializers/workarounds_for_ruby19.rb

@@ -5,10 +5,10 @@ if RUBY_VERSION.to_f >= 1.9
     def mb_chars
       self.force_encoding(Encoding::UTF_8)
     end
-    
+
     alias_method(:orig_concat, :concat)
     def concat(value)
-      orig_concat value.force_encoding(Encoding::UTF_8)
+      orig_concat value.frozen? ? value : value.force_encoding(Encoding::UTF_8)
     end
   end
 
@@ -49,7 +49,7 @@ if RUBY_VERSION.to_f >= 1.9
       def encode(value, encoding = "utf-8")
         String === value ? value.force_encoding(encoding) : value
       end
-      
+
       def each_utf8(&block)
         each_orig do |row|
           yield row.map {|col| encode(col) }
@@ -57,7 +57,7 @@ if RUBY_VERSION.to_f >= 1.9
       end
       alias each_orig each
       alias each each_utf8
-     
+
       def each_hash_utf8(&block)
         each_hash_orig do |row|
           row.each {|k, v| row[k] = encode(v) }
@@ -68,5 +68,5 @@ if RUBY_VERSION.to_f >= 1.9
       alias each_hash each_hash_utf8
     end
   end
-  
+
 end

data/config/locales/en.yml

@@ -25,9 +25,9 @@ en:
         address2: "Address (contd.)"
         city: City
         country: "Country"
-        first_name: "First Name"
+        firstname: "First Name"
         first_name_begins_with: "First Name Begins With"
-        last_name: "Last Name"
+        lastname: "Last Name"
         last_name_begins_with: "Last Name Begins With"
         phone: Phone
         state: "State"
@@ -68,6 +68,7 @@ en:
         quantity: Quantity
       order:
         checkout_complete: "Checkout Complete"
+        completed_at: "Completed At"
         ip_address: "IP Address"
         item_total: "Item Total"
         number: Number
@@ -333,6 +334,7 @@ en:
   debit: Debit
   default: Default
   delete: Delete
+  delivery: Delivery
   depth: Depth
   description: Description
   destroy: Destroy
@@ -368,9 +370,16 @@ en:
   enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
+  enter_atleast_five_letters: Enter atleast five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
   environment: "Environment"
   error: error
+  errors:
+    messages:
+      no_shipping_methods_available: "No shipping methods available for selected location, please change your address and try again."
+  errors_prohibited_this_record_from_being_saved:
+    one: "1 error prohibited this record from being saved"
+    other: "%{count} errors prohibited this record from being saved"
   event: Event
   existing_customer: "Existing Customer"
   expiration: "Expiration"
@@ -391,15 +400,18 @@ en:
   flat_rate_per_order: "Flat Rate (per order)"
   flexible_rate: "Flexible Rate"
   forgot_password: "Forgot Password?"
+  from_state: From State
   front_end: Front End
   full_name: "Full Name"
   gateway: Gateway
   gateway_configuration: "Gateway configuration"
+  gateway_config_unavailable: "Gateway unavailable for environment"
   gateway_error: "Gateway Error"
   gateway_setting_description: "Select a payment gateway and configure its settings."
   gateway_settings_warning: "If you are changing the gateway type, you must save first before you can edit the gateway settings"
   general: "General"
   general_settings: "General Settings"
+  edit_general_settings: "Edit General Settings"
   general_settings_description: "Configure general Spree settings."
   google_analytics: "Google Analytics"
   google_analytics_active: "Active"
@@ -522,7 +534,6 @@ en:
   no_payment_methods_available: "Can't check out, no payment methods are configured for this environment"
   no_products_found: "No products found"
   no_results: "No results"
-  no_shipping_methods_available: "No shipping methods available, please change your address and try again."
   no_user_found: "No user was found with that email address"
   none: None
   none_available: "None Available"
@@ -540,8 +551,9 @@ en:
     variant_not_deleted: "Variant could not be deleted"
   on_hand: "On Hand"
   operation: Operation
-  option_Values: "Option Values"
+  option_type: "Option Type"
   option_types: "Option Types"
+  option_value: "Option Value"
   option_values: "Option Values"
   options: Options
   or: or
@@ -552,6 +564,11 @@ en:
   order_date: "Order Date"
   order_details: "Order Details"
   order_email_resent: "Order Email Resent"
+  order_mailer:
+    confirm_email:
+      subject:  "Order Confirmation"
+    cancel_email:
+      subject: "Cancellation of Order"
   order_not_in_system: That order number is not valid on this site.
   order_number: Order
   order_operation_authorize: Authorize
@@ -594,6 +611,7 @@ en:
   path: Path
   pay: pay
   payment: Payment
+  payment_actions: "Actions"
   payment_gateway: "Payment Gateway"
   payment_information: "Payment Information"
   payment_method: Payment Method
@@ -603,9 +621,14 @@ en:
   payment_state: Payment State
   payment_states:
     balance_due: balance due
+    completed: completed
+    checkout: checkout
     credit_owed: credit owed
     failed: failed
     paid: paid
+    pending: pending
+    processing: processing
+    void: void
   payment_updated: Payment Updated
   payments: Payments
   pending_payments: Pending Payments
@@ -824,6 +847,9 @@ en:
   ship_address: "Ship Address"
   shipment: Shipment
   shipment_details: Shipment Details
+  shipment_mailer:
+    shipped_email:
+      subject: "Shipment Notification"
   shipment_number: "Shipment #"
   shipment_state: Shipment State
   shipment_states:
@@ -881,8 +907,6 @@ en:
   ssl_will_be_used_in_production_mode: "SSL will be used in production mode"
   ssl_will_not_be_used_in_development_and_test_modes: "SSL will not be used in development and test mode if necessary."
   ssl_will_not_be_used_in_production_mode: "SSL will not be used in production mode"
-  spree_alert_checking: "Check for Spree security and release alerts"
-  spree_alert_not_checking: "Not checking for Spree security and release alerts"
   start: Start
   start_date: Valid from
   state: State
@@ -918,11 +942,13 @@ en:
   test: "Test"
   test_mode: Test Mode
   thank_you_for_your_order: "Thank you for your business.  Please print out a copy of this confirmation page for your records."
+  there_were_problems_with_the_following_fields: "There were problems with the following fields"
   this_file_language: "English (US)"
   this_month: "This Month"
   this_year: "This Year"
   thumbnail: "Thumbnail"
   to_add_variants_you_must_first_define: "To add variants, you must first define"
+  to_state: "To State"
   top_grossing_products: "Top Grossing Products"
   total: Total
   tracking: Tracking
@@ -975,6 +1001,7 @@ en:
   width: Width
   year: "Year"
   you_have_been_logged_out: "You have been logged out."
+  you_have_no_orders_yet: "You have no orders yet."
   your_cart_is_empty: "Your cart is empty"
   zip: Zip
   zone: Zone

data/config/routes.rb

@@ -8,10 +8,6 @@ Rails.application.routes.draw do
 
   resources :tax_categories
 
-  resources :countries, :only => :index do
-    resources :states
-  end
-
   resources :states, :only => :index
 
   # non-restful checkout stuff
@@ -49,7 +45,7 @@ Rails.application.routes.draw do
   end
 
   #   # Search routes
-  match 's/:product_group_query' => 'products#index', :as => :simple_search
+  match 's/*product_group_query' => 'products#index', :as => :simple_search
   match '/pg/:product_group_name' => 'products#index', :as => :pg_search
   match '/t/*id/s/*product_group_query' => 'taxons#show', :as => :taxons_search
   match 't/*id/pg/:product_group_name' => 'taxons#show', :as => :taxons_pg_search
@@ -75,11 +71,19 @@ Rails.application.routes.draw do
     resources :configurations
     resources :products do
       resources :product_properties
-      resources :images
+      resources :images do
+        collection do
+          post :update_positions
+        end
+      end
       member do
         get :clone
       end
-      resources :variants
+      resources :variants do
+        collection do
+          post :update_positions
+        end
+      end
       resources :option_types do
         member do
           get :select
@@ -101,7 +105,12 @@ Rails.application.routes.draw do
         end
       end
     end
-    resources :option_types
+    resources :option_types do
+      collection do
+        post :update_positions
+      end
+    end
+    
     resources :properties do
       collection do
         get :filtered
@@ -149,11 +158,7 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :general_settings do
-      collection do
-        post :dismiss_alert
-      end
-    end
+    resource :general_settings
 
     resources :taxonomies do
       member do

data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb

@@ -2,18 +2,18 @@ class AddCountOnHandToVariantsAndProducts < ActiveRecord::Migration
   def self.up
     add_column :variants, :count_on_hand, :integer, :default => 0, :null => false
     add_column :products, :count_on_hand, :integer, :default => 0, :null => false
-    
+
     # In some cases needed to reflect changes in table structure
     Variant.reset_column_information
     Product.reset_column_information
-    
-    say_with_time 'Transfering inventory units with status on_hand to variants table...' do 
+
+    say_with_time 'Transfering inventory units with status on_hand to variants table...' do
       Variant.all.each do |v|
         v.update_attribute(:count_on_hand, v.inventory_units.with_state("on_hand").size)
         InventoryUnit.destroy_all(:variant_id => v.id, :state => "on_hand")
       end
     end
-    
+
     say_with_time 'Updating products count on hand' do
       Product.all.each do |p|
         product_count_on_hand = p.has_variants? ?
@@ -29,7 +29,7 @@ class AddCountOnHandToVariantsAndProducts < ActiveRecord::Migration
       v.count_on_hand.times do
         InventoryUnit.create(:variant => variant, :state => 'on_hand')
       end
-    end  
+    end
     remove_column :variants, :count_on_hand
     remove_column :products, :count_on_hand
   end

data/db/migrate/20091213222815_creditcard_last_four_digits.rb

@@ -1,19 +1,19 @@
 class CreditcardLastFourDigits < ActiveRecord::Migration
-  
+
   # Hack to allow for legacy migrations
   class Creditcard < ActiveRecord::Base
   end
-  
+
   def self.up
     rename_column :creditcards, :display_number, :last_digits
-    
+
     Creditcard.reset_column_information
     Creditcard.all.each do |card|
       card.update_attribute(:last_digits, card.last_digits.gsub("XXXX-XXXX-XXXX-", "")) if card.last_digits.present?
-    end 
+    end
   end
 
   def self.down
-    rename_column :creditcards, :last_digits, :display_number 
+    rename_column :creditcards, :last_digits, :display_number
   end
 end

data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb

@@ -1,8 +1,8 @@
 class ShipmentIdForInventoryUnits < ActiveRecord::Migration
   def self.up
     add_column "inventory_units", "shipment_id", :integer
-    add_index(:inventory_units, :shipment_id)    
-    
+    add_index(:inventory_units, :shipment_id)
+
     # migrate legacy shipments
     Shipment.all.each do |shipment|
       unless shipment.order

data/db/migrate/20100209025806_create_payment_methods.rb

@@ -1,5 +1,5 @@
 class CreatePaymentMethods < ActiveRecord::Migration
-  def self.up  
+  def self.up
     create_table :payment_methods do |t|
       t.string :type
       t.string :name
@@ -8,10 +8,10 @@ class CreatePaymentMethods < ActiveRecord::Migration
       t.string :environment, :default => "development"
       t.timestamps
     end
-    # TODO - also migrate any legacy configurations for gateways and billing integrations before dropping the old tables 
+    # TODO - also migrate any legacy configurations for gateways and billing integrations before dropping the old tables
     # we probably also need to do this inside the payment_gateway extension b/c table won't exist yet in fresh bootstrap
     #drop_table :billing_integrations
-    #drop_table :gateways 
+    #drop_table :gateways
   end
 
   def self.down

data/db/migrate/20100209144531_polymorphic_payments.rb

@@ -20,7 +20,7 @@ class PolymorphicPayments < ActiveRecord::Migration
 
     change_table :creditcards do |t|
       t.remove :checkout_id
-    end 
+    end
   end
 
   def self.down

data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb

@@ -1,6 +1,6 @@
 class AssignCreditcardTxnsToPayment < ActiveRecord::Migration
   def self.up
-    add_column "creditcard_txns", "payment_id", :integer  
+    add_column "creditcard_txns", "payment_id", :integer
     ActiveRecord::Base.connection.select_all("SELECT * FROM creditcard_txns").each do |txn_attrs|
       if creditcard = Creditcard.find_by_id(txn_attrs["creditcard_id"]) and creditcard.payments.first
         execute "UPDATE creditcard_txns SET payment_id = #{creditcard.payments.first.id} WHERE id = #{txn_attrs['id']}"
@@ -11,6 +11,6 @@ class AssignCreditcardTxnsToPayment < ActiveRecord::Migration
 
   def self.down
     remove_column "creditcard_txns", "payment_id"
-    add_column "creditcard_txns", "creditcard_payment_id", :integer  
+    add_column "creditcard_txns", "creditcard_payment_id", :integer
   end
 end

data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb

@@ -1,5 +1,5 @@
 class DeletedAtForPaymentMethods < ActiveRecord::Migration
-  def self.up  
+  def self.up
     change_table :payment_methods do |t|
       t.timestamp :deleted_at, :default => nil
     end

data/db/migrate/20100506185838_add_description_to_taxons.rb

@@ -1,7 +1,7 @@
 class AddDescriptionToTaxons < ActiveRecord::Migration
     def self.up
       # skip this migration if the attribute already exists because of advanced taxon extension
-      return if Taxon.new.respond_to? :description
+      return if column_exists?(:taxons, :description)
       add_column :taxons, :description, :text
     end
 

data/db/migrate/20100816212146_shipping_method_id_for_orders.rb

@@ -1,6 +1,6 @@
 class ShippingMethodIdForOrders < ActiveRecord::Migration
   def self.up
-    add_column :orders, :shipping_method_id, :integer 
+    add_column :orders, :shipping_method_id, :integer
   end
 
   def self.down

data/db/migrate/20101026184808_migrate_checkout_to_orders.rb

@@ -1,8 +1,8 @@
 class MigrateCheckoutToOrders < ActiveRecord::Migration
-  
+
   class Checkout < ActiveRecord::Base
   end
-  
+
   def self.up
     Order.find_each do |order|
       checkout = update_order(order)

data/db/migrate/20101223215658_add_position_to_variants.rb

@@ -0,0 +1,9 @@
+class AddPositionToVariants < ActiveRecord::Migration
+  def self.up
+    add_column :variants, :position, :integer
+  end
+
+  def self.down
+    remove_column :variants, :position
+  end
+end