spree_api 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b03a74b1a9c26442b47bd4cafc751ab4aca8b57
-  data.tar.gz: ff3854cca3d4e175eef15ebce69f55f8d253e358
+  metadata.gz: 6e021bb1a2dda7f373c4bf71dd273367027f6846
+  data.tar.gz: 0acaad562b4a7d569ec240909234dc02013558db
 SHA512:
-  metadata.gz: c7e16209da056ce552fd01451ef01d708162cf9588769b86d860a43fd6819cc5445cc9ef43e3a9c27a0e571e58fc1fa4927211a75e3e1b72aa842c8585469ec2
-  data.tar.gz: 0dca3e352a84ca5ecb6ffd14b8466de305dff8c38f3201c53b0b1efd4f8a6b62b39c52c7a7dce05191dd8ca99b5771fddded75a11044970721c23213e80b43ac
+  metadata.gz: 1a2cacf906976ec0cf7a1f04757a858440005f2b9b00996c39e28cf9f119b16f928b51d8ed76df294cf6a5cc9bf0b74e85f6dc698f5f3a01d126cbea39bf8a3c
+  data.tar.gz: 70bfd52d15cdee786dffaa2c011bb5e9f9cecf452c302c299e5ccd198e1ae96b1bd2104facc5d2e700b310382f807cf0314db122e0d47fd0c511d9774e5babc8

data/app/controllers/spree/api/v1/orders_controller.rb

@@ -27,21 +27,31 @@ module Spree
         end
 
         def create
-          authorize! :create, Order
-          order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
-                         Spree.user_class.find(order_params[:user_id])
-                       else
-                         current_api_user
-          end
+          authorize! :create, Spree::Order
+          if can?(:admin, Spree::Order)
+            order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
+                          Spree.user_class.find(order_params[:user_id])
+                        else
+                          current_api_user
+            end
 
-          import_params = if @current_user_roles.include?('admin')
-                            params[:order].present? ? params[:order].permit! : {}
-                          else
-                            order_params
-          end
+            import_params = if @current_user_roles.include?('admin')
+                              params[:order].present? ? params[:order].permit! : {}
+                            else
+                              order_params
+                            end
+
+            @order = Spree::Core::Importer::Order.import(order_user, import_params)
 
-          @order = Spree::Core::Importer::Order.import(order_user, import_params)
-          respond_with(@order, default_template: :show, status: 201)
+            respond_with(@order, default_template: :show, status: 201)
+          else
+            @order = Spree::Order.create!(user: current_api_user, store: current_store)
+            if @order.contents.update_cart(order_params)
+              respond_with(@order, default_template: :show, status: 201)
+            else
+              invalid_resource!(@order)
+            end
+          end
         end
 
         def empty

data/app/controllers/spree/api/v1/payments_controller.rb

@@ -16,6 +16,7 @@ module Spree
         end
 
         def create
+          @order.validate_payments_attributes([payment_params])
           @payment = @order.payments.build(payment_params)
           if @payment.save
             respond_with(@payment, status: 201, default_template: :show)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement