spree_api 4.1.0.rc2 → 4.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a479891e3736679be9d19820952e056567de6724bf61a6b54590b06af72d619
-  data.tar.gz: 9fbde044c628e2f504c539087fac6e054b94af04373531f4e3b8c92250dd81b2
+  metadata.gz: 1a6d504c0ee96c400f8b0d26171978338dd75a3620ebc24ff51e29f658bbd1ee
+  data.tar.gz: 36a37886c072632e633d41d9a695ba8b47b6665a4d5d81d61c1fe52c83528cdc
 SHA512:
-  metadata.gz: 3c63a92046076264917387d569e5013b14e8272eaaa6372998a2ced2a6b96c5b6b577bda57a316203c1662d41767354483304c716c5a83725b8dee69d537dbf8
-  data.tar.gz: f16b0110f8b770a4eb0aff2ed57736e69d7180612b010fffa84114a98722d1461336c769178d8d1971b4c15080c6b57b8e8954cfc8e6ea87d8378bc54865eb6e
+  metadata.gz: 7daf912d4522c924888c99d967208619a0c50b17d3093878722e807e656b5e5354ed6d4a20c31daae0b442496d66f397ed1922053c8a63deda0f80ab52223357
+  data.tar.gz: e1d87922707bcd3d5d5e23549bd4eaa841d19865a792151144b18cedab459aa89e05a4fa1a287ff745f5e867d7c755e2056caf85502b304965bc888f3605ea20

data/app/controllers/spree/api/v2/storefront/cart_controller.rb

@@ -5,6 +5,7 @@ module Spree
         class CartController < ::Spree::Api::V2::BaseController
           include Spree::Api::V2::Storefront::OrderConcern
           before_action :ensure_order, except: :create
+          before_action :load_variant, only: :add_item
 
           def create
             spree_authorize! :create, Spree::Order
@@ -22,14 +23,12 @@ module Spree
           end
 
           def add_item
-            variant = Spree::Variant.find(params[:variant_id])
-
             spree_authorize! :update, spree_current_order, order_token
-            spree_authorize! :show, variant
+            spree_authorize! :show, @variant
 
             result = add_item_service.call(
               order: spree_current_order,
-              variant: variant,
+              variant: @variant,
               quantity: params[:quantity],
               options: params[:options]
             )
@@ -149,6 +148,10 @@ module Spree
             @line_item ||= spree_current_order.line_items.find(params[:line_item_id])
           end
 
+          def load_variant
+            @variant = Spree::Variant.find(params[:variant_id])
+          end
+
           def render_error_item_quantity
             render json: { error: I18n.t(:wrong_quantity, scope: 'spree.api.v2.cart') }, status: 422
           end

data/docs/v2/storefront/index.yaml

@@ -457,6 +457,7 @@ paths:
         <pre>
           order: {
             email: 'john@snow.org',
+            special_instructions: 'Please leave at door',
             bill_address_attributes: {
               firstname: 'John',
               lastname: 'Snow',
@@ -519,18 +520,16 @@ paths:
             order: {
               payments_attributes: [
                 {
-                  payment_method_id: 1
+                  payment_method_id: 1,
+                  source_attributes: {
+                    number: '4111111111111111',
+                    month: '01',
+                    year: '2022',
+                    verification_value: '123',
+                    name: 'John Doe'
+                  }
                 }
               ]
-            },
-            payment_source: {
-              1: {
-                number: '4111111111111111',
-                month: '01',
-                year: '2022',
-                verification_value: '123',
-                name: 'John Doe'
-              }
             }
           }
         </pre>
@@ -583,6 +582,9 @@ paths:
                     email:
                       type: string
                       example: 'john@snow.org'
+                    special_instructions:
+                      type: string
+                      example: 'Please leave at door'
                     bill_address_attributes:
                       $ref: '#/components/schemas/AddressPayload'
                     ship_address_attributes:
@@ -596,10 +598,10 @@ paths:
                             type: number
                             example: 1
                             description: 'ID of selected payment method'
+                          source_attributes:
+                            $ref: '#/components/schemas/PaymentSource'
                     shipments_attributes:
                       type: object
-                payment_source:
-                  type: object
 
   '/checkout/next':
     patch:
@@ -2416,6 +2418,29 @@ components:
         zipcode: '20814'
         state_name: 'MD'
         country_iso: 'US'
+    PaymentSource:
+      properties:
+        number:
+          type: string
+          description: 'Credit card number'
+        month:
+          type: string
+        year:
+          type: string
+        verification_value:
+          type: string
+        cc_type:
+          type: string
+          description: 'Credit Card Brand'
+        name:
+          type: string
+      example:
+        number: '4111111111111111'
+        month: '01'
+        year: '2022'
+        verification_value: '123'
+        cc_type: 'visa'
+        name: 'John Doe'
 
   parameters:
     CreditCardIncludeParam:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc2
+  version: 4.1.0.rc3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement