Commit Graph

445 Commits

Author SHA1 Message Date
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
phuanbui 39c6ec26b4 Merge pull request 'export-data-affiliate-transaction-merge-dev' (#96) from export-data-affiliate-transaction-merge-dev into develop
Reviewed-on: #96
2022-12-04 13:48:24 +00: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
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
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
Sinh 9e188c3eb6 Merge branch 'integrate-shiip' into develop 2022-12-01 14:11:31 +07:00
Sinh 437a67e4b4 add warehouse subject 2022-11-30 17:39:41 +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
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 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
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 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
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
Minh Nguyen 2b238cabde Merge pull request 'feature/campaign-completed' (#85) from feature/campaign-completed into develop
Reviewed-on: #85
2022-11-24 07:16:33 +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 83d795fcee Merge pull request 'feature/campaign-completed' (#84) from feature/campaign-completed into develop
Reviewed-on: #84
2022-11-24 03:08:16 +00: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
Sinh 3307ae3abd Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-11-24 09:46:01 +07:00
Sinh fa693cc60b fix nats 2022-11-24 09:45:53 +07:00
Nguyen Minh 5b935df169 fix conflcit 2022-11-24 09:42:31 +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 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 45dc489c4c Merge pull request 'fix' (#79) from feature/social-post into master
Reviewed-on: #79
2022-11-23 10:01:27 +00: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
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 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
Tue ec2a6e2d43 build email 2022-11-23 09:53:50 +07:00
Tue b996a5b562 build email 2022-11-23 09:52:48 +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
phuanbui 87c184a189 Merge pull request 'add value config get segment' (#75) from feaure/staff-getinfo into develop
Reviewed-on: #75
2022-11-22 04:53:01 +00:00
anbuiselly ede51d03d0 add value config get segment 2022-11-22 11:52:16 +07:00
Nguyen Minh a93fa2c141 fix 2022-11-22 10:36:44 +07: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