classes.rb in google-api-client-0.14.5

- old
+ new

@@ -1496,11 +1496,11 @@
         # Corresponds to the JSON property `includedDestinations`
         # @return [Array<String>]
         attr_accessor :included_destinations
       
         # The two-letter ISO 639-1 language of the items in the feed. Must be a valid
-        # language for targetCountryLanguage.country.
+        # language for targets[].country.
         # Corresponds to the JSON property `language`
         # @return [String]
         attr_accessor :language
       
         def initialize(**args)
@@ -2698,10 +2698,15 @@
         # Cancellations of the line item.
         # Corresponds to the JSON property `cancellations`
         # @return [Array<Google::Apis::ContentV2::OrderCancellation>]
         attr_accessor :cancellations
       
+        # The channel type of the order: "purchaseOnGoogle" or "googleExpress".
+        # Corresponds to the JSON property `channelType`
+        # @return [String]
+        attr_accessor :channel_type
+      
         # The id of the line item.
         # Corresponds to the JSON property `id`
         # @return [String]
         attr_accessor :id
       
@@ -2772,10 +2777,11 @@
         end
       
         # Update properties of this object
         def update!(**args)
           @cancellations = args[:cancellations] if args.key?(:cancellations)
+          @channel_type = args[:channel_type] if args.key?(:channel_type)
           @id = args[:id] if args.key?(:id)
           @price = args[:price] if args.key?(:price)
           @product = args[:product] if args.key?(:product)
           @quantity_canceled = args[:quantity_canceled] if args.key?(:quantity_canceled)
           @quantity_delivered = args[:quantity_delivered] if args.key?(:quantity_delivered)
@@ -2985,11 +2991,12 @@
       
       # 
       class OrderLineItemShippingDetailsMethod
         include Google::Apis::Core::Hashable
       
-        # The carrier for the shipping. Optional.
+        # The carrier for the shipping. Optional. See shipments[].carrier for a list of
+        # acceptable values.
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # Maximum transit time.
@@ -3274,10 +3281,33 @@
       # 
       class OrderShipment
         include Google::Apis::Core::Hashable
       
         # The carrier handling the shipment.
+        # 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"
+        # - "dynamex"
+        # - "lasership"
+        # - "smartpost"
+        # - "fedex smartpost"
+        # - "mpx"
+        # - "uds"
+        # - "united delivery service"
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # Date on which the shipment has been created, in ISO 8601 format.
@@ -3850,20 +3880,62 @@
       
       # 
       class OrdersCustomBatchRequestEntryShipLineItems
         include Google::Apis::Core::Hashable
       
-        # The carrier handling the shipment.
+        # Deprecated. Please use shipmentInfo instead. The carrier handling the shipment.
+        # See shipments[].carrier in the  Orders resource representation for a list of
+        # acceptable values.
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # Line items to ship.
         # Corresponds to the JSON property `lineItems`
         # @return [Array<Google::Apis::ContentV2::OrderShipmentLineItemShipment>]
         attr_accessor :line_items
       
+        # Deprecated. Please use shipmentInfo instead. The ID of the shipment.
+        # Corresponds to the JSON property `shipmentId`
+        # @return [String]
+        attr_accessor :shipment_id
+      
+        # Shipment information. This field is repeated because a single line item can be
+        # shipped in several packages (and have several tracking IDs).
+        # Corresponds to the JSON property `shipmentInfos`
+        # @return [Array<Google::Apis::ContentV2::OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>]
+        attr_accessor :shipment_infos
+      
+        # Deprecated. Please use shipmentInfo instead. The tracking id for the shipment.
+        # Corresponds to the JSON property `trackingId`
+        # @return [String]
+        attr_accessor :tracking_id
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @carrier = args[:carrier] if args.key?(:carrier)
+          @line_items = args[:line_items] if args.key?(:line_items)
+          @shipment_id = args[:shipment_id] if args.key?(:shipment_id)
+          @shipment_infos = args[:shipment_infos] if args.key?(:shipment_infos)
+          @tracking_id = args[:tracking_id] if args.key?(:tracking_id)
+        end
+      end
+      
+      # 
+      class OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
+        include Google::Apis::Core::Hashable
+      
+        # The carrier handling the shipment. See shipments[].carrier in the  Orders
+        # resource representation for a list of acceptable values.
+        # Corresponds to the JSON property `carrier`
+        # @return [String]
+        attr_accessor :carrier
+      
         # The ID of the shipment.
         # Corresponds to the JSON property `shipmentId`
         # @return [String]
         attr_accessor :shipment_id
       
@@ -3877,21 +3949,21 @@
         end
       
         # Update properties of this object
         def update!(**args)
           @carrier = args[:carrier] if args.key?(:carrier)
-          @line_items = args[:line_items] if args.key?(:line_items)
           @shipment_id = args[:shipment_id] if args.key?(:shipment_id)
           @tracking_id = args[:tracking_id] if args.key?(:tracking_id)
         end
       end
       
       # 
       class OrdersCustomBatchRequestEntryUpdateShipment
         include Google::Apis::Core::Hashable
       
-        # The carrier handling the shipment. Not updated if missing.
+        # The carrier handling the shipment. Not updated if missing. See shipments[].
+        # carrier in the  Orders resource representation for a list of acceptable values.
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # The ID of the shipment.
@@ -4212,11 +4284,13 @@
       
       # 
       class OrdersShipLineItemsRequest
         include Google::Apis::Core::Hashable
       
-        # The carrier handling the shipment.
+        # Deprecated. Please use shipmentInfo instead. The carrier handling the shipment.
+        # See shipments[].carrier in the  Orders resource representation for a list of
+        # acceptable values.
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # Line items to ship.
@@ -4227,16 +4301,22 @@
         # The ID of the operation. Unique across all operations for a given order.
         # Corresponds to the JSON property `operationId`
         # @return [String]
         attr_accessor :operation_id
       
-        # The ID of the shipment.
+        # Deprecated. Please use shipmentInfo instead. The ID of the shipment.
         # Corresponds to the JSON property `shipmentId`
         # @return [String]
         attr_accessor :shipment_id
       
-        # The tracking id for the shipment.
+        # Shipment information. This field is repeated because a single line item can be
+        # shipped in several packages (and have several tracking IDs).
+        # Corresponds to the JSON property `shipmentInfos`
+        # @return [Array<Google::Apis::ContentV2::OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>]
+        attr_accessor :shipment_infos
+      
+        # Deprecated. Please use shipmentInfo instead. The tracking id for the shipment.
         # Corresponds to the JSON property `trackingId`
         # @return [String]
         attr_accessor :tracking_id
       
         def initialize(**args)
@@ -4247,10 +4327,11 @@
         def update!(**args)
           @carrier = args[:carrier] if args.key?(:carrier)
           @line_items = args[:line_items] if args.key?(:line_items)
           @operation_id = args[:operation_id] if args.key?(:operation_id)
           @shipment_id = args[:shipment_id] if args.key?(:shipment_id)
+          @shipment_infos = args[:shipment_infos] if args.key?(:shipment_infos)
           @tracking_id = args[:tracking_id] if args.key?(:tracking_id)
         end
       end
       
       # 
@@ -4332,10 +4413,11 @@
       
       # 
       class OrdersUpdateShipmentRequest
         include Google::Apis::Core::Hashable
       
-        # The carrier handling the shipment. Not updated if missing.
+        # The carrier handling the shipment. Not updated if missing. See shipments[].
+        # carrier in the  Orders resource representation for a list of acceptable values.
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
       
         # The ID of the operation. Unique across all operations for a given order.