varmeziyaryasin
/
niki
forked from ebhomengo/niki
1
0
Fork 0
Code Pull Requests Activity
288 Commits 4 Branches 0 Tags 26 MiB
Commit Graph

288 Commits

Author SHA1 Message Date
hossein e7ea933038 Merge pull request 'refactor(admin): change aggregation response struct' (#214) from stage/hamed/change-agg-struck into develop 
Reviewed-on: ebhomengo/niki#214
 2024-12-01 13:50:00 +00:00
Hamed Xamani 16c83e1368 refactor(admin): change aggregation response struct 2024-11-27 16:47:02 +03:30
hossein 7aa381c113 Merge pull request 'fix(admin): fix query total and refactor query search' (#213) from stage/hamed/refactor-search into develop 
Reviewed-on: ebhomengo/niki#213
 2024-11-27 05:21:40 +00:00
hossein 4ee7c48797 Merge branch 'develop' into stage/hamed/refactor-search 2024-11-27 05:21:21 +00:00
hossein 4e2baf17c9 Merge pull request 'feat(admin): append refer time key on get all kindbox' (#210) from stage/hamed/kind_box_aggreation into develop 
Reviewed-on: ebhomengo/niki#210
 2024-11-23 10:28:43 +00:00
Hamed Xamani 241272eb7b feat(admin): append refer time key on get all kindbox(#121) 2024-11-23 13:35:00 +03:30
Hamed Xamani dddd1125d0 fix(admin): fix query total and refactor query search 2024-11-20 11:26:59 +03:30
hossein a239bb089c Merge pull request 'feat(admin): append nested data in kindbox and kindboxreq(#208)' (#209) from stage/hamed/agregate-kindbox into develop 
Reviewed-on: ebhomengo/niki#209
 2024-11-19 15:51:32 +00:00
hossein 6a8005592d Merge branch 'develop' into stage/hamed/agregate-kindbox 2024-11-19 15:51:21 +00:00
hossein 54da7e48fa Merge pull request 'feat(admin): add benefactor aggregator service(#198)' (#207) from stage/hamed/agregate-service into develop 
Reviewed-on: ebhomengo/niki#207
 2024-11-19 15:51:12 +00:00
Hamed Xamani 4e97455049 feat(admin): append nested data in kindbox and kindboxreq(#208) 2024-11-19 10:15:20 +03:30
Hamed Xamani 1d14e86602 feat(admin): add benefactor aggregator service(#198) 2024-11-19 08:20:05 +03:30
hossein bf8a141f68 Merge pull request 'fix(niki): fix get all kindbox and kindboxreq with filter param' (#206) from stage/hamed/fix-get-all-api into develop 
Reviewed-on: ebhomengo/niki#206
 2024-11-10 19:46:14 +00:00
Hamed Xamani 61c943c0ac fix(niki): fix get all kindbox and kindboxreq with filter param 2024-11-09 20:09:47 +03:30
hossein 69d4a3ec2b Merge pull request 'Fix priority run migration admin_access' (#205) from stage/hamed/fix-migration into develop 
Reviewed-on: ebhomengo/niki#205
 2024-11-06 05:32:54 +00:00
hossein fa670eda35 Merge branch 'develop' into stage/hamed/fix-migration 2024-11-06 05:32:45 +00:00
hossein 84cc20c0ac Merge pull request 'refactor(niki): remove unnecessary id validation(#131)' (#202) from stage/hamed/unnecessary-check-userid into develop 
Reviewed-on: ebhomengo/niki#202
 2024-11-06 05:12:11 +00:00
hossein 7292ce6c09 Merge branch 'develop' into stage/hamed/unnecessary-check-userid 2024-11-06 05:11:59 +00:00
Hamed Xamani a7a90a118f Fix priority run migration admin_access 2024-11-05 17:29:55 +03:30
hossein 8407126700 Merge pull request 'feat(admin): implement update benefactor profile and change status(#196)' (#199) from stage/hamed/edit-benefactor into develop 
Reviewed-on: ebhomengo/niki#199
 2024-11-04 19:04:48 +00:00
hossein 67d9d5cb7d fix conflicts 2024-11-04 22:33:04 +03:30
hossein e13a517811 Merge pull request 'feat(admin): add search query param(#195)' (#201) from stage/hamed/add-search-param into develop 
Reviewed-on: ebhomengo/niki#201
 2024-11-04 18:57:09 +00:00
hossein 63ffcb8f92 Merge branch 'develop' into stage/hamed/add-search-param 2024-11-04 18:56:53 +00:00
hossein f52850c8d2 Merge pull request 'fix(niki): fix date zero values in response(#197)' (#203) from stage/hamed/null-time into develop 
Reviewed-on: ebhomengo/niki#203
 2024-11-04 18:56:19 +00:00
Hamed Xamani 86caf92026 fix(niki): fix date zero values in response(#197) 2024-11-04 20:03:29 +03:30
Hamed Xamani d4a768974a refactor(niki): remove unnecessary id validation(#131) 2024-11-04 17:44:15 +03:30
Hamed Xamani 07b7509a50 feat(admin): add search query param(#195) 
add search on get all in benefactor, kindbox and kindboxreq endpoint
 2024-11-04 15:12:22 +03:30
hossein e1fde10138 Merge pull request 'fix(niki): add benefactor_id filter to avoid getting all kindboxes' (#200) from stage/erfan/fix-get-benefactor into develop 
Reviewed-on: ebhomengo/niki#200
 2024-11-01 19:05:48 +00:00
Erfan Mohammadi 3dd67e0f83 fix(niki): add benefactor_id filter to avoid getting all kindboxes 2024-11-01 19:26:13 +03:30
Hamed Xamani f067686af7 feat(admin): implement update benefactor profile and change status(#196) 2024-10-29 15:04:12 +03:30
hossein 0e92213d2e Merge pull request 'feat(niki): get benefactor info by admin (#174)' (#192) from stage/ruhollahh01/get-benefactor-by-admin into develop 
Reviewed-on: ebhomengo/niki#192
 2024-10-29 11:06:35 +00:00
Ruhollah f1ad1b9051 feat(niki): get benefactor info by admin (#174) 2024-10-25 12:23:04 +03:30
hossein 3ac97bce91 Merge pull request 'feat(admin): Add status filter in get all refer times(#193)' (#194) from stage/hamed/add-refer-time-filter into develop 
Reviewed-on: ebhomengo/niki#194
 2024-10-23 05:30:42 +00:00
Hamed Xamani 281adb0af5 feat(admin): Add status filter in get all refer times(#193) 2024-10-21 14:32:25 +03:30
Erfan Mohammadi 300b69b449 feat(niki): get all benefactors by admin 2024-10-10 11:48:25 +03:30
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