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

Merge pull request #366 from Tria-plc/freight/hot_fix

Browse Source 
Freight/hot fix
This commit is contained in:
yaschalew10
2026-06-30 06:48:41 +03:00
committed by GitHub
parent 524d10d004 b142552f17
commit dc4d1c2ac0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/edr-freight-api/src/modules/first-mile/entities/first-mile.entity.ts
View File

@@ -35,8 +35,9 @@ export class FirstMile extends BaseEntity {
@Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 }) @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
remainingPayment!: number; remainingPayment!: number;
@Column({ type: 'boolean', default: false }) // TODO: uncomment after migration creates column
isPostPaymentCompleted!: boolean; // @Column({ type: 'boolean', default: false })
// isPostPaymentCompleted!: boolean;
@Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true }) @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
estimatedKm?: number | null; estimatedKm?: number | null;

5
apps/edr-freight-api/src/modules/last-mile/entities/last-mile.entity.ts
View File

@@ -35,8 +35,9 @@ export class LastMile extends BaseEntity {
@Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 }) @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
remainingPayment!: number; remainingPayment!: number;
@Column({ type: 'boolean', default: false }) // TODO: uncomment after migration creates column
isPostPaymentCompleted!: boolean; // @Column({ type: 'boolean', default: false })
// isPostPaymentCompleted!: boolean;
@Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true }) @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
estimatedKm?: number | null; estimatedKm?: number | null;

1
apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
View File

@@ -559,7 +559,6 @@ const FirstMilePage = () => {
}; };
const matchesFilter = (r: FirstMileRecord) => { const matchesFilter = (r: FirstMileRecord) => {
if (filterPostPaymentPending && r.isPostPaymentCompleted) return false;
switch (statusFilter) { switch (statusFilter) {
case "ALL": return true; case "ALL": return true;
case "ASSIGNED": return isAssigned(r); case "ASSIGNED": return isAssigned(r);

1
apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
View File

@@ -539,7 +539,6 @@ const LastMilePage = () => {
); );
const matchesFilter = (r: LastMileRecord) => { const matchesFilter = (r: LastMileRecord) => {
if (filterPostPaymentPending && r.isPostPaymentCompleted) return false;
switch (statusFilter) { switch (statusFilter) {
case "ALL": return true; case "ALL": return true;
case "ASSIGNED": return isAssigned(r); case "ASSIGNED": return isAssigned(r);