@dapex-tech/elite-online-services 0.0.14 → 0.0.15

package/createClient.d.ts

@@ -17,4 +17,5 @@ export declare function createClient(baseUrl?: string): {
     DriversService: typeof services.DriversService;
     HealthService: typeof services.HealthService;
     MainService: typeof services.MainService;
+    VoucherService: typeof services.VoucherService;
 };

package/models/CustomerLoginDto.d.ts

@@ -2,7 +2,7 @@ export type CustomerLoginDto = {
     /**
      * Email must be valid
      */
-    email: string;
+    email?: string;
     /**
      * Phone must be valid
      */
@@ -10,7 +10,7 @@ export type CustomerLoginDto = {
     /**
      * Phone country code
      */
-    phoneCountryCode: string;
+    phoneCountryCode?: string;
     /**
      * Customer's Password, must be at least 6 characters long
      */

package/models/TripDto.d.ts

@@ -7,17 +7,17 @@ export type TripDto = {
     /**
      * Trip ID
      */
-    id: number;
+    id?: number;
     driverId?: Record<string, any> | null;
     customerId?: Record<string, any> | null;
     adminId?: Record<string, any> | null;
-    status: Record<string, any>;
-    tripSource: Record<string, any>;
-    driverAssignmentMode: Record<string, any>;
+    status?: TripDto.status;
+    tripSource?: Record<string, any>;
+    driverAssignmentMode?: Record<string, any>;
     /**
      * Origin location type
      */
-    originLocationType: number;
+    originLocationType?: number;
     /**
      * Origin latitude
      */
@@ -37,7 +37,7 @@ export type TripDto = {
     /**
      * Destination location type
      */
-    destinationLocationType: number;
+    destinationLocationType?: number;
     /**
      * Destination latitude
      */
@@ -78,6 +78,42 @@ export type TripDto = {
      * Customer phone
      */
     customerPhone?: Record<string, any> | null;
+    /**
+     * Distance Meters
+     */
+    distanceMeters?: Record<string, any> | null;
+    /**
+     * Total Milliseconds
+     */
+    totalMilliseconds?: Record<string, any> | null;
+    /**
+     * Driving Milliseconds
+     */
+    drivingMilliseconds?: Record<string, any> | null;
+    /**
+     * Paused Milliseconds
+     */
+    pausedMilliseconds?: Record<string, any> | null;
+    /**
+     * Paused Traffic Milliseconds
+     */
+    pausedTrafficMilliseconds?: Record<string, any> | null;
+    /**
+     * Pickup cost
+     */
+    pickupCost?: Record<string, any> | null;
+    /**
+     * Distance cost
+     */
+    distanceCost?: Record<string, any> | null;
+    /**
+     * Waiting cost
+     */
+    waitingCost?: Record<string, any> | null;
+    /**
+     * Traffic delay cost
+     */
+    trafficDelayCost?: Record<string, any> | null;
     /**
      * Total trip cost
      */
@@ -106,3 +142,20 @@ export type TripDto = {
      */
     payments?: Array<PaymentDto> | null;
 };
+export declare namespace TripDto {
+    enum status {
+        REQUESTED = "REQUESTED",
+        DRIVER_SEARCHING = "DRIVER_SEARCHING",
+        DRIVER_ASSIGNED = "DRIVER_ASSIGNED",
+        DRIVER_ASSIGNED_PENDING = "DRIVER_ASSIGNED_PENDING",
+        DRIVER_ONWAY = "DRIVER_ONWAY",
+        DRIVER_AT_PICKUP = "DRIVER_AT_PICKUP",
+        IN_PROGRESS = "IN_PROGRESS",
+        PAUSED = "PAUSED",
+        PAUSED_TRAFFIC = "PAUSED_TRAFFIC",
+        COMPLETED = "COMPLETED",
+        CANCELED_PASSENGER = "CANCELED_PASSENGER",
+        CANCELED_DRIVER = "CANCELED_DRIVER",
+        CANCELED_ADMIN = "CANCELED_ADMIN"
+    }
+}

package/models/TripDto.js

@@ -1,2 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TripDto = void 0;
+var TripDto;
+(function (TripDto) {
+    let status;
+    (function (status) {
+        status["REQUESTED"] = "REQUESTED";
+        status["DRIVER_SEARCHING"] = "DRIVER_SEARCHING";
+        status["DRIVER_ASSIGNED"] = "DRIVER_ASSIGNED";
+        status["DRIVER_ASSIGNED_PENDING"] = "DRIVER_ASSIGNED_PENDING";
+        status["DRIVER_ONWAY"] = "DRIVER_ONWAY";
+        status["DRIVER_AT_PICKUP"] = "DRIVER_AT_PICKUP";
+        status["IN_PROGRESS"] = "IN_PROGRESS";
+        status["PAUSED"] = "PAUSED";
+        status["PAUSED_TRAFFIC"] = "PAUSED_TRAFFIC";
+        status["COMPLETED"] = "COMPLETED";
+        status["CANCELED_PASSENGER"] = "CANCELED_PASSENGER";
+        status["CANCELED_DRIVER"] = "CANCELED_DRIVER";
+        status["CANCELED_ADMIN"] = "CANCELED_ADMIN";
+    })(status = TripDto.status || (TripDto.status = {}));
+})(TripDto || (exports.TripDto = TripDto = {}));

package/models/TripStatuses.d.ts

@@ -0,0 +1,15 @@
+export declare enum TripStatuses {
+    REQUESTED = "REQUESTED",
+    DRIVER_SEARCHING = "DRIVER_SEARCHING",
+    DRIVER_ASSIGNED = "DRIVER_ASSIGNED",
+    DRIVER_ASSIGNED_PENDING = "DRIVER_ASSIGNED_PENDING",
+    DRIVER_ONWAY = "DRIVER_ONWAY",
+    DRIVER_AT_PICKUP = "DRIVER_AT_PICKUP",
+    IN_PROGRESS = "IN_PROGRESS",
+    PAUSED = "PAUSED",
+    PAUSED_TRAFFIC = "PAUSED_TRAFFIC",
+    COMPLETED = "COMPLETED",
+    CANCELED_PASSENGER = "CANCELED_PASSENGER",
+    CANCELED_DRIVER = "CANCELED_DRIVER",
+    CANCELED_ADMIN = "CANCELED_ADMIN"
+}

package/models/TripStatuses.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TripStatuses = void 0;
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+var TripStatuses;
+(function (TripStatuses) {
+    TripStatuses["REQUESTED"] = "REQUESTED";
+    TripStatuses["DRIVER_SEARCHING"] = "DRIVER_SEARCHING";
+    TripStatuses["DRIVER_ASSIGNED"] = "DRIVER_ASSIGNED";
+    TripStatuses["DRIVER_ASSIGNED_PENDING"] = "DRIVER_ASSIGNED_PENDING";
+    TripStatuses["DRIVER_ONWAY"] = "DRIVER_ONWAY";
+    TripStatuses["DRIVER_AT_PICKUP"] = "DRIVER_AT_PICKUP";
+    TripStatuses["IN_PROGRESS"] = "IN_PROGRESS";
+    TripStatuses["PAUSED"] = "PAUSED";
+    TripStatuses["PAUSED_TRAFFIC"] = "PAUSED_TRAFFIC";
+    TripStatuses["COMPLETED"] = "COMPLETED";
+    TripStatuses["CANCELED_PASSENGER"] = "CANCELED_PASSENGER";
+    TripStatuses["CANCELED_DRIVER"] = "CANCELED_DRIVER";
+    TripStatuses["CANCELED_ADMIN"] = "CANCELED_ADMIN";
+})(TripStatuses || (exports.TripStatuses = TripStatuses = {}));

package/models/TripUpdateTripsStatusDto.d.ts

@@ -2,5 +2,25 @@ export type TripUpdateTripsStatusDto = {
     /**
      * Status to update the trip to
      */
-    status: Record<string, any>;
+    status: TripUpdateTripsStatusDto.status;
 };
+export declare namespace TripUpdateTripsStatusDto {
+    /**
+     * Status to update the trip to
+     */
+    enum status {
+        REQUESTED = "REQUESTED",
+        DRIVER_SEARCHING = "DRIVER_SEARCHING",
+        DRIVER_ASSIGNED = "DRIVER_ASSIGNED",
+        DRIVER_ASSIGNED_PENDING = "DRIVER_ASSIGNED_PENDING",
+        DRIVER_ONWAY = "DRIVER_ONWAY",
+        DRIVER_AT_PICKUP = "DRIVER_AT_PICKUP",
+        IN_PROGRESS = "IN_PROGRESS",
+        PAUSED = "PAUSED",
+        PAUSED_TRAFFIC = "PAUSED_TRAFFIC",
+        COMPLETED = "COMPLETED",
+        CANCELED_PASSENGER = "CANCELED_PASSENGER",
+        CANCELED_DRIVER = "CANCELED_DRIVER",
+        CANCELED_ADMIN = "CANCELED_ADMIN"
+    }
+}

package/models/TripUpdateTripsStatusDto.js

@@ -1,2 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TripUpdateTripsStatusDto = void 0;
+var TripUpdateTripsStatusDto;
+(function (TripUpdateTripsStatusDto) {
+    /**
+     * Status to update the trip to
+     */
+    let status;
+    (function (status) {
+        status["REQUESTED"] = "REQUESTED";
+        status["DRIVER_SEARCHING"] = "DRIVER_SEARCHING";
+        status["DRIVER_ASSIGNED"] = "DRIVER_ASSIGNED";
+        status["DRIVER_ASSIGNED_PENDING"] = "DRIVER_ASSIGNED_PENDING";
+        status["DRIVER_ONWAY"] = "DRIVER_ONWAY";
+        status["DRIVER_AT_PICKUP"] = "DRIVER_AT_PICKUP";
+        status["IN_PROGRESS"] = "IN_PROGRESS";
+        status["PAUSED"] = "PAUSED";
+        status["PAUSED_TRAFFIC"] = "PAUSED_TRAFFIC";
+        status["COMPLETED"] = "COMPLETED";
+        status["CANCELED_PASSENGER"] = "CANCELED_PASSENGER";
+        status["CANCELED_DRIVER"] = "CANCELED_DRIVER";
+        status["CANCELED_ADMIN"] = "CANCELED_ADMIN";
+    })(status = TripUpdateTripsStatusDto.status || (TripUpdateTripsStatusDto.status = {}));
+})(TripUpdateTripsStatusDto || (exports.TripUpdateTripsStatusDto = TripUpdateTripsStatusDto = {}));

package/models/VoucherCreateDto.d.ts

@@ -0,0 +1,54 @@
+export type VoucherCreateDto = {
+    /**
+     * Card number
+     */
+    cardNumber: string;
+    /**
+     * Voucher status
+     */
+    status: string;
+    /**
+     * Program name
+     */
+    program: string;
+    /**
+     * Senior center
+     */
+    seniorCenter: string;
+    /**
+     * First name
+     */
+    firstName: string;
+    /**
+     * Last name
+     */
+    lastName: string;
+    /**
+     * Middle name
+     */
+    middleName?: string;
+    /**
+     * Address
+     */
+    address: string;
+    /**
+     * Apartment number
+     */
+    apartmentNumber?: string;
+    /**
+     * City
+     */
+    city: string;
+    /**
+     * State
+     */
+    state: string;
+    /**
+     * Zip code
+     */
+    zipCode: string;
+    /**
+     * Rider phone
+     */
+    riderPhone: string;
+};

package/models/VoucherCreateDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/VoucherDto.d.ts

@@ -0,0 +1,62 @@
+export type VoucherDto = {
+    /**
+     * Voucher ID
+     */
+    id: number;
+    /**
+     * Card number
+     */
+    cardNumber: string;
+    /**
+     * Voucher status
+     */
+    status: string;
+    /**
+     * Program name
+     */
+    program: string;
+    /**
+     * Senior center
+     */
+    seniorCenter: string;
+    /**
+     * First name
+     */
+    firstName: string;
+    /**
+     * Last name
+     */
+    lastName: string;
+    /**
+     * Middle name
+     */
+    middleName?: string;
+    /**
+     * Address
+     */
+    address: string;
+    /**
+     * Apartment number
+     */
+    apartmentNumber?: string;
+    /**
+     * City
+     */
+    city: string;
+    /**
+     * State
+     */
+    state: string;
+    /**
+     * Zip code
+     */
+    zipCode: string;
+    /**
+     * Rider phone
+     */
+    riderPhone: string;
+    /**
+     * Created at timestamp
+     */
+    createdAt: string;
+};

package/models/VoucherDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/VoucherUpdateDto.d.ts

@@ -0,0 +1,54 @@
+export type VoucherUpdateDto = {
+    /**
+     * Card number
+     */
+    cardNumber?: string;
+    /**
+     * Voucher status
+     */
+    status?: string;
+    /**
+     * Program name
+     */
+    program?: string;
+    /**
+     * Senior center
+     */
+    seniorCenter?: string;
+    /**
+     * First name
+     */
+    firstName?: string;
+    /**
+     * Last name
+     */
+    lastName?: string;
+    /**
+     * Middle name
+     */
+    middleName?: string;
+    /**
+     * Address
+     */
+    address?: string;
+    /**
+     * Apartment number
+     */
+    apartmentNumber?: string;
+    /**
+     * City
+     */
+    city?: string;
+    /**
+     * State
+     */
+    state?: string;
+    /**
+     * Zip code
+     */
+    zipCode?: string;
+    /**
+     * Rider phone
+     */
+    riderPhone?: string;
+};

package/models/VoucherUpdateDto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/index.d.ts

@@ -29,8 +29,12 @@ export * from './TokensDto';
 export * from './TripAssignDriverDto';
 export * from './TripDto';
 export * from './TripLocationPointDto';
+export * from './TripStatuses';
 export * from './TripUpdateDriverAssignmentModeDto';
 export * from './TripUpdateDto';
 export * from './TripUpdateTripsStatusDto';
 export * from './UpdateFcmTokenDto';
 export * from './ValidateResetCodeDto';
+export * from './VoucherCreateDto';
+export * from './VoucherDto';
+export * from './VoucherUpdateDto';

package/models/index.js

@@ -45,8 +45,12 @@ __exportStar(require("./TokensDto"), exports);
 __exportStar(require("./TripAssignDriverDto"), exports);
 __exportStar(require("./TripDto"), exports);
 __exportStar(require("./TripLocationPointDto"), exports);
+__exportStar(require("./TripStatuses"), exports);
 __exportStar(require("./TripUpdateDriverAssignmentModeDto"), exports);
 __exportStar(require("./TripUpdateDto"), exports);
 __exportStar(require("./TripUpdateTripsStatusDto"), exports);
 __exportStar(require("./UpdateFcmTokenDto"), exports);
 __exportStar(require("./ValidateResetCodeDto"), exports);
+__exportStar(require("./VoucherCreateDto"), exports);
+__exportStar(require("./VoucherDto"), exports);
+__exportStar(require("./VoucherUpdateDto"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dapex-tech/elite-online-services",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"main": "./index.js",
 	"types": "./index.d.ts",
 	"private": false,

package/services/AdminCustomerService.d.ts

@@ -14,7 +14,7 @@ export declare class AdminCustomerService {
     static create(requestBody: CustomerRegisterDto): CancelablePromise<CustomerDto>;
     /**
      * Get all customers
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @param id Filter by id
      * @param firstName Filter by first name
@@ -26,7 +26,7 @@ export declare class AdminCustomerService {
      * @returns CustomerDto List of customers
      * @throws ApiError
      */
-    static findAll(search?: string, order?: OrderDto, id?: number, firstName?: string, lastName?: string, email?: string, phone?: string, phoneCountryCode?: string, isVerified?: boolean): CancelablePromise<Array<CustomerDto>>;
+    static findAll(q?: string, order?: OrderDto, id?: number, firstName?: string, lastName?: string, email?: string, phone?: string, phoneCountryCode?: string, isVerified?: boolean): CancelablePromise<Array<CustomerDto>>;
     /**
      * Get a single customer by ID
      * @param id

package/services/AdminCustomerService.js

@@ -20,7 +20,7 @@ class AdminCustomerService {
     }
     /**
      * Get all customers
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @param id Filter by id
      * @param firstName Filter by first name
@@ -32,12 +32,12 @@ class AdminCustomerService {
      * @returns CustomerDto List of customers
      * @throws ApiError
      */
-    static findAll(search, order, id, firstName, lastName, email, phone, phoneCountryCode, isVerified) {
+    static findAll(q, order, id, firstName, lastName, email, phone, phoneCountryCode, isVerified) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/admins/customers',
             query: {
-                'search': search,
+                'q': q,
                 'order': order,
                 'id': id,
                 'firstName': firstName,

package/services/AdminDriversService.d.ts

@@ -11,7 +11,7 @@ export declare class AdminDriversService {
     static createDriver(requestBody: DriverCreateDto): CancelablePromise<any>;
     /**
      * Get all drivers
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @param id Filter by id
      * @param firstName Filter by first name
@@ -26,7 +26,7 @@ export declare class AdminDriversService {
      * @returns any List of drivers
      * @throws ApiError
      */
-    static findAll(search?: string, order?: OrderDto, id?: number, firstName?: string, lastName?: string, email?: string, phone?: string, status?: boolean, isOnline?: boolean, isActive?: boolean, license?: string, type?: string): CancelablePromise<any>;
+    static findAll(q?: string, order?: OrderDto, id?: number, firstName?: string, lastName?: string, email?: string, phone?: string, status?: boolean, isOnline?: boolean, isActive?: boolean, license?: string, type?: string): CancelablePromise<any>;
     /**
      * Get a single driver by ID
      * @param id

package/services/AdminDriversService.js

@@ -20,7 +20,7 @@ class AdminDriversService {
     }
     /**
      * Get all drivers
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @param id Filter by id
      * @param firstName Filter by first name
@@ -35,12 +35,12 @@ class AdminDriversService {
      * @returns any List of drivers
      * @throws ApiError
      */
-    static findAll(search, order, id, firstName, lastName, email, phone, status, isOnline, isActive, license, type) {
+    static findAll(q, order, id, firstName, lastName, email, phone, status, isOnline, isActive, license, type) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/admins/drivers',
             query: {
-                'search': search,
+                'q': q,
                 'order': order,
                 'id': id,
                 'firstName': firstName,

package/services/AdminService.d.ts

@@ -14,12 +14,12 @@ export declare class AdminService {
     static create(requestBody: AdminCreateDto): CancelablePromise<AdminDto>;
     /**
      * Get all admins
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @returns AdminDto List of admins
      * @throws ApiError
      */
-    static findAll(search?: string, order?: OrderDto): CancelablePromise<Array<AdminDto>>;
+    static findAll(q?: string, order?: OrderDto): CancelablePromise<Array<AdminDto>>;
     /**
      * Get a single admin by ID
      * @param id

package/services/AdminService.js

@@ -20,17 +20,17 @@ class AdminService {
     }
     /**
      * Get all admins
-     * @param search Text to search for in name, surname, phone number or email
+     * @param q Text to search for in name, surname, phone number or email
      * @param order Sorting options
      * @returns AdminDto List of admins
      * @throws ApiError
      */
-    static findAll(search, order) {
+    static findAll(q, order) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/admins',
             query: {
-                'search': search,
+                'q': q,
                 'order': order,
             },
         });

package/services/AdminTripsService.d.ts

@@ -1,16 +1,21 @@
+import type { OrderDto } from '../models/OrderDto';
 import type { TripAssignDriverDto } from '../models/TripAssignDriverDto';
 import type { TripDto } from '../models/TripDto';
+import type { TripStatuses } from '../models/TripStatuses';
 import type { TripUpdateDriverAssignmentModeDto } from '../models/TripUpdateDriverAssignmentModeDto';
 import type { TripUpdateDto } from '../models/TripUpdateDto';
 import type { CancelablePromise } from '../core/CancelablePromise';
 export declare class AdminTripsService {
     /**
      * Get all trips
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search: string): CancelablePromise<Array<TripDto>>;
+    static findAll(q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<Array<TripDto>>;
     /**
      * Create a new trip/service order
      * @param requestBody
@@ -35,11 +40,12 @@ export declare class AdminTripsService {
     static update(id: number, requestBody: TripUpdateDto): CancelablePromise<TripDto>;
     /**
      * Update trip status
-     * @param id
+     * @param id Trip ID
+     * @param status Action to be executed on the trip
      * @returns TripDto Trip status updated successfully.
      * @throws ApiError
      */
-    static updateTripStatus(id: number): CancelablePromise<TripDto>;
+    static updateTripStatus(id: number, status: TripStatuses): CancelablePromise<TripDto>;
     /**
      * Assign a driver to a trip
      * @param id

package/services/AdminTripsService.js

@@ -6,16 +6,22 @@ const request_1 = require("../core/request");
 class AdminTripsService {
     /**
      * Get all trips
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search) {
+    static findAll(q, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/admins/trips',
             query: {
-                'search': search,
+                'q': q,
+                'order': order,
+                'customerId': customerId,
+                'driverId': driverId,
             },
         });
     }
@@ -68,16 +74,18 @@ class AdminTripsService {
     }
     /**
      * Update trip status
-     * @param id
+     * @param id Trip ID
+     * @param status Action to be executed on the trip
      * @returns TripDto Trip status updated successfully.
      * @throws ApiError
      */
-    static updateTripStatus(id) {
+    static updateTripStatus(id, status) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'PATCH',
             url: '/admins/trips/{id}/status/{status}',
             path: {
                 'id': id,
+                'status': status,
             },
         });
     }

package/services/CustomerTripsService.d.ts

@@ -1,4 +1,5 @@
 import type { CustomerTripActions } from '../models/CustomerTripActions';
+import type { OrderDto } from '../models/OrderDto';
 import type { TripDto } from '../models/TripDto';
 import type { TripUpdateDto } from '../models/TripUpdateDto';
 import type { TripUpdateTripsStatusDto } from '../models/TripUpdateTripsStatusDto';
@@ -13,11 +14,14 @@ export declare class CustomerTripsService {
     static create(requestBody: TripDto): CancelablePromise<TripDto>;
     /**
      * Get all trips for a customer
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search: string): CancelablePromise<Array<TripDto>>;
+    static findAll(q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<Array<TripDto>>;
     /**
      * Get active trip for a customer
      * @returns TripDto Active trip found

package/services/CustomerTripsService.js

@@ -20,16 +20,22 @@ class CustomerTripsService {
     }
     /**
      * Get all trips for a customer
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search) {
+    static findAll(q, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/customers/trips',
             query: {
-                'search': search,
+                'q': q,
+                'order': order,
+                'customerId': customerId,
+                'driverId': driverId,
             },
         });
     }

package/services/DriverTripsService.d.ts

@@ -1,4 +1,5 @@
 import type { DriverTripActions } from '../models/DriverTripActions';
+import type { OrderDto } from '../models/OrderDto';
 import type { TripDto } from '../models/TripDto';
 import type { TripUpdateDto } from '../models/TripUpdateDto';
 import type { CancelablePromise } from '../core/CancelablePromise';
@@ -12,11 +13,14 @@ export declare class DriverTripsService {
     static create(requestBody: TripDto): CancelablePromise<TripDto>;
     /**
      * Get all trips for a driver
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search: string): CancelablePromise<Array<TripDto>>;
+    static findAll(q?: string, order?: OrderDto, customerId?: number, driverId?: number): CancelablePromise<Array<TripDto>>;
     /**
      * Update a trip by ID
      * @param id

package/services/DriverTripsService.js

@@ -20,16 +20,22 @@ class DriverTripsService {
     }
     /**
      * Get all trips for a driver
-     * @param search
+     * @param q Text to search for in trip fields
+     * @param order Sorting options
+     * @param customerId Filter by customer ID (scope to customer)
+     * @param driverId Filter by driver ID (scope to driver)
      * @returns TripDto List of trips
      * @throws ApiError
      */
-    static findAll(search) {
+    static findAll(q, order, customerId, driverId) {
         return (0, request_1.request)(OpenAPI_1.OpenAPI, {
             method: 'GET',
             url: '/drivers/trips',
             query: {
-                'search': search,
+                'q': q,
+                'order': order,
+                'customerId': customerId,
+                'driverId': driverId,
             },
         });
     }

package/services/VoucherService.d.ts

@@ -0,0 +1,61 @@
+import type { MessageResponseDto } from '../models/MessageResponseDto';
+import type { OrderDto } from '../models/OrderDto';
+import type { VoucherCreateDto } from '../models/VoucherCreateDto';
+import type { VoucherDto } from '../models/VoucherDto';
+import type { VoucherUpdateDto } from '../models/VoucherUpdateDto';
+import type { CancelablePromise } from '../core/CancelablePromise';
+export declare class VoucherService {
+    /**
+     * Create a new voucher
+     * @param requestBody
+     * @returns VoucherDto Voucher created successfully.
+     * @throws ApiError
+     */
+    static create(requestBody: VoucherCreateDto): CancelablePromise<VoucherDto>;
+    /**
+     * Get all vouchers
+     * @param q Text to search for in card number, name, senior center, program or status
+     * @param order Sorting options
+     * @returns VoucherDto List of vouchers
+     * @throws ApiError
+     */
+    static findAll(q?: string, order?: OrderDto): CancelablePromise<Array<VoucherDto>>;
+    /**
+     * Import vouchers from Excel file
+     * @param formData
+     * @returns any Parsed Excel data (first sheet as array of rows).
+     * @throws ApiError
+     */
+    static importExcel(formData: {
+        file?: Blob;
+    }): CancelablePromise<any>;
+    /**
+     * Get a single voucher by ID
+     * @param id
+     * @returns VoucherDto Voucher found
+     * @throws ApiError
+     */
+    static findById(id: number): CancelablePromise<VoucherDto>;
+    /**
+     * Update a voucher by ID
+     * @param id
+     * @param requestBody
+     * @returns VoucherDto Voucher updated successfully.
+     * @throws ApiError
+     */
+    static update(id: number, requestBody: VoucherUpdateDto): CancelablePromise<VoucherDto>;
+    /**
+     * Delete a voucher by ID
+     * @param id
+     * @returns MessageResponseDto Voucher deleted successfully.
+     * @throws ApiError
+     */
+    static remove(id: number): CancelablePromise<MessageResponseDto>;
+    /**
+     * Get a single voucher by card number
+     * @param cardNumber
+     * @returns VoucherDto Voucher found
+     * @throws ApiError
+     */
+    static findByCardNumber(cardNumber: string): CancelablePromise<VoucherDto>;
+}

package/services/VoucherService.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VoucherService = void 0;
+const OpenAPI_1 = require("../core/OpenAPI");
+const request_1 = require("../core/request");
+class VoucherService {
+    /**
+     * Create a new voucher
+     * @param requestBody
+     * @returns VoucherDto Voucher created successfully.
+     * @throws ApiError
+     */
+    static create(requestBody) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'POST',
+            url: '/vouchers',
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+    /**
+     * Get all vouchers
+     * @param q Text to search for in card number, name, senior center, program or status
+     * @param order Sorting options
+     * @returns VoucherDto List of vouchers
+     * @throws ApiError
+     */
+    static findAll(q, order) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/vouchers',
+            query: {
+                'q': q,
+                'order': order,
+            },
+        });
+    }
+    /**
+     * Import vouchers from Excel file
+     * @param formData
+     * @returns any Parsed Excel data (first sheet as array of rows).
+     * @throws ApiError
+     */
+    static importExcel(formData) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'POST',
+            url: '/vouchers/import',
+            formData: formData,
+            mediaType: 'multipart/form-data',
+        });
+    }
+    /**
+     * Get a single voucher by ID
+     * @param id
+     * @returns VoucherDto Voucher found
+     * @throws ApiError
+     */
+    static findById(id) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/vouchers/{id}',
+            path: {
+                'id': id,
+            },
+        });
+    }
+    /**
+     * Update a voucher by ID
+     * @param id
+     * @param requestBody
+     * @returns VoucherDto Voucher updated successfully.
+     * @throws ApiError
+     */
+    static update(id, requestBody) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'PATCH',
+            url: '/vouchers/{id}',
+            path: {
+                'id': id,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+    /**
+     * Delete a voucher by ID
+     * @param id
+     * @returns MessageResponseDto Voucher deleted successfully.
+     * @throws ApiError
+     */
+    static remove(id) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'DELETE',
+            url: '/vouchers/{id}',
+            path: {
+                'id': id,
+            },
+        });
+    }
+    /**
+     * Get a single voucher by card number
+     * @param cardNumber
+     * @returns VoucherDto Voucher found
+     * @throws ApiError
+     */
+    static findByCardNumber(cardNumber) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/vouchers/card-number/{cardNumber}',
+            path: {
+                'cardNumber': cardNumber,
+            },
+        });
+    }
+}
+exports.VoucherService = VoucherService;

package/services/index.d.ts

@@ -12,3 +12,4 @@ export * from './DriverTripsService';
 export * from './DriversService';
 export * from './HealthService';
 export * from './MainService';
+export * from './VoucherService';

package/services/index.js

@@ -28,3 +28,4 @@ __exportStar(require("./DriverTripsService"), exports);
 __exportStar(require("./DriversService"), exports);
 __exportStar(require("./HealthService"), exports);
 __exportStar(require("./MainService"), exports);
+__exportStar(require("./VoucherService"), exports);

package/socketService.d.ts

@@ -1,4 +1,4 @@
-import type { DriverStatus } from './types';
+import type { DriverStatus, DriverExecuteTripAction } from './types';
 export declare class SocketService {
     private socket;
     private token;
@@ -7,7 +7,7 @@ export declare class SocketService {
         url: string;
         path: string;
     };
-    static getInstance(): Promise<SocketService>;
+    static getInstance(): SocketService;
     setToken(token: string): void;
     clearToken(): void;
     connect(): void;
@@ -25,4 +25,5 @@ export declare class SocketService {
     onTripUpdate(cb: (data: any) => void): void;
     offTripUpdate(cb?: (data: any) => void): void;
     emitDriverStatusUpdate(data: DriverStatus): void;
+    emitTripActionUpdate(data: DriverExecuteTripAction): void;
 }

package/socketService.js

@@ -28,7 +28,7 @@ class SocketService {
             path: baseUrl,
         };
     }
-    static async getInstance() {
+    static getInstance() {
         if (!instance) {
             const url = `${OpenAPI_1.OpenAPI.BASE}/realtime`;
             instance = new SocketService(url);
@@ -122,5 +122,8 @@ class SocketService {
     emitDriverStatusUpdate(data) {
         this.emit('driverStatusUpdate', { ...data });
     }
+    emitTripActionUpdate(data) {
+        this.emit('tripActionUpdate', { ...data });
+    }
 }
 exports.SocketService = SocketService;

package/types/realtime/active-trip.d.ts

@@ -0,0 +1,26 @@
+import { TripStatuses } from '../..';
+export interface ActiveTrip {
+    id: number;
+    driverId: number | null;
+    customerId: number | null;
+    originAddress?: string | null;
+    originLatitude: number | null;
+    originLongitude: number | null;
+    destinationAddress: string | null;
+    destinationLatitude: number | null;
+    destinationLongitude: number | null;
+    status: TripStatuses;
+    currentLatitude: number;
+    currentLongitude: number;
+    lastUpdate?: Date;
+    deltaDistanceMeters?: number;
+    deltaTotalMilliseconds?: number;
+    deltaDrivingMilliseconds?: number;
+    deltaPausedMilliseconds?: number;
+    deltaPausedTrafficMilliseconds?: number;
+    deltaPickupCost?: number;
+    deltaDistanceCost?: number;
+    deltaWaitingCost?: number;
+    deltaTrafficDelayCost?: number;
+    deltaTotalCost?: number;
+}

package/types/realtime/active-trip.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/types/realtime/driver-status.d.ts

@@ -4,5 +4,6 @@ export interface DriverStatus {
     lng?: number;
     heartbeat?: string;
     isOnline?: boolean;
+    waitingTripIds: number[] | undefined;
     activeTripId?: number;
 }

package/types/realtime/index.d.ts

@@ -1,2 +1,3 @@
 export * from './driver-execute-trip-action';
 export * from './driver-status';
+export * from './active-trip';

package/types/realtime/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./driver-execute-trip-action"), exports);
 __exportStar(require("./driver-status"), exports);
+__exportStar(require("./active-trip"), exports);