Commit Graph

41 Commits

Author SHA1 Message Date
Nedim
2cfac4a023 Contracts for buyer 2023-10-04 12:10:46 +02:00
Senad Uka
7df0c64d15 upstream sync 2023-10-02 12:59:19 +02:00
8a2dbfe055 Merge branch 'invoice' into 'main'
Added invoices endpoint

See merge request ukacorp/mesari/backend!14
2023-10-02 10:57:29 +00:00
Nedim
60042ebd30 Added invoices endpoint 2023-09-29 12:11:24 +02:00
Senad Uka
937c61c635 Upstream sync 2023-09-27 08:04:50 +02:00
Senad Uka
7320fcb527 Upstream sync 2023-09-26 07:25:19 +02:00
3b7ba95d27 Merge branch 'devices-serach' into 'main'
Devices serach

See merge request ukacorp/mesari/backend!13
2023-09-25 12:10:48 +00:00
Nedim
045d349c86 Added search params for get contract 2023-09-25 11:25:48 +02:00
04df3ece96 Merge branch 'main-new' into 'main'
Rebase

See merge request ukacorp/mesari/backend!12
2023-09-25 05:18:15 +00:00
Nedim
4779c32a56 Fixed comments 2023-09-22 08:28:50 +02:00
Nedim
85e695b2d8 Rebase 2023-09-21 12:54:40 +02:00
Senad Uka
c2d6923375 Upstream sync 2023-09-21 11:59:08 +02:00
f4dcb823c4 Merge branch 'revert-0b8792b3' into 'main'
Revert "Merge branch 'fetch-device-info' into 'main'"

See merge request ukacorp/mesari/backend!11
2023-09-21 09:57:06 +00:00
080587f327 Revert "Merge branch 'fetch-device-info' into 'main'"
This reverts merge request !10
2023-09-21 09:56:37 +00:00
0b8792b373 Merge branch 'fetch-device-info' into 'main'
Added fetch device info

See merge request ukacorp/mesari/backend!10
2023-09-21 09:39:36 +00:00
11d560f4d2 Merge branch 'soft-delete' into 'main'
Soft delete device

See merge request ukacorp/mesari/backend!8
2023-09-21 09:37:42 +00:00
Nedim
499906f883 Added fetch device info 2023-09-21 10:04:47 +02:00
Senad Uka
0a450eae56 Upstream sync 2023-09-19 05:09:33 +02:00
Nedim
56bb362e51 Soft delete device 2023-09-18 13:58:48 +02:00
Senad Uka
dc728c4183 Upstream sync 2023-09-18 13:39:32 +02:00
Senad Uka
1f30f85787 Upstream sync 2023-09-18 12:27:40 +02:00
9750aa2c37 Merge branch 'device-info-comment-fix' into 'main'
Fixed comments for create new device where device not found while saving device_info

See merge request ukacorp/mesari/backend!9
2023-09-15 09:06:20 +00:00
Nedim
aefa8d927b Fixed comments for create new device where device not found while saving device_info 2023-09-15 10:01:11 +02:00
faea7f213b Merge branch 'save-device-info' into 'main'
Added route for saving device info

See merge request ukacorp/mesari/backend!7
2023-09-14 06:18:58 +00:00
Nedim
dcf1652dd9 Fixed naming 2023-09-14 08:10:33 +02:00
Nedim
1353404aed Added logic for finding devices 2023-09-14 07:34:16 +02:00
Nedim
386f051d67 Added route for saving device info 2023-09-12 18:28:18 +02:00
32c0cd1ffc Merge branch 'services' into 'main'
Added multiple services to be trigered from main API

See merge request ukacorp/mesari/backend!6
2023-09-11 10:25:54 +00:00
Nedim
67615d76dd Added multiple services to be trigered from main API 2023-09-11 12:05:15 +02:00
f52d8d9a30 Merge branch 'module-name' into 'main'
Module name

See merge request ukacorp/mesari/backend!5
2023-09-11 09:22:38 +00:00
Nedim
203961986d Module name 2023-09-11 11:18:56 +02:00
a4fed06efc Merge branch 'setting-up-user' into 'main'
Fixed module name

See merge request ukacorp/mesari/backend!4
2023-09-11 06:08:55 +00:00
Nedim
0829e049f0 Fixed module name 2023-09-11 08:08:24 +02:00
5fa6f33501 Merge branch 'setting-up-user' into 'main'
Added devices and companies models

See merge request ukacorp/mesari/backend!3
2023-09-11 05:55:03 +00:00
Nedim
f02e5e49cb Added views for QOR admin 2023-09-07 13:04:34 +02:00
Nedim
40c6366608 Added devices and companies models 2023-09-06 11:58:33 +02:00
8bbfa53d42 Merge branch 'env-setup' into 'main'
Added environment variables

See merge request ukacorp/mesari/backend!2
2023-09-05 09:40:52 +00:00
Nedim
2cdbbd5745 Added environment variables 2023-09-05 11:37:03 +02:00
b9131699a7 Merge branch 'initial-setup' into 'main'
Setup boilerplate gorm , and admin part

See merge request ukacorp/mesari/backend!1
2023-09-04 09:32:12 +00:00
Nedim
62de1401e5 Setup boilerplate gorm , and admin part 2023-09-04 11:19:59 +02:00
eb4303bb08 Initial commit 2023-09-04 05:54:45 +00:00