google-api-client 0.23.5 → 0.23.6

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

@@ -694,6 +694,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class OrderReportDisbursement
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class OrderReportTransaction
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class OrderReturn
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -796,6 +808,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class OrderreportsListDisbursementsResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class OrderreportsListTransactionsResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class OrdersAcknowledgeRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -2749,6 +2773,35 @@ module Google
         end
       end
       
+      class OrderReportDisbursement
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :disbursement_amount, as: 'disbursementAmount', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
+      
+          property :disbursement_creation_date, as: 'disbursementCreationDate'
+          property :disbursement_date, as: 'disbursementDate'
+          property :disbursement_id, as: 'disbursementId'
+          property :merchant_id, :numeric_string => true, as: 'merchantId'
+        end
+      end
+      
+      class OrderReportTransaction
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :disbursement_amount, as: 'disbursementAmount', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
+      
+          property :disbursement_creation_date, as: 'disbursementCreationDate'
+          property :disbursement_date, as: 'disbursementDate'
+          property :disbursement_id, as: 'disbursementId'
+          property :merchant_id, :numeric_string => true, as: 'merchantId'
+          property :merchant_order_id, as: 'merchantOrderId'
+          property :order_id, as: 'orderId'
+          property :product_amount, as: 'productAmount', class: Google::Apis::ContentV2::Amount, decorator: Google::Apis::ContentV2::Amount::Representation
+      
+          property :transaction_date, as: 'transactionDate'
+        end
+      end
+      
       class OrderReturn
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -2907,6 +2960,26 @@ module Google
         end
       end
       
+      class OrderreportsListDisbursementsResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :disbursements, as: 'disbursements', class: Google::Apis::ContentV2::OrderReportDisbursement, decorator: Google::Apis::ContentV2::OrderReportDisbursement::Representation
+      
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+        end
+      end
+      
+      class OrderreportsListTransactionsResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+          collection :transactions, as: 'transactions', class: Google::Apis::ContentV2::OrderReportTransaction, decorator: Google::Apis::ContentV2::OrderReportTransaction::Representation
+      
+        end
+      end
+      
       class OrdersAcknowledgeRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation

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

@@ -1992,6 +1992,104 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Retrieves a report for disbursements 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] 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
+        #   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::OrderreportsListDisbursementsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::OrderreportsListDisbursementsResponse]
+        #
+        # @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)
+          command =  make_simple_command(:get, '{merchantId}/orderreports/disbursements', options)
+          command.response_representation = Google::Apis::ContentV2::OrderreportsListDisbursementsResponse::Representation
+          command.response_class = Google::Apis::ContentV2::OrderreportsListDisbursementsResponse
+          command.params['merchantId'] = merchant_id unless merchant_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['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 a list of transactions for an disbursement 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] 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 [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] 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::OrderreportsListTransactionsResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::OrderreportsListTransactionsResponse]
+        #
+        # @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)
+          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['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
+        
         # Marks an order as acknowledged.
         # @param [Fixnum] merchant_id
         #   The ID of the account that manages the order. This cannot be a multi-client
@@ -2335,7 +2433,8 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Notifies that item return and refund was handled directly in store.
+        # Notifies that item return and refund was handled directly by merchant outside
+        # of Google payments processing (e.g. cash refund done in store).
         # @param [Fixnum] merchant_id
         #   The ID of the account that manages the order. This cannot be a multi-client
         #   account.

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 = '20180809'
+      REVISION = '20180821'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

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

@@ -639,7 +639,8 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Notifies that item return and refund was handled directly in store.
+        # Notifies that item return and refund was handled directly by merchant outside
+        # of Google payments processing (e.g. cash refund done in store).
         # @param [Fixnum] merchant_id
         #   The ID of the account that manages the order. This cannot be a multi-client
         #   account.

data/generated/google/apis/dlp_v2.rb

@@ -27,7 +27,7 @@ module Google
     # @see https://cloud.google.com/dlp/docs/
     module DlpV2
       VERSION = 'V2'
-      REVISION = '20180814'
+      REVISION = '20180821'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -656,8 +656,8 @@ module Google
         end
       end
       
-      # Options defining a file or a set of files (path ending with *) within
-      # a Google Cloud Storage bucket.
+      # Options defining a file or a set of files within a Google Cloud Storage
+      # bucket.
       class GooglePrivacyDlpV2CloudStorageOptions
         include Google::Apis::Core::Hashable
       
@@ -2097,8 +2097,8 @@ module Google
       class GooglePrivacyDlpV2FileSet
         include Google::Apis::Core::Hashable
       
-        # The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-        # path is allowed.
+        # The Cloud Storage url of the file(s) to scan, in the format
+        # `gs://<bucket>/<path>`. Trailing wildcard in the path is allowed.
         # Corresponds to the JSON property `url`
         # @return [String]
         attr_accessor :url
@@ -4373,7 +4373,9 @@ module Google
       class GooglePrivacyDlpV2Regex
         include Google::Apis::Core::Hashable
       
-        # Pattern defining the regular expression.
+        # Pattern defining the regular expression. Its syntax
+        # (https://github.com/google/re2/wiki/Syntax) can be found under the
+        # google/re2 repository on GitHub.
         # Corresponds to the JSON property `pattern`
         # @return [String]
         attr_accessor :pattern
@@ -4716,8 +4718,8 @@ module Google
         # @return [Google::Apis::DlpV2::GooglePrivacyDlpV2BigQueryOptions]
         attr_accessor :big_query_options
       
-        # Options defining a file or a set of files (path ending with *) within
-        # a Google Cloud Storage bucket.
+        # Options defining a file or a set of files within a Google Cloud Storage
+        # bucket.
         # Corresponds to the JSON property `cloudStorageOptions`
         # @return [Google::Apis::DlpV2::GooglePrivacyDlpV2CloudStorageOptions]
         attr_accessor :cloud_storage_options

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

@@ -1461,6 +1461,8 @@ module Google
         #   - `create_time`: corresponds to time the triggeredJob was created.
         #   - `update_time`: corresponds to time the triggeredJob was last updated.
         #   - `name`: corresponds to JobTrigger's name.
+        #   - `display_name`: corresponds to JobTrigger's display name.
+        #   - `status`: corresponds to JobTrigger's status.
         # @param [Fixnum] page_size
         #   Optional size of the page, can be limited by a server.
         # @param [String] page_token

data/generated/google/apis/drive_v2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/drive/
     module DriveV2
       VERSION = 'V2'
-      REVISION = '20180809'
+      REVISION = '20180816'
 
       # View and manage the files in your Google Drive
       AUTH_DRIVE = 'https://www.googleapis.com/auth/drive'

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

@@ -1801,6 +1801,13 @@ module Google
           attr_accessor :can_delete
           alias_method :can_delete?, :can_delete
         
+          # Whether the current user can delete children of this folder. This is false
+          # when the item is not a folder. Only populated for Team Drive items.
+          # Corresponds to the JSON property `canDeleteChildren`
+          # @return [Boolean]
+          attr_accessor :can_delete_children
+          alias_method :can_delete_children?, :can_delete_children
+        
           # Whether the current user can download this file.
           # Corresponds to the JSON property `canDownload`
           # @return [Boolean]
@@ -1820,6 +1827,22 @@ module Google
           attr_accessor :can_list_children
           alias_method :can_list_children?, :can_list_children
         
+          # Whether the current user can move children of this folder outside of the Team
+          # Drive. This is false when the item is not a folder. Only populated for Team
+          # Drive items.
+          # Corresponds to the JSON property `canMoveChildrenOutOfTeamDrive`
+          # @return [Boolean]
+          attr_accessor :can_move_children_out_of_team_drive
+          alias_method :can_move_children_out_of_team_drive?, :can_move_children_out_of_team_drive
+        
+          # Whether the current user can move children of this folder within the Team
+          # Drive. This is false when the item is not a folder. Only populated for Team
+          # Drive items.
+          # Corresponds to the JSON property `canMoveChildrenWithinTeamDrive`
+          # @return [Boolean]
+          attr_accessor :can_move_children_within_team_drive
+          alias_method :can_move_children_within_team_drive?, :can_move_children_within_team_drive
+        
           # Whether the current user can move this item into a Team Drive. If the item is
           # in a Team Drive, this field is equivalent to canMoveTeamDriveItem.
           # Corresponds to the JSON property `canMoveItemIntoTeamDrive`
@@ -1827,10 +1850,25 @@ module Google
           attr_accessor :can_move_item_into_team_drive
           alias_method :can_move_item_into_team_drive?, :can_move_item_into_team_drive
         
-          # Whether the current user can move this Team Drive item by changing its parent.
-          # Note that a request to change the parent for this item may still fail
-          # depending on the new parent that is being added. Only populated for Team Drive
-          # files.
+          # Whether the current user can move this Team Drive item outside of this Team
+          # Drive by changing its parent. Note that a request to change the parent of the
+          # item may still fail depending on the new parent that is being added. Only
+          # populated for Team Drive items.
+          # Corresponds to the JSON property `canMoveItemOutOfTeamDrive`
+          # @return [Boolean]
+          attr_accessor :can_move_item_out_of_team_drive
+          alias_method :can_move_item_out_of_team_drive?, :can_move_item_out_of_team_drive
+        
+          # Whether the current user can move this Team Drive item within this Team Drive.
+          # Note that a request to change the parent of the item may still fail depending
+          # on the new parent that is being added. Only populated for Team Drive items.
+          # Corresponds to the JSON property `canMoveItemWithinTeamDrive`
+          # @return [Boolean]
+          attr_accessor :can_move_item_within_team_drive
+          alias_method :can_move_item_within_team_drive?, :can_move_item_within_team_drive
+        
+          # Deprecated - use canMoveItemWithinTeamDrive or canMoveItemOutOfTeamDrive
+          # instead.
           # Corresponds to the JSON property `canMoveTeamDriveItem`
           # @return [Boolean]
           attr_accessor :can_move_team_drive_item
@@ -1852,7 +1890,8 @@ module Google
           alias_method :can_read_team_drive?, :can_read_team_drive
         
           # Whether the current user can remove children from this folder. This is always
-          # false when the item is not a folder.
+          # false when the item is not a folder. For Team Drive items, use
+          # canDeleteChildren or canTrashChildren instead.
           # Corresponds to the JSON property `canRemoveChildren`
           # @return [Boolean]
           attr_accessor :can_remove_children
@@ -1876,6 +1915,13 @@ module Google
           attr_accessor :can_trash
           alias_method :can_trash?, :can_trash
         
+          # Whether the current user can trash children of this folder. This is false when
+          # the item is not a folder. Only populated for Team Drive items.
+          # Corresponds to the JSON property `canTrashChildren`
+          # @return [Boolean]
+          attr_accessor :can_trash_children
+          alias_method :can_trash_children?, :can_trash_children
+        
           # Whether the current user can restore this file from trash.
           # Corresponds to the JSON property `canUntrash`
           # @return [Boolean]
@@ -1894,10 +1940,15 @@ module Google
             @can_comment = args[:can_comment] if args.key?(:can_comment)
             @can_copy = args[:can_copy] if args.key?(:can_copy)
             @can_delete = args[:can_delete] if args.key?(:can_delete)
+            @can_delete_children = args[:can_delete_children] if args.key?(:can_delete_children)
             @can_download = args[:can_download] if args.key?(:can_download)
             @can_edit = args[:can_edit] if args.key?(:can_edit)
             @can_list_children = args[:can_list_children] if args.key?(:can_list_children)
+            @can_move_children_out_of_team_drive = args[:can_move_children_out_of_team_drive] if args.key?(:can_move_children_out_of_team_drive)
+            @can_move_children_within_team_drive = args[:can_move_children_within_team_drive] if args.key?(:can_move_children_within_team_drive)
             @can_move_item_into_team_drive = args[:can_move_item_into_team_drive] if args.key?(:can_move_item_into_team_drive)
+            @can_move_item_out_of_team_drive = args[:can_move_item_out_of_team_drive] if args.key?(:can_move_item_out_of_team_drive)
+            @can_move_item_within_team_drive = args[:can_move_item_within_team_drive] if args.key?(:can_move_item_within_team_drive)
             @can_move_team_drive_item = args[:can_move_team_drive_item] if args.key?(:can_move_team_drive_item)
             @can_read_revisions = args[:can_read_revisions] if args.key?(:can_read_revisions)
             @can_read_team_drive = args[:can_read_team_drive] if args.key?(:can_read_team_drive)
@@ -1905,6 +1956,7 @@ module Google
             @can_rename = args[:can_rename] if args.key?(:can_rename)
             @can_share = args[:can_share] if args.key?(:can_share)
             @can_trash = args[:can_trash] if args.key?(:can_trash)
+            @can_trash_children = args[:can_trash_children] if args.key?(:can_trash_children)
             @can_untrash = args[:can_untrash] if args.key?(:can_untrash)
           end
         end
@@ -3148,6 +3200,12 @@ module Google
           attr_accessor :can_copy
           alias_method :can_copy?, :can_copy
         
+          # Whether the current user can delete children from folders in this Team Drive.
+          # Corresponds to the JSON property `canDeleteChildren`
+          # @return [Boolean]
+          attr_accessor :can_delete_children
+          alias_method :can_delete_children?, :can_delete_children
+        
           # Whether the current user can delete this Team Drive. Attempting to delete the
           # Team Drive may still fail if there are untrashed items inside the Team Drive.
           # Corresponds to the JSON property `canDeleteTeamDrive`
@@ -3187,7 +3245,7 @@ module Google
           attr_accessor :can_read_revisions
           alias_method :can_read_revisions?, :can_read_revisions
         
-          # Whether the current user can remove children from folders in this Team Drive.
+          # Deprecated - use canDeleteChildren or canTrashChildren instead.
           # Corresponds to the JSON property `canRemoveChildren`
           # @return [Boolean]
           attr_accessor :can_remove_children
@@ -3211,6 +3269,12 @@ module Google
           attr_accessor :can_share
           alias_method :can_share?, :can_share
         
+          # Whether the current user can trash children from folders in this Team Drive.
+          # Corresponds to the JSON property `canTrashChildren`
+          # @return [Boolean]
+          attr_accessor :can_trash_children
+          alias_method :can_trash_children?, :can_trash_children
+        
           def initialize(**args)
              update!(**args)
           end
@@ -3224,6 +3288,7 @@ module Google
             @can_change_team_members_only_restriction = args[:can_change_team_members_only_restriction] if args.key?(:can_change_team_members_only_restriction)
             @can_comment = args[:can_comment] if args.key?(:can_comment)
             @can_copy = args[:can_copy] if args.key?(:can_copy)
+            @can_delete_children = args[:can_delete_children] if args.key?(:can_delete_children)
             @can_delete_team_drive = args[:can_delete_team_drive] if args.key?(:can_delete_team_drive)
             @can_download = args[:can_download] if args.key?(:can_download)
             @can_edit = args[:can_edit] if args.key?(:can_edit)
@@ -3234,6 +3299,7 @@ module Google
             @can_rename = args[:can_rename] if args.key?(:can_rename)
             @can_rename_team_drive = args[:can_rename_team_drive] if args.key?(:can_rename_team_drive)
             @can_share = args[:can_share] if args.key?(:can_share)
+            @can_trash_children = args[:can_trash_children] if args.key?(:can_trash_children)
           end
         end