zippendo 1.1.4 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1fd3fb3e24a4236350f098c4bbb42958c9b9594573b1a9b31231db93af4213
-  data.tar.gz: 4f0c7247864b61936c1be3bf37e2b928d2454f0e4a20805d117e2e28c4c708ac
+  metadata.gz: 9046cd444c2dbbda30c2e2c8e2e08aec15d8206be3287f0d043bcb74f97657b3
+  data.tar.gz: 726e7ca6345cad33efc1cf35ab023be4c56d7f85ac1c74d3e40350581e7afffc
 SHA512:
-  metadata.gz: 762b9743e3d730de1dd5228904a454275cb36284adb06b5a5102a1baf03114091c9ff9515489433ec8f69278df43f748c9a75791ee0d51bb86e476ffe159463f
-  data.tar.gz: 61566cb8dbe7a72a8cb2f56550c29866e5cc156e1945239cc12bad22bb5f30b25cdd7772a33762ce4ccb71e509474f5cf8068088526ccd432f3c51c6e82e4208
+  metadata.gz: 36ddb9373acdf2fe3f645127e0815bc5f0956c134da085c1e15c4cf0f2b9443ed09e414e22c0caea750c056ebb30a0de180e4784430f9dac3e30b97f543b30f8
+  data.tar.gz: 9e4bf9bd6aebe0033eaa37a2d34eafaf84d68b10d3e7b643dab8cc26e351bafa4eb180800863902bea437a8eb40e425eb364405895a510819fc76e05b12206c1

data/docs/BatchSendShipments200ResponseResultsInner.md

@@ -5,9 +5,9 @@
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **shipment_id** | **String** | The shipment this result refers to. |  |
-| **status** | **String** | Whether this shipment was successfully booked with its carrier. |  |
-| **code** | **String** | Canonical machine-readable error code, present when `status` is `failed`. | [optional] |
-| **message** | **String** | Human-readable failure detail, present when `status` is `failed`. | [optional] |
+| **status** | **String** | `sent` when the carrier booked it, `failed` when the carrier or Zippendo rejected it, and `skipped` when the batch ran out of time before reaching it. A `skipped` shipment was never sent to the carrier and is safe to submit again. |  |
+| **code** | **String** | Canonical machine-readable error code, present when `status` is `failed` or `skipped`. | [optional] |
+| **message** | **String** | Human-readable detail, present when `status` is `failed` or `skipped`. | [optional] |
 | **errors** | [**Array<SendShipment422ResponseErrorsInner>**](SendShipment422ResponseErrorsInner.md) | Carrier-specific errors, present when the carrier rejected the booking. | [optional] |
 
 ## Example

data/docs/BatchSendShipments200ResponseSummary.md

@@ -4,9 +4,10 @@
 
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
-| **total** | **Integer** | Number of unique shipments processed. |  |
+| **total** | **Integer** | Number of unique shipments requested. |  |
 | **sent** | **Integer** | How many were successfully booked. |  |
-| **failed** | **Integer** | How many failed. |  |
+| **failed** | **Integer** | How many the carrier or Zippendo rejected. |  |
+| **skipped** | **Integer** | How many the batch ran out of time to attempt. Submit these again. |  |
 
 ## Example
 
@@ -16,7 +17,8 @@ require 'zippendo'
 instance = Zippendo::BatchSendShipments200ResponseSummary.new(
   total: 3,
   sent: 2,
-  failed: 1
+  failed: 1,
+  skipped: 0
 )
 ```
 

data/docs/CreateShipment201ResponseParcelsInnerOrderLinesInner.md

@@ -5,7 +5,7 @@
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **id** | **String** | Unique order line identifier. | [optional] |
-| **sku** | **String** | Stock keeping unit of the product. |  |
+| **sku** | **String** | Stock keeping unit of the product. Optional — not every webshop assigns SKUs. | [optional] |
 | **quantity** | **Integer** | Number of units in this order line. |  |
 | **description** | **String** | Human-readable product description. | [optional] |
 | **unit_price** | **Float** | Price per unit in the order line currency. | [optional] |

data/docs/CreateShipmentRequest.md

@@ -9,7 +9,7 @@
 | **service_point_id** | **String** | Selected carrier service point identifier. | [optional] |
 | **parties** | [**Array<CreateShipmentRequestPartiesInner>**](CreateShipmentRequestPartiesInner.md) | Parties involved in the shipment. Optional when orderId is provided. | [optional] |
 | **type** | **String** | Direction of the shipment relative to the organization. |  |
-| **carrier_settings** | [**CreateShipmentRequestCarrierSettings**](CreateShipmentRequestCarrierSettings.md) |  |  |
+| **carrier_settings** | [**CreateShipmentRequestCarrierSettings**](CreateShipmentRequestCarrierSettings.md) |  | [optional] |
 | **parcels** | [**Array<CreateShipmentRequestParcelsInner>**](CreateShipmentRequestParcelsInner.md) | Parcels to include. Optional when orderId is provided. | [optional] |
 | **pickup_details** | [**CreateShipmentRequestPickupDetails**](CreateShipmentRequestPickupDetails.md) |  | [optional] |
 | **term_of_trade** | **String** | Incoterm governing the shipment. | [optional][default to 'DAP'] |
@@ -17,6 +17,8 @@
 | **order_id** | **String** | Order to derive parties and parcels from. | [optional] |
 | **label_printer_id** | **String** | Printer to assign for labels. | [optional] |
 | **document_printer_id** | **String** | Printer to assign for documents. | [optional] |
+| **shipping_rule_id** | **String** | Create the shipment from this shipping rule: carrier settings and the sender address derive from the rule (explicit carrierSettings and addressId are then ignored). | [optional] |
+| **droppoint** | [**CreateShipmentRequestDroppoint**](CreateShipmentRequestDroppoint.md) |  | [optional] |
 
 ## Example
 
@@ -36,7 +38,9 @@ instance = Zippendo::CreateShipmentRequest.new(
   status: pending,
   order_id: ord_5e6f7a8b,
   label_printer_id: prn_label_01,
-  document_printer_id: prn_doc_01
+  document_printer_id: prn_doc_01,
+  shipping_rule_id: rule_3c4d5e6f,
+  droppoint: null
 )
 ```
 

data/docs/CreateShipmentRequestDroppoint.md

@@ -0,0 +1,24 @@
+# Zippendo::CreateShipmentRequestDroppoint
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **id** | **String** | Identifier of the selected service point. |  |
+| **name** | **String** | Display name of the service point. |  |
+| **address** | **String** | Formatted address of the service point. |  |
+| **coordinates** | [**Array<ListShippingRules200ResponseDataInnerAdditionalParametersValueAnyOfCoordinatesInner>**](ListShippingRules200ResponseDataInnerAdditionalParametersValueAnyOfCoordinatesInner.md) | Latitude/longitude of the service point. | [optional] |
+
+## Example
+
+```ruby
+require 'zippendo'
+
+instance = Zippendo::CreateShipmentRequestDroppoint.new(
+  id: sp_pn_4521,
+  name: Føtex Nørrebro,
+  address: Nørrebrogade 20, 2200 København N,
+  coordinates: [55.6987,12.5501]
+)
+```
+

data/docs/CreateShipmentRequestParcelsInnerOrderLinesInner.md

@@ -5,7 +5,7 @@
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **id** | **String** | Unique order line identifier. | [optional] |
-| **sku** | **String** | Stock keeping unit of the product. |  |
+| **sku** | **String** | Stock keeping unit of the product. Optional — not every webshop assigns SKUs. | [optional] |
 | **quantity** | **Integer** | Number of units in this order line. |  |
 | **description** | **String** | Human-readable product description. | [optional] |
 | **unit_price** | **Float** | Price per unit in the order line currency. | [optional] |

data/docs/GetOrder200ResponseShipmentsInner.md

@@ -10,6 +10,7 @@
 | **type** | **String** | Direction of the shipment relative to the organization. |  |
 | **tracking** | [**CreateShipment201ResponseTracking**](CreateShipment201ResponseTracking.md) |  | [optional] |
 | **carrier_settings** | [**ListShipments200ResponseDataInnerCarrierSettings**](ListShipments200ResponseDataInnerCarrierSettings.md) |  |  |
+| **service_point_id** | **String** | Selected carrier service point identifier. | [optional] |
 | **created_at** | **String** | Timestamp when the shipment was created. |  |
 | **updated_at** | **String** | Timestamp when the shipment was last updated. |  |
 | **shipping_rule_id** | **String** | ID of the shipping rule used for this shipment. | [optional] |
@@ -27,6 +28,7 @@ instance = Zippendo::GetOrder200ResponseShipmentsInner.new(
   type: outbound,
   tracking: null,
   carrier_settings: null,
+  service_point_id: sp_pn_4521,
   created_at: 2026-06-22T14:30:00.000Z,
   updated_at: 2026-06-22T14:30:00.000Z,
   shipping_rule_id: clz9k2f0a0002abcd5678ijkl,

data/docs/ShipmentsApi.md

@@ -240,7 +240,7 @@ end
 
 Create shipment
 
-Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order.
+Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order. When shippingRuleId is provided, carrier settings and the sender address derive from the rule.
 
 ### Examples
 
@@ -255,7 +255,7 @@ end
 
 api_instance = Zippendo::ShipmentsApi.new
 org_id = 'org_8f3kd92ld0' # String | Organization ID
-create_shipment_request = Zippendo::CreateShipmentRequest.new({type: 'outbound', carrier_settings: Zippendo::CreateShipmentRequestCarrierSettings.new({carrier_id: 'car_pn_001', product_id: 'prod_mypack_home', services: ["A7"], additional_parameters: { key: Zippendo::CreateShippingRuleRequestAdditionalParametersValue.new({id: 'sp_pn_4521', name: 'Føtex Nørrebro', address: 'Nørrebrogade 20, 2200 København N'})}})}) # CreateShipmentRequest | 
+create_shipment_request = Zippendo::CreateShipmentRequest.new({type: 'outbound'}) # CreateShipmentRequest | 
 
 begin
   # Create shipment

data/docs/UpdateShipmentRequest.md

@@ -9,7 +9,7 @@
 | **service_point_id** | **String** | Selected carrier service point identifier. | [optional] |
 | **parties** | [**Array<CreateShipmentRequestPartiesInner>**](CreateShipmentRequestPartiesInner.md) | Parties involved in the shipment. Optional when orderId is provided. | [optional] |
 | **type** | **String** | Direction of the shipment relative to the organization. | [optional] |
-| **carrier_settings** | [**CreateShipmentRequestCarrierSettings**](CreateShipmentRequestCarrierSettings.md) |  | [optional] |
+| **carrier_settings** | [**UpdateShipmentRequestCarrierSettings**](UpdateShipmentRequestCarrierSettings.md) |  | [optional] |
 | **parcels** | [**Array<CreateShipmentRequestParcelsInner>**](CreateShipmentRequestParcelsInner.md) | Parcels to include. Optional when orderId is provided. | [optional] |
 | **pickup_details** | [**CreateShipmentRequestPickupDetails**](CreateShipmentRequestPickupDetails.md) |  | [optional] |
 | **term_of_trade** | **String** | Incoterm governing the shipment. | [optional][default to 'DAP'] |
@@ -18,6 +18,7 @@
 | **label_printer_id** | **String** | Printer to assign for labels. | [optional] |
 | **document_printer_id** | **String** | Printer to assign for documents. | [optional] |
 | **shipping_rule_id** | **String** | Shipping rule to apply to the shipment. Pass null to clear. | [optional] |
+| **droppoint** | [**UpdateShipmentRequestDroppoint**](UpdateShipmentRequestDroppoint.md) |  | [optional] |
 
 ## Example
 
@@ -38,7 +39,8 @@ instance = Zippendo::UpdateShipmentRequest.new(
   order_id: ord_5e6f7a8b,
   label_printer_id: prn_label_01,
   document_printer_id: prn_doc_01,
-  shipping_rule_id: rule_3c4d5e6f
+  shipping_rule_id: rule_3c4d5e6f,
+  droppoint: null
 )
 ```
 

data/docs/UpdateShipmentRequestCarrierSettings.md

@@ -0,0 +1,24 @@
+# Zippendo::UpdateShipmentRequestCarrierSettings
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **carrier_id** | **String** | Identifier of the carrier to use. |  |
+| **product_id** | **String** | Identifier of the carrier product/service. |  |
+| **services** | **Array<String>** | Additional service codes requested from the carrier. |  |
+| **additional_parameters** | [**Hash<String, CreateShippingRuleRequestAdditionalParametersValue>**](CreateShippingRuleRequestAdditionalParametersValue.md) | Carrier-specific extra parameters as key/value pairs. |  |
+
+## Example
+
+```ruby
+require 'zippendo'
+
+instance = Zippendo::UpdateShipmentRequestCarrierSettings.new(
+  carrier_id: car_pn_001,
+  product_id: prod_mypack_home,
+  services: ["A7"],
+  additional_parameters: {"notificationEmail":"anna@example.dk"}
+)
+```
+

data/docs/UpdateShipmentRequestDroppoint.md

@@ -0,0 +1,24 @@
+# Zippendo::UpdateShipmentRequestDroppoint
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **id** | **String** | Identifier of the selected service point. |  |
+| **name** | **String** | Display name of the service point. |  |
+| **address** | **String** | Formatted address of the service point. |  |
+| **coordinates** | [**Array<ListShippingRules200ResponseDataInnerAdditionalParametersValueAnyOfCoordinatesInner>**](ListShippingRules200ResponseDataInnerAdditionalParametersValueAnyOfCoordinatesInner.md) | Latitude/longitude of the service point. | [optional] |
+
+## Example
+
+```ruby
+require 'zippendo'
+
+instance = Zippendo::UpdateShipmentRequestDroppoint.new(
+  id: sp_pn_4521,
+  name: Føtex Nørrebro,
+  address: Nørrebrogade 20, 2200 København N,
+  coordinates: [55.6987,12.5501]
+)
+```
+

data/lib/zippendo/api/shipments_api.rb

@@ -243,7 +243,7 @@ module Zippendo
     end
 
     # Create shipment
-    # Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order.
+    # Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order. When shippingRuleId is provided, carrier settings and the sender address derive from the rule.
     # @param org_id [String] Organization ID
     # @param create_shipment_request [CreateShipmentRequest] 
     # @param [Hash] opts the optional parameters
@@ -254,7 +254,7 @@ module Zippendo
     end
 
     # Create shipment
-    # Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order.
+    # Create a new shipment for an organization. When orderId is provided, parties and parcels are derived from the order. When shippingRuleId is provided, carrier settings and the sender address derive from the rule.
     # @param org_id [String] Organization ID
     # @param create_shipment_request [CreateShipmentRequest] 
     # @param [Hash] opts the optional parameters

data/lib/zippendo/models/batch_send_shipments200_response_results_inner.rb

@@ -18,13 +18,13 @@ module Zippendo
     # The shipment this result refers to.
     attr_accessor :shipment_id
 
-    # Whether this shipment was successfully booked with its carrier.
+    # `sent` when the carrier booked it, `failed` when the carrier or Zippendo rejected it, and `skipped` when the batch ran out of time before reaching it. A `skipped` shipment was never sent to the carrier and is safe to submit again.
     attr_accessor :status
 
-    # Canonical machine-readable error code, present when `status` is `failed`.
+    # Canonical machine-readable error code, present when `status` is `failed` or `skipped`.
     attr_accessor :code
 
-    # Human-readable failure detail, present when `status` is `failed`.
+    # Human-readable detail, present when `status` is `failed` or `skipped`.
     attr_accessor :message
 
     # Carrier-specific errors, present when the carrier rejected the booking.
@@ -155,9 +155,9 @@ module Zippendo
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @shipment_id.nil?
       return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ["sent", "failed"])
+      status_validator = EnumAttributeValidator.new('String', ["sent", "failed", "skipped"])
       return false unless status_validator.valid?(@status)
-      code_validator = EnumAttributeValidator.new('String', ["INTERNAL_ERROR", "BAD_REQUEST", "VALIDATION_FAILED", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "CONFLICT", "RATE_LIMITED", "PAYLOAD_TOO_LARGE", "IMAGE_DIMENSIONS_EXCEEDED", "NOT_IMPLEMENTED", "AUTH_INVALID_CREDENTIALS", "AUTH_TOKEN_INVALID", "AUTH_TOKEN_EXPIRED", "AUTH_EMAIL_NOT_VERIFIED", "AUTH_EMAIL_EXISTS", "AUTH_OAUTH_FAILED", "AUTH_SIGNUP_NOT_ALLOWED", "AUTH_VERIFICATION_FAILED", "AUTH_RESET_TOKEN_INVALID", "AUTH_MFA_REQUIRED", "AUTH_MFA_INVALID_CODE", "AUTH_MFA_ALREADY_ENABLED", "AUTH_MFA_NOT_ENABLED", "SESSION_REQUIRED", "ORG_NOT_FOUND", "ORG_ACCESS_DENIED", "ORG_DISABLED", "ORG_SLUG_EXISTS", "BRAND_NOT_FOUND", "BRAND_ACCESS_DENIED", "BRAND_SLUG_EXISTS", "BRAND_HAS_RECORDS", "USER_NOT_FOUND", "USER_EXISTS", "TERMS_NOT_ACCEPTED", "MEMBER_NOT_FOUND", "MEMBER_SELF_BRAND_RESTRICTION", "ROLE_NOT_FOUND", "ROLE_NAME_EXISTS", "ROLE_IN_USE", "MEMBER_EXISTS", "INVITATION_NOT_FOUND", "INVITATION_EXPIRED", "INVITATION_ALREADY_SENT", "INVITATION_EMAIL_FAILED", "TOKEN_NOT_FOUND", "BILLING_PAYMENT_FAILED", "BILLING_NO_SUBSCRIPTION", "BILLING_TAX_ID_INVALID", "BILLING_PLAN_INVALID", "BILLING_OPERATION_FAILED", "FEATURE_NOT_AVAILABLE", "RESOURCE_LIMIT_REACHED", "PLAN_LIMITS_EXCEEDED", "NO_SUBSCRIPTION", "SUBSCRIPTION_INACTIVE", "BILLING_MANAGED_BY_SHOPIFY", "BILLING_CHECKOUT_REQUIRED", "ZIPPY_ADDON_REQUIRED", "SHIPMENT_NOT_FOUND", "SHIPMENT_DOCUMENT_NOT_FOUND", "SHIPMENT_ALREADY_SENT", "SHIPMENT_INVALID_STATE", "PARCEL_NOT_FOUND", "PARCEL_INVALID_SPLIT", "PICKUP_NOT_FOUND", "PICKUP_FAILED", "CARRIER_ERROR", "CARRIER_AUTH_FAILED", "CARRIER_NOT_FOUND", "CARRIER_PRODUCT_NOT_FOUND", "CARRIER_CONFIG_INVALID", "CARRIER_PARAMETER_INVALID", "CARRIER_SERVER_UNAVAILABLE", "CARRIER_GLS_WRONG_ADDRESS", "CARRIER_DAO_INVALID_POSTAL_CODE", "CARRIER_POSTNORD_BOOKING_FAILED", "CARRIER_FEDEX_BOOKING_FAILED", "CARRIER_DHL_EXPRESS_BOOKING_FAILED", "CARRIER_UPS_BOOKING_FAILED", "CARRIER_MATKAHUOLTO_BOOKING_FAILED", "CARRIER_TRACKING_WEBHOOK_REGISTRATION_FAILED", "CARRIER_CUSTOMS_UNSUPPORTED_PRODUCT", "CARRIER_CUSTOMS_INCOMPLETE", "CARRIER_REQUEST_NOT_FOUND", "CARRIER_REQUEST_LOCKED", "CARRIER_REQUEST_DISPATCH_FAILED", "SHIPPING_RULE_NOT_FOUND", "SHIPPING_RULE_INVALID", "ADDRESS_NOT_FOUND", "ORDER_NOT_FOUND", "ORDER_CHANNEL_NOT_FOUND", "ORDER_CHANNEL_CONFIG_INVALID", "INTEGRATION_NOT_CONFIGURED", "INSTALLATION_NOT_FOUND", "WEBHOOK_SIGNATURE_INVALID", "WEBHOOK_PAYLOAD_INVALID", "SHOPIFY_PENDING_INSTALL_NOT_FOUND", "SHOPIFY_PENDING_INSTALL_EXPIRED", "SHOP_ALREADY_CONNECTED", "SHOP_CLAIMED_BY_ANOTHER_ORG", "WOOCOMMERCE_CONNECT_FAILED", "WOOCOMMERCE_AUTH_STATE_INVALID", "CHECKOUT_TOKEN_INVALID", "ORDER_CHANNEL_TYPE_UNSUPPORTED", "PRINTER_NOT_FOUND", "PRINTER_OFFLINE", "PRINTER_AUTH_TIMEOUT", "PRINTER_JOB_NOT_FOUND", "ORG_INTEGRATION_NOT_FOUND", "ORG_WEBHOOK_NOT_FOUND", "AUTOMATION_NOT_FOUND", "AUTOMATION_INVALID", "ZIPPY_DISABLED", "CONVERSATION_NOT_FOUND", "ADMIN_FORBIDDEN", "JOB_HANDLER_NOT_REGISTERED", "JOB_QUEUE_NOT_CONFIGURED", "JOB_ENQUEUE_FAILED", "JOB_PAYLOAD_INVALID", "EMAIL_SEND_FAILED", "INTEGRATION_DELIVERY_FAILED", "WEBHOOK_DELIVERY_FAILED", "DOCUMENT_GENERATION_FAILED", "AI_UNAVAILABLE", "MIGRATION_PROVIDER_UNKNOWN", "MIGRATION_SOURCE_TOKEN_INVALID", "MIGRATION_SOURCE_UNREACHABLE", "MIGRATION_NOT_FOUND", "MIGRATION_IN_PROGRESS", "DATA_EXPORT_NOT_FOUND", "DATA_EXPORT_IN_PROGRESS", "DATA_EXPORT_NOT_READY", "DATA_EXPORT_EXPIRED", "DATA_EXPORT_FAILED"])
+      code_validator = EnumAttributeValidator.new('String', ["INTERNAL_ERROR", "BAD_REQUEST", "VALIDATION_FAILED", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "CONFLICT", "RATE_LIMITED", "PAYLOAD_TOO_LARGE", "IMAGE_DIMENSIONS_EXCEEDED", "NOT_IMPLEMENTED", "AUTH_INVALID_CREDENTIALS", "AUTH_TOKEN_INVALID", "AUTH_TOKEN_EXPIRED", "AUTH_EMAIL_NOT_VERIFIED", "AUTH_EMAIL_EXISTS", "AUTH_OAUTH_FAILED", "AUTH_SIGNUP_NOT_ALLOWED", "AUTH_VERIFICATION_FAILED", "AUTH_RESET_TOKEN_INVALID", "AUTH_MFA_REQUIRED", "AUTH_MFA_INVALID_CODE", "AUTH_MFA_ALREADY_ENABLED", "AUTH_MFA_NOT_ENABLED", "SESSION_REQUIRED", "ORG_NOT_FOUND", "ORG_ACCESS_DENIED", "ORG_DISABLED", "ORG_SLUG_EXISTS", "BRAND_NOT_FOUND", "BRAND_ACCESS_DENIED", "BRAND_SLUG_EXISTS", "BRAND_HAS_RECORDS", "USER_NOT_FOUND", "USER_EXISTS", "TERMS_NOT_ACCEPTED", "MEMBER_NOT_FOUND", "MEMBER_SELF_BRAND_RESTRICTION", "ROLE_NOT_FOUND", "ROLE_NAME_EXISTS", "ROLE_IN_USE", "MEMBER_EXISTS", "INVITATION_NOT_FOUND", "INVITATION_EXPIRED", "INVITATION_ALREADY_SENT", "INVITATION_EMAIL_FAILED", "TOKEN_NOT_FOUND", "BILLING_PAYMENT_FAILED", "BILLING_NO_SUBSCRIPTION", "BILLING_TAX_ID_INVALID", "BILLING_PLAN_INVALID", "BILLING_OPERATION_FAILED", "FEATURE_NOT_AVAILABLE", "RESOURCE_LIMIT_REACHED", "PLAN_LIMITS_EXCEEDED", "NO_SUBSCRIPTION", "SUBSCRIPTION_INACTIVE", "BILLING_MANAGED_BY_SHOPIFY", "BILLING_CHECKOUT_REQUIRED", "ZIPPY_ADDON_REQUIRED", "SHIPMENT_NOT_FOUND", "SHIPMENT_DOCUMENT_NOT_FOUND", "SHIPMENT_ALREADY_SENT", "SHIPMENT_INVALID_STATE", "SHIPMENT_SERVICE_POINT_REQUIRED", "SHIPMENT_SEND_NOT_ATTEMPTED", "PARCEL_NOT_FOUND", "PARCEL_INVALID_SPLIT", "PICKUP_NOT_FOUND", "PICKUP_FAILED", "CARRIER_ERROR", "CARRIER_AUTH_FAILED", "CARRIER_NOT_FOUND", "CARRIER_PRODUCT_NOT_FOUND", "CARRIER_CONFIG_INVALID", "CARRIER_PARAMETER_INVALID", "CARRIER_SERVER_UNAVAILABLE", "CARRIER_GLS_WRONG_ADDRESS", "CARRIER_DAO_INVALID_POSTAL_CODE", "CARRIER_POSTNORD_BOOKING_FAILED", "CARRIER_FEDEX_BOOKING_FAILED", "CARRIER_DHL_EXPRESS_BOOKING_FAILED", "CARRIER_UPS_BOOKING_FAILED", "CARRIER_MATKAHUOLTO_BOOKING_FAILED", "CARRIER_TRACKING_WEBHOOK_REGISTRATION_FAILED", "CARRIER_CUSTOMS_UNSUPPORTED_PRODUCT", "CARRIER_CUSTOMS_INCOMPLETE", "CARRIER_REQUEST_NOT_FOUND", "CARRIER_REQUEST_LOCKED", "CARRIER_REQUEST_DISPATCH_FAILED", "SHIPPING_RULE_NOT_FOUND", "SHIPPING_RULE_INVALID", "ADDRESS_NOT_FOUND", "ORDER_NOT_FOUND", "ORDER_CHANNEL_NOT_FOUND", "ORDER_CHANNEL_CONFIG_INVALID", "INTEGRATION_NOT_CONFIGURED", "INSTALLATION_NOT_FOUND", "WEBHOOK_SIGNATURE_INVALID", "WEBHOOK_PAYLOAD_INVALID", "SHOPIFY_PENDING_INSTALL_NOT_FOUND", "SHOPIFY_PENDING_INSTALL_EXPIRED", "SHOP_ALREADY_CONNECTED", "SHOP_CLAIMED_BY_ANOTHER_ORG", "WOOCOMMERCE_CONNECT_FAILED", "WOOCOMMERCE_AUTH_STATE_INVALID", "CHECKOUT_TOKEN_INVALID", "ORDER_CHANNEL_TYPE_UNSUPPORTED", "PRINTER_NOT_FOUND", "PRINTER_OFFLINE", "PRINTER_AUTH_TIMEOUT", "PRINTER_JOB_NOT_FOUND", "ORG_INTEGRATION_NOT_FOUND", "ORG_WEBHOOK_NOT_FOUND", "AUTOMATION_NOT_FOUND", "AUTOMATION_INVALID", "ZIPPY_DISABLED", "CONVERSATION_NOT_FOUND", "ADMIN_FORBIDDEN", "JOB_HANDLER_NOT_REGISTERED", "JOB_QUEUE_NOT_CONFIGURED", "JOB_ENQUEUE_FAILED", "JOB_PAYLOAD_INVALID", "EMAIL_SEND_FAILED", "INTEGRATION_DELIVERY_FAILED", "WEBHOOK_DELIVERY_FAILED", "DOCUMENT_GENERATION_FAILED", "AI_UNAVAILABLE", "MIGRATION_PROVIDER_UNKNOWN", "MIGRATION_SOURCE_TOKEN_INVALID", "MIGRATION_SOURCE_UNREACHABLE", "MIGRATION_NOT_FOUND", "MIGRATION_IN_PROGRESS", "DATA_EXPORT_NOT_FOUND", "DATA_EXPORT_IN_PROGRESS", "DATA_EXPORT_NOT_READY", "DATA_EXPORT_EXPIRED", "DATA_EXPORT_FAILED"])
       return false unless code_validator.valid?(@code)
       true
     end
@@ -175,7 +175,7 @@ module Zippendo
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ["sent", "failed"])
+      validator = EnumAttributeValidator.new('String', ["sent", "failed", "skipped"])
       unless validator.valid?(status)
         fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
       end
@@ -185,7 +185,7 @@ module Zippendo
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] code Object to be assigned
     def code=(code)
-      validator = EnumAttributeValidator.new('String', ["INTERNAL_ERROR", "BAD_REQUEST", "VALIDATION_FAILED", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "CONFLICT", "RATE_LIMITED", "PAYLOAD_TOO_LARGE", "IMAGE_DIMENSIONS_EXCEEDED", "NOT_IMPLEMENTED", "AUTH_INVALID_CREDENTIALS", "AUTH_TOKEN_INVALID", "AUTH_TOKEN_EXPIRED", "AUTH_EMAIL_NOT_VERIFIED", "AUTH_EMAIL_EXISTS", "AUTH_OAUTH_FAILED", "AUTH_SIGNUP_NOT_ALLOWED", "AUTH_VERIFICATION_FAILED", "AUTH_RESET_TOKEN_INVALID", "AUTH_MFA_REQUIRED", "AUTH_MFA_INVALID_CODE", "AUTH_MFA_ALREADY_ENABLED", "AUTH_MFA_NOT_ENABLED", "SESSION_REQUIRED", "ORG_NOT_FOUND", "ORG_ACCESS_DENIED", "ORG_DISABLED", "ORG_SLUG_EXISTS", "BRAND_NOT_FOUND", "BRAND_ACCESS_DENIED", "BRAND_SLUG_EXISTS", "BRAND_HAS_RECORDS", "USER_NOT_FOUND", "USER_EXISTS", "TERMS_NOT_ACCEPTED", "MEMBER_NOT_FOUND", "MEMBER_SELF_BRAND_RESTRICTION", "ROLE_NOT_FOUND", "ROLE_NAME_EXISTS", "ROLE_IN_USE", "MEMBER_EXISTS", "INVITATION_NOT_FOUND", "INVITATION_EXPIRED", "INVITATION_ALREADY_SENT", "INVITATION_EMAIL_FAILED", "TOKEN_NOT_FOUND", "BILLING_PAYMENT_FAILED", "BILLING_NO_SUBSCRIPTION", "BILLING_TAX_ID_INVALID", "BILLING_PLAN_INVALID", "BILLING_OPERATION_FAILED", "FEATURE_NOT_AVAILABLE", "RESOURCE_LIMIT_REACHED", "PLAN_LIMITS_EXCEEDED", "NO_SUBSCRIPTION", "SUBSCRIPTION_INACTIVE", "BILLING_MANAGED_BY_SHOPIFY", "BILLING_CHECKOUT_REQUIRED", "ZIPPY_ADDON_REQUIRED", "SHIPMENT_NOT_FOUND", "SHIPMENT_DOCUMENT_NOT_FOUND", "SHIPMENT_ALREADY_SENT", "SHIPMENT_INVALID_STATE", "PARCEL_NOT_FOUND", "PARCEL_INVALID_SPLIT", "PICKUP_NOT_FOUND", "PICKUP_FAILED", "CARRIER_ERROR", "CARRIER_AUTH_FAILED", "CARRIER_NOT_FOUND", "CARRIER_PRODUCT_NOT_FOUND", "CARRIER_CONFIG_INVALID", "CARRIER_PARAMETER_INVALID", "CARRIER_SERVER_UNAVAILABLE", "CARRIER_GLS_WRONG_ADDRESS", "CARRIER_DAO_INVALID_POSTAL_CODE", "CARRIER_POSTNORD_BOOKING_FAILED", "CARRIER_FEDEX_BOOKING_FAILED", "CARRIER_DHL_EXPRESS_BOOKING_FAILED", "CARRIER_UPS_BOOKING_FAILED", "CARRIER_MATKAHUOLTO_BOOKING_FAILED", "CARRIER_TRACKING_WEBHOOK_REGISTRATION_FAILED", "CARRIER_CUSTOMS_UNSUPPORTED_PRODUCT", "CARRIER_CUSTOMS_INCOMPLETE", "CARRIER_REQUEST_NOT_FOUND", "CARRIER_REQUEST_LOCKED", "CARRIER_REQUEST_DISPATCH_FAILED", "SHIPPING_RULE_NOT_FOUND", "SHIPPING_RULE_INVALID", "ADDRESS_NOT_FOUND", "ORDER_NOT_FOUND", "ORDER_CHANNEL_NOT_FOUND", "ORDER_CHANNEL_CONFIG_INVALID", "INTEGRATION_NOT_CONFIGURED", "INSTALLATION_NOT_FOUND", "WEBHOOK_SIGNATURE_INVALID", "WEBHOOK_PAYLOAD_INVALID", "SHOPIFY_PENDING_INSTALL_NOT_FOUND", "SHOPIFY_PENDING_INSTALL_EXPIRED", "SHOP_ALREADY_CONNECTED", "SHOP_CLAIMED_BY_ANOTHER_ORG", "WOOCOMMERCE_CONNECT_FAILED", "WOOCOMMERCE_AUTH_STATE_INVALID", "CHECKOUT_TOKEN_INVALID", "ORDER_CHANNEL_TYPE_UNSUPPORTED", "PRINTER_NOT_FOUND", "PRINTER_OFFLINE", "PRINTER_AUTH_TIMEOUT", "PRINTER_JOB_NOT_FOUND", "ORG_INTEGRATION_NOT_FOUND", "ORG_WEBHOOK_NOT_FOUND", "AUTOMATION_NOT_FOUND", "AUTOMATION_INVALID", "ZIPPY_DISABLED", "CONVERSATION_NOT_FOUND", "ADMIN_FORBIDDEN", "JOB_HANDLER_NOT_REGISTERED", "JOB_QUEUE_NOT_CONFIGURED", "JOB_ENQUEUE_FAILED", "JOB_PAYLOAD_INVALID", "EMAIL_SEND_FAILED", "INTEGRATION_DELIVERY_FAILED", "WEBHOOK_DELIVERY_FAILED", "DOCUMENT_GENERATION_FAILED", "AI_UNAVAILABLE", "MIGRATION_PROVIDER_UNKNOWN", "MIGRATION_SOURCE_TOKEN_INVALID", "MIGRATION_SOURCE_UNREACHABLE", "MIGRATION_NOT_FOUND", "MIGRATION_IN_PROGRESS", "DATA_EXPORT_NOT_FOUND", "DATA_EXPORT_IN_PROGRESS", "DATA_EXPORT_NOT_READY", "DATA_EXPORT_EXPIRED", "DATA_EXPORT_FAILED"])
+      validator = EnumAttributeValidator.new('String', ["INTERNAL_ERROR", "BAD_REQUEST", "VALIDATION_FAILED", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "CONFLICT", "RATE_LIMITED", "PAYLOAD_TOO_LARGE", "IMAGE_DIMENSIONS_EXCEEDED", "NOT_IMPLEMENTED", "AUTH_INVALID_CREDENTIALS", "AUTH_TOKEN_INVALID", "AUTH_TOKEN_EXPIRED", "AUTH_EMAIL_NOT_VERIFIED", "AUTH_EMAIL_EXISTS", "AUTH_OAUTH_FAILED", "AUTH_SIGNUP_NOT_ALLOWED", "AUTH_VERIFICATION_FAILED", "AUTH_RESET_TOKEN_INVALID", "AUTH_MFA_REQUIRED", "AUTH_MFA_INVALID_CODE", "AUTH_MFA_ALREADY_ENABLED", "AUTH_MFA_NOT_ENABLED", "SESSION_REQUIRED", "ORG_NOT_FOUND", "ORG_ACCESS_DENIED", "ORG_DISABLED", "ORG_SLUG_EXISTS", "BRAND_NOT_FOUND", "BRAND_ACCESS_DENIED", "BRAND_SLUG_EXISTS", "BRAND_HAS_RECORDS", "USER_NOT_FOUND", "USER_EXISTS", "TERMS_NOT_ACCEPTED", "MEMBER_NOT_FOUND", "MEMBER_SELF_BRAND_RESTRICTION", "ROLE_NOT_FOUND", "ROLE_NAME_EXISTS", "ROLE_IN_USE", "MEMBER_EXISTS", "INVITATION_NOT_FOUND", "INVITATION_EXPIRED", "INVITATION_ALREADY_SENT", "INVITATION_EMAIL_FAILED", "TOKEN_NOT_FOUND", "BILLING_PAYMENT_FAILED", "BILLING_NO_SUBSCRIPTION", "BILLING_TAX_ID_INVALID", "BILLING_PLAN_INVALID", "BILLING_OPERATION_FAILED", "FEATURE_NOT_AVAILABLE", "RESOURCE_LIMIT_REACHED", "PLAN_LIMITS_EXCEEDED", "NO_SUBSCRIPTION", "SUBSCRIPTION_INACTIVE", "BILLING_MANAGED_BY_SHOPIFY", "BILLING_CHECKOUT_REQUIRED", "ZIPPY_ADDON_REQUIRED", "SHIPMENT_NOT_FOUND", "SHIPMENT_DOCUMENT_NOT_FOUND", "SHIPMENT_ALREADY_SENT", "SHIPMENT_INVALID_STATE", "SHIPMENT_SERVICE_POINT_REQUIRED", "SHIPMENT_SEND_NOT_ATTEMPTED", "PARCEL_NOT_FOUND", "PARCEL_INVALID_SPLIT", "PICKUP_NOT_FOUND", "PICKUP_FAILED", "CARRIER_ERROR", "CARRIER_AUTH_FAILED", "CARRIER_NOT_FOUND", "CARRIER_PRODUCT_NOT_FOUND", "CARRIER_CONFIG_INVALID", "CARRIER_PARAMETER_INVALID", "CARRIER_SERVER_UNAVAILABLE", "CARRIER_GLS_WRONG_ADDRESS", "CARRIER_DAO_INVALID_POSTAL_CODE", "CARRIER_POSTNORD_BOOKING_FAILED", "CARRIER_FEDEX_BOOKING_FAILED", "CARRIER_DHL_EXPRESS_BOOKING_FAILED", "CARRIER_UPS_BOOKING_FAILED", "CARRIER_MATKAHUOLTO_BOOKING_FAILED", "CARRIER_TRACKING_WEBHOOK_REGISTRATION_FAILED", "CARRIER_CUSTOMS_UNSUPPORTED_PRODUCT", "CARRIER_CUSTOMS_INCOMPLETE", "CARRIER_REQUEST_NOT_FOUND", "CARRIER_REQUEST_LOCKED", "CARRIER_REQUEST_DISPATCH_FAILED", "SHIPPING_RULE_NOT_FOUND", "SHIPPING_RULE_INVALID", "ADDRESS_NOT_FOUND", "ORDER_NOT_FOUND", "ORDER_CHANNEL_NOT_FOUND", "ORDER_CHANNEL_CONFIG_INVALID", "INTEGRATION_NOT_CONFIGURED", "INSTALLATION_NOT_FOUND", "WEBHOOK_SIGNATURE_INVALID", "WEBHOOK_PAYLOAD_INVALID", "SHOPIFY_PENDING_INSTALL_NOT_FOUND", "SHOPIFY_PENDING_INSTALL_EXPIRED", "SHOP_ALREADY_CONNECTED", "SHOP_CLAIMED_BY_ANOTHER_ORG", "WOOCOMMERCE_CONNECT_FAILED", "WOOCOMMERCE_AUTH_STATE_INVALID", "CHECKOUT_TOKEN_INVALID", "ORDER_CHANNEL_TYPE_UNSUPPORTED", "PRINTER_NOT_FOUND", "PRINTER_OFFLINE", "PRINTER_AUTH_TIMEOUT", "PRINTER_JOB_NOT_FOUND", "ORG_INTEGRATION_NOT_FOUND", "ORG_WEBHOOK_NOT_FOUND", "AUTOMATION_NOT_FOUND", "AUTOMATION_INVALID", "ZIPPY_DISABLED", "CONVERSATION_NOT_FOUND", "ADMIN_FORBIDDEN", "JOB_HANDLER_NOT_REGISTERED", "JOB_QUEUE_NOT_CONFIGURED", "JOB_ENQUEUE_FAILED", "JOB_PAYLOAD_INVALID", "EMAIL_SEND_FAILED", "INTEGRATION_DELIVERY_FAILED", "WEBHOOK_DELIVERY_FAILED", "DOCUMENT_GENERATION_FAILED", "AI_UNAVAILABLE", "MIGRATION_PROVIDER_UNKNOWN", "MIGRATION_SOURCE_TOKEN_INVALID", "MIGRATION_SOURCE_UNREACHABLE", "MIGRATION_NOT_FOUND", "MIGRATION_IN_PROGRESS", "DATA_EXPORT_NOT_FOUND", "DATA_EXPORT_IN_PROGRESS", "DATA_EXPORT_NOT_READY", "DATA_EXPORT_EXPIRED", "DATA_EXPORT_FAILED"])
       unless validator.valid?(code)
         fail ArgumentError, "invalid value for \"code\", must be one of #{validator.allowable_values}."
       end

data/lib/zippendo/models/batch_send_shipments200_response_summary.rb

@@ -16,21 +16,25 @@ require 'time'
 module Zippendo
   # Aggregate counts for the batch.
   class BatchSendShipments200ResponseSummary < ApiModelBase
-    # Number of unique shipments processed.
+    # Number of unique shipments requested.
     attr_accessor :total
 
     # How many were successfully booked.
     attr_accessor :sent
 
-    # How many failed.
+    # How many the carrier or Zippendo rejected.
     attr_accessor :failed
 
+    # How many the batch ran out of time to attempt. Submit these again.
+    attr_accessor :skipped
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'total' => :'total',
         :'sent' => :'sent',
-        :'failed' => :'failed'
+        :'failed' => :'failed',
+        :'skipped' => :'skipped'
       }
     end
 
@@ -49,7 +53,8 @@ module Zippendo
       {
         :'total' => :'Integer',
         :'sent' => :'Integer',
-        :'failed' => :'Integer'
+        :'failed' => :'Integer',
+        :'skipped' => :'Integer'
       }
     end
 
@@ -92,6 +97,12 @@ module Zippendo
       else
         self.failed = nil
       end
+
+      if attributes.key?(:'skipped')
+        self.skipped = attributes[:'skipped']
+      else
+        self.skipped = nil
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -135,6 +146,18 @@ module Zippendo
         invalid_properties.push('invalid value for "failed", must be greater than or equal to -9007199254740991.')
       end
 
+      if @skipped.nil?
+        invalid_properties.push('invalid value for "skipped", skipped cannot be nil.')
+      end
+
+      if @skipped > 9007199254740991
+        invalid_properties.push('invalid value for "skipped", must be smaller than or equal to 9007199254740991.')
+      end
+
+      if @skipped < -9007199254740991
+        invalid_properties.push('invalid value for "skipped", must be greater than or equal to -9007199254740991.')
+      end
+
       invalid_properties
     end
 
@@ -151,6 +174,9 @@ module Zippendo
       return false if @failed.nil?
       return false if @failed > 9007199254740991
       return false if @failed < -9007199254740991
+      return false if @skipped.nil?
+      return false if @skipped > 9007199254740991
+      return false if @skipped < -9007199254740991
       true
     end
 
@@ -208,6 +234,24 @@ module Zippendo
       @failed = failed
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] skipped Value to be assigned
+    def skipped=(skipped)
+      if skipped.nil?
+        fail ArgumentError, 'skipped cannot be nil'
+      end
+
+      if skipped > 9007199254740991
+        fail ArgumentError, 'invalid value for "skipped", must be smaller than or equal to 9007199254740991.'
+      end
+
+      if skipped < -9007199254740991
+        fail ArgumentError, 'invalid value for "skipped", must be greater than or equal to -9007199254740991.'
+      end
+
+      @skipped = skipped
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -215,7 +259,8 @@ module Zippendo
       self.class == o.class &&
           total == o.total &&
           sent == o.sent &&
-          failed == o.failed
+          failed == o.failed &&
+          skipped == o.skipped
     end
 
     # @see the `==` method
@@ -227,7 +272,7 @@ module Zippendo
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [total, sent, failed].hash
+      [total, sent, failed, skipped].hash
     end
 
     # Builds the object from hash

data/lib/zippendo/models/create_shipment201_response_parcels_inner_order_lines_inner.rb

@@ -18,7 +18,7 @@ module Zippendo
     # Unique order line identifier.
     attr_accessor :id
 
-    # Stock keeping unit of the product.
+    # Stock keeping unit of the product. Optional — not every webshop assigns SKUs.
     attr_accessor :sku
 
     # Number of units in this order line.
@@ -90,6 +90,7 @@ module Zippendo
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'sku',
         :'description',
         :'unit_price',
         :'currency',
@@ -121,8 +122,6 @@ module Zippendo
 
       if attributes.key?(:'sku')
         self.sku = attributes[:'sku']
-      else
-        self.sku = nil
       end
 
       if attributes.key?(:'quantity')
@@ -165,11 +164,7 @@ module Zippendo
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @sku.nil?
-        invalid_properties.push('invalid value for "sku", sku cannot be nil.')
-      end
-
-      if @sku.to_s.length < 1
+      if !@sku.nil? && @sku.to_s.length < 1
         invalid_properties.push('invalid value for "sku", the character length must be greater than or equal to 1.')
       end
 
@@ -220,8 +215,7 @@ module Zippendo
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @sku.nil?
-      return false if @sku.to_s.length < 1
+      return false if !@sku.nil? && @sku.to_s.length < 1
       return false if @quantity.nil?
       return false if @quantity > 9007199254740991
       return false if @quantity < 1
@@ -238,11 +232,7 @@ module Zippendo
     # Custom attribute writer method with validation
     # @param [Object] sku Value to be assigned
     def sku=(sku)
-      if sku.nil?
-        fail ArgumentError, 'sku cannot be nil'
-      end
-
-      if sku.to_s.length < 1
+      if !sku.nil? && sku.to_s.length < 1
         fail ArgumentError, 'invalid value for "sku", the character length must be greater than or equal to 1.'
       end
 

data/lib/zippendo/models/create_shipment_request.rb

@@ -52,6 +52,11 @@ module Zippendo
     # Printer to assign for documents.
     attr_accessor :document_printer_id
 
+    # Create the shipment from this shipping rule: carrier settings and the sender address derive from the rule (explicit carrierSettings and addressId are then ignored).
+    attr_accessor :shipping_rule_id
+
+    attr_accessor :droppoint
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -89,7 +94,9 @@ module Zippendo
         :'status' => :'status',
         :'order_id' => :'orderId',
         :'label_printer_id' => :'labelPrinterId',
-        :'document_printer_id' => :'documentPrinterId'
+        :'document_printer_id' => :'documentPrinterId',
+        :'shipping_rule_id' => :'shippingRuleId',
+        :'droppoint' => :'droppoint'
       }
     end
 
@@ -118,7 +125,9 @@ module Zippendo
         :'status' => :'String',
         :'order_id' => :'String',
         :'label_printer_id' => :'String',
-        :'document_printer_id' => :'String'
+        :'document_printer_id' => :'String',
+        :'shipping_rule_id' => :'String',
+        :'droppoint' => :'CreateShipmentRequestDroppoint'
       }
     end
 
@@ -130,7 +139,7 @@ module Zippendo
         :'pickup_details',
         :'order_id',
         :'label_printer_id',
-        :'document_printer_id'
+        :'document_printer_id',
       ])
     end
 
@@ -176,8 +185,6 @@ module Zippendo
 
       if attributes.key?(:'carrier_settings')
         self.carrier_settings = attributes[:'carrier_settings']
-      else
-        self.carrier_settings = nil
       end
 
       if attributes.key?(:'parcels')
@@ -213,6 +220,14 @@ module Zippendo
       if attributes.key?(:'document_printer_id')
         self.document_printer_id = attributes[:'document_printer_id']
       end
+
+      if attributes.key?(:'shipping_rule_id')
+        self.shipping_rule_id = attributes[:'shipping_rule_id']
+      end
+
+      if attributes.key?(:'droppoint')
+        self.droppoint = attributes[:'droppoint']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -232,10 +247,6 @@ module Zippendo
         invalid_properties.push('invalid value for "type", type cannot be nil.')
       end
 
-      if @carrier_settings.nil?
-        invalid_properties.push('invalid value for "carrier_settings", carrier_settings cannot be nil.')
-      end
-
       if !@parcels.nil? && @parcels.length < 1
         invalid_properties.push('invalid value for "parcels", number of items must be greater than or equal to 1.')
       end
@@ -252,7 +263,6 @@ module Zippendo
       return false if @type.nil?
       type_validator = EnumAttributeValidator.new('String', ["outbound", "inbound"])
       return false unless type_validator.valid?(@type)
-      return false if @carrier_settings.nil?
       return false if !@parcels.nil? && @parcels.length < 1
       status_validator = EnumAttributeValidator.new('String', ["draft", "pending", "processing", "dispatched", "partly_dispatched", "error", "cancelled", "on_hold"])
       return false unless status_validator.valid?(@status)
@@ -297,16 +307,6 @@ module Zippendo
       @type = type
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] carrier_settings Value to be assigned
-    def carrier_settings=(carrier_settings)
-      if carrier_settings.nil?
-        fail ArgumentError, 'carrier_settings cannot be nil'
-      end
-
-      @carrier_settings = carrier_settings
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] parcels Value to be assigned
     def parcels=(parcels)
@@ -348,7 +348,9 @@ module Zippendo
           status == o.status &&
           order_id == o.order_id &&
           label_printer_id == o.label_printer_id &&
-          document_printer_id == o.document_printer_id
+          document_printer_id == o.document_printer_id &&
+          shipping_rule_id == o.shipping_rule_id &&
+          droppoint == o.droppoint
     end
 
     # @see the `==` method
@@ -360,7 +362,7 @@ module Zippendo
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [reference, address_id, service_point_id, parties, type, carrier_settings, parcels, pickup_details, term_of_trade, status, order_id, label_printer_id, document_printer_id].hash
+      [reference, address_id, service_point_id, parties, type, carrier_settings, parcels, pickup_details, term_of_trade, status, order_id, label_printer_id, document_printer_id, shipping_rule_id, droppoint].hash
     end
 
     # Builds the object from hash