Commit Graph

329 Commits

Author SHA1 Message Date
buiphuan0211 ea80206619 add field from-to holiday WarehouseNatsResponse 2022-12-20 11:13:11 +07:00
anbuiselly 67a5afa933 add field IsPendingInactive 2022-12-14 10:52:38 +07:00
anbuiselly c1a5444e5e edit res warehouse 2022-12-12 14:25:40 +07:00
anbuiselly aa3a201b18 edit response warehouse 2022-12-12 14:07:28 +07:00
Sinh 46539db236 update get warehouse condition 2022-12-09 10:05:41 +07:00
trunglam b39948c635 Merge pull request 'export-data-affiliate-transaction' (#103) from export-data-affiliate-transaction into master
Reviewed-on: #103
2022-12-07 06:53:36 +00:00
anbuiselly 23eebdce8a change code 2022-12-07 13:48:43 +07:00
Minh Nguyen fa80e0d707 Merge pull request 'add response' (#102) from feature/add-response-data-export-update into master
Reviewed-on: #102
2022-12-05 10:25:33 +00:00
tuannt20 99894963e6 add response 2022-12-05 12:04:43 +07:00
anbuiselly 0d69cc3357 change model get transaction 2022-12-04 21:25:42 +07:00
anbuiselly 5b7d8329ae update model gettransaction 2022-12-04 21:05:25 +07:00
anbuiselly d7c2660ae2 edit getTransactionRequest 2022-12-04 21:01:43 +07:00
anbuiselly 599d36120e edit getTransactionRequest 2022-12-04 20:57:25 +07:00
anbuiselly 7c05aa7011 get list affiliate-transaction 2022-12-04 20:43:54 +07:00
Minh Nguyen 24f0e88472 Merge pull request 'feature/campaign-completed' (#94) from feature/campaign-completed into master
Reviewed-on: #94
2022-12-02 06:58:08 +00:00
Nguyen Minh 4d766bbcea fix conflict 2022-12-02 13:57:40 +07:00
tuannt20 9cec9d8c2f update field 2022-12-02 10:15:58 +07:00
tuanngo 64079b6cad Merge pull request 'add response' (#91) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #91
2022-11-29 06:56:21 +00:00
tuannt20 aff5a872e3 add response 2022-11-29 13:54:39 +07:00
sinhluu 1d722f31a5 Merge pull request 'admin-push-notification-supplier' (#90) from admin-push-notification-supplier into master
Reviewed-on: #90
2022-11-28 03:32:05 +00:00
Sinh 25890d58bc merge branch master into 'admin-push-notification-supplier 2022-11-28 10:31:05 +07:00
tuanngo 8a30a03810 Merge pull request 'add response' (#88) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #88
2022-11-24 08:59:53 +00:00
tuannt20 83e9aef3c9 add response 2022-11-24 15:44:25 +07:00
Minh Nguyen 1fe67e7356 Merge pull request 'fix response' (#86) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #86
2022-11-24 07:45:59 +00:00
Nguyen Minh 6d6fe6acd2 Merge branch 'feature/campaign-completed' of git.selly.red:Selly-Modules/natsio into feature/campaign-completed 2022-11-24 14:16:06 +07:00
Nguyen Minh 8858688f0f update options 2022-11-24 14:15:53 +07:00
tuannt20 af807784ec fix response 2022-11-24 11:14:15 +07:00
Minh Nguyen b7f3c061c8 Merge pull request 'add GetCampaign' (#83) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #83
2022-11-24 03:07:49 +00:00
tuannt20 2f278526a9 add GetCampaign 2022-11-24 09:49:41 +07:00
Minh Nguyen 436a713725 Merge pull request 'add nasts campaign transaction' (#81) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #81
2022-11-24 02:41:01 +00: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 45dc489c4c Merge pull request 'fix' (#79) from feature/social-post into master
Reviewed-on: #79
2022-11-23 10:01:27 +00:00
Nguyen Minh dbf8ad502f fix 2022-11-23 16:54:31 +07:00
phuanbui 8266f7f5ff Merge pull request 'add nats' (#77) from notification-amin into admin-push-notification-supplier
Reviewed-on: #77
2022-11-23 03:30:51 +00:00
anbuiselly c47768308c add nats 2022-11-23 10:29:50 +07:00
Sinh 8248069bb8 count supplier 2022-11-23 10:08:52 +07:00
Minh Nguyen c704f10cda Merge pull request 'feature/campaign' (#76) from feature/campaign into master
Reviewed-on: #76
2022-11-22 08:39:56 +00:00
Minh Nguyen 5a2a7fbbe0 Merge pull request 'add nats staff' (#71) from feature/add-source-response-update-quantity into feature/campaign
Reviewed-on: #71
2022-11-22 03:26:24 +00:00
tuannt20 0dd3dce224 add nats staff 2022-11-22 10:04:40 +07:00
Nguyen Minh 549aee36d0 update notification opts 2022-11-18 14:52:05 +07:00
Sinh d45da3e74c nats - get supplier from old server 2022-11-18 10:13:41 +07:00
Minh Nguyen 828d4e34ba Merge pull request 'rename' (#61) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #61
2022-11-17 02:32:48 +00:00
tuannt20 b8f10912c1 rename 2022-11-17 09:27:45 +07:00
Minh Nguyen cf9f8f2c63 Merge pull request 'fix' (#59) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #59
2022-11-16 10:34:53 +00:00
tuannt20 26f8b64258 fix 2022-11-16 17:33:29 +07:00
Minh Nguyen cfa306d0fc Merge pull request 'nats model campaign admin' (#57) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #57
2022-11-16 10:23:33 +00:00
tuannt20 6e21f72ac0 fix name func 2022-11-16 17:21:37 +07:00
tuannt20 7a213f4b4d nats model campaign admin 2022-11-16 16:43:17 +07:00
Nguyen Minh 18f4444156 fix 2022-11-14 15:11:04 +07:00