Merge pull request #943 from Tria-plc/freight_feature/usermanagement

changes

apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/total.ts

@@ -128,7 +128,10 @@ export function computeGlShipmentTotal(
     const qty = q.bulkQuantity;
     const rate =
       rateFor(
-        (i) => (i.unit === "per_ton" || i.unit === "per_item") && !i.isClearance,
+        (i) =>
+          (i.unit === "per_ton" || i.unit === "per_item") &&
+          !i.isClearance &&
+          !i.conditionalOn,
       ) ?? items[0];
     if (rate && qty > 0) {
       lines.push({
@@ -165,6 +168,23 @@ export function computeGlShipmentTotal(
     }
   }
 
+  // Lashing / cargo securing — bulk-only, applies whenever the contract shows
+  // it (the commodity needs lashing). Per-ton scales by tonnage; per-wagon
+  // depends on the wagon capacity the train stocks — shown at real pricing.
+  const lashing = items.find((i) => i.conditionalOn === "has_lashing");
+  if (lashing && lashing.unit === "per_ton") {
+    const tons = q.bulkQuantity;
+    if (tons > 0) {
+      lines.push({
+        label: lashing.label,
+        unitPrice: lashing.unitPrice,
+        unit: lashing.unit,
+        quantity: tons,
+        amount: lashing.unitPrice * tons,
+      });
+    }
+  }
+
   // Customs clearance service fee — billed on the booking invoice with the
   // freight. Container fees estimate per size (per box, or per wagon: two 20ft
   // share one); bulk per-ton scales by tonnage. Bulk per-wagon fees depend on

apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx

@@ -213,6 +213,7 @@ const RuleEngineFormDialog = ({
       // and the legal units (container → per box/wagon, bulk → per ton/wagon).
       if (name === "cargoKind") {
         next.containerTypeId = "";
+        next.cargoTypeId = "";
         next.rateUnit = "";
       }
       return next;
@@ -339,6 +340,10 @@ const RuleEngineFormDialog = ({
           value={resolveSelectValue(field, values)}
           onChange={(v) => setField(field.name, v === RULE_ENGINE_SELECT_NONE ? "" : v)}
           disabled={selectOptionsLoading}
+          // Native required blocks submit while a mandatory select is empty —
+          // without it the form posts and the API 400s (e.g. a container
+          // customs/lashing rate with no container type picked).
+          required={field.required}
           data={options
             .filter((opt) => opt.value !== "")
             .map((opt) => ({