google-api-client 0.17.3 → 0.17.4

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

@@ -88,8 +88,9 @@ module Google
         
         # Claims the website of a Merchant Center sub-account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account whose website is claimed.
         # @param [Boolean] overwrite
@@ -171,7 +172,8 @@ module Google
         
         # Deletes a Merchant Center sub-account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. This must be a multi-client account.
+        #   The ID of the managing account. This must be a multi-client account, and
+        #   accountId must be the ID of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Boolean] dry_run
@@ -213,8 +215,9 @@ module Google
         
         # Retrieves a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [String] fields
@@ -334,8 +337,9 @@ module Google
         
         # Updates a Merchant Center account. This method supports patch semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Google::Apis::ContentV2::Account] account_object
@@ -379,8 +383,9 @@ module Google
         
         # Updates a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Google::Apis::ContentV2::Account] account_object
@@ -459,8 +464,9 @@ module Google
         
         # Retrieves the status of a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [String] fields
@@ -578,8 +584,9 @@ module Google
         
         # Retrieves the tax settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [String] fields
@@ -658,8 +665,9 @@ module Google
         
         # Updates the tax settings of the account. This method supports patch semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [Google::Apis::ContentV2::AccountTax] account_tax_object
@@ -703,8 +711,9 @@ module Google
         
         # Updates the tax settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [Google::Apis::ContentV2::AccountTax] account_tax_object
@@ -2277,8 +2286,9 @@ module Google
         
         # Retrieves the shipping settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [String] fields
@@ -2395,8 +2405,9 @@ module Google
         # Updates the shipping settings of the account. This method supports patch
         # semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [Google::Apis::ContentV2::ShippingSettings] shipping_settings_object
@@ -2440,8 +2451,9 @@ module Google
         
         # Updates the shipping settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account. If this account is not a multi-client account,
-        #   then this parameter must be the same as accountId.
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [Google::Apis::ContentV2::ShippingSettings] shipping_settings_object

data/generated/google/apis/content_v2sandbox.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/shopping-content
     module ContentV2sandbox
       VERSION = 'V2sandbox'
-      REVISION = '20171102'
+      REVISION = '20171124'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

data/generated/google/apis/content_v2sandbox/classes.rb

@@ -984,26 +984,20 @@ module Google
         # Acceptable values are:
         # - "gsx"
         # - "ups"
-        # - "united parcel service"
         # - "usps"
-        # - "united states postal service"
         # - "fedex"
         # - "dhl"
         # - "ecourier"
         # - "cxt"
         # - "google"
-        # - "on trac"
         # - "ontrac"
-        # - "on-trac"
-        # - "on_trac"
-        # - "delvic"
+        # - "emsy"
+        # - "ont"
+        # - "deliv"
         # - "dynamex"
         # - "lasership"
-        # - "smartpost"
-        # - "fedex smartpost"
         # - "mpx"
         # - "uds"
-        # - "united delivery service"
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
@@ -1065,6 +1059,12 @@ module Google
         # @return [String]
         attr_accessor :line_item_id
       
+        # The ID of the product to ship. This is the REST ID used in the products
+        # service. Either lineItemId or productId is required.
+        # Corresponds to the JSON property `productId`
+        # @return [String]
+        attr_accessor :product_id
+      
         # The quantity that is shipped.
         # Corresponds to the JSON property `quantity`
         # @return [Fixnum]
@@ -1077,6 +1077,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @line_item_id = args[:line_item_id] if args.key?(:line_item_id)
+          @product_id = args[:product_id] if args.key?(:product_id)
           @quantity = args[:quantity] if args.key?(:quantity)
         end
       end
@@ -1157,6 +1158,18 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
+        # Amount to refund for the cancelation. Optional. If not set, Google will
+        # calculate the default based on the price and tax of the items involved. The
+        # amount must not be larger than the net amount left on the order.
+        # Corresponds to the JSON property `amountPretax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_pretax
+      
+        # Tax amount that correspond to cancellation amount in amountPretax.
+        # Corresponds to the JSON property `amountTax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_tax
+      
         # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
@@ -1167,6 +1180,12 @@ module Google
         # @return [String]
         attr_accessor :operation_id
       
+        # The ID of the product to cancel. This is the REST ID used in the products
+        # service. Either lineItemId or productId is required.
+        # Corresponds to the JSON property `productId`
+        # @return [String]
+        attr_accessor :product_id
+      
         # The quantity to cancel.
         # Corresponds to the JSON property `quantity`
         # @return [Fixnum]
@@ -1189,8 +1208,11 @@ module Google
         # Update properties of this object
         def update!(**args)
           @amount = args[:amount] if args.key?(:amount)
+          @amount_pretax = args[:amount_pretax] if args.key?(:amount_pretax)
+          @amount_tax = args[:amount_tax] if args.key?(:amount_tax)
           @line_item_id = args[:line_item_id] if args.key?(:line_item_id)
           @operation_id = args[:operation_id] if args.key?(:operation_id)
+          @product_id = args[:product_id] if args.key?(:product_id)
           @quantity = args[:quantity] if args.key?(:quantity)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
@@ -1475,11 +1497,29 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
+        # Amount to refund for the cancelation. Optional. If not set, Google will
+        # calculate the default based on the price and tax of the items involved. The
+        # amount must not be larger than the net amount left on the order.
+        # Corresponds to the JSON property `amountPretax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_pretax
+      
+        # Tax amount that correspond to cancellation amount in amountPretax.
+        # Corresponds to the JSON property `amountTax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_tax
+      
         # The ID of the line item to cancel. Either lineItemId or productId is required.
         # Corresponds to the JSON property `lineItemId`
         # @return [String]
         attr_accessor :line_item_id
       
+        # The ID of the product to cancel. This is the REST ID used in the products
+        # service. Either lineItemId or productId is required.
+        # Corresponds to the JSON property `productId`
+        # @return [String]
+        attr_accessor :product_id
+      
         # The quantity to cancel.
         # Corresponds to the JSON property `quantity`
         # @return [Fixnum]
@@ -1502,7 +1542,10 @@ module Google
         # Update properties of this object
         def update!(**args)
           @amount = args[:amount] if args.key?(:amount)
+          @amount_pretax = args[:amount_pretax] if args.key?(:amount_pretax)
+          @amount_tax = args[:amount_tax] if args.key?(:amount_tax)
           @line_item_id = args[:line_item_id] if args.key?(:line_item_id)
+          @product_id = args[:product_id] if args.key?(:product_id)
           @quantity = args[:quantity] if args.key?(:quantity)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
@@ -1518,6 +1561,17 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
+        # The amount that is refunded. Either amount or amountPretax and amountTax
+        # should be filled.
+        # Corresponds to the JSON property `amountPretax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_pretax
+      
+        # Tax amount that correspond to refund amount in amountPretax.
+        # Corresponds to the JSON property `amountTax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_tax
+      
         # The reason for the refund.
         # Corresponds to the JSON property `reason`
         # @return [String]
@@ -1535,6 +1589,8 @@ module Google
         # Update properties of this object
         def update!(**args)
           @amount = args[:amount] if args.key?(:amount)
+          @amount_pretax = args[:amount_pretax] if args.key?(:amount_pretax)
+          @amount_tax = args[:amount_tax] if args.key?(:amount_tax)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
         end
@@ -1549,6 +1605,12 @@ module Google
         # @return [String]
         attr_accessor :line_item_id
       
+        # The ID of the product to return. This is the REST ID used in the products
+        # service. Either lineItemId or productId is required.
+        # Corresponds to the JSON property `productId`
+        # @return [String]
+        attr_accessor :product_id
+      
         # The quantity to return.
         # Corresponds to the JSON property `quantity`
         # @return [Fixnum]
@@ -1571,6 +1633,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @line_item_id = args[:line_item_id] if args.key?(:line_item_id)
+          @product_id = args[:product_id] if args.key?(:product_id)
           @quantity = args[:quantity] if args.key?(:quantity)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
@@ -1858,6 +1921,17 @@ module Google
         # @return [Google::Apis::ContentV2sandbox::Price]
         attr_accessor :amount
       
+        # The amount that is refunded. Either amount or amountPretax and amountTax
+        # should be filled.
+        # Corresponds to the JSON property `amountPretax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_pretax
+      
+        # Tax amount that correspond to refund amount in amountPretax.
+        # Corresponds to the JSON property `amountTax`
+        # @return [Google::Apis::ContentV2sandbox::Price]
+        attr_accessor :amount_tax
+      
         # The ID of the operation. Unique across all operations for a given order.
         # Corresponds to the JSON property `operationId`
         # @return [String]
@@ -1880,6 +1954,8 @@ module Google
         # Update properties of this object
         def update!(**args)
           @amount = args[:amount] if args.key?(:amount)
+          @amount_pretax = args[:amount_pretax] if args.key?(:amount_pretax)
+          @amount_tax = args[:amount_tax] if args.key?(:amount_tax)
           @operation_id = args[:operation_id] if args.key?(:operation_id)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
@@ -1926,6 +2002,12 @@ module Google
         # @return [String]
         attr_accessor :operation_id
       
+        # The ID of the product to return. This is the REST ID used in the products
+        # service. Either lineItemId or productId is required.
+        # Corresponds to the JSON property `productId`
+        # @return [String]
+        attr_accessor :product_id
+      
         # The quantity to return.
         # Corresponds to the JSON property `quantity`
         # @return [Fixnum]
@@ -1949,6 +2031,7 @@ module Google
         def update!(**args)
           @line_item_id = args[:line_item_id] if args.key?(:line_item_id)
           @operation_id = args[:operation_id] if args.key?(:operation_id)
+          @product_id = args[:product_id] if args.key?(:product_id)
           @quantity = args[:quantity] if args.key?(:quantity)
           @reason = args[:reason] if args.key?(:reason)
           @reason_text = args[:reason_text] if args.key?(:reason_text)
@@ -2225,6 +2308,12 @@ module Google
         # @return [Array<Google::Apis::ContentV2sandbox::TestOrderLineItem>]
         attr_accessor :line_items
       
+        # Determines if test order must be pulled by merchant or pushed to merchant via
+        # push integration.
+        # Corresponds to the JSON property `notificationMode`
+        # @return [String]
+        attr_accessor :notification_mode
+      
         # The details of the payment method.
         # Corresponds to the JSON property `paymentMethod`
         # @return [Google::Apis::ContentV2sandbox::TestOrderPaymentMethod]
@@ -2265,6 +2354,7 @@ module Google
           @customer = args[:customer] if args.key?(:customer)
           @kind = args[:kind] if args.key?(:kind)
           @line_items = args[:line_items] if args.key?(:line_items)
+          @notification_mode = args[:notification_mode] if args.key?(:notification_mode)
           @payment_method = args[:payment_method] if args.key?(:payment_method)
           @predefined_delivery_address = args[:predefined_delivery_address] if args.key?(:predefined_delivery_address)
           @promotions = args[:promotions] if args.key?(:promotions)

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

@@ -642,6 +642,7 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :line_item_id, as: 'lineItemId'
+          property :product_id, as: 'productId'
           property :quantity, as: 'quantity'
         end
       end
@@ -673,8 +674,13 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :amount, as: 'amount', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
       
+          property :amount_pretax, as: 'amountPretax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
+          property :amount_tax, as: 'amountTax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
           property :line_item_id, as: 'lineItemId'
           property :operation_id, as: 'operationId'
+          property :product_id, as: 'productId'
           property :quantity, as: 'quantity'
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
@@ -768,7 +774,12 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :amount, as: 'amount', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
       
+          property :amount_pretax, as: 'amountPretax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
+          property :amount_tax, as: 'amountTax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
           property :line_item_id, as: 'lineItemId'
+          property :product_id, as: 'productId'
           property :quantity, as: 'quantity'
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
@@ -780,6 +791,10 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :amount, as: 'amount', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
       
+          property :amount_pretax, as: 'amountPretax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
+          property :amount_tax, as: 'amountTax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
         end
@@ -789,6 +804,7 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :line_item_id, as: 'lineItemId'
+          property :product_id, as: 'productId'
           property :quantity, as: 'quantity'
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
@@ -882,6 +898,10 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :amount, as: 'amount', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
       
+          property :amount_pretax, as: 'amountPretax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
+          property :amount_tax, as: 'amountTax', class: Google::Apis::ContentV2sandbox::Price, decorator: Google::Apis::ContentV2sandbox::Price::Representation
+      
           property :operation_id, as: 'operationId'
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
@@ -901,6 +921,7 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation
           property :line_item_id, as: 'lineItemId'
           property :operation_id, as: 'operationId'
+          property :product_id, as: 'productId'
           property :quantity, as: 'quantity'
           property :reason, as: 'reason'
           property :reason_text, as: 'reasonText'
@@ -988,6 +1009,7 @@ module Google
           property :kind, as: 'kind'
           collection :line_items, as: 'lineItems', class: Google::Apis::ContentV2sandbox::TestOrderLineItem, decorator: Google::Apis::ContentV2sandbox::TestOrderLineItem::Representation
       
+          property :notification_mode, as: 'notificationMode'
           property :payment_method, as: 'paymentMethod', class: Google::Apis::ContentV2sandbox::TestOrderPaymentMethod, decorator: Google::Apis::ContentV2sandbox::TestOrderPaymentMethod::Representation
       
           property :predefined_delivery_address, as: 'predefinedDeliveryAddress'