solidus_core 1.0.0.pre3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8aa521a33c27c10cdec65089ae5d044c1aa62e
-  data.tar.gz: c5b6055ae2ce9a0050d2fa9a1afdf938df77cca5
+  metadata.gz: 230b3381580409e57183114635859cadf3a87f95
+  data.tar.gz: 5d5c36600b0a347d48704541db654fa13df20fff
 SHA512:
-  metadata.gz: 38bf62e7f2f12a3da4b897b6b144faf9a5bece9d80fd7fa321e70277ddd1b16b44c9dc7c490b196459100ad246903826c43e4e7162d77ce4d9e30802b6120912
-  data.tar.gz: b7247c74c10e6a276f20c20127073b958004f1177e75a6e0e5913eb19001d25fce59bdb923273ae8d288a7e6b2bb93c856539d2073c3e31dbcb97c81c0d590bd
+  metadata.gz: 271be6c98555a1782033872a437bf979919ff06a2d94cf6f5a0b31f2ca98f0ca41d770342a28140a9724dd8bde8a2ef1d6a1845759e161b3922082964d50d289
+  data.tar.gz: b61583b962acfc39e26ceb869a4179921e5979bfbfb48f43f17056a9814ed381e6e0e392874b2507ceaa2a5ac549e8a910c58f527f47f5510bb33bd7366c3a4f

data/app/models/spree/credit_card.rb

@@ -21,8 +21,6 @@ module Spree
     validates :name, presence: true, if: :require_card_numbers?, on: :create
     validates :verification_value, presence: true, if: :require_card_numbers?, on: :create, unless: :imported
 
-    validate :expiry_not_in_the_past
-
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
     scope :default, -> { where(default: true) }
 
@@ -172,19 +170,6 @@ module Spree
 
     private
 
-    def expiry_not_in_the_past
-      if year.present? && month.present?
-        if month.to_i < 1 || month.to_i > 12
-          errors.add(:base, :expiry_invalid)
-        else
-          current = Time.current
-          if year.to_i < current.year or (year.to_i == current.year and month.to_i < current.month)
-            errors.add(:base, :card_expired)
-          end
-        end
-      end
-    end
-
     def require_card_numbers?
       !self.encrypted_data.present? && !self.has_payment_profile?
     end

data/app/models/spree/exchange.rb

@@ -42,5 +42,9 @@ module Spree
       Spree::Exchange
     end
 
+    def model_name
+      self.class.model_name
+    end
+
   end
 end

data/app/models/spree/option_value.rb

@@ -1,6 +1,6 @@
 module Spree
   class OptionValue < Spree::Base
-    belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
+    belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values
     acts_as_list scope: :option_type
 
     has_many :option_values_variants, dependent: :destroy
@@ -9,12 +9,13 @@ module Spree
     validates :name, presence: true, uniqueness: { scope: :option_type_id }
     validates :presentation, presence: true
 
+    after_save :touch
     after_touch :touch_all_variants
 
     # Updates the updated_at column on all the variants associated with this
     # option value.
     def touch_all_variants
-      variants.update_all(updated_at: Time.current)
+      variants.find_each(&:touch)
     end
 
     # @return [String] a string representation of all option value and its

data/app/models/spree/order.rb

@@ -425,16 +425,6 @@ module Spree
       end
     end
 
-    def ensure_line_items_are_in_stock
-      if insufficient_stock_lines.present?
-        errors.add(:base, Spree.t(:insufficient_stock_lines_present))
-        restart_checkout_flow
-        false
-      else
-        true
-      end
-    end
-
     def merge!(order, user = nil)
       order.line_items.each do |other_order_line_item|
         next unless other_order_line_item.currency == currency

data/app/models/spree/order/checkout.rb

@@ -103,7 +103,7 @@ module Spree
               end
 
               before_transition to: :resumed, do: :ensure_line_item_variants_are_not_deleted
-              before_transition to: :resumed, do: :ensure_line_items_are_in_stock
+              before_transition to: :resumed, do: :validate_line_item_availability
 
               # Sequence of before_transition to: :complete
               # calls matter so that we do not process payments
@@ -112,7 +112,6 @@ module Spree
               before_transition to: :complete, do: :ensure_available_shipping_rates
               before_transition to: :complete, do: :ensure_promotions_eligible
               before_transition to: :complete, do: :ensure_line_item_variants_are_not_deleted
-              before_transition to: :complete, do: :ensure_line_items_are_in_stock
               before_transition to: :complete, do: :ensure_inventory_units, unless: :unreturned_exchange?
 
               after_transition to: :complete, do: :finalize!

data/db/default/spree/store_credit.rb

@@ -1,8 +1,8 @@
 Spree::StoreCreditCategory.find_or_create_by!(name: Spree.t("store_credit_category.default"))
 
 Spree::PaymentMethod.create_with(
-  name: Spree.t("store_credit.store_credit"),
-  description: Spree.t("store_credit.store_credit"),
+  name: "Store Credit",
+  description: "Store credit",
   active: true,
   display_on: 'none',
 ).find_or_create_by!(
@@ -10,7 +10,11 @@ Spree::PaymentMethod.create_with(
   environment: Rails.env,
 )
 
-Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: Spree.t("store_credit.expiring"))
-Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree.t("store_credit.non_expiring"))
+Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: 'Expiring')
+Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: 'Non-expiring')
 
-Spree::ReimbursementType.create_with(name: Spree.t("store_credit.store_credit")).find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
+Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
+
+Spree::StoreCreditCategory.find_or_create_by!(name: 'Gift Card')
+
+Spree::StoreCreditUpdateReason.find_or_create_by!(name: 'Credit Given In Error')

data/db/seeds.rb

@@ -3,12 +3,3 @@ default_path = File.join(File.dirname(__FILE__), 'default')
 
 Rake::Task['db:load_dir'].reenable
 Rake::Task['db:load_dir'].invoke(default_path)
-
-Spree::PaymentMethod.find_or_create_by(type: "Spree::PaymentMethod::StoreCredit", name: "Store Credit", description: "Store credit.", active: true, environment: Rails.env, display_on: 'back_end')
-
-Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
-Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)
-
-Spree::StoreCreditCategory.find_or_create_by(name: 'Gift Card')
-
-Spree::StoreCreditUpdateReason.find_or_create_by(name: 'Credit Given In Error')

data/lib/spree/testing_support/factories/order_factory.rb

@@ -47,7 +47,7 @@ FactoryGirl.define do
 
         after(:create) do |order|
           order.refresh_shipment_rates
-          order.update_column(:completed_at, Time.now)
+          order.update_column(:completed_at, Time.current)
         end
 
         factory :completed_order_with_pending_payment do

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -5,10 +5,6 @@ FactoryGirl.define do
     price 19.99
     cost_price 17.00
     sku    { generate(:sku) }
-    weight { generate(:random_float) }
-    height { generate(:random_float) }
-    width  { generate(:random_float) }
-    depth  { generate(:random_float) }
     is_master 0
     track_inventory true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant