solidus_core 1.0.7 → 1.1.0.beta1

data/app/models/spree/taxonomy.rb

@@ -9,7 +9,7 @@ module Spree
 
     after_save :set_name
 
-    default_scope -> { order("#{self.table_name}.position") }
+    default_scope -> { order(:position) }
 
     private
       def set_name

data/app/models/spree/transfer_item.rb

@@ -1,5 +1,5 @@
 module Spree
-  class TransferItem < ActiveRecord::Base
+  class TransferItem < Spree::Base
     acts_as_paranoid
     belongs_to :stock_transfer, inverse_of: :transfer_items
     belongs_to :variant

data/app/models/spree/unit_cancel.rb

@@ -1,7 +1,7 @@
 # This represents an inventory unit that has been canceled from an order after it has already been completed
 # The reason specifies why it was canceled.
 # This class should encapsulate logic related to canceling inventory after order complete
-class Spree::UnitCancel < ActiveRecord::Base
+class Spree::UnitCancel < Spree::Base
   SHORT_SHIP = 'Short Ship'
   belongs_to :inventory_unit
   has_one :adjustment, as: :source, dependent: :destroy
@@ -20,7 +20,7 @@ class Spree::UnitCancel < ActiveRecord::Base
       order: inventory_unit.order,
       label: "#{Spree.t(:cancellation)} - #{reason}",
       eligible: true,
-      state: 'closed',
+      finalized: true
     )
   end
 

data/app/models/spree/user_address.rb

@@ -0,0 +1,21 @@
+module Spree
+  class UserAddress < Spree::Base
+    belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id"
+    belongs_to :address, class_name: "Spree::Address"
+
+    validates_uniqueness_of :address_id, scope: :user_id
+    validates_uniqueness_of :user_id, conditions: -> { active.default }, message: :default_address_exists, if: :default?
+
+    scope :with_address_values, ->(address_attributes) do
+      joins(:address).merge(
+        Spree::Address.with_values(address_attributes)
+      )
+    end
+
+    scope :all_historical, -> { unscope(where: :archived) }
+    scope :default, -> { where(default: true) }
+    scope :active, -> { where(archived: false) }
+
+    default_scope -> { order([default: :desc, updated_at: :desc]) }
+  end
+end

data/app/models/spree/user_stock_location.rb

@@ -1,5 +1,5 @@
 module Spree
-  class UserStockLocation < ActiveRecord::Base
+  class UserStockLocation < Spree::Base
     belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations
     belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations
   end

data/app/models/spree/variant.rb

@@ -21,9 +21,9 @@ module Spree
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
-    delegate_belongs_to :product, :name, :description, :slug, :available_on,
-                        :shipping_category_id, :meta_description, :meta_keywords,
-                        :shipping_category
+    delegate :name, :description, :slug, :available_on, :shipping_category_id,
+             :meta_description, :meta_keywords, :shipping_category,
+             to: :product
 
     has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
@@ -38,13 +38,6 @@ module Spree
 
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
-    has_one :default_price,
-      -> { where(currency: Spree::Config[:currency], is_default: true) },
-      class_name: 'Spree::Price',
-      dependent: :destroy
-
-    delegate_belongs_to :default_price, :display_price, :display_amount, :price, :price=, :currency
-
     has_many :prices,
       class_name: 'Spree::Price',
       dependent: :destroy,
@@ -64,7 +57,19 @@ module Spree
 
     after_touch :clear_in_stock_cache
 
-    scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
+    # Returns variants that are in stock. When stock locations are provided as
+    # a parameter, the scope is limited to variants that are in stock in the
+    # provided stock locations.
+    #
+    # @param stock_locations [Array<Spree::StockLocation>] the stock locations to check
+    # @return [ActiveRecord::Relation]
+    def self.in_stock(stock_locations = nil)
+      in_stock_variants = joins(:stock_items).where(Spree::StockItem.arel_table[:count_on_hand].gt(0).or(arel_table[:track_inventory].eq(false)))
+      if stock_locations.present?
+        in_stock_variants = in_stock_variants.where(spree_stock_items: { stock_location_id: stock_locations.map(&:id) })
+      end
+      in_stock_variants
+    end
 
     self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
     self.whitelisted_ransackable_attributes = %w[weight sku]
@@ -119,8 +124,8 @@ module Spree
     #
     # @return [String] a sentence-ified string of option values.
     def options_text
-      values = self.option_values.sort do |a, b|
-        a.option_type.position <=> b.option_type.position
+      values = self.option_values.includes(:option_type).sort_by do |option_value|
+        option_value.option_type.position
       end
 
       values.to_a.map! do |ov|
@@ -319,6 +324,16 @@ module Spree
       images.first || (fallback && product.variant_images.first) || Spree::Image.new
     end
 
+    # Determines the variant's property values by verifying which of the product's
+    # variant property rules apply to itself.
+    #
+    # @return [Array<Spree::VariantPropertyRuleValue>] variant_properties
+    def variant_properties
+      self.product.variant_property_rules.map do |rule|
+        rule.values if rule.applies_to_variant?(self)
+      end.flatten.compact
+    end
+
     private
 
       def set_master_out_of_stock

data/app/models/spree/variant_property_rule.rb

@@ -0,0 +1,42 @@
+# The reason for variant properties not being associated with variants
+# (either directly or through an association table) is performance.
+#
+# Variant properties are intended to be applied to a group of variants based
+# on their option values. If there were thousands of variants that shared the
+# same option value, attempting to associate a variant property with that
+# group of variants would be problematic in terms of performance.
+#
+# An added benefit to this approach is not having to associate existing variant
+# properties with newly created variants. If the variant has the option values
+# targeted by the rule, the properties will automatically apply to the variant.
+module Spree
+  class VariantPropertyRule < Spree::Base
+    belongs_to :product, touch: true
+
+    has_many :values, class_name: 'Spree::VariantPropertyRuleValue', dependent: :destroy
+    has_many :properties, through: :values
+    has_many :conditions, class_name: 'Spree::VariantPropertyRuleCondition', dependent: :destroy
+    has_many :option_values, through: :conditions
+
+    accepts_nested_attributes_for :values, allow_destroy: true, reject_if: lambda { |val| val[:property_name].blank? }
+
+    # Checks whether the provided ids are the same as the rule's
+    # condition's option value ids.
+    #
+    # @param option_value_ids [Array<Integer>] list of option value ids
+    # @return [Boolean]
+    def matches_option_value_ids?(option_value_ids)
+      self.option_value_ids.sort == option_value_ids.sort
+    end
+
+    # Checks whether the rule applies to the variant by
+    # checking the rule's conditions against the variant's
+    # option values.
+    #
+    # @param variant [Spree::Variant] variant to check
+    # @return [Boolean]
+    def applies_to_variant?(variant)
+      (self.option_value_ids & variant.option_value_ids).present?
+    end
+  end
+end

data/app/models/spree/variant_property_rule_condition.rb

@@ -0,0 +1,8 @@
+module Spree
+  class VariantPropertyRuleCondition < Spree::Base
+    belongs_to :option_value
+    belongs_to :variant_property_rule, touch: true
+
+    validates_uniqueness_of :option_value_id, scope: :variant_property_rule_id
+  end
+end

data/app/models/spree/variant_property_rule_value.rb

@@ -0,0 +1,8 @@
+module Spree
+  class VariantPropertyRuleValue < Spree::Base
+    include Spree::OrderedPropertyValueList
+
+    belongs_to :property
+    belongs_to :variant_property_rule, touch: true
+  end
+end

data/app/models/spree/zone.rb

@@ -2,7 +2,9 @@ module Spree
   class Zone < Spree::Base
     has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
     has_many :tax_rates, dependent: :destroy, inverse_of: :zone
-    has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
+
+    has_many :shipping_method_zones
+    has_many :shipping_methods, through: :shipping_method_zones
 
     validates :name, presence: true, uniqueness: { allow_blank: true }
     after_save :remove_defunct_members
@@ -21,7 +23,7 @@ module Spree
     # Returns nil in the case of no matches.
     def self.match(address)
       return unless address and matches = self.includes(:zone_members).
-        order('spree_zones.zone_members_count', 'spree_zones.created_at', 'spree_zones.id').
+        order(:zone_members_count, :created_at, :id).
         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)
 

data/app/views/spree/carton_mailer/shipped_email.text.erb

@@ -5,7 +5,7 @@
 ============================================================
 <%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
-<% @carton.manifest.each do |item| %>
+<% @manifest.each do |item| %>
   <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
 <% end %>
 ============================================================

data/config/locales/en.yml

@@ -228,6 +228,7 @@ en:
       spree/state:
         one: State
         other: States
+      spree/stock: stock
       spree/stock_movement:
         one: Stock Movement
         other: Stock Movements
@@ -322,6 +323,10 @@ en:
           attributes:
             base:
               cannot_destroy_default_store: Cannot destroy the default Store.
+        spree/user_address:
+          attributes:
+            user_id:
+              default_address_exists: "already has a default address"
 
   devise:
     confirmations:
@@ -404,6 +409,7 @@ en:
     add_option_value: Add Option Value
     add_product: Add Product
     add_product_properties: Add Product Properties
+    add_variant_properties: Add Variant Properties
     add_rule_of_type: Add rule of type
     add_state: Add State
     add_stock: Add Stock
@@ -808,6 +814,8 @@ en:
       no_longer_change_items: You will no longer be able to add or edit any transfer items
     find_a_taxon: Find a Taxon
     finalized: Finalized
+    finalized_at: Finalized at
+    finalized_by: Finalized by
     close_stock_transfer:
       will_cause: Closing a stock transfer will cause the following
       no_longer_edit: You will no longer be able to edit the stock transfer in any way
@@ -1201,6 +1209,9 @@ en:
       one_use_per_user:
         description: Only One Use Per User
         name: One Use Per User
+      option_value:
+        description: Order includes specified product(s) with matching option value(s)
+        name: Option Value(s)
       product:
         description: Order includes specified product(s)
         name: Product(s)
@@ -1353,6 +1364,7 @@ en:
         track_information: ! 'Tracking Information: %{tracking}'
         track_link: ! 'Tracking Link: %{url}'
     shipment_date: Shipment date
+    shipment_number: Shipment Number
     shipment_numbers: Shipment numbers
     shipment_state: Shipment State
     shipment_states:
@@ -1556,6 +1568,7 @@ en:
     value: Value
     variant: Variant
     variant_placeholder: Choose a variant
+    variant_properties: Variant Properties
     variant_search: Variant Search
     variant_search_placeholder: "SKU or Option Value"
     variant_to_add: Variant to add

data/db/default/spree/store_credit.rb

@@ -7,7 +7,6 @@ Spree::PaymentMethod.create_with(
   display_on: 'none',
 ).find_or_create_by!(
   type: "Spree::PaymentMethod::StoreCredit",
-  environment: Rails.env,
 )
 
 Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: 'Expiring')

data/db/default/spree/zones.rb

@@ -5,7 +5,7 @@ north_america = Spree::Zone.create!(name: "North America", description: "USA + C
  "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
  "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
  "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
- "Estonia"].
+ "Estonia", "Croatia", "Czech Republic", "Greece"].
 each do |name|
   eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
 end

data/db/migrate/20130228210442_create_shipping_method_zone.rb

@@ -1,5 +1,5 @@
 class CreateShippingMethodZone < ActiveRecord::Migration
-  class ShippingMethodZone < ActiveRecord::Base
+  class ShippingMethodZone < Spree::Base
     self.table_name = 'shipping_methods_zones'
   end
   def up

data/db/migrate/20150121022521_remove_environment_from_payment_method.rb

@@ -0,0 +1,6 @@
+class RemoveEnvironmentFromPaymentMethod < ActiveRecord::Migration
+  def up
+    Spree::PaymentMethod.where('environment != ?', Rails.env).update_all(active: false)
+    remove_column :spree_payment_methods, :environment
+  end
+end

data/db/migrate/20150506181611_create_spree_store_credit_payment_method.rb

@@ -1,17 +1,21 @@
 class CreateSpreeStoreCreditPaymentMethod < ActiveRecord::Migration
-  class PaymentMethod < ActiveRecord::Base
+  class PaymentMethod < Spree::Base
     self.table_name = 'spree_payment_methods'
     self.inheritance_column = :_type_disabled
   end
   def up
+    # If migrating from Spree 3.0, the environment column is already gone.
+    # We remove it in a later migration if upgrading from spree <= 2.4 to soldius
+    if column_exists?(:spree_payment_methods, :environment)
+      attributes = {type: "Spree::PaymentMethod::StoreCredit", environment: Rails.env}
+    else
+      attributes = {type: "Spree::PaymentMethod::StoreCredit"}
+    end
     PaymentMethod.create_with(
       name: Spree.t("store_credit.store_credit"),
       description: Spree.t("store_credit.store_credit"),
       active: true,
       display_on: 'none',
-    ).find_or_create_by!(
-      type: "Spree::PaymentMethod::StoreCredit",
-      environment: Rails.env,
-    )
+    ).find_or_create_by!(attributes)
   end
 end

data/db/migrate/20150731201146_add_spree_user_addresses.rb

@@ -0,0 +1,16 @@
+class AddSpreeUserAddresses < ActiveRecord::Migration
+  def change
+    create_table :spree_user_addresses do |t|
+      t.integer :user_id, null: false
+      t.integer :address_id, null: false
+      t.boolean :default, default: false
+      t.boolean :archived, default: false
+      t.timestamps null: false
+    end
+
+    add_index :spree_user_addresses, :user_id
+    add_index :spree_user_addresses, :address_id
+    add_index :spree_user_addresses, [:user_id, :address_id], unique: true
+  end
+end
+

data/db/migrate/20150811210350_remove_mandatory_from_adjustments.rb

@@ -0,0 +1,5 @@
+class RemoveMandatoryFromAdjustments < ActiveRecord::Migration
+  def change
+    remove_column :spree_adjustments, :mandatory, :boolean
+  end
+end

data/db/migrate/20150811211025_add_finalized_to_spree_adjustments.rb

@@ -0,0 +1,11 @@
+class AddFinalizedToSpreeAdjustments < ActiveRecord::Migration
+  # This migration replaces the open/closed state column of spree_adjustments
+  # with a finalized boolean.
+  # This may cause a few minutes of downtime on very large stores as the
+  # adjustments table can become quite large.
+  def change
+    add_column :spree_adjustments, :finalized, :boolean
+    execute %q(UPDATE spree_adjustments SET finalized=('closed' = state))
+    remove_column :spree_adjustments, :state, :string
+  end
+end

data/db/migrate/20150820160821_add_store_payment_methods.rb

@@ -0,0 +1,10 @@
+class AddStorePaymentMethods < ActiveRecord::Migration
+  def change
+    create_table :spree_store_payment_methods do |t|
+      t.references :store, null: false, index: true
+      t.references :payment_method, null: false, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150824213633_convert_habtm_to_hmt_for_shipping_methods_zones.rb

@@ -0,0 +1,17 @@
+class ConvertHabtmToHmtForShippingMethodsZones < ActiveRecord::Migration
+  def up
+    add_column :spree_shipping_methods_zones, :id, :primary_key
+    add_column :spree_shipping_methods_zones, :created_at, :datetime
+    add_column :spree_shipping_methods_zones, :updated_at, :datetime
+
+    rename_table :spree_shipping_methods_zones, :spree_shipping_method_zones
+  end
+
+  def down
+    rename_table :spree_shipping_method_zones, :spree_shipping_methods_zones
+
+    remove_column :spree_shipping_methods_zones, :updated_at
+    remove_column :spree_shipping_methods_zones, :created_at
+    remove_column :spree_shipping_methods_zones, :id
+  end
+end

data/db/migrate/20150824214129_convert_habtm_to_hmt_for_products_promotion_rules.rb

@@ -0,0 +1,17 @@
+class ConvertHabtmToHmtForProductsPromotionRules < ActiveRecord::Migration
+  def up
+    add_column :spree_products_promotion_rules, :id, :primary_key
+    add_column :spree_products_promotion_rules, :created_at, :datetime
+    add_column :spree_products_promotion_rules, :updated_at, :datetime
+
+    rename_table :spree_products_promotion_rules, :spree_product_promotion_rules
+  end
+
+  def down
+    rename_table :spree_product_promotion_rules, :spree_products_promotion_rules
+
+    remove_column :spree_products_promotion_rules, :id, :primary_key
+    remove_column :spree_products_promotion_rules, :created_at, :datetime
+    remove_column :spree_products_promotion_rules, :updated_at, :datetime
+  end
+end