quang
|
90a8b41081
|
Merge branch 'develop' into refactor-location
|
2023-01-16 14:07:05 +07:00 |
|
quang
|
f69ac3ba0c
|
test
|
2023-01-16 14:03:09 +07:00 |
|
quang
|
d50a1a56fa
|
Merge branch 'master' into refactor-location
|
2023-01-16 11:21:27 +07:00 |
 Minh Nguyen
|
1f77ded036
|
Merge pull request 'update' (#126) from feature-campaign-get-seller-statistic into develop
Reviewed-on: #126
|
2023-01-11 03:21:24 +00:00 |
|
Minh Nguyen
|
09c4f03186
|
Merge pull request 'feature-campaign-get-seller-statistic' (#125) from feature-campaign-get-seller-statistic into develop
Reviewed-on: #125
|
2023-01-11 02:29:06 +00:00 |
phuanbui
|
8d20189418
|
Merge pull request 'add get-detail-supplier-info' (#124) from setup-holiday-supplier-tool into develop
Reviewed-on: #124
|
2023-01-10 04:28:06 +00:00 |
Sinh
|
27d387fd43
|
Merge branch 'supplier-setup-product' into develop
|
2023-01-09 16:10:50 +07:00 |
|
Sinh
|
1edc683dd5
|
add subject process product req
|
2023-01-09 15:56:46 +07:00 |
tuanngo
|
de9c3c1723
|
Merge pull request 'feature/get-info-supplier-campaign-app' (#122) from feature/get-info-supplier-campaign-app into develop
Reviewed-on: #122
|
2023-01-03 02:24:01 +00:00 |
tuannt20
|
e4436002e8
|
update
|
2023-01-03 09:23:34 +07:00 |
|
tuannt20
|
6ed64beecb
|
update
|
2023-01-03 09:21:06 +07:00 |
|
tuanngo
|
a8f5bf5d6c
|
Merge pull request 'add response' (#121) from feature/get-info-supplier-campaign-app into develop
Reviewed-on: #121
|
2023-01-03 02:15:06 +00:00 |
|
tuannt20
|
cdccf31571
|
add response
|
2023-01-03 09:11:55 +07:00 |
buiphuan0211
|
b0fa596ac2
|
fix
|
2022-12-29 14:13:22 +07:00 |
|
buiphuan0211
|
1d0c2f3aa4
|
fix conflict
|
2022-12-29 13:59:36 +07:00 |
|
buiphuan0211
|
f09f9412fd
|
fix conflict
|
2022-12-29 13:51:37 +07:00 |
|
Sinh
|
e7888e2c4c
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into supplier-setup-product
|
2022-12-29 10:02:35 +07:00 |
|
phuanbui
|
082fac0a6a
|
Merge pull request 'change res check-token-supllier' (#118) from setup-holiday-supplier-tool into develop
Reviewed-on: #118
|
2022-12-27 16:49:59 +00:00 |
|
phuanbui
|
903da5338c
|
Merge pull request 'fix' (#117) from setup-holiday-supplier-tool into develop
Reviewed-on: #117
|
2022-12-27 09:38:19 +00:00 |
|
phuanbui
|
8326c478e1
|
Merge pull request 'edit requestPayload check token supplier' (#116) from setup-holiday-supplier-tool into develop
Reviewed-on: #116
|
2022-12-27 09:18:00 +00:00 |
|
Sinh
|
e8eddbbc82
|
Merge branch 'supplier-setup-product' into develop
|
2022-12-26 15:36:09 +07:00 |
|
Sinh
|
252c82f1e4
|
add client queue
|
2022-12-26 15:16:46 +07:00 |
|
Sinh
|
dcf44fa87b
|
Merge branch 'supplier-setup-product' into develop
|
2022-12-26 15:13:38 +07:00 |
|
Sinh
|
e66596baf6
|
define nats queue
|
2022-12-26 15:12:48 +07:00 |
|
Sinh
|
b19fea04c8
|
define nats product
|
2022-12-26 14:08:14 +07:00 |
|
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 |
|
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
|
c336e034f8
|
fix conflix
|
2022-12-23 14:52:00 +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 |
|
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
|
92ce4547a4
|
fix conflict
|
2022-12-23 09:30:44 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Sinh
|
46539db236
|
update get warehouse condition
|
2022-12-09 10:05:41 +07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Sinh
|
9d7ebe2ef0
|
Merge branch 'admin-push-notification-supplier' into develop
|
2022-11-24 09:40:11 +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 |
|
Sinh
|
1f31cbdf76
|
Merge branch 'admin-push-notification-supplier' into develop
|
2022-11-23 10:24:07 +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 |
|
Nguyen Minh
|
a93fa2c141
|
fix
|
2022-11-22 10:36:44 +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 |
|
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 |
|
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 |
|
Tue
|
d293fb7412
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-17 13:56:08 +07:00 |
|
Tue
|
035fb59f64
|
build email
|
2022-11-17 13:55:44 +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 |
|
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 |
|
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 |
|
Nguyen Minh
|
44e7cca0d7
|
Merge branch 'feature/campaign' into develop
|
2022-11-14 15:11:18 +07:00 |
|
Nguyen Minh
|
3e1dcb2fe1
|
fix conflict
|
2022-11-14 14:47:20 +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
|
b799bf834e
|
Merge branch 'get-bank-info' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-08 18:01:27 +07:00 |
|
QuanTT0110
|
0580606373
|
get-bank-info
|
2022-11-08 18:00:24 +07:00 |
|
QuanTT0110
|
61498e1594
|
update
|
2022-11-08 15:22:53 +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
|
a5a42a3f4d
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-08 14:16:04 +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
|
d244ae1dc1
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-08 14:02: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
|
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
|
040c867c15
|
sync data warehouse into service supplier
|
2022-11-08 11:12:37 +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
|
e7c9490554
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-07 11:21:48 +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
|
eb114a390f
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-04 17:29:07 +07:00 |
|
Tue
|
0b82072bea
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms
|
2022-11-04 17:28:55 +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 |
|
Tue
|
3c44e6511c
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-03 11:14:50 +07:00 |
|
Tue
|
587d21ce1b
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-03 11:14:38 +07:00 |
|
Sinh
|
69195e7442
|
Merge branch 'refactor-supplier' into develop
|
2022-11-03 11:11:41 +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
|
21435db9b3
|
Merge branch 'refactor-supplier' into develop
|
2022-11-02 17:27:22 +07:00 |
|
Sinh
|
ac1ec030db
|
define nats func - get supplier order cash and supplier withdraw cash
|
2022-11-02 17:27:10 +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
|
868df4713d
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier
|
2022-11-02 16:24:07 +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 |
|
Sinh
|
7d00af18b4
|
Merge branch 'integrate-onpoint' into develop
|
2022-11-02 09:41:23 +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
|
8c63494417
|
build auth sms
|
2022-11-01 10:45:24 +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 |
|
Tue
|
ebd26022d9
|
build auth sms
|
2022-10-31 10:10:00 +07: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 |
|
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
|
e020db1c74
|
resolve conflict
|
2022-10-27 14:32:08 +07:00 |
|
quang1472001
|
0bed9a6dfb
|
[location] refactor code
|
2022-10-27 14:30:40 +07:00 |
|
quang1472001
|
d395f8944f
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 13:42:17 +07:00 |
|
quang1472001
|
6e5080c430
|
[location] update location client
|
2022-10-27 13:41:58 +07:00 |
|
QuanTT0110
|
ebb3cd070a
|
Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 11:58:29 +07:00 |
|
QuanTT0110
|
72aaea5b87
|
fix get bank info
|
2022-10-27 11:58:19 +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 |
|
QuanTT0110
|
389a26ad6f
|
fix get bank info
|
2022-10-27 11:30:17 +07:00 |
|
Sinh
|
ecb51cc5da
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 11:13:25 +07:00 |
|
quang1472001
|
86cfda6dce
|
[location] create RequestCondition
|
2022-10-27 11:11:45 +07:00 |
|
QuanTT0110
|
96bc454514
|
fix conflict
|
2022-10-27 09:41:38 +07:00 |
|
QuanTT0110
|
33bc508f1f
|
get bank and branches by bank ids
|
2022-10-27 09:37:07 +07:00 |
|
Sinh
|
708fad7c59
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier
|
2022-10-27 09:19:13 +07:00 |
|
Tue
|
574f61fe2f
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 09:18:06 +07:00 |
|
Tue
|
112c1c0f7d
|
build auth sms
|
2022-10-27 09:17:20 +07:00 |
|
Sinh
|
97686ff405
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier
|
2022-10-27 09:16:36 +07:00 |
|
Tue
|
bab221fcb5
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 09:16:08 +07:00 |
|
Sinh
|
ef6a15e939
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 09:16:07 +07:00 |
|
Tue
|
bb2405471b
|
build auth sms
|
2022-10-27 09:15:14 +07:00 |
|
Sinh
|
8df9dc1138
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-27 08:52:28 +07:00 |
|
Sinh
|
855cf4ad5f
|
Merge branch 'refactor-supplier' into develop
|
2022-10-26 17:58:34 +07:00 |
|
Sinh
|
20f460b4ef
|
create supplier cashflow
|
2022-10-26 17:56:15 +07:00 |
|
QuanTT0110
|
dcbf82a4d0
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into feature/get-freeship-by-supplierids
|
2022-10-25 12:00:45 +07:00 |
|
QuanTT0110
|
27b14aa122
|
get freeships by supplier ids
|
2022-10-25 12:00:37 +07:00 |
|
trunglt251292
|
5dbde84ea9
|
Merge branch 'move-config-suppliers' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-24 10:56:03 +07:00 |
|
Minh Nguyen
|
e35090e490
|
Merge pull request 'rerun' (#48) from feature/seller-add-field-planPackage into develop
Reviewed-on: #48
|
2022-10-24 03:07:44 +00:00 |
|
QuanTT0110
|
f0eb62f3f5
|
get list permission authsms
|
2022-10-21 11:49:48 +07:00 |
|
Sinh
|
b5fe2c5a71
|
Merge branch 'integrate-onpoint' into develop
|
2022-10-21 09:27:07 +07:00 |
|
Tue
|
2b890e01ef
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-20 15:18:00 +07:00 |
|
Tue
|
a6f9f9eac7
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-20 15:10:50 +07:00 |
|
Tue
|
d2874bc681
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-20 14:40:39 +07:00 |
|
Tue
|
87158679a7
|
update auth sms
|
2022-10-20 14:32:32 +07:00 |
|
Sinh
|
f3ef44279b
|
Merge branch 'integrate-onpoint' into develop
|
2022-10-18 15:05:12 +07:00 |
|
Sinh
|
e0ecb83b9e
|
Merge branch 'add-queue-subscribe' into develop
|
2022-10-18 11:55:46 +07:00 |
|
Sinh
|
9c9ed32d58
|
Merge branch 'add-queue-subscribe' into develop
|
2022-10-18 11:47:24 +07:00 |
|
Minh Nguyen
|
f6386332de
|
Merge pull request 'get list warehouse freeship' (#46) from feature/get-list-warehouse-freeship into develop
Reviewed-on: #46
|
2022-10-17 08:13:42 +00:00 |
|
QuanTT0110
|
b7d963cc90
|
get list warehouse freeship
|
2022-10-17 15:09:50 +07:00 |
|
Sinh
|
65fe4d8380
|
Merge branch 'integrate-onpoint' into develop
|
2022-10-17 14:44:25 +07:00 |
|
Sinh
|
8d571022fc
|
Merge branch 'integrate-onpoint' into develop
|
2022-10-17 11:25:33 +07:00 |
|
Sinh
|
722fa1aacf
|
Merge branch 'update-payload' into develop
|
2022-10-17 11:24:30 +07:00 |
|
quang1472001
|
d71d7f0eb4
|
[location] add Keyword to WardRequestCondition struct
|
2022-10-13 10:23:11 +07:00 |
|
Tue
|
af44ea63f4
|
fix warehouse
|
2022-10-12 11:38:54 +07:00 |
|
Tue
|
c7ad6baf4c
|
Merge branch 'feature/get-bank-info' of git.selly.red:Selly-Modules/natsio into develop
|
2022-10-11 14:02:55 +07:00 |
Minh Nguyen
|
539aa79128
|
Merge pull request #41 from Selly-Modules/feature/seller-add-field-planPackage
seller-add-field-planPackage
|
2022-10-10 09:06:46 +07:00 |
|
quang1472001
|
ed0f16623a
|
add old slug to location response struct
|
2022-10-07 15:23:02 +07:00 |
|
quang1472001
|
3e13cb55b3
|
update location request condition
|
2022-10-06 11:22:10 +07:00 |
|
quang1472001
|
cebb3214cf
|
update location add slug & DistinctWithField
|
2022-10-06 10:55:49 +07:00 |
|
quang1472001
|
b9b55d144e
|
update fix GetDistrictByCondition
|
2022-10-06 10:20:47 +07:00 |
|
quang1472001
|
29b2b861ff
|
update location add find by slug
|
2022-10-06 09:19:21 +07:00 |
|
quang1472001
|
a86a097886
|
update location
|
2022-10-05 18:15:36 +07:00 |
|
quang1472001
|
863e924a5e
|
update location
|
2022-10-05 18:12:42 +07:00 |
|
quang1472001
|
7a3e50ef97
|
update location
|
2022-10-05 17:59:44 +07:00 |
|
Sinh
|
13a465b627
|
Merge branch 'integrate-onpoint' into develop
|
2022-10-04 15:47:25 +07:00 |
|
Sinh
|
7f57a9bd97
|
Merge branch 'export-warehouse-data' into develop
|
2022-09-30 10:41:46 +07:00 |
|
trunglt251292
|
8fe3b39134
|
Merge branch 'feature/seller-by-id' of github.com:Selly-Modules/natsio into develop
|
2022-09-30 10:29:50 +07:00 |
|
Sinh
|
68146c7c2a
|
Merge branch 'integrate-onpoint' into develop
|
2022-09-28 09:37:32 +07:00 |
|
Sinh
|
439d1a0d5a
|
Merge branch 'global-care-car-insurance' into develop
|
2022-09-28 09:33:32 +07:00 |
|
Minh Nguyen
|
ed564effe6
|
Merge pull request #36 from Selly-Modules/feature/seller-by-id
js cashflow seller
|
2022-09-23 23:33:01 +07:00 |
|
Minh Nguyen
|
c2acdaf244
|
Merge pull request #35 from Selly-Modules/feature/seller-by-id
Feature/seller by
|
2022-09-23 22:12:04 +07:00 |
|
Minh Nguyen
|
40e5219036
|
Merge pull request #34 from Selly-Modules/feature/seller-by-id
update js stream
|
2022-09-23 14:47:28 +07:00 |
|
Minh Nguyen
|
df9ccf9d69
|
Merge pull request #33 from Selly-Modules/feature/seller-by-id
stream name
|
2022-09-23 11:58:12 +07:00 |
|
Minh Nguyen
|
e61ae3c10d
|
Merge pull request #32 from Selly-Modules/feature/seller-by-id
jestream
|
2022-09-23 11:17:31 +07:00 |
|
Nguyen Minh
|
36ad0b4972
|
Merge branch 'feature/seller-by-id' into develop
|
2022-09-23 10:14:24 +07:00 |
|
quang1472001
|
d7c0138d6a
|
Merge branch 'develop' of github.com:Selly-Modules/natsio into develop
|
2022-09-22 15:18:06 +07:00 |
|
quang1472001
|
021df099cc
|
update location
|
2022-09-22 14:56:31 +07:00 |
|
Minh Nguyen
|
08a9fdabe0
|
Merge pull request #30 from Selly-Modules/feature/seller-by-id
support chat get seller info
|
2022-09-22 13:49:48 +07:00 |
|
Tue
|
6b168cd98a
|
bank info
|
2022-09-21 14:06:59 +07:00 |
|
Minh Nguyen
|
4a5adc610e
|
Merge pull request #28 from Selly-Modules/feature/seller-by-id
get seller info support chat
|
2022-09-21 10:19:57 +07:00 |
|
trunglt251292
|
a9cc99994f
|
Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop
|
2022-09-20 14:47:19 +07:00 |
|
trunglt251292
|
6bd4ebce2e
|
Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop
|
2022-09-20 13:50:25 +07:00 |
|
trunglt251292
|
3c5c95b103
|
[Update]
|
2022-09-20 10:56:45 +07:00 |
|
trunglt251292
|
a261c32dc4
|
Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop
|
2022-09-20 10:29:13 +07:00 |
|
Sinh
|
fa5be3e17c
|
Merge branch 'integrate-onpoint' into develop
|
2022-09-19 15:02:07 +07:00 |
|
anbuiselly
|
c449dd44f1
|
Merge pull request #27 from Selly-Modules/feature/seller-by-id
Feature/seller by
|
2022-09-19 14:54:08 +07:00 |
|
Sinh
|
af85d25516
|
Merge branch 'integrate-onpoint' into develop
|
2022-09-19 14:19:07 +07:00 |
|
Minh Nguyen
|
389507050a
|
Merge pull request #25 from Selly-Modules/feature/seller-by-id
Feature/seller by
|
2022-09-19 11:51:05 +07:00 |
|
Sinh
|
86269e4292
|
Merge branch 'integrate-onpoint' into develop
|
2022-09-19 11:10:46 +07:00 |
|
Tue
|
22cd1eb18f
|
bank info
|
2022-09-17 10:59:30 +07:00 |
|
Tue
|
44f0e4be44
|
bank info
|
2022-09-17 10:55:37 +07:00 |
|
trunglt251292
|
ddc0af6338
|
Merge branch 'selly-food' of github.com:Selly-Modules/natsio into develop
|
2022-09-16 15:36:57 +07:00 |
|
trunglt251292
|
5f5bfeb182
|
fix conflict
|
2022-09-16 14:52:01 +07:00 |
|
Nguyen Minh
|
139dc6a865
|
Fix conflict
|
2022-09-15 17:04:26 +07:00 |
|
Tue
|
4546d0e89b
|
add bank branch info
|
2022-09-15 11:20:34 +07:00 |