spree_api 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6915e8f0e8af6dc55d88e85a9c3a0211fe6bfbfa
-  data.tar.gz: 3928d9716a7dc2f3c62fe7a9f77e9e4647649ebc
+  metadata.gz: 740146e6e06bfaba423598030a2f2906075f4eca
+  data.tar.gz: 3fe9cd0b5b6f906f6e9ec563f81bf876a0d0cf9e
 SHA512:
-  metadata.gz: cdf0580320b0432d991c35ae8c94ba6401d518e63e3f775a99cf7f4df59f57add00160ceb9bdf7550ec406b5ac491c2f3d1d8e022c5e9957cfe6d354af1fb0ab
-  data.tar.gz: 3b59ed63cbf9b2beee4ff47d856be8d1a2ac4a5a69aba39b43f30c8bb554488e77fa453a15e52e6504032df1662b2f35abb990a2031d399a136f9b17bfa3285c
+  metadata.gz: 55589923a2e6de34eebc3ee9c60b60c872b68822d2b106255a7be3c1d1b4fc9e6942d8901b640947d2e3440b32321caf168939fc2e95152cd8461b7c26475737
+  data.tar.gz: 6900cbbc53bd1aa8adfc852237bcaa80f0d15172115ba55b65f655f89d065b7150735b7a0a92c3854cd12cfd2ec34b99e7ce296069cff1aa1f48314f0280bb45

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.3.3
+  version: 3.3.4
 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.3.3
+        version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement