Use E12 for same-country and CLASSIC for international shipping

#5637
metasfresh · Nov 15, 2019 · d35b3b1 · d35b3b1
1 parent f82833e
commit d35b3b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/....gateway.dpd/src/main/java/de/metas/shipper/gateway/dpd/DpdDraftDeliveryOrderCreator.java b/....gateway.dpd/src/main/java/de/metas/shipper/gateway/dpd/DpdDraftDeliveryOrderCreator.java
@@ -109,7 +109,17 @@ public DeliveryOrder createDraftDeliveryOrder(@NonNull final CreateDraftDelivery
 		final ShipperId shipperId = deliveryOrderKey.getShipperId();
 		final ShipperTransportationId shipperTransportationId = deliveryOrderKey.getShipperTransportationId();
 
-		final DpdServiceType serviceType = DpdServiceType.DPD_CLASSIC;
+		final DpdServiceType serviceType;
+		if (pickupFromLocation.getC_Country_ID() == deliverToLocation.getC_Country_ID())
+		{
+			// inside same country we want "next-day" delivery
+			serviceType = DpdServiceType.DPD_E12;
+		}
+		else
+		{
+			// international shipping only works with classic delivery (or express)
+			serviceType = DpdServiceType.DPD_CLASSIC;
+		}
 
 		final DpdOrderCustomDeliveryData customDeliveryData = DpdOrderCustomDeliveryData.builder()
 				.orderType(DpdOrderType.CONSIGNMENT)
@@ -144,7 +154,6 @@ public DeliveryOrder createDraftDeliveryOrder(@NonNull final CreateDraftDelivery
 				timeFrom,
 				timeTo,
 				deliverToBPartner,
-				deliverToBPartnerLocationId,
 				deliverToLocation,
 				deliverToPhoneNumber,
 				serviceType,
@@ -176,7 +185,6 @@ DeliveryOrder createDeliveryOrderFromParams(
 			@NonNull final LocalTime timeFrom,
 			@NonNull final LocalTime timeTo,
 			@NonNull final I_C_BPartner deliverToBPartner,
-			final int deliverToBPartnerLocationId,
 			@NonNull final I_C_Location deliverToLocation,
 			@Nullable final String deliverToPhoneNumber,
 			@NonNull final ServiceType serviceType,

diff --git a/de.metas.shipper.gateway.dpd/src/test/java/de/metas/shipper/gateway/dpd/DpdTestHelper.java b/de.metas.shipper.gateway.dpd/src/test/java/de/metas/shipper/gateway/dpd/DpdTestHelper.java
@@ -403,7 +403,6 @@ private DeliveryOrder createDraftDeliveryOrderFromDummy(@NonNull final DeliveryO
 		//noinspection deprecation,ConstantConditions
 		deliverToBPartner.setEMail(deliveryOrder.getDeliveryContact().getEmailAddress());
 		final I_C_Location deliverToLocation = ShipperTestHelper.createLocation(deliveryOrder.getDeliveryAddress());
-		final int deliverToBPartnerLocationId = 0;
 		final String deliverToPhoneNumber = deliveryOrder.getDeliveryContact().getSimplePhoneNumber();
 
 		//
@@ -427,7 +426,6 @@ private DeliveryOrder createDraftDeliveryOrderFromDummy(@NonNull final DeliveryO
 				timeFrom,
 				timeTo,
 				deliverToBPartner,
-				deliverToBPartnerLocationId,
 				deliverToLocation,
 				deliverToPhoneNumber,
 				detectedServiceType,