Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-30 09:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Marshal
2026-07-02 13:43:07 +00:00
parent 860af20e0d
commit 71894ae2d3
3 changed files with 0 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/edr-freight-api/src/app.module.ts
View File

@@ -59,7 +59,6 @@ import { FreightPermissionKeyMigrationSeeder } from "./seed/freight-permission-k
import { DemoFreightDataSeeder } from "./seed/demo-freight-data.seeder"; import { DemoFreightDataSeeder } from "./seed/demo-freight-data.seeder";
import { GovCompaniesSeeder } from "./seed/gov-companies.seeder"; import { GovCompaniesSeeder } from "./seed/gov-companies.seeder";
import { ApprovedFirstLastMileDemoBookingsSeeder } from "./seed/approved-first-lastmile-demo-bookings.seeder"; import { ApprovedFirstLastMileDemoBookingsSeeder } from "./seed/approved-first-lastmile-demo-bookings.seeder";
import { PaidIndodeDemoBookingsSeeder } from "./seed/paid-indode-demo-bookings.seeder";
//New Trains, Wagons, Container and Cargo management modules //New Trains, Wagons, Container and Cargo management modules
import { TrainsModule } from "./modules/trains/trains.module"; import { TrainsModule } from "./modules/trains/trains.module";
import { WagonsModule } from './modules/wagons/wagons.module'; import { WagonsModule } from './modules/wagons/wagons.module';
@@ -161,7 +160,6 @@ import { ImportOperationsModule } from './modules/import-operations/import-opera
ExportDjiboutiInterchangeDemoSeeder, ExportDjiboutiInterchangeDemoSeeder,
MarshallingDemoTrainsSeeder, MarshallingDemoTrainsSeeder,
ApprovedFirstLastMileDemoBookingsSeeder, ApprovedFirstLastMileDemoBookingsSeeder,
PaidIndodeDemoBookingsSeeder,
], ],
}) })
export class AppModule implements OnApplicationBootstrap { export class AppModule implements OnApplicationBootstrap {
@@ -180,7 +178,6 @@ export class AppModule implements OnApplicationBootstrap {
private readonly warehouseDemoSeeder: WarehouseDemoSeeder, private readonly warehouseDemoSeeder: WarehouseDemoSeeder,
private readonly exportDjiboutiInterchangeDemoSeeder: ExportDjiboutiInterchangeDemoSeeder, private readonly exportDjiboutiInterchangeDemoSeeder: ExportDjiboutiInterchangeDemoSeeder,
private readonly marshallingDemoTrainsSeeder: MarshallingDemoTrainsSeeder, private readonly marshallingDemoTrainsSeeder: MarshallingDemoTrainsSeeder,
private readonly paidIndodeDemoBookingsSeeder: PaidIndodeDemoBookingsSeeder,
private readonly freightPermissionKeyMigrationSeeder: FreightPermissionKeyMigrationSeeder, private readonly freightPermissionKeyMigrationSeeder: FreightPermissionKeyMigrationSeeder,
private readonly demoFreightDataSeeder: DemoFreightDataSeeder, private readonly demoFreightDataSeeder: DemoFreightDataSeeder,
private readonly govCompaniesSeeder: GovCompaniesSeeder, private readonly govCompaniesSeeder: GovCompaniesSeeder,
@@ -202,7 +199,6 @@ export class AppModule implements OnApplicationBootstrap {
await this.warehouseDemoSeeder.run(); await this.warehouseDemoSeeder.run();
await this.exportDjiboutiInterchangeDemoSeeder.run(); await this.exportDjiboutiInterchangeDemoSeeder.run();
await this.marshallingDemoTrainsSeeder.run(); await this.marshallingDemoTrainsSeeder.run();
await this.paidIndodeDemoBookingsSeeder.run();
// Idempotent demo data: ≥100 wagons/type, approval chains, 4 staff users. // Idempotent demo data: ≥100 wagons/type, approval chains, 4 staff users.
// Each block self-guards on an empty-table check, so this is safe every boot. // Each block self-guards on an empty-table check, so this is safe every boot.
// Demo data seeds (DemoBookingsSeeder, PricingDataSeeder, // Demo data seeds (DemoBookingsSeeder, PricingDataSeeder,

1131
apps/edr-freight-api/src/seed/paid-indode-demo-bookings.seeder.ts
View File

File diff suppressed because it is too large Load Diff

30
apps/edr-freight-web/portal/src/pages/billing/InvoiceDetailPage.tsx
View File

@@ -130,11 +130,6 @@ export default function InvoiceDetailPage() {
const amountDue = Number(invoice.balanceAmount ?? invoice.totalAmount); const amountDue = Number(invoice.balanceAmount ?? invoice.totalAmount);
const handlePay = () => { const handlePay = () => {
<<<<<<< HEAD
const returnUrl = `${window.location.origin}/payment/success`;
const failureUrl = `${window.location.origin}/payment/failure`;
payMutation.mutate({ id, payload: { method: paymentMethod, returnUrl, failureUrl } });
=======
setPayModalOpen(true); setPayModalOpen(true);
}; };
@@ -184,7 +179,6 @@ export default function InvoiceDetailPage() {
} }
toast.error("This invoice's source isn't linked to a booking."); toast.error("This invoice's source isn't linked to a booking.");
} }
>>>>>>> 03740ee719f22f9617379a652b26f13b6870f671
}; };
return ( return (
@@ -214,20 +208,6 @@ export default function InvoiceDetailPage() {
</Title> </Title>
<InvoiceStatusBadge status={invoice.status} /> <InvoiceStatusBadge status={invoice.status} />
</Group> </Group>
<<<<<<< HEAD
{payable && (
<Group align="flex-end" gap="sm">
<Select
label="Payment provider"
value={paymentMethod}
onChange={(value) => setPaymentMethod((value as "TELEBIRR" | "WAAFI") ?? "TELEBIRR")}
data={[
{ value: "TELEBIRR", label: "Telebirr" },
{ value: "WAAFI", label: "Waafi" },
]}
w={170}
/>
=======
<Group gap={8} wrap="wrap"> <Group gap={8} wrap="wrap">
{canViewSource && ( {canViewSource && (
<Button <Button
@@ -271,7 +251,6 @@ export default function InvoiceDetailPage() {
</Button> </Button>
)} )}
{payable && ( {payable && (
>>>>>>> 03740ee719f22f9617379a652b26f13b6870f671
<Button <Button
color="edr-green" color="edr-green"
radius="md" radius="md"
@@ -279,14 +258,6 @@ export default function InvoiceDetailPage() {
leftSection={<CreditCard size={16} />} leftSection={<CreditCard size={16} />}
loading={payMutation.isPending} loading={payMutation.isPending}
onClick={handlePay} onClick={handlePay}
<<<<<<< HEAD
styles={{ root: { fontWeight: 600, height: 42, paddingInline: 18 } }}
>
Pay {formatCurrency(amountDue, invoice.currency)}
</Button>
</Group>
)}
=======
styles={{ styles={{
root: { fontWeight: 600, height: 42, paddingInline: 18 }, root: { fontWeight: 600, height: 42, paddingInline: 18 },
}} }}
@@ -296,7 +267,6 @@ export default function InvoiceDetailPage() {
</Button> </Button>
)} )}
</Group> </Group>
>>>>>>> 03740ee719f22f9617379a652b26f13b6870f671
</Group> </Group>
{/* Summary */} {/* Summary */}