Merge pull request #334 from Tria-plc/freight/feature/last_mile_invoice

Freight/feature/last mile invoice

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

@@ -34,6 +34,9 @@ export class FirstMile extends BaseEntity {
   @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
   remainingPayment!: number;
 
+  @Column({ type: 'boolean', default: false })
+  isPostPaymentCompleted!: boolean;
+
   @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
   estimatedKm?: number | null;
 

apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts

@@ -4,6 +4,7 @@ import { FindOptionsWhere } from 'typeorm';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { DriversService } from '../drivers/drivers.service';
 import { NotificationsService } from '../notifications/notifications.service';
+import { SmsClientService } from '../notifications/sms-client.service';
 import { VehiclesService } from '../vehicles/vehicles.service';
 import { CreateFirstMileDto } from './dto/create-first-mile.dto';
 import { UpdateFirstMileDto } from './dto/update-first-mile.dto';
@@ -37,6 +38,7 @@ export class FirstMileService {
     private readonly vehiclesService: VehiclesService,
     private readonly driversService: DriversService,
     private readonly notificationsService: NotificationsService,
+    private readonly smsClient: SmsClientService,
   ) {}
 
   /**
@@ -251,16 +253,19 @@ export class FirstMileService {
 
       const booking = (record as FirstMile & { booking?: { reference?: string; firstMilePickupAddress?: string | null; originYard?: { label?: string } | null } }).booking;
 
-      await this.notificationsService.notifyDriverVehicleAssignment({
+      const driverName = `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim();
-        driverPhone: driver.phoneNumber,
+      const message =
-        driverName: `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim(),
+        `Dear ${driverName}, you have been assigned to a first-mile pickup. ` +
-        vehiclePlateNumber: vehicle.plateNumber ?? vehicleId,
+        `Booking: ${booking?.reference ?? record.bookingId}. Vehicle: ${vehicle.plateNumber ?? vehicleId}. ` +
-        bookingReference: booking?.reference ?? record.bookingId,
+        (booking?.firstMilePickupAddress ? `Pickup: ${booking.firstMilePickupAddress}. ` : '') +
-        pickupAddress: booking?.firstMilePickupAddress,
+        (booking?.originYard?.label ? `Destination: ${booking.originYard.label}.` : '');
-        destinationYard: booking?.originYard?.label,
+
+      void this.smsClient.sendSms({
+        to: driver.phoneNumber,
+        message,
       });
 
-      this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
+      this.logger.log(`SMS queued to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
     } catch (err) {
       this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
     }

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

@@ -34,6 +34,9 @@ export class LastMile extends BaseEntity {
   @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
   remainingPayment!: number;
 
+  @Column({ type: 'boolean', default: false })
+  isPostPaymentCompleted!: boolean;
+
   @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
   estimatedKm?: number | null;
 

apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts

@@ -4,6 +4,7 @@ import { FindOptionsWhere } from 'typeorm';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { DriversService } from '../drivers/drivers.service';
 import { NotificationsService } from '../notifications/notifications.service';
+import { SmsClientService } from '../notifications/sms-client.service';
 import { VehiclesService } from '../vehicles/vehicles.service';
 import { CreateLastMileDto } from './dto/create-last-mile.dto';
 import { UpdateLastMileDto } from './dto/update-last-mile.dto';
@@ -32,12 +33,12 @@ export class LastMileService {
   private readonly logger = new Logger(LastMileService.name);
 
   constructor(
-   
     private readonly lastMileRepository: LastMileRepository,
     private readonly bookingsRepository: BookingsRepository,
     private readonly vehiclesService: VehiclesService,
     private readonly driversService: DriversService,
     private readonly notificationsService: NotificationsService,
+    private readonly smsClient: SmsClientService,
   ) {}
 
   async acceptBooking(bookingReference: string): Promise<LastMile | null> {
@@ -185,16 +186,19 @@ export class LastMileService {
       };
       const booking = (record as LastMile & { booking?: BookingWithYards }).booking;
 
-      await this.notificationsService.notifyDriverVehicleAssignment({
+      const driverName = `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim();
-        driverPhone: driver.phoneNumber,
+      const message =
-        driverName: `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim(),
+        `Dear ${driverName}, you have been assigned to a last-mile delivery. ` +
-        vehiclePlateNumber: vehicle.plateNumber ?? vehicleId,
+        `Booking: ${booking?.reference ?? record.bookingId}. Vehicle: ${vehicle.plateNumber ?? vehicleId}. ` +
-        bookingReference: booking?.reference ?? record.bookingId,
+        (booking?.destinationYard?.label ? `Pickup: ${booking.destinationYard.label}. ` : '') +
-        pickupAddress: booking?.destinationYard?.label,
+        (booking?.lastMileDeliveryAddress ? `Destination: ${booking.lastMileDeliveryAddress}.` : '');
-        destinationYard: booking?.lastMileDeliveryAddress,
+
+      void this.smsClient.sendSms({
+        to: driver.phoneNumber,
+        message,
       });
 
-      this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
+      this.logger.log(`SMS queued to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
     } catch (err) {
       this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
     }

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

@@ -314,6 +314,7 @@ const FirstMilePage = () => {
 
   const [search, setSearch] = useState("");
   const [statusFilter, setStatusFilter] = useState<StatusFilter>("ALL");
+  const [filterPostPaymentPending, setFilterPostPaymentPending] = useState(false);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
 
   const [assignOpen, setAssignOpen] = useState(false);
@@ -529,6 +530,7 @@ const FirstMilePage = () => {
   };
 
   const matchesFilter = (r: FirstMileRecord) => {
+    if (filterPostPaymentPending && r.isPostPaymentCompleted) return false;
     switch (statusFilter) {
       case "ALL": return true;
       case "ASSIGNED": return isAssigned(r);
@@ -566,7 +568,7 @@ const FirstMilePage = () => {
         .includes(term);
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [records, search, statusFilter]);
+  }, [records, search, statusFilter, filterPostPaymentPending]);
 
   const pageCount = Math.max(1, Math.ceil(filteredRecords.length / pagination.pageSize));
   const pagedRecords = useMemo(() => {
@@ -887,6 +889,17 @@ const FirstMilePage = () => {
                     </Button>
                   );
                 })}
+                <Button
+                  size="xs"
+                  variant={filterPostPaymentPending ? "filled" : "default"}
+                  styles={{ label: { fontWeight: 500 } }}
+                  onClick={() => {
+                    setFilterPostPaymentPending(!filterPostPaymentPending);
+                    setPagination((p) => ({ ...p, pageIndex: 0 }));
+                  }}
+                >
+                  Post Payment Pending
+                </Button>
               </Group>
             </Stack>
           </Box>

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

@@ -298,6 +298,7 @@ const LastMilePage = () => {
 
   const [search, setSearch] = useState("");
   const [statusFilter, setStatusFilter] = useState<StatusFilter>("ALL");
+  const [filterPostPaymentPending, setFilterPostPaymentPending] = useState(false);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
 
   const [assignOpen, setAssignOpen] = useState(false);
@@ -508,6 +509,7 @@ const LastMilePage = () => {
   );
 
   const matchesFilter = (r: LastMileRecord) => {
+    if (filterPostPaymentPending && r.isPostPaymentCompleted) return false;
     switch (statusFilter) {
       case "ALL": return true;
       case "ASSIGNED": return isAssigned(r);
@@ -545,7 +547,7 @@ const LastMilePage = () => {
         .includes(term);
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [records, search, statusFilter]);
+  }, [records, search, statusFilter, filterPostPaymentPending]);
 
   const pageCount = Math.max(1, Math.ceil(filteredRecords.length / pagination.pageSize));
   const pagedRecords = useMemo(() => {
@@ -866,6 +868,17 @@ const LastMilePage = () => {
                     </Button>
                   );
                 })}
+                <Button
+                  size="xs"
+                  variant={filterPostPaymentPending ? "filled" : "default"}
+                  styles={{ label: { fontWeight: 500 } }}
+                  onClick={() => {
+                    setFilterPostPaymentPending(!filterPostPaymentPending);
+                    setPagination((p) => ({ ...p, pageIndex: 0 }));
+                  }}
+                >
+                  Post Payment Pending
+                </Button>
               </Group>
             </Stack>
           </Box>