natib21
48db0b240b
fix fayda
2026-07-03 09:32:41 +00:00
natib21
b218179d72
:wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-03 09:10:31 +00:00
natib21
e4b0c73c63
fix fayda
2026-07-03 09:10:05 +00:00
yaschalew
c449e73337
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 18:08:35 +03:00
yaschalew
49036abf7f
fix
2026-07-02 18:07:21 +03:00
yaschalew10
0a3b4fb225
Merge pull request #411 from Tria-plc/freight/feature/first_mile_invoice
...
fix
2026-07-02 18:03:14 +03:00
yaschalew
26e2974d87
fix
2026-07-02 18:02:23 +03:00
yaschalew10
7df24673a8
Merge pull request #403 from Tria-plc/freight/feature/first_mile_invoice
...
Freight/feature/first mile invoice
2026-07-02 17:57:45 +03:00
yaschalew
2b7e67b227
fix
2026-07-02 17:56:17 +03:00
yaschalew
8f24544f78
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:42:21 +03:00
natib21
eb5d8a7411
fix
2026-07-02 14:42:04 +00:00
yaschalew
71e1ab98f4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:37:54 +03:00
natib21
b7da024968
fix
2026-07-02 14:37:38 +00:00
yaschalew
9198fcd3e7
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:34:40 +03:00
natib21
2424e96e74
fix
2026-07-02 14:34:22 +00:00
yaschalew
60eba409ae
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:27:25 +03:00
natib21
e5fed081fc
fix
2026-07-02 14:27:09 +00:00
yaschalew
86090d5c37
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:19:09 +03:00
natib21
7d85f5dc2e
fix
2026-07-02 14:18:53 +00:00
Nathnael Wondisha
9d14414bf1
Merge pull request #410 from Tria-plc/freight/feat/fixes-v1
...
fix: merge marker in invoice detial page
2026-07-02 17:14:40 +03:00
yaschalew
8f152466e8
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:14:31 +03:00
natib21
c2c29f0735
fix
2026-07-02 14:14:13 +00:00
Nathnael
635d674bbe
fix: merge marker in invoice detial page
2026-07-02 14:11:34 +00:00
yaschalew
245dd2da88
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 17:07:04 +03:00
natib21
34b87bbcee
fix
2026-07-02 14:06:45 +00:00
yaschalew
86b1534ed4
Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice
2026-07-02 16:56:04 +03:00
yaschalew
fb8dcb0217
fix
2026-07-02 16:55:51 +03:00
natib21
7f6c9c6313
fix
2026-07-02 13:55:08 +00:00
marshal
193294d464
Merge pull request #408 from Tria-plc/contrat-backup2
...
Contrat backup2
2026-07-02 16:49:33 +03:00
Marshal
f77e4d150b
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:44:50 +00:00
Nathnael Wondisha
17f2ef9c85
Merge pull request #406 from Tria-plc/freight/feat/fixes-v1
...
Freight/feat/fixes v1
2026-07-02 16:44:43 +03:00
natib21
d8f1ed8899
fix issue
2026-07-02 13:44:19 +00:00
ghost2023
2c5e553d7c
Merge branch 'dev' into freight/feat/fixes-v1
2026-07-02 16:43:16 +03:00
Marshal
71894ae2d3
merge conflict
2026-07-02 13:43:07 +00:00
Abubeker Yasin
8e19089e89
Merge pull request #407 from Tria-plc/passenger/feat/iam
...
feat: ( iam ) add portal auth registration, forgot/change password, …
2026-07-02 16:39:13 +03:00
Abubeker Yasin
60e0c26943
feat: ( iam ) add portal auth registration, forgot/change password, Fayda setup
2026-07-02 16:35:54 +03:00
ghost2023
df60c4750e
fix: warehouse query
2026-07-02 16:32:35 +03:00
Marshal
860af20e0d
Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2
2026-07-02 13:29:10 +00:00
Marshal
fec2a5d320
update import gl flow
2026-07-02 13:27:59 +00:00
ghost2023
b75a3ab54b
fix: first-mile error
2026-07-02 16:25:45 +03:00
Marshal
fe40d9f4be
update import gl flow
2026-07-02 13:24:39 +00:00
Eyob T.
f1f5917253
Merge pull request #405 from Tria-plc/alpha
...
Refine booking flow
2026-07-02 16:23:26 +03:00
ghost2023
79c3293a72
fix: booking paid trigger
2026-07-02 16:18:46 +03:00
natib21
1869790eab
fix
2026-07-02 13:18:34 +00:00
natib21
e429a2cebf
fix
2026-07-02 13:15:44 +00:00
natib21
64e346324b
fix issue
2026-07-02 13:11:12 +00:00
Roba Boru
83eafacee1
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-02 16:08:20 +03:00
Roba Boru
93f2d12d3c
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
2026-07-02 16:07:46 +03:00
Roba Boru
f2ee62b95f
Refine booking flow
2026-07-02 16:03:57 +03:00
Hagernesh Tadesse
a5d7384f59
Merge pull request #404 from Tria-plc/truckassign
...
Truckassign
Import: customer can assign truck when there is no last-mile delivery.
Export: customer can assign truck when there is no first-mile pickup.
Other/domestic: customer can assign truck only when neither first nor last mile is selected.
Booking must still be PAID and in an allowed status.
2026-07-02 16:00:00 +03:00
