Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix gl steps
This commit is contained in:
marshal
2026-07-29 10:33:03 +03:00
committed by GitHub
parent edc6439216 f6e363cd6f
commit fe79c2442c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/edr-freight-api/src/seed/freight-permissions.registry.ts
View File

@@ -142,7 +142,7 @@ const ruleEngineCrudId = (
): string => { ): string => {
const n = const n =
RULE_ENGINE_RESOURCE_SLUGS.indexOf(slug) * 3 + RULE_ENGINE_RESOURCE_SLUGS.indexOf(slug) * 3 +
RULE_ENGINE_CRUD_ACTIONS.indexOf(action) + RULE_ENGINE_CRUD_ACTIONS.indexOf(action) +
1; // 1..36 1; // 1..36
return `b2000002-0001-4000-8000-${n.toString(16).padStart(12, '0')}`; return `b2000002-0001-4000-8000-${n.toString(16).padStart(12, '0')}`;
}; };

6
apps/edr-freight-web/backoffice/src/components/contracts/PhasedClearanceActionPanel.tsx
View File

@@ -476,7 +476,7 @@ export function PhasedClearanceActionPanel({
description="Advise amount and attach notice" description="Advise amount and attach notice"
icon={<Receipt size={14} />} icon={<Receipt size={14} />}
> >
{showEt && canEt && activeStep === 3 ? ( {showEt && canEt && activeStep === 4 ? (
<DutyStep <DutyStep
entityId={entityId} entityId={entityId}
isBooking={isBooking} isBooking={isBooking}
@@ -538,7 +538,7 @@ export function PhasedClearanceActionPanel({
{showEt && {showEt &&
canEt && canEt &&
!bookingCreated && !bookingCreated &&
(activeStep >= 5 || (activeStep >= 6 ||
isMilestoneDone(clearance.milestones, "TRANSIT_PERMIT_UPLOADED")) ? ( isMilestoneDone(clearance.milestones, "TRANSIT_PERMIT_UPLOADED")) ? (
<TransitPermitStep <TransitPermitStep
entityId={entityId} entityId={entityId}
@@ -582,7 +582,7 @@ export function PhasedClearanceActionPanel({
description="Hand off to GL Djibouti" description="Hand off to GL Djibouti"
icon={<PackageCheck size={14} />} icon={<PackageCheck size={14} />}
> >
{showEt && canEt && activeStep === 6 ? ( {showEt && canEt && activeStep === 7 ? (
<FinalizePreClearanceStep <FinalizePreClearanceStep
entityId={entityId} entityId={entityId}
isBooking={isBooking} isBooking={isBooking}