Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 00:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,792 Commits 96 Branches 0 Tags
dc55ebda29aac03b153c65dd811a79a0339ac2b0
Commit Graph

1353 Commits

Author SHA1 Message Date
marshal
dc55ebda29 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 18:23:56 +03:00
marshal
1a6f461a06 changes 2026-06-30 18:23:47 +03:00
Marshal
33d3aa9294 Enhance rule engine form to support currency formatting and suffix display 2026-06-30 15:18:30 +00:00
Marshal
708bd75d1f enhance contract review and editing experience 2026-06-30 15:16:27 +00:00
marshal
dd9a7e639a console 2026-06-30 06:15:57 +03:00
Marshal
f51c015814 Enhance payment module 2026-06-30 03:13:18 +00:00
marshal
c501effc32 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:52:59 +03:00
Marshal
9674c9394d Update logging configuration to use TYPEORM_LOGGING environment variable 2026-06-30 02:52:19 +00:00
marshal
d05f634948 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-30 05:22:10 +03:00
Marshal
a072f04450 Enhance contract and booking request handling 2026-06-30 02:20:32 +00:00
marshal
abce3da6ce merge conflict 2026-06-30 05:17:56 +03:00
Marshal
d91389daac cfix payment 2026-06-29 15:46:17 +00:00
Marshal
ce3584cd4a cfix payment 2026-06-29 15:41:00 +00:00
Marshal
c6979a97c2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 15:25:53 +00:00
Eyob T.
d4fb34c572 Merge pull request #345 from Tria-plc/alpha 
Update payment methods and cron job for payment cancellation
 2026-06-29 18:06:08 +03:00
Nathnael
31a2e93c49 fix: rm the hardcode false for general contract 2026-06-29 14:42:53 +00:00
Nathnael
feae27d0c3 feat: improve the invoices in the portal 2026-06-29 14:26:25 +00:00
Nathnael Wondisha
4cf8e89780 Merge branch 'dev' into freight/feat/invoice 2026-06-29 17:24:29 +03:00
Nathnael
e9f9450b0f fix: types 2026-06-29 14:10:10 +00:00
yaschalew10
eb1db022a7 Merge pull request #347 from Tria-plc/freight/feature/last_mile_invoice 
fix
 2026-06-29 17:03:03 +03:00
natib21
7dba546254 fix 2026-06-29 13:59:51 +00:00
yaschalew10
c9951bf0dd Merge pull request #346 from Tria-plc/freight/feature/last_mile_invoice 
Freight/feature/last mile invoice
 2026-06-29 16:56:09 +03:00
Nathnael
6d40d185d6 feat: setup the invoice page in the portal 2026-06-29 13:54:14 +00:00
Nathnael
69955bc0e6 feat: setup the invoice backend 2026-06-29 13:53:32 +00:00
natib21
8b6b6ec737 fix 2026-06-29 13:52:54 +00:00
natib21
f2826f2b9b fix 2026-06-29 13:49:01 +00:00
Nathnael
f7f0f6aef3 fix: update the invoice generation to the new booking creation 2026-06-29 13:45:35 +00:00
Roba Boru
0d5691051f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-29 16:38:00 +03:00
Roba Boru
0b4e3d7817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-29 16:37:37 +03:00
Roba Boru
4c153b0e3b Update payment methods and cron job for payment cancellation 2026-06-29 16:37:01 +03:00
Abubeker Yasin
d6f3ed5cd4 Merge pull request #343 from Tria-plc/alpha 
Currency enum runtime issue resolution
 2026-06-29 16:30:16 +03:00
natib21
93ca1485c8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 13:24:32 +00:00
natib21
0d8ed45256 fix 2026-06-29 13:24:01 +00:00
marshal
7179f75a70 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 16:05:46 +03:00
marshal
69df391f90 Update payment service and API base URL for local development 2026-06-29 16:03:53 +03:00
Stephanos A
cc8e88d7eb Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-29 16:03:12 +03:00
Stephanos A
98959c03cc Fare engine issue resolution 2026-06-29 16:03:00 +03:00
Marshal
0783ee1635 Merge branch 'freight_feature/contrat' of github.com:Tria-plc/edr-platform into freight_feature/contrat 2026-06-29 13:01:48 +00:00
Marshal
0b1e330459 add payemnt test 2026-06-29 13:00:55 +00:00
Abubeker Yasin
86bea9dc8d Merge pull request #342 from Tria-plc/alpha 
Alpha
 2026-06-29 15:29:00 +03:00
yaschalew
0d4587cf52 Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:26:54 +03:00
natib21
fc95d48d28 fix 2026-06-29 12:25:36 +00:00
marshal
4e632123c0 Merge pull request #340 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:21:01 +03:00
marshal
6685a3ba76 payemnt 2026-06-29 15:17:51 +03:00
natib21
aac790292b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 12:15:53 +00:00
natib21
a64e531324 fix 2026-06-29 12:15:30 +00:00
marshal
d22fb6bb22 Merge pull request #338 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:10:57 +03:00
yaschalew
75ff175538 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice 2026-06-29 15:09:20 +03:00
marshal
a83a686f37 payemnt 2026-06-29 15:09:19 +03:00
marshal
f958a7639a Merge pull request #336 from Tria-plc/freight_feature/contrat 
payemnt
 2026-06-29 15:08:50 +03:00