google-api-client 0.24.2 → 0.24.3

data/generated/google/apis/content_v2/representations.rb

@@ -268,6 +268,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class CustomerReturnReason
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class CutoffTime
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -610,6 +616,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class MerchantOrderReturn
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class MerchantOrderReturnItem
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class Order
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -646,61 +664,61 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItem
+      class OrderLegacyPromotion
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItemProduct
+      class OrderLegacyPromotionBenefit
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItemProductVariantAttribute
+      class OrderLineItem
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItemReturnInfo
+      class OrderLineItemProduct
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItemShippingDetails
+      class OrderLineItemProductVariantAttribute
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderLineItemShippingDetailsMethod
+      class OrderLineItemReturnInfo
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderMerchantProvidedAnnotation
+      class OrderLineItemShippingDetails
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderPaymentMethod
+      class OrderLineItemShippingDetailsMethod
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderPromotion
+      class OrderMerchantProvidedAnnotation
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
       end
       
-      class OrderPromotionBenefit
+      class OrderPaymentMethod
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
         include Google::Apis::Core::JsonObjectSupport
@@ -838,6 +856,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class OrderreturnsListResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class OrdersAcknowledgeRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -1420,6 +1444,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class RefundReason
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class ReturnShipment
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class Row
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -1444,6 +1480,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class ShipmentTrackingInfo
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class ShippingSettings
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -2001,6 +2043,14 @@ module Google
         end
       end
       
+      class CustomerReturnReason
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :description, as: 'description'
+          property :reason_code, as: 'reasonCode'
+        end
+      end
+      
       class CutoffTime
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -2615,6 +2665,35 @@ module Google
         end
       end
       
+      class MerchantOrderReturn
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :creation_date, as: 'creationDate'
+          property :merchant_order_id, as: 'merchantOrderId'
+          property :order_id, as: 'orderId'
+          property :order_return_id, as: 'orderReturnId'
+          collection :return_items, as: 'returnItems', class: Google::Apis::ContentV2::MerchantOrderReturnItem, decorator: Google::Apis::ContentV2::MerchantOrderReturnItem::Representation
+      
+          collection :return_shipments, as: 'returnShipments', class: Google::Apis::ContentV2::ReturnShipment, decorator: Google::Apis::ContentV2::ReturnShipment::Representation
+      
+        end
+      end
+      
+      class MerchantOrderReturnItem
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :customer_return_reason, as: 'customerReturnReason', class: Google::Apis::ContentV2::CustomerReturnReason, decorator: Google::Apis::ContentV2::CustomerReturnReason::Representation
+      
+          property :item_id, as: 'itemId'
+          property :merchant_return_reason, as: 'merchantReturnReason', class: Google::Apis::ContentV2::RefundReason, decorator: Google::Apis::ContentV2::RefundReason::Representation
+      
+          property :product, as: 'product', class: Google::Apis::ContentV2::OrderLineItemProduct, decorator: Google::Apis::ContentV2::OrderLineItemProduct::Representation
+      
+          collection :return_shipment_ids, as: 'returnShipmentIds'
+          property :state, as: 'state'
+        end
+      end
+      
       class Order
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -2636,7 +2715,7 @@ module Google
       
           property :payment_status, as: 'paymentStatus'
           property :placed_date, as: 'placedDate'
-          collection :promotions, as: 'promotions', class: Google::Apis::ContentV2::OrderPromotion, decorator: Google::Apis::ContentV2::OrderPromotion::Representation
+          collection :promotions, as: 'promotions', class: Google::Apis::ContentV2::OrderLegacyPromotion, decorator: Google::Apis::ContentV2::OrderLegacyPromotion::Representation
       
           collection :refunds, as: 'refunds', class: Google::Apis::ContentV2::OrderRefund, decorator: Google::Apis::ContentV2::OrderRefund::Representation
       
@@ -2705,6 +2784,33 @@ module Google
         end
       end
       
+      class OrderLegacyPromotion
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :benefits, as: 'benefits', class: Google::Apis::ContentV2::OrderLegacyPromotionBenefit, decorator: Google::Apis::ContentV2::OrderLegacyPromotionBenefit::Representation
+      
+          property :effective_dates, as: 'effectiveDates'
+          property :generic_redemption_code, as: 'genericRedemptionCode'
+          property :id, as: 'id'
+          property :long_title, as: 'longTitle'
+          property :product_applicability, as: 'productApplicability'
+          property :redemption_channel, as: 'redemptionChannel'
+        end
+      end
+      
+      class OrderLegacyPromotionBenefit
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :discount, as: 'discount', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
+      
+          collection :offer_ids, as: 'offerIds'
+          property :sub_type, as: 'subType'
+          property :tax_impact, as: 'taxImpact', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
+      
+          property :type, as: 'type'
+        end
+      end
+      
       class OrderLineItem
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -2815,33 +2921,6 @@ module Google
         end
       end
       
-      class OrderPromotion
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          collection :benefits, as: 'benefits', class: Google::Apis::ContentV2::OrderPromotionBenefit, decorator: Google::Apis::ContentV2::OrderPromotionBenefit::Representation
-      
-          property :effective_dates, as: 'effectiveDates'
-          property :generic_redemption_code, as: 'genericRedemptionCode'
-          property :id, as: 'id'
-          property :long_title, as: 'longTitle'
-          property :product_applicability, as: 'productApplicability'
-          property :redemption_channel, as: 'redemptionChannel'
-        end
-      end
-      
-      class OrderPromotionBenefit
-        # @private
-        class Representation < Google::Apis::Core::JsonRepresentation
-          property :discount, as: 'discount', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
-      
-          collection :offer_ids, as: 'offerIds'
-          property :sub_type, as: 'subType'
-          property :tax_impact, as: 'taxImpact', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
-      
-          property :type, as: 'type'
-        end
-      end
-      
       class OrderRefund
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -3014,6 +3093,7 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :charge_state, as: 'chargeState'
           property :invoice_id, as: 'invoiceId'
+          collection :invoice_ids, as: 'invoiceIds'
         end
       end
       
@@ -3029,6 +3109,7 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :invoice_id, as: 'invoiceId'
+          collection :invoice_ids, as: 'invoiceIds'
           property :refund_state, as: 'refundState'
         end
       end
@@ -3061,6 +3142,16 @@ module Google
         end
       end
       
+      class OrderreturnsListResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+          collection :resources, as: 'resources', class: Google::Apis::ContentV2::MerchantOrderReturn, decorator: Google::Apis::ContentV2::MerchantOrderReturn::Representation
+      
+        end
+      end
+      
       class OrdersAcknowledgeRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -4219,6 +4310,25 @@ module Google
         end
       end
       
+      class RefundReason
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :description, as: 'description'
+          property :reason_code, as: 'reasonCode'
+        end
+      end
+      
+      class ReturnShipment
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :creation_date, as: 'creationDate'
+          property :return_method_type, as: 'returnMethodType'
+          property :shipment_id, as: 'shipmentId'
+          collection :shipment_tracking_infos, as: 'shipmentTrackingInfos', class: Google::Apis::ContentV2::ShipmentTrackingInfo, decorator: Google::Apis::ContentV2::ShipmentTrackingInfo::Representation
+      
+        end
+      end
+      
       class Row
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -4266,6 +4376,14 @@ module Google
         end
       end
       
+      class ShipmentTrackingInfo
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :carrier, as: 'carrier'
+          property :tracking_number, as: 'trackingNumber'
+        end
+      end
+      
       class ShippingSettings
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -4372,7 +4490,7 @@ module Google
           property :payment_method, as: 'paymentMethod', class: Google::Apis::ContentV2::TestOrderPaymentMethod, decorator: Google::Apis::ContentV2::TestOrderPaymentMethod::Representation
       
           property :predefined_delivery_address, as: 'predefinedDeliveryAddress'
-          collection :promotions, as: 'promotions', class: Google::Apis::ContentV2::OrderPromotion, decorator: Google::Apis::ContentV2::OrderPromotion::Representation
+          collection :promotions, as: 'promotions', class: Google::Apis::ContentV2::OrderLegacyPromotion, decorator: Google::Apis::ContentV2::OrderLegacyPromotion::Representation
       
           property :shipping_cost, as: 'shippingCost', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
       

data/generated/google/apis/content_v2/service.rb

@@ -1996,11 +1996,11 @@ module Google
         # @param [Fixnum] merchant_id
         #   The ID of the account that manages the order. This cannot be a multi-client
         #   account.
+        # @param [String] disbursement_start_date
+        #   The first date which disbursements occurred. In ISO 8601 format.
         # @param [String] disbursement_end_date
         #   The last date which disbursements occurred. In ISO 8601 format. Default:
         #   current date.
-        # @param [String] disbursement_start_date
-        #   The first date which disbursements occurred. In ISO 8601 format.
         # @param [Fixnum] max_results
         #   The maximum number of disbursements to return in the response, used for paging.
         # @param [String] page_token
@@ -2024,7 +2024,7 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def listdisbursements_orderreport(merchant_id, disbursement_end_date: nil, disbursement_start_date: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+        def listdisbursements_orderreport(merchant_id, disbursement_start_date, disbursement_end_date: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
           command =  make_simple_command(:get, '{merchantId}/orderreports/disbursements', options)
           command.response_representation = Google::Apis::ContentV2::OrderreportsListDisbursementsResponse::Representation
           command.response_class = Google::Apis::ContentV2::OrderreportsListDisbursementsResponse
@@ -2046,15 +2046,15 @@ module Google
         #   account.
         # @param [String] disbursement_id
         #   The Google-provided ID of the disbursement (found in Wallet).
-        # @param [String] disbursement_end_date
-        #   The last date in which disbursements occurred. In ISO 8601 format. Default:
-        #   current date.
-        # @param [String] disbursement_start_date
-        #   The first date in which disbursements occurred. In ISO 8601 format.
+        # @param [String] transaction_start_date
+        #   The first date in which transaction occurred. In ISO 8601 format.
         # @param [Fixnum] max_results
         #   The maximum number of disbursements to return in the response, used for paging.
         # @param [String] page_token
         #   The token returned by the previous request.
+        # @param [String] transaction_end_date
+        #   The last date in which transaction occurred. In ISO 8601 format. Default:
+        #   current date.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -2074,16 +2074,106 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def listtransactions_orderreport(merchant_id, disbursement_id, disbursement_end_date: nil, disbursement_start_date: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+        def listtransactions_orderreport(merchant_id, disbursement_id, transaction_start_date, max_results: nil, page_token: nil, transaction_end_date: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
           command =  make_simple_command(:get, '{merchantId}/orderreports/disbursements/{disbursementId}/transactions', options)
           command.response_representation = Google::Apis::ContentV2::OrderreportsListTransactionsResponse::Representation
           command.response_class = Google::Apis::ContentV2::OrderreportsListTransactionsResponse
           command.params['merchantId'] = merchant_id unless merchant_id.nil?
           command.params['disbursementId'] = disbursement_id unless disbursement_id.nil?
-          command.query['disbursementEndDate'] = disbursement_end_date unless disbursement_end_date.nil?
-          command.query['disbursementStartDate'] = disbursement_start_date unless disbursement_start_date.nil?
           command.query['maxResults'] = max_results unless max_results.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['transactionEndDate'] = transaction_end_date unless transaction_end_date.nil?
+          command.query['transactionStartDate'] = transaction_start_date unless transaction_start_date.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieves an order return from your Merchant Center account.
+        # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
+        # @param [String] return_id
+        #   Merchant order return ID generated by Google.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::ContentV2::MerchantOrderReturn] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::MerchantOrderReturn]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_orderreturn(merchant_id, return_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, '{merchantId}/orderreturns/{returnId}', options)
+          command.response_representation = Google::Apis::ContentV2::MerchantOrderReturn::Representation
+          command.response_class = Google::Apis::ContentV2::MerchantOrderReturn
+          command.params['merchantId'] = merchant_id unless merchant_id.nil?
+          command.params['returnId'] = return_id unless return_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Lists order returns in your Merchant Center account.
+        # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
+        # @param [String] created_end_date
+        #   Obtains order returns created before this date (inclusively), in ISO 8601
+        #   format.
+        # @param [String] created_start_date
+        #   Obtains order returns created after this date (inclusively), in ISO 8601
+        #   format.
+        # @param [Fixnum] max_results
+        #   The maximum number of order returns to return in the response, used for paging.
+        #   The default value is 25 returns per page, and the maximum allowed value is
+        #   250 returns per page.
+        # @param [String] order_by
+        #   Return the results in the specified order.
+        # @param [String] page_token
+        #   The token returned by the previous request.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::ContentV2::OrderreturnsListResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::OrderreturnsListResponse]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_orderreturns(merchant_id, created_end_date: nil, created_start_date: nil, max_results: nil, order_by: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, '{merchantId}/orderreturns', options)
+          command.response_representation = Google::Apis::ContentV2::OrderreturnsListResponse::Representation
+          command.response_class = Google::Apis::ContentV2::OrderreturnsListResponse
+          command.params['merchantId'] = merchant_id unless merchant_id.nil?
+          command.query['createdEndDate'] = created_end_date unless created_end_date.nil?
+          command.query['createdStartDate'] = created_start_date unless created_start_date.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['orderBy'] = order_by unless order_by.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?