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 |
|
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
|
4d19b6d7cf
|
Merge branch 'refactor-location' into develop
|
2022-11-21 16:20:33 +07:00 |
|
thaingocquang
|
e3599d1903
|
[location] update location subject
|
2022-11-21 16:20:06 +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 |
|
phuanbui
|
48460713cb
|
Merge pull request 'change request get staff' (#69) from feaure/staff-getinfo into develop
Reviewed-on: #69
|
2022-11-21 03:39:07 +00:00 |
|
anbuiselly
|
f8658523a2
|
change request get staff
|
2022-11-21 10:37:53 +07:00 |
|
phuanbui
|
691e9d76fa
|
Merge pull request 'fix' (#68) from feaure/staff-getinfo into develop
Reviewed-on: #68
|
2022-11-21 01:55:47 +00:00 |
|
anbuiselly
|
74b88b9a2f
|
fix
|
2022-11-21 08:55:30 +07:00 |
|
phuanbui
|
ab51f5fd09
|
Merge pull request 'change mgs get staff-info' (#67) from feaure/staff-getinfo into develop
Reviewed-on: #67
|
2022-11-21 01:34:47 +00:00 |
|
anbuiselly
|
f9c269ce2d
|
change mgs get staff-info
|
2022-11-21 08:33:39 +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 |
|
phuanbui
|
45b49fb83c
|
Merge pull request 'fix get list staff' (#66) from feaure/staff-getinfo into develop
Reviewed-on: #66
|
2022-11-18 14:50:21 +00:00 |
|
anbuiselly
|
2199bb4eef
|
fix get list staff
|
2022-11-18 21:49:42 +07:00 |
|
phuanbui
|
6cd6c3e231
|
Merge pull request 'edit get staff-info' (#65) from feaure/staff-getinfo into develop
Reviewed-on: #65
|
2022-11-18 10:48:46 +00:00 |
|
anbuiselly
|
0a9381065f
|
edit get staff-info
|
2022-11-18 17:47:26 +07:00 |
|
phuanbui
|
d891c3a051
|
Merge pull request 'get staff by notification action' (#64) from feaure/staff-getinfo into develop
Reviewed-on: #64
|
2022-11-18 09:23:35 +00:00 |
|
anbuiselly
|
8cceae74ef
|
get staff by notification action
|
2022-11-18 16:22:17 +07:00 |
|
Minh Nguyen
|
15ba847ef8
|
Merge pull request 'update notification opts' (#63) from feature/campaign into develop
Reviewed-on: #63
|
2022-11-18 07:52:29 +00:00 |
|
Nguyen Minh
|
549aee36d0
|
update notification opts
|
2022-11-18 14:52:05 +07:00 |
|
Sinh
|
17dace7edf
|
remove err method email
|
2022-11-18 10:24:06 +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 |