Abubeker Yasin
29fd5cec34
refactor: ( d-money ) update trade_type and business_type
2026-06-25 14:46:07 +03:00
Abubeker Yasin
5b89c5852d
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-06-25 14:33:50 +03:00
Abubeker Yasin
a0a02b473d
fix: ( my booking ) add get passenger id from the iamuserid
2026-06-25 14:20:17 +03:00
Stephanos A
9e84a022df
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 19:54:37 +03:00
Stephanos A
58967e6e3d
IAM related required updates
2026-06-24 19:53:05 +03:00
Abubeker Yasin
5d9e2cee53
refactor: ( iam ) add ispublic to public endpoints
2026-06-24 16:06:53 +03:00
Abubeker Yasin
6e33075b05
fix: ( seats ) restore @IsPublic() on GET /seats/seatmap/:scheduleId
2026-06-24 15:32:45 +03:00
Abubeker Yasin
e2e10e0a44
fix: ( seed ) add @InjectDataSource() to PassengerStaffUsersSeeder constructor
2026-06-24 15:03:48 +03:00
Stephanos A
3ed748234d
fix duplicate entry from schema.prisma
2026-06-24 14:41:38 +03:00
Abubeker Yasin
cae90919f2
fix: ( prisma ) remove duplicated passenger
2026-06-24 14:29:48 +03:00
Stephanos A
755b8b2939
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 14:18:33 +03:00
Stephanos A
86760933e8
IAM, package, luggage, app health, rate limit, and more
2026-06-24 14:02:51 +03:00
Abubeker Yasin
51c400bb6e
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
2026-06-24 14:01:00 +03:00
Abubeker Yasin
567ba29185
fix: ( migration )
2026-06-24 14:00:01 +03:00
Roba Boru
3a99b182e0
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 13:53:32 +03:00
Roba Boru
350759ce25
Fix build errors
2026-06-24 13:49:27 +03:00
Abubeker Yasin
56c73cd337
fix: ( seats ) remove IamModule reference from SeatsModule imports
2026-06-24 12:31:34 +03:00
Abubeker Yasin
e7bbc8112b
fix: ( schema ) restore optional Passenger.user
2026-06-24 12:25:42 +03:00
Roba Boru
4c9c5f7e2f
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 11:56:30 +03:00
Roba Boru
4ac72c3271
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 11:55:18 +03:00
Abubeker Yasin
c79e63231c
Merge branch 'dev' into passenger/feat/iam
2026-06-24 11:53:33 +03:00
Roba Boru
bdcadeca81
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-24 11:53:32 +03:00
Roba Boru
9320e0e9ab
Update seatmap configuration
2026-06-24 11:50:44 +03:00
Abubeker Yasin
d78b5114ff
feat: ( d-money ) create d-money success page
2026-06-24 11:49:07 +03:00
Abubeker Yasin
1dfe4b9c37
refactor: ( iam ) add public decorator for public endpoins
2026-06-24 11:39:31 +03:00
yaschalew
f99e6b87db
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
2026-06-24 11:21:44 +03:00
yaschalew
a1b72e591e
fix issue
2026-06-24 11:21:13 +03:00
natib21
7fed72ea7a
fix
2026-06-24 08:16:24 +00:00
marshal
bd7c97a8a8
fix(freight-web): switch API_BASE_URL from localhost to production
2026-06-24 11:15:45 +03:00
marshal
b1dfdeb4c5
fix(freight-web): comment out unused onBlur prop and UserCheck import
2026-06-24 11:09:45 +03:00
marshal
fd4cc8f080
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 10:58:57 +03:00
yaschalew
5897dc342d
fix conflict
2026-06-24 10:08:19 +03:00
natib21
f6ffea2b87
fix return value
2026-06-24 06:38:03 +00:00
Abubeker Yasin
b98534f3fd
Merge branch 'dev' into passenger/feat/iam
2026-06-24 09:33:24 +03:00
marshal
baf12fd38e
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 04:33:15 +03:00
Marshal
d7688fce21
feat(freight-web): polish document clearance, general contracts list and detail UIs
2026-06-24 01:32:40 +00:00
marshal
9bd9ff99d1
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 03:40:30 +03:00
Marshal
3655e50f2e
feat(bookings): refactor location handling for first/last mile and improve geocoding logic
2026-06-24 00:39:43 +00:00
Marshal
7ec06f2ff0
feat(bookings): enhance operation request flow and add location selection for first/last mile
2026-06-24 00:36:01 +00:00
Marshal
5be181aba8
feat(bookings): enhance operation request flow and add location selection for first/last mile
2026-06-24 00:35:37 +00:00
marshal
5d3aa1b66a
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 03:21:22 +03:00
Marshal
8ef7641048
feat(bookings): add contract validity window and customs clearing features
...
- Introduced contract validity days, valid from and valid until fields in the booking model.
- Updated booking acceptance logic to enforce validity window constraints.
- Added customs clearing agent and first/last mile pickup/delivery coordinates to the booking model.
- Implemented LocationPicker component for address selection with map integration using Leaflet.
- Enhanced booking review step to display customs clearing agent details.
- Updated API and DTOs to accommodate new booking fields.
- Added migration scripts for database schema changes.
- Implemented tests for booking acceptance and DTO transformations.
2026-06-24 00:21:01 +00:00
marshal
44b46c99e7
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 02:49:34 +03:00
marshal
0379de8147
Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 02:49:24 +03:00
Marshal
07cd7dc111
feat: enhance booking operations to support freight forwarder variants and improve consolidation handling
2026-06-23 23:48:45 +00:00
Marshal
9d81a2e1ee
integrate global logistics staff user into seeder
...
refactor pricing data seeder to fold surcharge types into rates
update route meta subtitle to remove surcharge types
enhance RuleEngineFormDialog to support conditional field visibility
remove surcharge types from URL constants and related services
add cargo leaf options query for bulk cargo type selection
update RuleEngineResourcePage to utilize cargo leaf options
modify resources configuration to remove surcharge types
implement migration to fold surcharge types into rates
create utility to derive legacy rate types from new rate structure
2026-06-23 23:15:32 +00:00
Marshal
2b4dfc6490
feat: implement staff price adjustment feature for bookings
2026-06-23 22:54:32 +00:00
marshal
13f0c92821
feat: add showFreeTextBox field to cargo type seeder and improve reference data validation in draft bookings seed
2026-06-24 01:22:53 +03:00
marshal
72df5ce689
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile
2026-06-24 01:22:31 +03:00
Marshal
196e296275
feat: update terminology for shipment date to estimated shipment date in booking forms
2026-06-23 22:21:12 +00:00
