Commit Graph

253 Commits

Author SHA1 Message Date
AMiR 046b292f9f feat(niki): get all benefactor by admin 2024-10-10 11:35:42 +03:30
hossein cf27483182 Merge pull request 'feat(niki): add api to fetch refer time list for benefactor and admin' (#190) from stage/hamed/get-all-refer-time into develop
Reviewed-on: ebhomengo/niki#190
2024-10-09 05:21:28 +00:00
hossein e5119a1701 Merge branch 'develop' into stage/hamed/get-all-refer-time 2024-10-09 05:17:20 +00:00
hossein 845e321b7b Merge pull request 'fix(delivery): Remove unused filter from delivery to service layer (#165)' (#189) from stage/hamed/remove-filter-benefactor-id into develop
Reviewed-on: ebhomengo/niki#189
2024-10-09 05:16:27 +00:00
hossein 4d8f8adf59 Merge branch 'develop' into stage/hamed/remove-filter-benefactor-id 2024-10-09 05:16:16 +00:00
hossein 08ff2d3d40 Merge pull request 'Benefactor Tests: Address, Kind box requests, benefactor' (#149) from stage/rezoo/e2e-test/benefactor into develop
Reviewed-on: ebhomengo/niki#149
2024-10-09 05:13:07 +00:00
Reza Mobaraki dad8eba72d
update vendor
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-10-08 21:33:54 +03:30
Reza Mobaraki 606650e32b
test(end2end): update tests, remove mock data
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-10-08 21:33:04 +03:30
Hamed Xamani 78db09faf4 feat(niki): add api to fetch refer time list for benefactor and admin 2024-10-08 00:27:11 +03:30
Hamed Xamani 6f6643552d fix(delivery): remove unused filter from delivery to service layer (#165) 2024-10-08 00:21:11 +03:30
Reza Mobaraki ebd05c16f7
Merge branch 'develop' into stage/rezoo/e2e-test/benefactor 2024-10-02 09:50:35 +03:30
Reza Mobaraki 9458e4fa2e
test(end2end): fix
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-10-02 01:21:32 +03:30
Reza Mobaraki 00de075ad3
test(end2end): add subtests
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-10-02 01:12:58 +03:30
hossein 5f7ce41418 Merge pull request 'fix: date, date-time filter' (#187) from hotfix/Fix-refer-dates-format into develop
Reviewed-on: ebhomengo/niki#187
2024-09-25 05:31:39 +00:00
hossein c0af314119 Merge branch 'develop' into hotfix/Fix-refer-dates-format 2024-09-25 05:31:19 +00:00
hossein b25edc44eb Merge pull request 'fix(delivery): bind kindbox id path param and benefactor id' (#186) from stage/erfan/fix-get-kindbox-by-benefactor into develop
Reviewed-on: ebhomengo/niki#186
2024-09-25 05:27:39 +00:00
hossein 38875b7497 Merge branch 'develop' into stage/erfan/fix-get-kindbox-by-benefactor 2024-09-25 05:27:23 +00:00
hossein 29d25b461d Merge pull request 'fix(repository): resolve pagination 500 error on page_number field (#160)' (#185) from stage/erfan/fix-pagination into develop
Reviewed-on: ebhomengo/niki#185
2024-09-25 05:26:38 +00:00
Reza Mobaraki cc53a7ddc8
fix(BuildFilterQuery): use regex to validate date and date time
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-09-24 15:32:55 +03:30
Reza Mobaraki e006ff5898
fix: date, date-time filter
Signed-off-by: Reza Mobaraki <rezam578@gmail.com>
2024-09-24 14:30:22 +03:30
Erfan Mohammadi 385fa2645a fix(repository): resolve pagination 500 error on page_number field (#160) 2024-09-22 23:50:02 +03:30
Erfan Mohammadi 1166c11b6f fix(delivery): bind kindbox id path param and benefactor id 2024-09-22 01:13:31 +03:30
Iman Mirazimi 4ef5c0ed66 feat(niki): sms notification for agent 2024-09-16 18:26:05 +03:30
Iman Mirazimi d26d4fc179 fix(niki): agent structure refactor 2024-09-16 14:44:45 +03:30
hossein 47b7f7f216 Merge pull request 'fix(niki): agent structure refactor' (#171) from agent-structure-refactor into develop
Reviewed-on: ebhomengo/niki#171
2024-09-16 04:52:06 +00:00
hossein 6819dde2ce Merge branch 'develop' into agent-structure-refactor 2024-09-16 04:49:41 +00:00
hossein c8c5ca808e Merge pull request 'feat(niki): implement refresh access token for admins and benefactors (#156)' (#157) from stage/ruhollahh01/implement-refresh-access-token-endpoints into develop
Reviewed-on: ebhomengo/niki#157
2024-09-16 04:49:25 +00:00
hossein 061db253fe Merge branch 'develop' into stage/ruhollahh01/implement-refresh-access-token-endpoints 2024-09-16 04:49:05 +00:00
hossein a6fd4e2357 Merge pull request 'fix(niki): fix create and update kind-box request by admin internal errors (#167 and #168)' (#172) from stage/ruhollahh01/fix-create-and-update-kindbox-req-by-admin into develop
Reviewed-on: ebhomengo/niki#172
2024-09-16 04:48:55 +00:00
Ruhollah 0703319928 fix(niki): fix create and update kind-box request by admin internal errors (#167 and #168) 2024-09-15 23:47:26 +03:30
Ruhollah e727bf5c0e feat(niki): implement refresh access token for admins and benefactors (#156) 2024-09-15 15:04:11 +03:30
Iman Mirazimi b55ec32b21 fix(niki): agent structure refactor 2024-09-15 11:06:09 +03:30
hossein 5526088b35 Merge pull request 'feat(kindbox): add edit kindbox by Admin' (#142) from stage/fatemeh/admin-edit-kindbox into develop
Reviewed-on: ebhomengo/niki#142
2024-09-11 11:01:54 +00:00
Fatemeh Javadi 8d5b12b4d5 feat(kindbox): add edit kindbox by Admin 2024-09-11 10:09:52 +03:30
hossein a3bd4247a2 Merge pull request 'refactor(param): remove embedded entities in delivery response structs' (#169) from stage/erfan/refactor-delivery-response-params into develop
Reviewed-on: ebhomengo/niki#169
2024-09-11 06:07:35 +00:00
hossein a4a6866896 Merge branch 'develop' into stage/erfan/refactor-delivery-response-params 2024-09-11 06:07:19 +00:00
hossein 243caf8f82 Merge pull request 'fix(makefile): skip formatting vendor and auto generated files' (#158) from stage/erfan/fix-makefile-format-skipping-vendor into develop
Reviewed-on: ebhomengo/niki#158
2024-09-11 05:59:03 +00:00
hossein d37253c0db Merge branch 'develop' into stage/erfan/fix-makefile-format-skipping-vendor 2024-09-11 05:58:50 +00:00
hossein 083327472c Merge pull request 'feat: add CORS middleware configuration with custom allowed origins(#154)' (#155) from stage/erfan/add-cors-configuration into develop
Reviewed-on: ebhomengo/niki#155
2024-09-11 05:58:26 +00:00
hossein c896090a7c Merge branch 'develop' into stage/erfan/add-cors-configuration 2024-09-11 05:58:16 +00:00
hossein 951f5c8114 Merge pull request 'fix(validation): Add validation for KindBox status in enumeration by admin' (#144) from stage/fatemeh/admin-kindbox-enumeration-validation into develop
Reviewed-on: ebhomengo/niki#144
2024-09-11 05:51:14 +00:00
hossein 1aab6d9d82 Merge branch 'develop' into stage/fatemeh/admin-kindbox-enumeration-validation 2024-09-11 05:50:46 +00:00
Erfan Mohammadi e5b380851c refactor(param): remove embedded entities in delivery response structs 2024-09-11 00:25:19 +03:30
Erfan Mohammadi 82e71763e2 fix(makefile): skip formatting vendor and auto generated files 2024-09-09 12:39:57 +03:30
Erfan Mohammadi 2c3124ee2c feat: add CORS middleware configuration with custom allowed origins(#154) 2024-09-08 13:34:06 +03:30
hossein 9ddcdd7a82 Merge pull request 'fix(delivery): register admin agent route to fix 404 error' (#152) from stage/ruhollahh01/fix-admin-agent-route into develop
Reviewed-on: ebhomengo/niki#152
2024-09-06 13:42:00 +00:00
Ruhollah 1e50e4c458 fix(delivery): register admin agent route to fix 404 error 2024-09-06 15:00:29 +03:30
hossein 2ebe233d8f Merge pull request 'fix(delivery): fix swagger sending request to the wrong host and port' (#151) from stage/ruhollahh01/fix-swagger-host-issue into develop
Reviewed-on: ebhomengo/niki#151
2024-09-04 15:09:08 +00:00
Ruhollah ccc56ddb03 fix(delivery): fix swagger sending request to the wrong host and port 2024-09-04 18:12:24 +03:30
hossein fab3cfa7d4 Merge pull request 'refactor(niki): stage deployment docker setup (#130)' (#148) from stage/ruhollahh01/refactor-stage-deployment-docker-setup into develop
Reviewed-on: ebhomengo/niki#148
2024-09-03 05:36:03 +00:00