solidus_core 1.0.0.pre3 → 1.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/models/spree/credit_card.rb +0 -15
- data/app/models/spree/exchange.rb +4 -0
- data/app/models/spree/option_value.rb +3 -2
- data/app/models/spree/order.rb +0 -10
- data/app/models/spree/order/checkout.rb +1 -2
- data/db/default/spree/store_credit.rb +9 -5
- data/db/seeds.rb +0 -9
- data/lib/spree/testing_support/factories/order_factory.rb +1 -1
- data/lib/spree/testing_support/factories/variant_factory.rb +0 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 230b3381580409e57183114635859cadf3a87f95
|
4
|
+
data.tar.gz: 5d5c36600b0a347d48704541db654fa13df20fff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 271be6c98555a1782033872a437bf979919ff06a2d94cf6f5a0b31f2ca98f0ca41d770342a28140a9724dd8bde8a2ef1d6a1845759e161b3922082964d50d289
|
7
|
+
data.tar.gz: b61583b962acfc39e26ceb869a4179921e5979bfbfb48f43f17056a9814ed381e6e0e392874b2507ceaa2a5ac549e8a910c58f527f47f5510bb33bd7366c3a4f
|
@@ -21,8 +21,6 @@ module Spree
|
|
21
21
|
validates :name, presence: true, if: :require_card_numbers?, on: :create
|
22
22
|
validates :verification_value, presence: true, if: :require_card_numbers?, on: :create, unless: :imported
|
23
23
|
|
24
|
-
validate :expiry_not_in_the_past
|
25
|
-
|
26
24
|
scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
|
27
25
|
scope :default, -> { where(default: true) }
|
28
26
|
|
@@ -172,19 +170,6 @@ module Spree
|
|
172
170
|
|
173
171
|
private
|
174
172
|
|
175
|
-
def expiry_not_in_the_past
|
176
|
-
if year.present? && month.present?
|
177
|
-
if month.to_i < 1 || month.to_i > 12
|
178
|
-
errors.add(:base, :expiry_invalid)
|
179
|
-
else
|
180
|
-
current = Time.current
|
181
|
-
if year.to_i < current.year or (year.to_i == current.year and month.to_i < current.month)
|
182
|
-
errors.add(:base, :card_expired)
|
183
|
-
end
|
184
|
-
end
|
185
|
-
end
|
186
|
-
end
|
187
|
-
|
188
173
|
def require_card_numbers?
|
189
174
|
!self.encrypted_data.present? && !self.has_payment_profile?
|
190
175
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Spree
|
2
2
|
class OptionValue < Spree::Base
|
3
|
-
belongs_to :option_type, class_name: 'Spree::OptionType',
|
3
|
+
belongs_to :option_type, class_name: 'Spree::OptionType', inverse_of: :option_values
|
4
4
|
acts_as_list scope: :option_type
|
5
5
|
|
6
6
|
has_many :option_values_variants, dependent: :destroy
|
@@ -9,12 +9,13 @@ module Spree
|
|
9
9
|
validates :name, presence: true, uniqueness: { scope: :option_type_id }
|
10
10
|
validates :presentation, presence: true
|
11
11
|
|
12
|
+
after_save :touch
|
12
13
|
after_touch :touch_all_variants
|
13
14
|
|
14
15
|
# Updates the updated_at column on all the variants associated with this
|
15
16
|
# option value.
|
16
17
|
def touch_all_variants
|
17
|
-
variants.
|
18
|
+
variants.find_each(&:touch)
|
18
19
|
end
|
19
20
|
|
20
21
|
# @return [String] a string representation of all option value and its
|
data/app/models/spree/order.rb
CHANGED
@@ -425,16 +425,6 @@ module Spree
|
|
425
425
|
end
|
426
426
|
end
|
427
427
|
|
428
|
-
def ensure_line_items_are_in_stock
|
429
|
-
if insufficient_stock_lines.present?
|
430
|
-
errors.add(:base, Spree.t(:insufficient_stock_lines_present))
|
431
|
-
restart_checkout_flow
|
432
|
-
false
|
433
|
-
else
|
434
|
-
true
|
435
|
-
end
|
436
|
-
end
|
437
|
-
|
438
428
|
def merge!(order, user = nil)
|
439
429
|
order.line_items.each do |other_order_line_item|
|
440
430
|
next unless other_order_line_item.currency == currency
|
@@ -103,7 +103,7 @@ module Spree
|
|
103
103
|
end
|
104
104
|
|
105
105
|
before_transition to: :resumed, do: :ensure_line_item_variants_are_not_deleted
|
106
|
-
before_transition to: :resumed, do: :
|
106
|
+
before_transition to: :resumed, do: :validate_line_item_availability
|
107
107
|
|
108
108
|
# Sequence of before_transition to: :complete
|
109
109
|
# calls matter so that we do not process payments
|
@@ -112,7 +112,6 @@ module Spree
|
|
112
112
|
before_transition to: :complete, do: :ensure_available_shipping_rates
|
113
113
|
before_transition to: :complete, do: :ensure_promotions_eligible
|
114
114
|
before_transition to: :complete, do: :ensure_line_item_variants_are_not_deleted
|
115
|
-
before_transition to: :complete, do: :ensure_line_items_are_in_stock
|
116
115
|
before_transition to: :complete, do: :ensure_inventory_units, unless: :unreturned_exchange?
|
117
116
|
|
118
117
|
after_transition to: :complete, do: :finalize!
|
@@ -1,8 +1,8 @@
|
|
1
1
|
Spree::StoreCreditCategory.find_or_create_by!(name: Spree.t("store_credit_category.default"))
|
2
2
|
|
3
3
|
Spree::PaymentMethod.create_with(
|
4
|
-
name:
|
5
|
-
description:
|
4
|
+
name: "Store Credit",
|
5
|
+
description: "Store credit",
|
6
6
|
active: true,
|
7
7
|
display_on: 'none',
|
8
8
|
).find_or_create_by!(
|
@@ -10,7 +10,11 @@ Spree::PaymentMethod.create_with(
|
|
10
10
|
environment: Rails.env,
|
11
11
|
)
|
12
12
|
|
13
|
-
Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name:
|
14
|
-
Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name:
|
13
|
+
Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: 'Expiring')
|
14
|
+
Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: 'Non-expiring')
|
15
15
|
|
16
|
-
Spree::ReimbursementType.create_with(name:
|
16
|
+
Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
|
17
|
+
|
18
|
+
Spree::StoreCreditCategory.find_or_create_by!(name: 'Gift Card')
|
19
|
+
|
20
|
+
Spree::StoreCreditUpdateReason.find_or_create_by!(name: 'Credit Given In Error')
|
data/db/seeds.rb
CHANGED
@@ -3,12 +3,3 @@ default_path = File.join(File.dirname(__FILE__), 'default')
|
|
3
3
|
|
4
4
|
Rake::Task['db:load_dir'].reenable
|
5
5
|
Rake::Task['db:load_dir'].invoke(default_path)
|
6
|
-
|
7
|
-
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')
|
8
|
-
|
9
|
-
Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
|
10
|
-
Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)
|
11
|
-
|
12
|
-
Spree::StoreCreditCategory.find_or_create_by(name: 'Gift Card')
|
13
|
-
|
14
|
-
Spree::StoreCreditUpdateReason.find_or_create_by(name: 'Credit Given In Error')
|
@@ -5,10 +5,6 @@ FactoryGirl.define do
|
|
5
5
|
price 19.99
|
6
6
|
cost_price 17.00
|
7
7
|
sku { generate(:sku) }
|
8
|
-
weight { generate(:random_float) }
|
9
|
-
height { generate(:random_float) }
|
10
|
-
width { generate(:random_float) }
|
11
|
-
depth { generate(:random_float) }
|
12
8
|
is_master 0
|
13
9
|
track_inventory true
|
14
10
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.
|
4
|
+
version: 1.0.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activemerchant
|