solidus_core 1.1.4 → 1.2.0.beta1

data/app/models/spree/stock_location.rb

@@ -77,7 +77,7 @@ module Spree
       item = stock_item_or_create(variant)
       item.update_columns(
         count_on_hand: item.count_on_hand + quantity,
-        updated_at: Time.now
+        updated_at: Time.current
       )
     end
 
@@ -95,17 +95,7 @@ module Spree
 
     def fill_status(variant, quantity)
       if item = stock_item(variant)
-
-        if item.count_on_hand >= quantity
-          on_hand = quantity
-          backordered = 0
-        else
-          on_hand = item.count_on_hand
-          on_hand = 0 if on_hand < 0
-          backordered = item.backorderable? ? (quantity - on_hand) : 0
-        end
-
-        [on_hand, backordered]
+        item.fill_status(quantity)
       else
         [0, 0]
       end

data/app/models/spree/stock_transfer.rb

@@ -46,7 +46,7 @@ module Spree
       finalized? && shipped? && !closed?
     end
 
-    def ship(tracking_number: nil, shipped_at: nil)
+    def ship(tracking_number: self.tracking_number, shipped_at: nil)
       update_attributes!(tracking_number: tracking_number, shipped_at: shipped_at)
     end
 
@@ -70,7 +70,7 @@ module Spree
 
     def finalize(finalized_by)
       if finalizable?
-        self.update_attributes({ finalized_at: Time.now, finalized_by: finalized_by })
+        self.update_attributes({ finalized_at: Time.current, finalized_by: finalized_by })
       else
         errors.add(:base, Spree.t(:stock_transfer_cannot_be_finalized))
         false
@@ -91,7 +91,7 @@ module Spree
 
     def close(closed_by)
       if receivable?
-        self.update_attributes({ closed_at: Time.now, closed_by: closed_by })
+        self.update_attributes({ closed_at: Time.current, closed_by: closed_by })
       else
         errors.add(:base, Spree.t(:stock_transfer_must_be_receivable))
         false

data/app/models/spree/store_credit.rb

@@ -162,7 +162,7 @@ class Spree::StoreCredit < Spree::Base
   end
 
   def generate_authorization_code
-    "#{self.id}-SC-#{Time.now.utc.strftime("%Y%m%d%H%M%S%6N")}"
+    "#{self.id}-SC-#{Time.current.utc.strftime("%Y%m%d%H%M%S%6N")}"
   end
 
   def editable?
@@ -192,7 +192,7 @@ class Spree::StoreCredit < Spree::Base
       self.action = INVALIDATE_ACTION
       self.update_reason = reason
       self.action_originator = user_performing_invalidation
-      self.invalidated_at = Time.now
+      self.invalidated_at = Time.current
       save
     else
       errors.add(:invalidated_at, Spree.t("store_credit.errors.cannot_invalidate_uncaptured_authorization"))

data/app/models/spree/tax_category.rb

@@ -1,7 +1,8 @@
 module Spree
   class TaxCategory < Spree::Base
     acts_as_paranoid
-    validates :name, presence: true, uniqueness: { scope: :deleted_at, allow_blank: true }
+    validates :name, presence: true
+    validates_uniqueness_of :name, unless: :deleted_at
 
     has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
     after_save :ensure_one_default
@@ -12,7 +13,7 @@ module Spree
 
     def ensure_one_default
       if is_default
-        Spree::TaxCategory.where(is_default: true).where.not(id: self.id).update_all(is_default: false, updated_at: Time.now)
+        Spree::TaxCategory.where(is_default: true).where.not(id: self.id).update_all(is_default: false, updated_at: Time.current)
       end
     end
   end

data/app/models/spree/tax_rate.rb

@@ -50,7 +50,7 @@ module Spree
       # When you ship to France, you'll see a Spanish refund AND a French tax.
       # This little bit of code at the end stops the Spanish refund from appearing.
       #
-      # For further discussion, see #4397 and #4327.
+      # For further discussion, see https://github.com/spree/spree/issues/4397 and https://github.com/spree/spree/issues/4327.
 
       remaining_rates = rates.dup
       rates.each do |rate|
@@ -145,12 +145,10 @@ module Spree
     #
     # Those rates should never come into play at all and only the French rates should apply.
     def potentially_applicable?(order_tax_zone)
-      # If the rate's zone matches the order's tax zone, then it's applicable.
-      self.zone == order_tax_zone ||
       # If the rate's zone *contains* the order's tax zone, then it's applicable.
       self.zone.contains?(order_tax_zone) ||
-      # 1) The rate's zone is the default zone, then it's always applicable.
-      (self.included_in_price? && self.zone.default_tax)
+      # The rate is a VAT and its zone contains the default zone, then it's applicable.
+      (self.included_in_price? && self.zone.contains?(Spree::Zone.default_tax))
     end
 
     # Creates necessary tax adjustments for the order.
@@ -175,21 +173,16 @@ module Spree
 
     # This method is used by Adjustment#update to recalculate the cost.
     def compute_amount(item)
-      if included_in_price
-        if default_zone_or_zone_match?(item.order.tax_zone)
-          calculator.compute(item)
-        else
-          # In this case, it's a refund.
-          calculator.compute(item) * - 1
-        end
+      if included_in_price && !default_zone_or_zone_match?(item.order.tax_zone)
+        # In this case, it's a refund.
+        calculator.compute(item) * - 1
       else
         calculator.compute(item)
       end
     end
 
     def default_zone_or_zone_match?(order_tax_zone)
-      default_tax = Zone.default_tax
-      (default_tax && default_tax.contains?(order_tax_zone)) || order_tax_zone == self.zone
+      Zone.default_tax.try!(:contains?, order_tax_zone) || self.zone.contains?(order_tax_zone)
     end
 
     private

data/app/models/spree/taxon.rb

@@ -9,6 +9,9 @@ module Spree
     has_many :prototype_taxons, dependent: :destroy
     has_many :prototypes, through: :prototype_taxons
 
+    has_many :promotion_rule_taxons
+    has_many :promotion_rules, through: :promotion_rule_taxons
+
     before_create :set_permalink
 
     validates :name, presence: true
@@ -96,7 +99,7 @@ module Spree
 
     def touch_ancestors_and_taxonomy
       # Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
-      self.class.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.now)
+      self.class.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.current)
       # Have taxonomy touch happen in #touch_ancestors_and_taxonomy rather than association option in order for imports to override.
       taxonomy.try!(:touch)
     end

data/app/models/spree/taxonomy.rb

@@ -16,7 +16,7 @@ module Spree
         if root
           root.update_columns(
             name: name,
-            updated_at: Time.now,
+            updated_at: Time.current,
           )
         else
           self.root = Taxon.create!(taxonomy_id: id, name: name)

data/app/models/spree/transfer_item.rb

@@ -5,8 +5,8 @@ module Spree
     belongs_to :variant
 
     validate :stock_availability, if: :check_stock?
-    validates_presence_of :stock_transfer, :variant
-    validates_uniqueness_of :variant_id, scope: :stock_transfer_id
+    validates :stock_transfer, :variant, presence: true
+    validates :variant_id, uniqueness: { scope: :stock_transfer_id }, allow_blank: true
     validates :expected_quantity, numericality: { greater_than: 0 }
     validates :received_quantity, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: :expected_quantity }
 

data/app/models/spree/unit_cancel.rb

@@ -3,6 +3,8 @@
 # This class should encapsulate logic related to canceling inventory after order complete
 class Spree::UnitCancel < Spree::Base
   SHORT_SHIP = 'Short Ship'
+  DEFAULT_REASON = 'Cancel'
+
   belongs_to :inventory_unit
   has_one :adjustment, as: :source, dependent: :destroy
 

data/app/models/spree/variant.rb

@@ -18,7 +18,7 @@ module Spree
 
     include Spree::DefaultPrice
 
-    belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
+    belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
 
     delegate :name, :description, :slug, :available_on, :shipping_category_id,
@@ -49,7 +49,7 @@ module Spree
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
     validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
+    validates_uniqueness_of :sku, allow_blank: true, unless: :deleted_at
 
     after_create :create_stock_items
     after_create :set_position
@@ -158,14 +158,6 @@ module Spree
       !!deleted_at
     end
 
-    # Override ActiveRecord finder to function even if the product has been
-    # deleted.
-    #
-    # @return [Spree::Product]
-    def product
-      Spree::Product.unscoped { super }
-    end
-
     # Assign given options hash to option values.
     #
     # @param options [Array] array of hashes with a name and value.
@@ -346,9 +338,12 @@ module Spree
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
         if price.nil? && Spree::Config[:require_master_price]
-          raise 'No master variant found to infer price' unless (product && product.master)
-          raise 'Must supply price for variant or master.price for product.' if self == product.master
-          self.price = product.master.price
+          if is_master?
+            errors.add :price, 'Must supply price for variant or master.price for product.'
+          else
+            raise 'No master variant found to infer price' unless (product && product.master)
+            self.price = product.master.price
+          end
         end
         if currency.nil?
           self.currency = Spree::Config[:currency]
@@ -356,7 +351,7 @@ module Spree
       end
 
       def set_cost_currency
-        self.cost_currency = Spree::Config[:currency] if cost_currency.nil? || cost_currency.empty?
+        self.cost_currency = Spree::Config[:currency] if cost_currency.blank?
       end
 
       def create_stock_items

data/app/models/spree/zone.rb

@@ -3,6 +3,11 @@ module Spree
     has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
     has_many :tax_rates, dependent: :destroy, inverse_of: :zone
 
+    with_options through: :zone_members, source: :zoneable do
+      has_many :countries, source_type: "Spree::Country"
+      has_many :states, source_type: "Spree::State"
+    end
+
     has_many :shipping_method_zones
     has_many :shipping_methods, through: :shipping_method_zones
 
@@ -106,6 +111,7 @@ module Spree
     # Indicates whether the specified zone falls entirely within the zone performing
     # the check.
     def contains?(target)
+      return true if self == target
       return false if kind == 'state' && target.kind == 'country'
       return false if zone_members.empty? || target.zone_members.empty?
 

data/app/models/spree/zone_member.rb

@@ -3,9 +3,6 @@ module Spree
     belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
     belongs_to :zoneable, polymorphic: true
 
-    def name
-      return nil if zoneable.nil?
-      zoneable.name
-    end
+    delegate :name, to: :zoneable, allow_nil: true
   end
 end

data/config/locales/en.yml

@@ -419,6 +419,7 @@ en:
     add_state: Add State
     add_stock: Add Stock
     add_stock_management: Add Stock Management
+    add_taxon: Add taxon
     add_to_cart: Add To Cart
     add_to_stock_location: Add to location
     add_variant: Add Variant
@@ -502,8 +503,8 @@ en:
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
     all: All
-    all_adjustments_closed: All adjustments successfully closed!
-    all_adjustments_opened: All adjustments successfully opened!
+    all_adjustments_finalized: All adjustments successfully finalized!
+    all_adjustments_unfinalized: All adjustments successfully unfinalized!
     all_departments: All departments
     all_items_have_been_returned: All items have been returned
     already_signed_up_for_analytics: You have already signed up for Spree Analytics
@@ -554,6 +555,7 @@ en:
     back_to_reports_list: Back To Reports List
     back_to_refund_reason_list: Back To Refund Reason List
     back_to_reimbursement_type_list: Back To Reimbursement Type List
+    back_to_return_authorizations_list: Back To Return Authorizations List
     back_to_rma_reason_list: Back To RMA Reason List
     back_to_shipping_categories: Back To Shipping Categories
     back_to_shipping_categories_list: Back To Shipping Categories List
@@ -623,7 +625,6 @@ en:
     clear_cache_warning: Clearing cache will temporarily reduce the performance of your store.
     clone: Clone
     close: Close
-    close_all_adjustments: Close All Adjustments
     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
@@ -814,6 +815,7 @@ en:
     fill_in_customer_info: Please fill in customer info
     filter_results: Filter Results
     finalize: Finalize
+    finalize_all_adjustments: Finalize All Adjustments
     finalize_stock_transfer:
       will_cause: Finalizing a stock transfer will cause the following
       no_longer_change_items: You will no longer be able to add or edit any transfer items
@@ -884,7 +886,6 @@ en:
     intercept_email_address: Intercept Email Address
     intercept_email_instructions: Override email recipient and replace with this address.
     internal_name: Internal Name
-    invalid_credit_card: Invalid credit card.
     invalid_exchange_variant: Invalid exchange variant.
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
@@ -942,6 +943,7 @@ en:
     make_refund: Make refund
     make_sure_the_above_reimbursement_amount_is_correct: Make sure the above reimbursement amount is correct
     manage_promotion_categories: Manage Promotion Categories
+    manage_stock: Manage Stock
     manual_intervention_required: Manual intervention required
     manage_variants: Manage Variants
     master_price: Master Price
@@ -1043,7 +1045,6 @@ en:
     number_of_codes: ! '%{count} codes'
     on_hand: On Hand
     open: Open
-    open_all_adjustments: Open All Adjustments
     option_type: Option Type
     option_type_placeholder: Choose an option type
     option_types: Option Types
@@ -1549,6 +1550,7 @@ en:
     unable_to_connect_to_gateway: Unable to connect to gateway.
     unable_to_create_reimbursements: Unable to create reimbursements because there are items pending manual intervention.
     unable_to_create_stock_transfer: Unable to create the stock transfer
+    unfinalize_all_adjustments: Unfinalize All Adjustments
     under_price: Under %{price}
     unlock: Unlock
     unrecognized_card_type: Unrecognized card type

data/db/default/spree/countries.rb

@@ -16,4 +16,4 @@ ActiveRecord::Base.transaction do
   Spree::Country.create!(countries)
 end
 
-Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id
+Spree::Config[:default_country_id] ||= Spree::Country.find_by(iso: "US").id

data/db/default/spree/zones.rb

@@ -1,17 +1,11 @@
 eu_vat = Spree::Zone.find_or_create_by!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
 north_america = Spree::Zone.find_or_create_by!(name: "North America", description: "USA + Canada")
 
-["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
- "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
- "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
- "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
- "Estonia", "Croatia", "Czech Republic", "Greece"].
-each do |name|
-  eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE).
+each do |symbol|
+  eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(iso: symbol))
 end
 
-["United States", "Canada"].each do |name|
-  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
+%w(US CA).each do |symbol|
+  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(iso: symbol))
 end
-
-

data/db/migrate/20130213191427_create_default_stock.rb

@@ -13,7 +13,7 @@ class CreateDefaultStock < ActiveRecord::Migration
     Spree::Variant.find_each do |variant|
       stock_item = Spree::StockItem.unscoped.build(stock_location: location, variant: variant)
       stock_item.send(:count_on_hand=, variant.count_on_hand)
-      # Avoid running default_scope defined by acts_as_paranoid, related to #3805,
+      # Avoid running default_scope defined by acts_as_paranoid, related to https://github.com/spree/spree/issues/3805,
       # validations would run a query with a delete_at column that might not be present yet
       stock_item.save! validate: false
     end

data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb

@@ -14,7 +14,7 @@ class AddAddressFieldsToStockLocation < ActiveRecord::Migration
 
     usa = Spree::Country.where(:iso => 'US').first
     # In case USA isn't found.
-    # See #3115
+    # See https://github.com/spree/spree/issues/3115
     country = usa || Spree::Country.first
     Spree::Country.reset_column_information
     Spree::StockLocation.update_all(:country_id => country)

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -1,14 +1,17 @@
 class CreateStoreFromPreferences < ActiveRecord::Migration
+  class Store < ActiveRecord::Base
+    self.table_name = 'spree_stores'
+  end
   def change
     preference_store = Spree::Preferences::Store.instance
-    if store = Spree::Store.where(default: true).first
+    if store = 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|
+      Store.new do |s|
         s.name              = preference_store.get 'spree/app_configuration/site_name' do
           'Sample Store'
         end

data/db/migrate/20141009204607_add_store_id_to_orders.rb

@@ -1,8 +1,12 @@
 class AddStoreIdToOrders < ActiveRecord::Migration
+  class Store < ActiveRecord::Base
+    self.table_name = 'spree_stores'
+  end
   def change
     add_column :spree_orders, :store_id, :integer
-    if Spree::Store.default.persisted?
-      Spree::Order.where(store_id: nil).update_all(store_id: Spree::Store.default.id)
+    default_store = Store.where(default: true).first
+    if default_store
+      Spree::Order.where(store_id: nil).update_all(store_id: default_store.id)
     end
   end
 end