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

Merge pull request #364 from Tria-plc/freight/feature/vehicle

Browse Source 
fix
This commit is contained in:
yaschalew10
2026-06-30 05:35:01 +03:00
committed by GitHub
parent c5e9794a35 76b25bd214
commit cd528dc4d6
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
View File

@@ -15,24 +15,6 @@ export class CreateInvoices1821000000002 implements MigrationInterface {
name = "CreateInvoices1821000000002"; name = "CreateInvoices1821000000002";
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {
<<<<<<< HEAD
const typeExists = await queryRunner.query(
`SELECT 1 FROM pg_type WHERE typname = 'invoices_status_enum' AND typnamespace = 'freight'::regnamespace;`,
);
if (!typeExists.length) {
await queryRunner.query(`
CREATE TYPE freight.invoices_status_enum AS ENUM (
'DRAFT',
'PENDING',
'PAID',
'OVERDUE',
'CANCELLED',
'REFUNDED'
);
`);
}
=======
await queryRunner.query(` await queryRunner.query(`
CREATE TYPE IF NOT EXISTS freight.invoices_status_enum AS ENUM ( CREATE TYPE IF NOT EXISTS freight.invoices_status_enum AS ENUM (
'DRAFT', 'DRAFT',
@@ -43,7 +25,6 @@ export class CreateInvoices1821000000002 implements MigrationInterface {
'REFUNDED' 'REFUNDED'
); );
`); `);
>>>>>>> 3ceacbe9a9087498cf007111b7b09ad3d35bce35
await queryRunner.query(` await queryRunner.query(`
CREATE TABLE freight.invoices ( CREATE TABLE freight.invoices (

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

@@ -35,8 +35,8 @@ 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 }) @Column({ type: 'boolean', default: false })
// isPostPaymentCompleted!: boolean; 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;

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

@@ -35,8 +35,8 @@ 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 }) @Column({ type: 'boolean', default: false })
// isPostPaymentCompleted!: boolean; 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;