Commit Graph

1037 Commits

Author SHA1 Message Date
yaschalew
ed44cb5675 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 16:19:59 +03:00
yaschalew
cefcaa7184 fix conflict 2026-06-24 16:18:35 +03:00
natib21
b0a5494405 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 13:14:59 +00:00
natib21
5b1d2e2984 fix 2026-06-24 13:14:33 +00:00
yaschalew10
aa59d80937 Merge pull request #277 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-24 16:13:34 +03:00
Abubeker Yasin
5d9e2cee53 refactor: ( iam ) add ispublic to public endpoints 2026-06-24 16:06:53 +03:00
hagiye
060d6b5988 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:51:03 +03:00
Abubeker Yasin
6e33075b05 fix: ( seats ) restore @IsPublic() on GET /seats/seatmap/:scheduleId 2026-06-24 15:32:45 +03:00
hagiye
9719bd02d7 Release Order plus Storage Allocation Rule and fee 2026-06-24 15:27:38 +03:00
hagiye
c69dd3c238 Release Order plus Storage fee 2026-06-24 15:23:50 +03:00
Abubeker Yasin
e2e10e0a44 fix: ( seed ) add @InjectDataSource() to PassengerStaffUsersSeeder constructor 2026-06-24 15:03:48 +03:00
yaschalew
409d79fb6b Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:52:47 +03:00
natib21
23e47c7319 fix 2026-06-24 11:52:17 +00:00
yaschalew
66e45d2cd5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:47:33 +03:00
natib21
f1b9989730 fix 2026-06-24 11:47:02 +00: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
yaschalew
5eaab8164a Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 13:02:42 +03:00
natib21
0e351fa0b4 sms 2026-06-24 10:02:16 +00:00
yaschalew
967969af65 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:36:52 +03:00
natib21
9c7300dcac fix 2026-06-24 09:35:54 +00:00
yaschalew
86c4e37cc9 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:34:08 +03:00
natib21
8c3827c70b fix 2026-06-24 09:33:37 +00:00
hagiye
8ee31789c6 merge conflict fix 2026-06-24 12:31:59 +03:00
Abubeker Yasin
56c73cd337 fix: ( seats ) remove IamModule reference from SeatsModule imports 2026-06-24 12:31:34 +03:00
yaschalew
b455d81ede Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:30:57 +03:00
yaschalew
833e55385d fix 2026-06-24 12:30:43 +03:00
natib21
79860c807c fix 2026-06-24 09:30:11 +00:00
Abubeker Yasin
e7bbc8112b fix: ( schema ) restore optional Passenger.user 2026-06-24 12:25:42 +03:00
yaschalew
d4578f215b Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:18:02 +03:00
natib21
930fa9e9d9 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 09:17:40 +00:00
marshal
49ae46934a fix(freight-api): call acceptBooking after payment completion 2026-06-24 12:16:03 +03:00
natib21
b1e0a403a6 fix 2026-06-24 09:02:09 +00: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
natib21
97a5ee61d9 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 08:43:57 +00:00
Abubeker Yasin
1dfe4b9c37 refactor: ( iam ) add public decorator for public endpoins 2026-06-24 11:39:31 +03:00
natib21
4f6a925e80 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 08:34:32 +00:00
natib21
9fcbf2783a booking id 2026-06-24 08:33:51 +00: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