Merge branch 'main' into 3.0.0

Author: AndrewBenzSW

CHANGELOG.md

@@ -173,6 +173,43 @@ Fixed handling of No Content responses
   multiple modifiers to be added. For example, a modifier could be added at the global level that applies to all requests and then
   another modifier can be added for a single request.
 
+## 2.3.1
+
+### Added
+
+- Added license number, invoice number, and certificate number to advanced options
+
+## 2.3.2
+
+### Added
+
+- Added funding_source and parcelguard to insurance provider enumeration
+
+## 2.3.3
+
+### Changed
+
+- update System.Text.Json to latest version 8.0.5
+
+## 2.3.4
+
+### Added
+
+- Added error code MultipackageNotSupported
+
+## 2.3.5
+
+### Added
+
+- Added error code FundingSourceMissingConfiguration
+- Added error code FundingSourceError
+
+## 2.3.6
+
+### Added
+
+- Added SP code TrackingStatusCode
+
 ## 3.0.0-beta.1
 
 ### Added
@@ -249,4 +286,4 @@ Fixed handling of No Content responses
 
 ### Updated
 
-- Marked v2 methods as obsolete
+- Marked v2 methods as obsolete

ShipEngineSDK/Enums/ErrorCode.cs

@@ -261,5 +261,23 @@ public enum ErrorCode
         /// </summary>
         [EnumMember(Value = "webhook_event_type_conflict")]
         WebhookEventTypeConflict,
+
+        /// <summary>
+        /// Funding source isnt properly configured and can't be used.
+        /// </summary>
+        [EnumMember(Value = "funding_source_missing_configuration")]
+        FundingSourceMissingConfiguration,
+
+        /// <summary>
+        /// There was an unexpected problem with a funding source.
+        /// </summary>
+        [EnumMember(Value = "funding_source_error")]
+        FundingSourceError,
+        
+        /// <summary>
+        /// The attempted operation does not support multiple packages.
+        /// </summary>
+        [EnumMember(Value = "multipackage_not_supported")]
+        MultipackageNotSupported,
     }
 }

ShipEngineSDK/Enums/ErrorType.cs

@@ -41,6 +41,18 @@ public enum ErrorType
         /// An unknown or unexpected error occurred in our system. Or an error occurred that has not yet been assigned a specific error_type. If you receive persistent system errors, then please contact our support or check our API status page to see if there's a known issue.
         /// </summary>/
         [EnumMember(Value = "system")]
-        System
+        System,
+
+        /// <summary>
+        /// General wallet error type.
+        /// </summary>/
+        [EnumMember(Value = "wallet")]
+        Wallet,
+
+        /// <summary>
+        /// General funding sources error type.
+        /// </summary>/
+        [EnumMember(Value = "funding_sources")]
+        FundingSources
     }
 }

ShipEngineSDK/Models/Dto/Common/AdvancedShipmentOptions.cs

@@ -100,13 +100,28 @@ public class AdvancedShipmentOptions
         public OriginType? OriginType { get; set; }
 
         /// <summary>
-        /// Indicates if this is a shipper relesae
+        /// Indicates if this is a shipper release
         /// </summary>
         public bool? ShipperRelease { get; set; }
 
         /// <summary>
         /// Defer payment until package is delivered, instead of when it is ordered.
         /// </summary>
         public CollectOnDelivery? CollectOnDelivery { get; set; }
+
+        /// <summary>
+        /// License number for customs declaration
+        /// </summary>
+        public string? LicenseNumber { get; set; }
+
+        /// <summary>
+        /// Invoice number for customs declaration
+        /// </summary>
+        public string? InvoiceNumber { get; set; }
+
+        /// <summary>
+        /// Certificate number for customs declaration
+        /// </summary>
+        public string? CertificateNumber { get; set; }
     }
 }

ShipEngineSDK/Models/Dto/Common/Enums/InsuranceProvider.cs

@@ -29,6 +29,18 @@ public enum InsuranceProvider
         /// The package is insured by a third-party insurance service, outside of ShipEngine.
         /// </summary>
         [EnumMember(Value = "third_party")]
-        ThirdParty
+        ThirdParty,
+
+        /// <summary>
+        /// This option will assign the insurance provider available with ShipEngine Carriers to the shipment (currently ParcelGuard). The response will auto-populate the insurance_provider field with parcelguard.
+        /// </summary>
+        [EnumMember(Value = "funding_source")]
+        FundingSource,
+
+        /// <summary>
+        /// This option will assign ParcelGuard as the insurance provider for the shipment. Using this value is functionally the same as using the 'funding_source' value.
+        /// </summary>
+        [EnumMember(Value = "parcelguard")]
+        ParcelGuard
     }
 }

ShipEngineSDK/Models/Dto/Common/Enums/TrackingStatusCode.cs

@@ -52,7 +52,13 @@ public enum TrackingStatusCode
         /// Not Yet In System
         /// </summary>
         [EnumMember(Value = "NY")]
-        NY
+        NY,
+
+        /// <summary>
+        /// Delivered To The Collection Location
+        /// </summary>
+        [EnumMember(Value = "SP")]
+        SP
 
     }
 }

ShipEngineSDK/PublicAPI.Shipped.txt

@@ -857,6 +857,7 @@ ShipEngineSDK.ErrorCode.InvalidStatus = 20 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.InvalidStringLength = 21 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.LabelImagesNotSupported = 22 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.MeterFailure = 23 -> ShipEngineSDK.ErrorCode
+ShipEngineSDK.ErrorCode.MultipackageNotSupported = 39 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.NoRatesReturned = 25 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.NotFound = 24 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.RateLimitExceeded = 26 -> ShipEngineSDK.ErrorCode
@@ -872,6 +873,8 @@ ShipEngineSDK.ErrorCode.Unspecified = 35 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.VerificationFailure = 36 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.WarehouseConflict = 37 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorCode.WebhookEventTypeConflict = 38 -> ShipEngineSDK.ErrorCode
+ShipEngineSDK.ErrorCode.FundingSourceMissingConfiguration = 39 -> ShipEngineSDK.ErrorCode
+ShipEngineSDK.ErrorCode.FundingSourceError = 40 -> ShipEngineSDK.ErrorCode
 ShipEngineSDK.ErrorSource
 ShipEngineSDK.ErrorSource.Carrier = 1 -> ShipEngineSDK.ErrorSource
 ShipEngineSDK.ErrorSource.OrderSource = 2 -> ShipEngineSDK.ErrorSource
@@ -1592,4 +1595,4 @@ virtual ShipEngineSDK.ShipEngineMock.VoidLabelWithLabelId(string! labelId, ShipE
 ~ShipEngineSDK.ValidateAddresses.Result.NormalizedAddress.get -> ShipEngineSDK.Common.Address
 ~ShipEngineSDK.ValidateAddresses.Result.NormalizedAddress.set -> void
 ~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.get -> ShipEngineSDK.Common.Address
-~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.set -> void
+~ShipEngineSDK.ValidateAddresses.Result.OriginalAddress.set -> void

ShipEngineSDK/PublicAPI.Unshipped.txt

@@ -433,6 +433,8 @@ ShipEngineSDK.Enums.ErrorCode.Unspecified = 35 -> ShipEngineSDK.Enums.ErrorCode
 ShipEngineSDK.Enums.ErrorCode.VerificationFailure = 36 -> ShipEngineSDK.Enums.ErrorCode
 ShipEngineSDK.Enums.ErrorCode.WarehouseConflict = 37 -> ShipEngineSDK.Enums.ErrorCode
 ShipEngineSDK.Enums.ErrorCode.WebhookEventTypeConflict = 38 -> ShipEngineSDK.Enums.ErrorCode
+ShipEngineSDK.Enums.ErrorCode.FundingSourceMissingConfiguration = 39 -> ShipEngineSDK.Enums.ErrorCode
+ShipEngineSDK.Enums.ErrorCode.FundingSourceError = 40 -> ShipEngineSDK.Enums.ErrorCode
 ShipEngineSDK.Enums.ErrorSource
 ShipEngineSDK.Enums.ErrorSource.Carrier = 1 -> ShipEngineSDK.Enums.ErrorSource
 ShipEngineSDK.Enums.ErrorSource.OrderSource = 2 -> ShipEngineSDK.Enums.ErrorSource
@@ -5532,6 +5534,8 @@ static ShipEngineSDK.Model.ErrorCode.Unspecified.get -> ShipEngineSDK.Model.Erro
 static ShipEngineSDK.Model.ErrorCode.VerificationFailure.get -> ShipEngineSDK.Model.ErrorCode!
 static ShipEngineSDK.Model.ErrorCode.WarehouseConflict.get -> ShipEngineSDK.Model.ErrorCode!
 static ShipEngineSDK.Model.ErrorCode.WebhookEventTypeConflict.get -> ShipEngineSDK.Model.ErrorCode!
+static ShipEngineSDK.Model.ErrorCode.FundingSourceMissingConfiguration.get -> ShipEngineSDK.Model.ErrorCode!
+static ShipEngineSDK.Model.ErrorCode.FundingSourceError.get -> ShipEngineSDK.Model.ErrorCode!
 static ShipEngineSDK.Model.ErrorSource.Carrier.get -> ShipEngineSDK.Model.ErrorSource!
 static ShipEngineSDK.Model.ErrorSource.OrderSource.get -> ShipEngineSDK.Model.ErrorSource!
 static ShipEngineSDK.Model.ErrorSource.Shipengine.get -> ShipEngineSDK.Model.ErrorSource!

generation/swagger.json

@@ -5665,7 +5665,9 @@
           "validation",
           "security",
           "system",
-          "integrations"
+          "integrations",
+          "wallet",
+          "funding_sources"
         ],
         "description": "The type of error\n"
       },

openapitools.json

@@ -14,7 +14,7 @@
         "ignoreFileOverride": "./.openapi-generator-ignore",
         "library": "generichost",
         "additionalProperties": {
-          "packageVersion": "3.0.0-beta.14",
+          "packageVersion": "3.0.0-beta.17",
           "targetFramework": "netstandard2.0",
           "validatable": false,
           "sourceFolder": "",