Commit Graph

154 Commits

Author SHA1 Message Date
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
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
Sinh 25890d58bc merge branch master into 'admin-push-notification-supplier 2022-11-28 10:31:05 +07:00
Nguyen Minh 5b935df169 fix conflcit 2022-11-24 09:42:31 +07:00
tuannt20 e3e498ed23 add nasts campaign transaction 2022-11-24 09:06:48 +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
Tue ec2a6e2d43 build email 2022-11-23 09:53:50 +07:00
Tue b996a5b562 build email 2022-11-23 09:52:48 +07: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
tuannt20 0dd3dce224 add nats staff 2022-11-22 10:04:40 +07:00
phuanbui 913c762897 Merge pull request 'add get segment info' (#70) from feaure/staff-getinfo into develop
Reviewed-on: #70
2022-11-21 22:44:59 +00:00
anbuiselly 2719017b61 add cmt 2022-11-22 05:44:36 +07:00
anbuiselly 0a1c76bb88 add get segment info 2022-11-22 05:43:02 +07:00
thaingocquang 75c8aefb9e Merge branch 'refactor-location' into develop 2022-11-21 16:00:31 +07:00
thaingocquang 8b907cec0d new location subject 2022-11-21 15:59:56 +07:00
anbuiselly 74b88b9a2f fix 2022-11-21 08:55:30 +07:00
anbuiselly f9c269ce2d change mgs get staff-info 2022-11-21 08:33:39 +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
Minh Nguyen d04712a560 Merge pull request 'feature/campaign' (#58) from feature/campaign into develop
Reviewed-on: #58
2022-11-16 10:23:51 +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 3e1dcb2fe1 fix conflict 2022-11-14 14:47:20 +07:00
Nguyen Minh 598c886aa6 nats model campaign 2022-11-14 14:45:26 +07:00
Tue 87d6bba079 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-09 14:28:29 +07:00
Tue a3206ebdd4 build auth sms 2022-11-09 14:28:10 +07:00
Tue 77547914e0 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 18:05:00 +07:00
Tue 3507d17029 build auth sms 2022-11-08 18:02:42 +07:00
QuanTT0110 61498e1594 update 2022-11-08 15:22:53 +07:00
Tue 2872e4f75b build auth sms 2022-11-08 14:15:47 +07:00
Tue ca99cdad86 build auth sms 2022-11-08 14:05:35 +07:00
Tue c004406728 build auth sms 2022-11-08 14:05:17 +07:00
Tue 7e433426cb build auth sms 2022-11-08 14:02:07 +07:00
Tue bf3a9ed022 build auth sms 2022-11-08 14:00:58 +07:00
Tue ffff325e78 build authsms 2022-11-08 13:53:52 +07:00
QuanTT0110 dc33b5ac71 sync data warehouse into service supplier 2022-11-08 11:12:02 +07:00
QuanTT0110 5c3c5b6dcb sync data warehouse into service supplier 2022-11-08 11:09:35 +07:00
QuanTT0110 ae16428783 sync data warehouse into service supplier 2022-11-08 11:05:34 +07:00
Tue d946b993ee build auth sms 2022-11-07 11:21:37 +07:00
Tue 70b38d05cf build auth sms 2022-11-07 11:21:27 +07:00
Tue 382a2b7dfa build auth sms 2022-11-04 17:28:51 +07:00
Tue 283974d869 build auth sms 2022-11-04 17:28:33 +07:00