spree_api 3.2.6 → 3.2.7

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 39ef2f0914a34708c43813dbb1b4552ff520990b
4
- data.tar.gz: 5bb30e487f979899e32315a3ee2d70b7e45b3445
3
+ metadata.gz: be64692826015c5e272c3cc3b47a08359061cf35
4
+ data.tar.gz: e584ef68870908ec528c990d86895041f2026ef4
5
5
  SHA512:
6
- metadata.gz: 305372478a8014c1c81104755b9330c2ba2b49e0cccaacf7aa769875f57bd08dcbcf870ef8d104cc33a6f2ca92be1be060ea9a11ad3b512ed2a2dd2bd554080f
7
- data.tar.gz: 4b7427945d31b4653d8af9023d281095082494bd393d1880e0aee2f5a780c40b402b42648c2945d94b15196508342754d9eaa8072bdcdb6bc3945fbf865b8708
6
+ metadata.gz: 139b6222fc1d2fa891a289a502edc2159289695623a765113b0b427d7c08711acb6dc186900762f2b780f2de0ab6e8101afca5e9db37cdd4e02d6a4cfa4be011
7
+ data.tar.gz: 7e15a78248987091ff20de7055af47f4a4314a84effdca674ce7fe0f4b245019babdfcf9966eaac5e98c4f698aa4716cc70993a3b08efa7ebe6d290b54e9d331
@@ -27,21 +27,32 @@ module Spree
27
27
  end
28
28
 
29
29
  def create
30
- authorize! :create, Order
31
- order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
32
- Spree.user_class.find(order_params[:user_id])
33
- else
34
- current_api_user
35
- end
30
+ authorize! :create, Spree::Order
31
+ if can?(:admin, Spree::Order)
32
+
33
+ order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
34
+ Spree.user_class.find(order_params[:user_id])
35
+ else
36
+ current_api_user
37
+ end
38
+
39
+ import_params = if @current_user_roles.include?("admin")
40
+ params[:order].present? ? params[:order].permit! : {}
41
+ else
42
+ order_params
43
+ end
44
+
45
+ @order = Spree::Core::Importer::Order.import(order_user, import_params)
36
46
 
37
- import_params = if @current_user_roles.include?("admin")
38
- params[:order].present? ? params[:order].permit! : {}
47
+ respond_with(@order, default_template: :show, status: 201)
39
48
  else
40
- order_params
49
+ @order = Spree::Order.create!(user: current_api_user, store: current_store)
50
+ if @order.contents.update_cart(order_params)
51
+ respond_with(@order, default_template: :show, status: 201)
52
+ else
53
+ invalid_resource!(@order)
54
+ end
41
55
  end
42
-
43
- @order = Spree::Core::Importer::Order.import(order_user, import_params)
44
- respond_with(@order, default_template: :show, status: 201)
45
56
  end
46
57
 
47
58
  def empty
@@ -17,6 +17,7 @@ module Spree
17
17
  end
18
18
 
19
19
  def create
20
+ @order.validate_payments_attributes([payment_params])
20
21
  @payment = @order.payments.build(payment_params)
21
22
  if @payment.save
22
23
  respond_with(@payment, status: 201, default_template: :show)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_api
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.6
4
+ version: 3.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Bigg
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-08 00:00:00.000000000 Z
11
+ date: 2017-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.6
19
+ version: 3.2.7
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: 3.2.6
26
+ version: 3.2.7
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rabl
29
29
  requirement: !ruby/object:Gem::Requirement