spree_api 3.2.6 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ef2f0914a34708c43813dbb1b4552ff520990b
-  data.tar.gz: 5bb30e487f979899e32315a3ee2d70b7e45b3445
+  metadata.gz: be64692826015c5e272c3cc3b47a08359061cf35
+  data.tar.gz: e584ef68870908ec528c990d86895041f2026ef4
 SHA512:
-  metadata.gz: 305372478a8014c1c81104755b9330c2ba2b49e0cccaacf7aa769875f57bd08dcbcf870ef8d104cc33a6f2ca92be1be060ea9a11ad3b512ed2a2dd2bd554080f
-  data.tar.gz: 4b7427945d31b4653d8af9023d281095082494bd393d1880e0aee2f5a780c40b402b42648c2945d94b15196508342754d9eaa8072bdcdb6bc3945fbf865b8708
+  metadata.gz: 139b6222fc1d2fa891a289a502edc2159289695623a765113b0b427d7c08711acb6dc186900762f2b780f2de0ab6e8101afca5e9db37cdd4e02d6a4cfa4be011
+  data.tar.gz: 7e15a78248987091ff20de7055af47f4a4314a84effdca674ce7fe0f4b245019babdfcf9966eaac5e98c4f698aa4716cc70993a3b08efa7ebe6d290b54e9d331

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