goca-spree-core 3.1.14.rails.5.0.1 → 3.1.14.rails.5.2.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/app/models/spree/order/checkout.rb +20 -21
- data/app/models/spree/shipment.rb +1 -1
- data/lib/spree/core/version.rb +1 -1
- data/spree_core.gemspec +14 -13
- metadata +44 -31
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 1d4b59e0c12576b7b1c2806c68cbf035b5a894913120f6cd8a44d3fe75683683
|
4
|
+
data.tar.gz: 3fd66d3a6c2210c2a8fd5f0d83e9a9088a4b9e836ef63daa04794d26fc8210cc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b70622b6d6248b274e93fe1b3126ad335216b25a6516a9c9c3eb4eb08a60a8134666e3c86bcd486d29ad2bff02bb8aae65ce7f282d75d0709d26c94d0a3ea28a
|
7
|
+
data.tar.gz: 0df8efcccb0c97d4c1351a1693c03b0d0e793ce8c8befcf82925f73a5aa880e77330c052eba7c1565ba4eaa4806691c04538fccb7a2c19f9d55ff84cb80d4de6
|
@@ -216,39 +216,38 @@ module Spree
|
|
216
216
|
|
217
217
|
define_callbacks :updating_from_params, terminator: ->(_target, result) { result == false }
|
218
218
|
|
219
|
-
set_callback :updating_from_params, :before, :update_params_payment_source
|
220
|
-
|
221
219
|
def update_from_params(params, permitted_params, request_env = {})
|
222
220
|
success = false
|
223
221
|
@updating_params = params
|
224
|
-
run_callbacks :updating_from_params do
|
225
|
-
# Set existing card after setting permitted parameters because
|
226
|
-
# rails would slice parameters containg ruby objects, apparently
|
227
|
-
existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
|
228
222
|
|
229
|
-
|
223
|
+
update_params_payment_source
|
230
224
|
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
raise Core::GatewayError.new Spree.t(:invalid_credit_card)
|
235
|
-
end
|
225
|
+
# Set existing card after setting permitted parameters because
|
226
|
+
# rails would slice parameters containg ruby objects, apparently
|
227
|
+
existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
|
236
228
|
|
237
|
-
|
229
|
+
attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |_k, v| v.nil? } : {}
|
238
230
|
|
239
|
-
|
240
|
-
|
241
|
-
|
231
|
+
if existing_card_id.present?
|
232
|
+
credit_card = CreditCard.find existing_card_id
|
233
|
+
if credit_card.user_id != user_id || credit_card.user_id.blank?
|
234
|
+
raise Core::GatewayError.new Spree.t(:invalid_credit_card)
|
242
235
|
end
|
243
236
|
|
244
|
-
if
|
245
|
-
attributes[:payments_attributes].first[:request_env] = request_env
|
246
|
-
end
|
237
|
+
credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
|
247
238
|
|
248
|
-
|
249
|
-
|
239
|
+
attributes[:payments_attributes].first[:source] = credit_card
|
240
|
+
attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
|
241
|
+
attributes[:payments_attributes].first.delete :source_attributes
|
250
242
|
end
|
251
243
|
|
244
|
+
if attributes[:payments_attributes]
|
245
|
+
attributes[:payments_attributes].first[:request_env] = request_env
|
246
|
+
end
|
247
|
+
|
248
|
+
success = update_attributes(attributes)
|
249
|
+
set_shipments_cost if shipments.any?
|
250
|
+
|
252
251
|
@updating_params = nil
|
253
252
|
success
|
254
253
|
end
|
data/lib/spree/core/version.rb
CHANGED
data/spree_core.gemspec
CHANGED
@@ -3,7 +3,7 @@ require_relative 'lib/spree/core/version.rb'
|
|
3
3
|
|
4
4
|
Gem::Specification.new do |s|
|
5
5
|
s.platform = Gem::Platform::RUBY
|
6
|
-
s.name = '
|
6
|
+
s.name = 'spree_core'
|
7
7
|
s.version = Spree.version
|
8
8
|
s.summary = 'The bare bones necessary for Spree.'
|
9
9
|
s.description = 'The bare bones necessary for Spree.'
|
@@ -19,29 +19,30 @@ Gem::Specification.new do |s|
|
|
19
19
|
s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
|
20
20
|
s.require_path = 'lib'
|
21
21
|
|
22
|
-
s.add_dependency 'activemerchant', '~> 1.
|
22
|
+
s.add_dependency 'activemerchant', '~> 1.67'
|
23
23
|
s.add_dependency 'acts_as_list', '~> 0.8'
|
24
|
-
s.add_dependency 'awesome_nested_set', '~> 3.
|
24
|
+
s.add_dependency 'awesome_nested_set', '~> 3.2.0'
|
25
25
|
s.add_dependency 'carmen', '~> 1.0.0'
|
26
26
|
s.add_dependency 'cancancan', '~> 2.0'
|
27
27
|
s.add_dependency 'deface', '~> 1.0'
|
28
|
-
s.add_dependency 'ffaker', '~> 2.
|
28
|
+
s.add_dependency 'ffaker', '~> 2.9'
|
29
29
|
s.add_dependency 'font-awesome-rails', '~> 4.0'
|
30
|
-
s.add_dependency 'friendly_id', '~> 5.2.
|
31
|
-
s.add_dependency 'highline', '~>
|
30
|
+
s.add_dependency 'friendly_id', '~> 5.2.1'
|
31
|
+
s.add_dependency 'highline', '~> 2.0.0'
|
32
32
|
s.add_dependency 'kaminari', '~> 1.0.1'
|
33
|
-
s.add_dependency 'monetize', '~> 1.
|
34
|
-
s.add_dependency 'paperclip', '~>
|
35
|
-
s.add_dependency 'paranoia', '~> 2.
|
33
|
+
s.add_dependency 'monetize', '~> 1.9'
|
34
|
+
s.add_dependency 'paperclip', '~> 6.1.0'
|
35
|
+
s.add_dependency 'paranoia', '~> 2.4.1'
|
36
36
|
s.add_dependency 'premailer-rails'
|
37
|
-
s.add_dependency 'rails', '~> 5.
|
38
|
-
s.add_dependency 'ransack', '~> 1.
|
37
|
+
s.add_dependency 'rails', '~> 5.2.8'
|
38
|
+
s.add_dependency 'ransack', '~> 2.1.1'
|
39
39
|
s.add_dependency 'responders'
|
40
|
-
s.add_dependency 'state_machines-activerecord', '~> 0.
|
40
|
+
s.add_dependency 'state_machines-activerecord', '~> 0.5'
|
41
41
|
s.add_dependency 'stringex'
|
42
42
|
s.add_dependency 'truncate_html', '~> 0.9.3'
|
43
|
-
s.add_dependency 'twitter_cldr', '~> 3
|
43
|
+
s.add_dependency 'twitter_cldr', '~> 4.3'
|
44
44
|
s.add_dependency 'sprockets-rails'
|
45
|
+
s.add_dependency 'mini_magick', '~> 4.9.4'
|
45
46
|
|
46
47
|
s.add_development_dependency 'email_spec', '~> 1.6'
|
47
48
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: goca-spree-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.14.rails.5.0
|
4
|
+
version: 3.1.14.rails.5.2.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-
|
11
|
+
date: 2025-04-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activemerchant
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '1.
|
19
|
+
version: '1.67'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '1.
|
26
|
+
version: '1.67'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: acts_as_list
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 3.2.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 3.2.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: carmen
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,14 +100,14 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '2.
|
103
|
+
version: '2.9'
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '2.
|
110
|
+
version: '2.9'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: font-awesome-rails
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -128,28 +128,28 @@ dependencies:
|
|
128
128
|
requirements:
|
129
129
|
- - "~>"
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 5.2.
|
131
|
+
version: 5.2.1
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - "~>"
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 5.2.
|
138
|
+
version: 5.2.1
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: highline
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - "~>"
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version:
|
145
|
+
version: 2.0.0
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - "~>"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version:
|
152
|
+
version: 2.0.0
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: kaminari
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
@@ -170,42 +170,42 @@ dependencies:
|
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: '1.
|
173
|
+
version: '1.9'
|
174
174
|
type: :runtime
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: '1.
|
180
|
+
version: '1.9'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: paperclip
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
185
|
- - "~>"
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version:
|
187
|
+
version: 6.1.0
|
188
188
|
type: :runtime
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
192
|
- - "~>"
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version:
|
194
|
+
version: 6.1.0
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: paranoia
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
199
|
- - "~>"
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version:
|
201
|
+
version: 2.4.1
|
202
202
|
type: :runtime
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
206
|
- - "~>"
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version:
|
208
|
+
version: 2.4.1
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: premailer-rails
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
@@ -226,28 +226,28 @@ dependencies:
|
|
226
226
|
requirements:
|
227
227
|
- - "~>"
|
228
228
|
- !ruby/object:Gem::Version
|
229
|
-
version: 5.
|
229
|
+
version: 5.2.8
|
230
230
|
type: :runtime
|
231
231
|
prerelease: false
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
234
|
- - "~>"
|
235
235
|
- !ruby/object:Gem::Version
|
236
|
-
version: 5.
|
236
|
+
version: 5.2.8
|
237
237
|
- !ruby/object:Gem::Dependency
|
238
238
|
name: ransack
|
239
239
|
requirement: !ruby/object:Gem::Requirement
|
240
240
|
requirements:
|
241
241
|
- - "~>"
|
242
242
|
- !ruby/object:Gem::Version
|
243
|
-
version:
|
243
|
+
version: 2.1.1
|
244
244
|
type: :runtime
|
245
245
|
prerelease: false
|
246
246
|
version_requirements: !ruby/object:Gem::Requirement
|
247
247
|
requirements:
|
248
248
|
- - "~>"
|
249
249
|
- !ruby/object:Gem::Version
|
250
|
-
version:
|
250
|
+
version: 2.1.1
|
251
251
|
- !ruby/object:Gem::Dependency
|
252
252
|
name: responders
|
253
253
|
requirement: !ruby/object:Gem::Requirement
|
@@ -268,14 +268,14 @@ dependencies:
|
|
268
268
|
requirements:
|
269
269
|
- - "~>"
|
270
270
|
- !ruby/object:Gem::Version
|
271
|
-
version: '0.
|
271
|
+
version: '0.5'
|
272
272
|
type: :runtime
|
273
273
|
prerelease: false
|
274
274
|
version_requirements: !ruby/object:Gem::Requirement
|
275
275
|
requirements:
|
276
276
|
- - "~>"
|
277
277
|
- !ruby/object:Gem::Version
|
278
|
-
version: '0.
|
278
|
+
version: '0.5'
|
279
279
|
- !ruby/object:Gem::Dependency
|
280
280
|
name: stringex
|
281
281
|
requirement: !ruby/object:Gem::Requirement
|
@@ -310,14 +310,14 @@ dependencies:
|
|
310
310
|
requirements:
|
311
311
|
- - "~>"
|
312
312
|
- !ruby/object:Gem::Version
|
313
|
-
version: '3
|
313
|
+
version: '4.3'
|
314
314
|
type: :runtime
|
315
315
|
prerelease: false
|
316
316
|
version_requirements: !ruby/object:Gem::Requirement
|
317
317
|
requirements:
|
318
318
|
- - "~>"
|
319
319
|
- !ruby/object:Gem::Version
|
320
|
-
version: '3
|
320
|
+
version: '4.3'
|
321
321
|
- !ruby/object:Gem::Dependency
|
322
322
|
name: sprockets-rails
|
323
323
|
requirement: !ruby/object:Gem::Requirement
|
@@ -332,6 +332,20 @@ dependencies:
|
|
332
332
|
- - ">="
|
333
333
|
- !ruby/object:Gem::Version
|
334
334
|
version: '0'
|
335
|
+
- !ruby/object:Gem::Dependency
|
336
|
+
name: mini_magick
|
337
|
+
requirement: !ruby/object:Gem::Requirement
|
338
|
+
requirements:
|
339
|
+
- - "~>"
|
340
|
+
- !ruby/object:Gem::Version
|
341
|
+
version: 4.9.4
|
342
|
+
type: :runtime
|
343
|
+
prerelease: false
|
344
|
+
version_requirements: !ruby/object:Gem::Requirement
|
345
|
+
requirements:
|
346
|
+
- - "~>"
|
347
|
+
- !ruby/object:Gem::Version
|
348
|
+
version: 4.9.4
|
335
349
|
- !ruby/object:Gem::Dependency
|
336
350
|
name: email_spec
|
337
351
|
requirement: !ruby/object:Gem::Requirement
|
@@ -950,7 +964,7 @@ homepage: http://spreecommerce.com
|
|
950
964
|
licenses:
|
951
965
|
- BSD-3
|
952
966
|
metadata: {}
|
953
|
-
post_install_message:
|
967
|
+
post_install_message:
|
954
968
|
rdoc_options: []
|
955
969
|
require_paths:
|
956
970
|
- lib
|
@@ -965,9 +979,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
965
979
|
- !ruby/object:Gem::Version
|
966
980
|
version: 1.8.23
|
967
981
|
requirements: []
|
968
|
-
|
969
|
-
|
970
|
-
signing_key:
|
982
|
+
rubygems_version: 3.2.3
|
983
|
+
signing_key:
|
971
984
|
specification_version: 4
|
972
985
|
summary: The bare bones necessary for Spree.
|
973
986
|
test_files: []
|