phuanbui
|
024186d17b
|
Merge pull request 'edit response checkTokenSupplier' (#115) from setup-holiday-supplier-tool into develop
Reviewed-on: #115
|
2022-12-24 06:52:13 +00:00 |
buiphuan0211
|
54f5c45488
|
edit response checkTokenSupplier
|
2022-12-24 13:50:58 +07:00 |
|
phuanbui
|
92cdded017
|
Merge pull request 'add field permission checkTokenSupplier' (#114) from setup-holiday-supplier-tool into develop
Reviewed-on: #114
|
2022-12-23 08:19:09 +00:00 |
|
buiphuan0211
|
b5d7425114
|
add field permission checkTokenSupplier
|
2022-12-23 15:13:35 +07:00 |
|
buiphuan0211
|
c336e034f8
|
fix conflix
|
2022-12-23 14:52:00 +07:00 |
|
buiphuan0211
|
daac1da25d
|
delete suppler-holiday && add checkTokenSupplier
|
2022-12-23 14:47:09 +07:00 |
|
phuanbui
|
4acbf78c22
|
Merge pull request 'add field supplier-holiday' (#112) from setup-holiday-supplier-tool into develop
Reviewed-on: #112
|
2022-12-23 04:36:56 +00:00 |
|
buiphuan0211
|
5ec216067d
|
add field supplier-holiday
|
2022-12-23 11:36:33 +07:00 |
|
phuanbui
|
514e37b885
|
Merge pull request 'setup-holiday-supplier-tool' (#111) from setup-holiday-supplier-tool into develop
Reviewed-on: #111
|
2022-12-23 04:24:08 +00:00 |
|
buiphuan0211
|
e00922334c
|
fix add file source supplierHolidayPayloadCreate
|
2022-12-23 11:23:31 +07:00 |
|
buiphuan0211
|
92ce4547a4
|
fix conflict
|
2022-12-23 09:30:44 +07:00 |
|
buiphuan0211
|
067db84489
|
add get,create, update supplier-holiday
|
2022-12-23 03:32:15 +07:00 |
|
phuanbui
|
ecf159ba99
|
Merge pull request 'delete field form-to-holiday in WarehouseNatsResponse' (#109) from setup-holiday-warehouse-admin into develop
Reviewed-on: #109
|
2022-12-20 04:49:05 +00:00 |
|
buiphuan0211
|
77ec5ee6c1
|
delete field form-to-holiday in WarehouseNatsResponse
|
2022-12-20 11:48:36 +07:00 |
|
phuanbui
|
25b22ad5a3
|
Merge pull request 'add field from-to holiday WarehouseNatsResponse' (#108) from setup-holiday-warehouse-admin into develop
Reviewed-on: #108
|
2022-12-20 04:13:33 +00:00 |
|
buiphuan0211
|
ea80206619
|
add field from-to holiday WarehouseNatsResponse
|
2022-12-20 11:13:11 +07:00 |
|
phuanbui
|
3a9f8b1436
|
Merge pull request 'add field IsPendingInactive' (#107) from setup-holiday-warehouse-admin into develop
Reviewed-on: #107
|
2022-12-14 03:53:40 +00:00 |
anbuiselly
|
67a5afa933
|
add field IsPendingInactive
|
2022-12-14 10:52:38 +07:00 |
|
phuanbui
|
7fd0729494
|
Merge pull request 'edit res warehouse' (#106) from setup-holiday-warehouse-admin into develop
Reviewed-on: #106
|
2022-12-12 07:26:12 +00:00 |
|
anbuiselly
|
c1a5444e5e
|
edit res warehouse
|
2022-12-12 14:25:40 +07:00 |
|
phuanbui
|
0fc3119b61
|
Merge pull request 'setup-holiday-warehouse-admin' (#105) from setup-holiday-warehouse-admin into develop
Reviewed-on: #105
|
2022-12-12 07:08:37 +00: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 |
|
phuanbui
|
6e9dedb8e2
|
Merge pull request 'change code' (#104) from export-data-affiliate-transaction into develop
Reviewed-on: #104
|
2022-12-07 06:50:23 +00:00 |
|
anbuiselly
|
23eebdce8a
|
change code
|
2022-12-07 13:48:43 +07:00 |
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 |
|
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
|
c95d28870f
|
Merge branch 'refactor-supplier' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-08 14:54:57 +07:00 |
|
QuanTT0110
|
b45fb1d19a
|
sync data warehouse into service supplier
|
2022-11-08 14:20:05 +07:00 |
|
Tue
|
2872e4f75b
|
build auth sms
|
2022-11-08 14:15:47 +07:00 |
|
Tue
|
7e433426cb
|
build auth sms
|
2022-11-08 14:02:07 +07:00 |
|
Tue
|
1cacdae547
|
build authsms
|
2022-11-08 13:58:30 +07:00 |
|
Tue
|
4d501a437c
|
build authsms
|
2022-11-08 13:57:22 +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 |
|
thaingocquang
|
d80b305b1a
|
[location] update request model page & limit
|
2022-11-07 16:04:12 +07:00 |
|
thaingocquang
|
34b1de6d42
|
[location] update request model add page & limit
|
2022-11-07 15:48:28 +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 |
|
Tue
|
b6f390064b
|
build auth sms
|
2022-11-04 15:21:03 +07:00 |
|
Tue
|
88931f9c53
|
build auth sms
|
2022-11-04 15:20:31 +07:00 |
|
Sinh
|
174b4b0594
|
Merge branch 'refactor-supplier' into develop
|
2022-11-04 10:28:19 +07:00 |
|
Sinh
|
0d3c931c87
|
define nats func - supplier balance
|
2022-11-04 10:28:09 +07:00 |
|
Sinh
|
70a8d4e847
|
Merge branch 'refactor-supplier' into develop
|
2022-11-03 16:03:48 +07:00 |
|
Sinh
|
aeec881299
|
define nats func - supplier balance
|
2022-11-03 16:02:43 +07:00 |
|
Tue
|
5797eb1a23
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-03 14:14:54 +07:00 |
|
Tue
|
32e93323b7
|
build auth sms
|
2022-11-03 14:14:25 +07:00 |
|
Tue
|
b4811f091e
|
build auth sms
|
2022-11-03 11:35:38 +07:00 |
|
Tue
|
634239a9f1
|
build auth sms
|
2022-11-03 11:35:23 +07:00 |
|
Sinh
|
b345cd5395
|
Pull origin build-auth-sms into refactor-supplier
|
2022-11-03 11:09:36 +07:00 |
|
Tue
|
9407b2df6b
|
build auth sms
|
2022-11-03 10:47:19 +07:00 |
|
Tue
|
6cade7d133
|
build auth sms
|
2022-11-03 10:46:56 +07:00 |
|
Tue
|
77f22993d4
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-03 00:17:59 +07:00 |
|
Tue
|
49426e322c
|
build auth sms
|
2022-11-03 00:17:49 +07:00 |
|
Sinh
|
01900b64e4
|
Merge branch 'refactor-supplier' into develop
|
2022-11-02 17:19:05 +07:00 |
|
Sinh
|
816316b558
|
define nats func - get supplier order cash and supplier withdraw cash
|
2022-11-02 17:18:11 +07:00 |
|
Tue
|
bd5825b7f8
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-02 16:49:20 +07:00 |
|
Tue
|
55e3c07cf6
|
build auth sms
|
2022-11-02 16:49:12 +07:00 |
|
Sinh
|
e26762916c
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier
|
2022-11-02 16:11:41 +07:00 |
|
Tue
|
19349b9813
|
build auth sms
|
2022-11-02 14:57:26 +07:00 |
|
Tue
|
cdbbf9fc73
|
build auth sms
|
2022-11-02 14:56:58 +07:00 |
|
Tue
|
15fd01d5d3
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-01 11:40:51 +07:00 |
|
Tue
|
285ddb75e7
|
build auth sms
|
2022-11-01 11:40:37 +07:00 |
|
Tue
|
56d210bf2d
|
build auth sms
|
2022-11-01 10:44:41 +07:00 |
|
Tue
|
645effaa04
|
build authsms
|
2022-11-01 10:43:20 +07:00 |
|
Tue
|
9a69327679
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-31 17:02:49 +07:00 |
|
Tue
|
0d8e3969db
|
build auth sms
|
2022-10-31 16:59:38 +07:00 |
|
Tue
|
64ad17016c
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms
|
2022-10-31 16:59:28 +07:00 |
 sinhluu
|
df352f8bd5
|
Merge pull request 'integrate-onpoint' (#54) from integrate-onpoint into master
Reviewed-on: #54
|
2022-10-31 09:33:37 +00:00 |
|
Tue
|
79528f72e4
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-31 10:09:31 +07:00 |
|
Tue
|
f6a2b34a7f
|
build authsms
|
2022-10-31 10:07:08 +07:00 |
|
Tue
|
7f03b98f90
|
build authsms
|
2022-10-31 10:04:13 +07:00 |
|
QuanTT0110
|
2dbeab594a
|
Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-28 11:39:47 +07:00 |
|
QuanTT0110
|
2602b22e40
|
fix get supplier free ship info
|
2022-10-28 11:39:29 +07:00 |
|
QuanTT0110
|
7377519ead
|
Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-28 11:19:26 +07:00 |
|
QuanTT0110
|
a86003caf0
|
fix get supplier free ship info
|
2022-10-28 11:19:15 +07:00 |
|
Tue
|
1e2d10b3ce
|
build auth sms
|
2022-10-28 09:39:20 +07:00 |
|
Tue
|
e324b88fe6
|
build authsms
|
2022-10-28 09:31:39 +07:00 |
|
QuanTT0110
|
0dafeb6f1f
|
Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 17:17:02 +07:00 |
|
QuanTT0110
|
0f4ba10479
|
get supplier freeship info
|
2022-10-27 17:16:45 +07:00 |
trunglt251292
|
9b59a6bc6a
|
Merge branch 'refactor-location' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 16:31:17 +07:00 |
|
trunglt251292
|
006accb415
|
[Update] Response warehouse
|
2022-10-27 16:29:38 +07:00 |
|
QuanTT0110
|
37c20ac3c7
|
get supplier freeship info
|
2022-10-27 16:16:09 +07:00 |
|
quang1472001
|
8c82fe548b
|
Merge branch 'refactor-location' into develop
|
2022-10-27 16:03:35 +07:00 |
|
quang1472001
|
cb45dbb694
|
[location] add slug to ResponseLocationAdress
|
2022-10-27 16:03:11 +07:00 |
|
QuanTT0110
|
73e2a8a7c8
|
get supplier freeship info
|
2022-10-27 15:52:39 +07:00 |
|
quang1472001
|
0bed9a6dfb
|
[location] refactor code
|
2022-10-27 14:30:40 +07:00 |
|
QuanTT0110
|
1c5666d7c1
|
Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 11:30:48 +07:00 |