spree_api 3.1.11 → 3.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32bd30759f0abad09d47b66f9874c4a6ea4c8177
-  data.tar.gz: af0f5ae1dc8c841a46e8e86eca60b36d7ec476dc
+  metadata.gz: '09ac4995e5cd8e7496470df5f64f5936971fbc4b'
+  data.tar.gz: 96cd750ac73a6af3508032b3861a63c0db47de4e
 SHA512:
-  metadata.gz: b72fb0549341e71b554b3761026f87bfa88c8ba8c12a7efd06c4c52dd829030ab01fdfa66f6d1aea83e1e67935c1448246ab95c8e947b26b9d61bc0e3b5d76ea
-  data.tar.gz: 9ed5bfb80217cb698598debcb6bef857a01e65fe1bb779adf3283799ff940fb7e04948236575955dba2b10a53acbbec3391ac814cc78a26f370eced0d0bcf243
+  metadata.gz: 37b50a7242662ee513ba896c6b12c87e962f8371c6e6b1057081f569ab02518ef7900ce4e4e2425fb55fbeade38965bfa36b6a87030e38b462a089e2ff3262d5
+  data.tar.gz: fadeb7db66ec68b583f726781e8471b5e592686fe83013b418f9961f4ab6ebc0f1b626467d948bb7fa4da792b8ca037cd03464298c76b849030304adef6bc68f

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

@@ -27,21 +27,32 @@ 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
+
+            @order = Spree::Core::Importer::Order.import(order_user, import_params)
 
-          import_params = if @current_user_roles.include?("admin")
-            params[:order].present? ? params[:order].permit! : {}
+            respond_with(@order, default_template: :show, status: 201)
           else
-            order_params
+            @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
-
-          @order = Spree::Core::Importer::Order.import(order_user, import_params)
-          respond_with(@order, default_template: :show, status: 201)
         end
 
         def empty

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

@@ -17,6 +17,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.1.11
+  version: 3.1.12
 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.1.11
+        version: 3.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.1.12
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement