Commit Graph

246 Commits

Author SHA1 Message Date
tuanngo 1737a6053a Merge pull request 'add response' (#101) from feature/add-response-data-export-update into develop
Reviewed-on: #101
2022-12-05 05:05:26 +00:00
tuannt20 99894963e6 add response 2022-12-05 12:04:43 +07:00
phuanbui 8415059365 Merge pull request 'change model get transaction' (#100) from export-data-affiliate-transaction into develop
Reviewed-on: #100
2022-12-04 14:26:15 +00:00
anbuiselly 0d69cc3357 change model get transaction 2022-12-04 21:25:42 +07:00
phuanbui 9a6980f3f9 Merge pull request 'update model gettransaction' (#99) from export-data-affiliate-transaction into develop
Reviewed-on: #99
2022-12-04 14:06:00 +00:00
anbuiselly 5b7d8329ae update model gettransaction 2022-12-04 21:05:25 +07:00
phuanbui 9615a51334 Merge pull request 'edit getTransactionRequest' (#98) from export-data-affiliate-transaction into develop
Reviewed-on: #98
2022-12-04 14:02:07 +00:00
anbuiselly d7c2660ae2 edit getTransactionRequest 2022-12-04 21:01:43 +07:00
phuanbui 9052e9a786 Merge pull request 'edit getTransactionRequest' (#97) from export-data-affiliate-transaction into develop
Reviewed-on: #97
2022-12-04 13:57:50 +00:00
anbuiselly 599d36120e edit getTransactionRequest 2022-12-04 20:57:25 +07:00
anbuiselly 577e993e48 fix conflict 2022-12-04 20:47:23 +07:00
anbuiselly 7c05aa7011 get list affiliate-transaction 2022-12-04 20:43:54 +07:00
Nguyen Minh 4d766bbcea fix conflict 2022-12-02 13:57:40 +07:00
tuanngo e21f1d586a Merge pull request 'update field' (#93) from feature/campaign-completed into develop
Reviewed-on: #93
2022-12-02 03:16:32 +00:00
tuannt20 9cec9d8c2f update field 2022-12-02 10:15:58 +07:00
tuanngo d0b2f408b0 Merge pull request 'feature/campaign-completed' (#92) from feature/campaign-completed into develop
Reviewed-on: #92
2022-11-29 06:56:54 +00:00
tuannt20 aff5a872e3 add response 2022-11-29 13:54:39 +07:00
Sinh 25890d58bc merge branch master into 'admin-push-notification-supplier 2022-11-28 10:31:05 +07:00
tuanngo 8509b1b8b7 Merge pull request 'feature/campaign-completed' (#89) from feature/campaign-completed into develop
Reviewed-on: #89
2022-11-24 09:00:32 +00:00
tuannt20 83e9aef3c9 add response 2022-11-24 15:44:25 +07:00
Minh Nguyen 97d62c9a6b Merge pull request 'feature/campaign-completed' (#87) from feature/campaign-completed into develop
Reviewed-on: #87
2022-11-24 07:46:34 +00:00
tuannt20 af807784ec fix response 2022-11-24 11:14:15 +07:00
Nguyen Minh 5b935df169 fix conflcit 2022-11-24 09:42:31 +07:00
Sinh 9d7ebe2ef0 Merge branch 'admin-push-notification-supplier' into develop 2022-11-24 09:40:11 +07:00
Sinh fb87ac7911 update nats 2022-11-24 09:38:10 +07:00
tuannt20 e3e498ed23 add nasts campaign transaction 2022-11-24 09:06:48 +07:00
Minh Nguyen 3853ab9893 Merge pull request 'fix' (#78) from feature/social-post into develop
Reviewed-on: #78
2022-11-23 09:54:52 +00:00
Nguyen Minh dbf8ad502f fix 2022-11-23 16:54:31 +07:00
anbuiselly c47768308c add nats 2022-11-23 10:29:50 +07:00
Sinh 1f31cbdf76 Merge branch 'admin-push-notification-supplier' into develop 2022-11-23 10:24:07 +07:00
Sinh 8248069bb8 count supplier 2022-11-23 10:08:52 +07:00
tuannt20 0dd3dce224 add nats staff 2022-11-22 10:04:40 +07:00
anbuiselly 0a1c76bb88 add get segment info 2022-11-22 05:43:02 +07:00
anbuiselly f8658523a2 change request get staff 2022-11-21 10:37:53 +07:00
thaingocquang 56cdb74646 Merge branch 'refactor-location' into develop 2022-11-21 00:29:44 +07:00
thaingocquang 1a77ac3d8e [location] update location resp model 2022-11-21 00:29:18 +07:00
thaingocquang 5eb76d813c Merge branch 'refactor-location' into develop 2022-11-21 00:09:03 +07:00
thaingocquang be18b81589 [location] update location resp model 2022-11-21 00:08:21 +07:00
anbuiselly 0a9381065f edit get staff-info 2022-11-18 17:47:26 +07:00
anbuiselly 8cceae74ef get staff by notification action 2022-11-18 16:22:17 +07:00
Sinh 23df6da6bf Merge branch 'admin-push-notification-supplier' into develop 2022-11-18 10:14:21 +07:00
Sinh d45da3e74c nats - get supplier from old server 2022-11-18 10:13:41 +07:00
thaingocquang 89d10dbb7f Merge branch 'refactor-location' into develop 2022-11-17 17:19:24 +07:00
thaingocquang b9885a2a02 [location] RequestCondition oldSlugs 2022-11-17 17:19:04 +07:00
thaingocquang 35e98d866f Merge branch 'refactor-location' into develop 2022-11-17 16:50:03 +07:00
thaingocquang f602e17ef2 [location] add oldSlug to RequestCondition 2022-11-17 16:49:02 +07:00
Minh Nguyen d10f445bf2 Merge pull request 'feature/campaign' (#62) from feature/campaign into develop
Reviewed-on: #62
2022-11-17 02:33:10 +00:00
tuannt20 b8f10912c1 rename 2022-11-17 09:27:45 +07:00
Minh Nguyen b3722384f8 Merge pull request 'feature/campaign' (#60) from feature/campaign into develop
Reviewed-on: #60
2022-11-16 10:35:35 +00:00
tuannt20 26f8b64258 fix 2022-11-16 17:33:29 +07:00