diff --git a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts index 38e1f9104..9190316cd 100644 --- a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts +++ b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts @@ -142,7 +142,7 @@ const ruleEngineCrudId = ( ): string => { const n = RULE_ENGINE_RESOURCE_SLUGS.indexOf(slug) * 3 + - RULE_ENGINE_CRUD_ACTIONS.indexOf(action) + + RULE_ENGINE_CRUD_ACTIONS.indexOf(action) + 1; // 1..36 return `b2000002-0001-4000-8000-${n.toString(16).padStart(12, '0')}`; }; diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx index 5583e6662..88074735b 100644 --- a/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx +++ b/apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx @@ -476,7 +476,7 @@ export function PhasedClearanceActionPanel({ description="Advise amount and attach notice" icon={} > - {showEt && canEt && activeStep === 3 ? ( + {showEt && canEt && activeStep === 4 ? ( = 5 || + (activeStep >= 6 || isMilestoneDone(clearance.milestones, "TRANSIT_PERMIT_UPLOADED")) ? ( } > - {showEt && canEt && activeStep === 6 ? ( + {showEt && canEt && activeStep === 7 ? (