spree_core 2.2.14 → 2.3.0

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

@@ -1,5 +1,5 @@
 module Spree
-  class Variant < ActiveRecord::Base
+  class Variant < Spree::Base
     #FIXME WARNING tested only under sqlite and postgresql
     scope :descend_by_popularity, -> { order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC") }
 

data/app/models/spree/zone.rb

@@ -1,8 +1,7 @@
 module Spree
-  class Zone < ActiveRecord::Base
-    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
-    has_many :tax_rates, dependent: :destroy, inverse_of: :zone
-
+  class Zone < Spree::Base
+    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
+    has_many :tax_rates, dependent: :destroy
     has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
 
     validates :name, presence: true, uniqueness: true
@@ -12,18 +11,17 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
-    self.whitelisted_ransackable_attributes = ['description']
-
     def self.default_tax
       where(default_tax: true).first
     end
-
+  
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
-      return unless matches = self.includes(:zone_members).
-        order('zone_members_count', 'created_at').
-        select { |zone| zone.include? address }
+      return unless address and matches = self.includes(:zone_members).
+        order('spree_zones.zone_members_count', 'spree_zones.created_at').
+        where("(spree_zone_members.zoneable_type = 'Spree::Country' AND spree_zone_members.zoneable_id = ?) OR (spree_zone_members.zoneable_type = 'Spree::State' AND spree_zone_members.zoneable_id = ?)", address.country_id, address.state_id).
+        references(:zones)
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
@@ -94,11 +92,23 @@ module Spree
     end
 
     def country_ids=(ids)
-      set_zone_members(ids, 'Spree::Country')
+      zone_members.destroy_all
+      ids.reject{ |id| id.blank? }.map do |id|
+        member = ZoneMember.new
+        member.zoneable_type = 'Spree::Country'
+        member.zoneable_id = id
+        members << member
+      end
     end
 
     def state_ids=(ids)
-      set_zone_members(ids, 'Spree::State')
+      zone_members.destroy_all
+      ids.reject{ |id| id.blank? }.map do |id|
+        member = ZoneMember.new
+        member.zoneable_type = 'Spree::State'
+        member.zoneable_id = id
+        members << member
+      end
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -126,15 +136,5 @@ module Spree
       def remove_previous_default
         Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
       end
-
-      def set_zone_members(ids, type)
-        zone_members.destroy_all
-        ids.reject{ |id| id.blank? }.map do |id|
-          member = ZoneMember.new
-          member.zoneable_type = type
-          member.zoneable_id = id
-          members << member
-        end
-      end
   end
 end

data/app/models/spree/zone_member.rb

@@ -1,6 +1,6 @@
 module Spree
-  class ZoneMember < ActiveRecord::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
+  class ZoneMember < Spree::Base
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
     belongs_to :zoneable, polymorphic: true
 
     def name

data/config/initializers/user_class_extensions.rb

@@ -14,14 +14,6 @@ Spree::Core::Engine.config.to_prepare do
       belongs_to :ship_address, :class_name => 'Spree::Address'
       belongs_to :bill_address, :class_name => 'Spree::Address'
 
-      def self.ransackable_associations(auth_object=nil)
-        %w[bill_address ship_address]
-      end
-
-      def self.ransackable_attributes(auth_object=nil)
-        %w[id email]
-      end
-
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_in_question)
         spree_roles.where(:name => role_in_question.to_s).any?

data/config/locales/en.yml

@@ -99,6 +99,12 @@ en:
       spree/state:
         abbr: Abbreviation
         name: Name
+      spree/store:
+        url: Site URL
+        meta_description: Meta Description
+        meta_keywords: Meta Keywords
+        seo_title: Seo Title
+        name: Site Name
       spree/tax_category:
         description: Description
         name: Name
@@ -232,7 +238,6 @@ en:
           attributes:
             base:
               card_expired: "Card has expired"
-              expiry_invalid: "Card expiration is invalid"
         spree/line_item:
           attributes:
             currency:
@@ -328,12 +333,6 @@ en:
     adjustment_total: Adjustment Total
     adjustments: Adjustments
     admin:
-      mail_methods:
-        send_testmail: Send Test Mail
-        testmail:
-          delivery_error: Test Mail delivery error
-          delivery_success: Test Mail sent successfully
-          error: ! 'Test Mail error: %{e}'
       tab:
         configuration: Configuration
         option_types: Option Types
@@ -405,7 +404,6 @@ en:
     back_to_prototypes_list: Back To Prototypes List
     back_to_reports_list: Back To Reports List
     back_to_shipping_categories: Back To Shipping Categories
-    back_to_shipping_categories_list: Back To Shipping Categories List
     back_to_shipping_methods_list: Back To Shipping Methods List
     back_to_states_list: Back To States List
     back_to_stock_locations_list: Back to Stock Locations List
@@ -418,7 +416,6 @@ en:
     back_to_users_list: Back To Users List
     back_to_zones_list: Back To Zones List
     backorderable: Backorderable
-    backorderable_default: Backorderable default
     backorders_allowed: backorders allowed
     balance_due: Balance Due
     bill_address: Bill Address
@@ -452,7 +449,6 @@ en:
     choose_dashboard_locale: Choose Dashboard Locale
     choose_location: Choose location
     city: City
-    click_and_drag_on_the_products_to_sort_them: 'Click & drag on the products to sort them.'
     clone: Clone
     close: Close
     close_all_adjustments: Close All Adjustments
@@ -528,9 +524,6 @@ en:
       js_format: yy/mm/dd
     date_range: Date Range
     default: Default
-    default_meta_description: Default Meta Description
-    default_meta_keywords: Default Meta Keywords
-    default_seo_title: Default Seo Title
     default_tax: Default Tax
     default_tax_zone: Default Tax Zone
     delete: Delete
@@ -592,7 +585,6 @@ en:
           signup: User signup
     exceptions:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
-    excl: excl.
     expiration: Expiration
     extension: Extension
     existing_shipments: Existing shipments
@@ -642,12 +634,10 @@ en:
     image: Image
     images: Images
     inactive: Inactive
-    incl: incl.
     included_in_price: Included in Price
     included_price_validation: cannot be selected unless you have set a Default Tax Zone
     instructions_to_reset_password: Please enter your email on the form below
     insufficient_stock: Insufficient stock available, only %{on_hand} remaining
-    insufficient_stock_lines_present: Some line items in this order have insufficient quantity.
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
@@ -698,17 +688,6 @@ en:
     login_name: Login
     logout: Logout
     look_for_similar_items: Look for similar items
-    mail_method_settings: Mail Method Settings
-    mail_methods: Mail Methods
-    mail_settings:
-      auth:
-        none: "None"
-        plain: "Plain"
-        login: "Login"
-        cram_md5: "cram_md5"
-      security:
-        ssl: "SSL"
-        tls: "TLS"
     make_refund: Make refund
     master_price: Master Price
     match_choices:
@@ -762,6 +741,7 @@ en:
     no_actions_added: No actions added
     no_orders_found: No orders found
     no_payment_methods_found: No payment methods found
+    no_payment_found: No payment found
     no_pending_payments: No pending payments
     no_products_found: No products found
     no_promotions_found: No promotions found
@@ -801,7 +781,6 @@ en:
     or_over_price: ! '%{price} or over'
     order: Order
     order_adjustments: Order adjustments
-    order_already_updated: The order has already been updated.
     order_approved: Order approved
     order_canceled: Order canceled
     order_details: Order Details
@@ -952,7 +931,6 @@ en:
         name: User Logged In
     promotions: Promotions
     promotion_uses: Promotion uses
-    propagate_all_variants: Propagate all variants
     properties: Properties
     property: Property
     prototype: Prototype
@@ -1062,19 +1040,8 @@ en:
     show_deleted: Show Deleted
     show_only_complete_orders: Only show complete orders
     show_rate_in_label: Show rate in label
-    site_name: Site Name
-    site_url: Site URL
     sku: SKU
     slug: Slug
-    smtp: SMTP
-    smtp_authentication_type: SMTP Authentication Type
-    smtp_domain: SMTP Domain
-    smtp_mail_host: SMTP Mail Host
-    smtp_password: SMTP Password
-    smtp_port: SMTP Port
-    smtp_send_all_emails_as_from_following_address: Send all mails as from the following address.
-    smtp_send_copy_to_this_addresses: Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas.
-    smtp_username: SMTP Username
     source: Source
     special_instructions: Special Instructions
     split: Split
@@ -1162,9 +1129,7 @@ en:
     usage_limit: Usage Limit
     use_app_default: Use App Default
     use_billing_address: Use Billing Address
-    use_existing_cc: Use an existing card on file
     use_new_cc: Use a new card
-    use_new_cc_or_payment_method: Use a new card / payment method
     use_s3: Use Amazon S3 For Images
     user: User
     user_rule:

data/db/default/spree/countries.rb

@@ -92,7 +92,7 @@ Spree::Country.create!([
   { name: "Guyana", iso3: "GUY", iso: "GY", iso_name: "GUYANA", numcode: "328" },
   { name: "Reunion", iso3: "REU", iso: "RE", iso_name: "REUNION", numcode: "638" },
   { name: "Haiti", iso3: "HTI", iso: "HT", iso_name: "HAITI", numcode: "332" },
-  { name: "Romania", iso3: "ROM", iso: "RO", iso_name: "ROMANIA", numcode: "642" },
+  { name: "Romania", iso3: "ROU", iso: "RO", iso_name: "ROMANIA", numcode: "642" },
   { name: "Swaziland", iso3: "SWZ", iso: "SZ", iso_name: "SWAZILAND", numcode: "748" },
   { name: "Holy See (Vatican City State)", iso3: "VAT", iso: "VA", iso_name: "HOLY SEE (VATICAN CITY STATE)", numcode: "336" },
   { name: "Russian Federation", iso3: "RUS", iso: "RU", iso_name: "RUSSIAN FEDERATION", numcode: "643", states_required: true },
@@ -226,7 +226,6 @@ Spree::Country.create!([
   { name: "New Zealand", iso3: "NZL", iso: "NZ", iso_name: "NEW ZEALAND", numcode: "554" },
   { name: "Saint Kitts and Nevis", iso3: "KNA", iso: "KN", iso_name: "SAINT KITTS AND NEVIS", numcode: "659", states_required: true },
   { name: "Serbia", iso3: "SRB", iso: "RS", "iso_name" => "SERBIA", numcode: "999" },
-  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" },
-  { name: "Jersey", iso3: "JEY", iso: "JE", iso_name: "JERSEY", numcode: "44" }
+  { name: "Montenegro", iso3: "MNE", iso: "ME", iso_name: "MONTENEGRO", numcode: "499" }
 ])
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id

data/db/default/spree/stores.rb

@@ -0,0 +1,9 @@
+# Possibly already created by a migration.
+unless Spree::Store.where(code: 'spree').exists?
+  Spree::Store.new do |s|
+    s.code              = 'spree'
+    s.name              = 'Spree Demo Site'
+    s.url               = 'demo.spreecommerce.com'
+    s.mail_from_address = 'spree@example.com'
+  end.save!
+end

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,10 +1,5 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
-    # If Spree::ShippingMethod zones association was patched in
-    # CreateShippingMethodZone migrations, it needs to be patched back
-    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
-                                                          :class_name => 'Spree::Zone',
-                                                          :foreign_key => 'shipping_method_id'
   end
 end

data/db/migrate/20130807024301_upgrade_adjustments.rb

@@ -9,14 +9,13 @@ class UpgradeAdjustments < ActiveRecord::Migration
       # Account for possible invalid data
       next if adjustment.source.nil?
       adjustment.source.update_column(:cost, adjustment.amount)
-      adjustment.destroy!
+      adjustment.destroy
     end
 
     # Tax adjustments have their sources altered
     Spree::Adjustment.where(:originator_type => "Spree::TaxRate").find_each do |adjustment|
-      adjustment.source_id = adjustment.originator_id
-      adjustment.source_type = "Spree::TaxRate"
-      adjustment.save!
+      adjustment.source = adjustment.originator
+      adjustment.save
     end
 
     # Promotion adjustments have their source altered also
@@ -34,7 +33,7 @@ class UpgradeAdjustments < ActiveRecord::Migration
         # Fail silently. This is primarily in instances where the calculator no longer exists
       end
 
-      adjustment.save!
+      adjustment.save
     end
   end
 end

data/db/migrate/20130807024302_rename_adjustment_fields.rb

@@ -7,8 +7,11 @@ class RenameAdjustmentFields < ActiveRecord::Migration
 
     # This enables the Spree::Order#all_adjustments association to work correctly
     Spree::Adjustment.reset_column_information
-    Spree::Adjustment.where(adjustable_type: "Spree::Order").find_each do |adjustment|
-      adjustment.update_column(:order_id, adjustment.adjustable_id)
+    Spree::Adjustment.find_each do |adjustment|
+      if adjustment.adjustable.is_a?(Spree::Order)
+        adjustment.order = adjustment.adjustable
+        adjustment.save
+      end
     end
   end
 end

data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb

@@ -8,7 +8,7 @@ class AddLineItemIdToSpreeInventoryUnits < ActiveRecord::Migration
       shipments = Spree::Shipment.includes(:inventory_units, :order)
 
       shipments.find_each do |shipment|
-        shipment.inventory_units.group_by(&:variant_id).each do |variant_id, units|
+        shipment.inventory_units.group_by(&:variant_id).each do |variant, units|
 
           line_item = shipment.order.line_items.find_by(variant_id: variant_id)
           next unless line_item

data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb

@@ -0,0 +1,8 @@
+class RemoveValueTypeFromSpreePreferences < ActiveRecord::Migration
+  def up
+    remove_column :spree_preferences, :value_type
+  end
+  def down
+    raise ActiveRecord::IrreversableMigration
+  end
+end

data/db/migrate/20140227112348_add_preference_store_to_everything.rb

@@ -0,0 +1,8 @@
+class AddPreferenceStoreToEverything < ActiveRecord::Migration
+  def change
+    add_column :spree_calculators, :preferences, :text
+    add_column :spree_gateways, :preferences, :text
+    add_column :spree_payment_methods, :preferences, :text
+    add_column :spree_promotion_rules, :preferences, :text
+  end
+end

data/db/migrate/20140309023735_migrate_old_preferences.rb

@@ -0,0 +1,23 @@
+class MigrateOldPreferences < ActiveRecord::Migration
+  def up
+    migrate_preferences(Spree::Calculator)
+    migrate_preferences(Spree::PaymentMethod)
+    migrate_preferences(Spree::PromotionRule)
+  end
+
+  def down
+  end
+
+  private
+  def migrate_preferences klass
+    klass.reset_column_information
+    klass.find_each do |record|
+      store = Spree::Preferences::ScopedStore.new(record.class.name.underscore, record.id)
+      record.defined_preferences.each do |key|
+        value = store.fetch(key){}
+        record.preferences[key] = value unless value.nil?
+      end
+      record.save!
+    end
+  end
+end

data/db/migrate/20140309024355_create_spree_stores.rb

@@ -0,0 +1,25 @@
+class CreateSpreeStores < ActiveRecord::Migration
+  def change
+    if table_exists?(:spree_stores)
+      rename_column :spree_stores, :domains, :url
+      rename_column :spree_stores, :email, :mail_from_address
+      add_column :spree_stores, :meta_description, :text
+      add_column :spree_stores, :meta_keywords, :text
+      add_column :spree_stores, :seo_title, :string
+    else
+      create_table :spree_stores do |t|
+        t.string :name
+        t.string :url
+        t.text :meta_description
+        t.text :meta_keywords
+        t.string :seo_title
+        t.string :mail_from_address
+        t.string :default_currency
+        t.string :code
+        t.boolean :default, default: false, null: false
+
+        t.timestamps
+      end
+    end
+  end
+end

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -0,0 +1,30 @@
+class CreateStoreFromPreferences < ActiveRecord::Migration
+  def change
+    preference_store = Spree::Preferences::Store.instance
+    if store = Spree::Store.where(default: true).first
+      store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
+      store.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
+      store.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
+      store.save!
+    else
+      # we set defaults for the things we now require
+      Spree::Store.new do |s|
+        s.name              = preference_store.get 'spree/app_configuration/site_name' do
+          'Spree Demo Site'
+        end
+        s.url               = preference_store.get 'spree/app_configuration/site_url' do
+          'demo.spreecommerce.com'
+        end
+        s.mail_from_address = preference_store.get 'spree/app_configuration/mails_from' do
+          'spree@example.com'
+        end
+
+        s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
+        s.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
+        s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
+        s.default_currency = preference_store.get('spree/app_configuration/currency') {}
+        s.code             = 'spree'
+      end.save!
+    end
+  end
+end