diff --git a/ShippingProAPICollection/Provider/DPD/DPDShipmentRequestModel.cs b/ShippingProAPICollection/Provider/DPD/DPDShipmentRequestModel.cs index 229a73a..d1819de 100644 --- a/ShippingProAPICollection/Provider/DPD/DPDShipmentRequestModel.cs +++ b/ShippingProAPICollection/Provider/DPD/DPDShipmentRequestModel.cs @@ -59,9 +59,7 @@ internal override bool IsExpress() public override void Validate() { - if (Weight <= 0) throw new ShipmentRequestWeightException(1, MaxPackageWeight, 0); - if (LabelCount == 1 && Weight > MaxPackageWeight) throw new ShipmentRequestWeightException(1, MaxPackageWeight, Weight); - if (Weight / LabelCount > MaxPackageWeight) throw new ShipmentRequestWeightException(1, MaxPackageWeight, Weight / LabelCount); + base.Validate(); if (!Note1.RangeLenghtValidation(0, 70)) throw new ShipmentRequestNoValidStringLengthException("Note1", null, 70); if (!Adressline1.RangeLenghtValidation(1, 35)) throw new ShipmentRequestNoValidStringLengthException("Adressline1", 1, 35); diff --git a/ShippingProAPICollection/Provider/RequestShipmentBase.cs b/ShippingProAPICollection/Provider/RequestShipmentBase.cs index 8a333ae..93cb7f4 100644 --- a/ShippingProAPICollection/Provider/RequestShipmentBase.cs +++ b/ShippingProAPICollection/Provider/RequestShipmentBase.cs @@ -161,8 +161,7 @@ public virtual void Validate() if (Country.Length != 2) throw new ShipmentRequestNoValidStringLengthException("Country", 2, 2); if (Weight <= 0) throw new ShipmentRequestWeightException(1, MaxPackageWeight, 0); - if (LabelCount == 1 && Weight > MaxPackageWeight) throw new ShipmentRequestWeightException(1, MaxPackageWeight, Weight); - if (Weight / LabelCount > MaxPackageWeight) throw new ShipmentRequestWeightException(1, MaxPackageWeight, Weight / LabelCount); + if (GetPackageWeight() > MaxPackageWeight) throw new ShipmentRequestWeightException(1, MaxPackageWeight, Weight / LabelCount); } ///