1783 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yaschalew	1193e2bfa9	fix commit	2026-06-29 18:35:51 +03:00
yaschalew	a564338eeb	Merge branch 'freight/feature/last_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice	2026-06-29 18:29:41 +03:00
yaschalew	690753154f	fix	2026-06-29 18:29:24 +03:00
natib21	04bc9eded6	fix	2026-06-29 15:28:04 +00:00
natib21	d94b73fe02	fix	2026-06-29 15:09:34 +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
natib21	9b11eeb623	fix	2026-06-29 14:54:34 +00:00
natib21	c728b249c2	fix	2026-06-29 14:48:47 +00:00
Nathnael Wondisha	296b4ed399	Merge pull request #348 from Tria-plc/freight/feat/invoice ... Migration to central invoice	2026-06-29 17:47:24 +03:00
natib21	fed21de634	Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/last_mile_invoice	2026-06-29 14:45:37 +00:00
natib21	6fa315db0f	fix	2026-06-29 14:45:22 +00: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
yaschalew10	4c393c33c8	Merge pull request #344 from Tria-plc/freight/feature/last_mile_invoice ... Freight/feature/last mile invoice	2026-06-29 16:26:48 +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
Yonas Tewabe	2d4608aded	Update deploy.yml	2026-06-29 16:21:46 +03:00
Yonas Tewabe	999753b842	Update deploy.yml	2026-06-29 16:07:44 +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
Abubeker Yasin	86bea9dc8d	Merge pull request #342 from Tria-plc/alpha ... Alpha	2026-06-29 15:29:00 +03:00
yaschalew10	a9274a0bad	Merge pull request #341 from Tria-plc/freight/feature/last_mile_invoice ... fix	2026-06-29 15:28:39 +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
yaschalew10	cb4f2c8933	Merge pull request #339 from Tria-plc/freight/feature/last_mile_invoice ... Freight/feature/last mile invoice	2026-06-29 15:17:34 +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
yaschalew10	87edba6c12	Merge pull request #337 from Tria-plc/freight/feature/last_mile_invoice ... Freight/feature/last mile invoice	2026-06-29 15:10:00 +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
natib21	b22ab739db	fix	2026-06-29 12:08:16 +00:00
marshal	09e1429c38	payemnt	2026-06-29 15:08:12 +03:00