Merge pull request #179 from akretion/geodis-manage-contract-condition

florian-dacosta · web-flow · commit ec2e8519c2bd · 2024-10-23T15:57:21.000+02:00
[IMP] Allow to specify contract condition for Geodis EDI (Particulier / Entreprise)
diff --git a/roulier/carriers/geodis_fr/edi/api.py b/roulier/carriers/geodis_fr/edi/api.py
@@ -131,6 +131,13 @@ def _shipments(self):
                 "required": False,
                 # 'description': """7085 : Notify recipient by M(ail), S(ms), P(=M+S)"""
             },
+            # Contract and condition : particular/pro
+            # when empty it is kind of computed by geodis sytem depending on option
+            "contractCondition": {
+                "type": "string",
+                "required": False,
+                "allowed": ["P", "E"],
+            },
             "shippingId": {
                 "type": "string",
                 "default": "",
diff --git a/roulier/carriers/geodis_fr/edi/encoder.py b/roulier/carriers/geodis_fr/edi/encoder.py
@@ -28,7 +28,7 @@ def encode_shipment(self, shipment, service, idx):
             ["CNI", "%s" % idx, shipment["shippingId"]],
             [
                 "TSR",
-                "2",  # 4065
+                shipment.get("contractCondition", ""),
                 [shipment["product"], "", "", shipment["productOption"]],  # 7273
                 shipment["productPriority"],  # 4219
                 shipment["notifications"],  # 7085 : M, S, P

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def encode_shipment(self, shipment, service, idx):`
`28`	`28`	`["CNI", "%s" % idx, shipment["shippingId"]],`
`29`	`29`	`[`
`30`	`30`	`"TSR",`
`31`		`- "2", # 4065`
	`31`	`+ shipment.get("contractCondition", ""),`
`32`	`32`	`[shipment["product"], "", "", shipment["productOption"]], # 7273`
`33`	`33`	`shipment["productPriority"], # 4219`
`34`	`34`	`shipment["notifications"], # 7085 : M, S, P`