Nguyen Minh
|
8ed19af4ea
|
change struct socket reward payload
|
2023-03-23 14:31:06 +07:00 |
 Minh Nguyen
|
783b68249d
|
Merge pull request 'reqrep socket' (#151) from feature/saving-campaign-bk into develop
Reviewed-on: #151
|
2023-03-23 03:46:25 +00:00 |
|
Nguyen Minh
|
985a86dbd7
|
model
|
2023-03-23 10:46:10 +07:00 |
|
Nguyen Minh
|
2c00022622
|
fix conflict
|
2023-03-23 10:36:07 +07:00 |
|
Nguyen Minh
|
afd6b215d6
|
reqrep socket
|
2023-03-23 10:34:58 +07:00 |
Sinh
|
d03758a32d
|
Merge master
|
2023-03-14 15:02:32 +07:00 |
|
Sinh
|
0b3bb76e26
|
Merge branch 'product/update-request-multi-step' into develop
|
2023-03-01 14:51:22 +07:00 |
|
Sinh
|
2e069b94e7
|
product request multi step
|
2023-03-01 14:40:34 +07:00 |
|
Sinh
|
2841d02165
|
Merge branch 'product/notify-change-price' into develop
|
2023-03-01 11:20:51 +07:00 |
|
Sinh
|
aee7b01b40
|
notify change price product
|
2023-03-01 10:42:54 +07:00 |
tuanngo
|
5882a84e04
|
Merge pull request 'update' (#143) from feature/saving-campaign-bk into develop
Reviewed-on: #143
|
2023-02-28 11:04:37 +00:00 |
tuannt20
|
2f64f1fa37
|
update
|
2023-02-28 18:04:14 +07:00 |
|
tuanngo
|
1fc8f9cfc1
|
Merge pull request 'add field get list seller by ids' (#142) from feature/saving-campaign-bk into develop
Reviewed-on: #142
|
2023-02-28 10:15:21 +00:00 |
|
tuannt20
|
a1d6840fd9
|
add field get list seller by ids
|
2023-02-28 17:14:49 +07:00 |
|
Sinh
|
4c328c0858
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into supplier-setup-product
|
2023-01-31 16:21:24 +07:00 |
anbuiselly
|
f4f15ea224
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into fix-holiday-product
|
2023-01-18 14:29:13 +07:00 |
quang
|
f32844916a
|
location
|
2023-01-17 16:29:47 +07:00 |
phuanbui
|
3958b49cd9
|
Merge pull request 'update_pending_active_product_by_warehouse_ids' (#130) from fix-holiday-product into develop
Reviewed-on: #130
|
2023-01-17 07:23:44 +00:00 |
|
anbuiselly
|
49156e576d
|
fix
|
2023-01-17 14:23:24 +07:00 |
|
anbuiselly
|
d94c6c8430
|
fixconflict
|
2023-01-17 14:17:52 +07:00 |
|
anbuiselly
|
292c7733f0
|
edit struct update_status_warehouse_pending_inactive
|
2023-01-17 14:15:27 +07:00 |
|
anbuiselly
|
dcba547b14
|
fix conflict
|
2023-01-17 11:37:03 +07:00 |
|
anbuiselly
|
9a30faa3a2
|
edit update update_pending_in_active_product_by_warehouse_ids
|
2023-01-17 11:35:38 +07:00 |
|
anbuiselly
|
b5e4e97b2f
|
fix conflict
|
2023-01-17 11:23:16 +07:00 |
|
anbuiselly
|
f9b2edb032
|
update_pending_active_product_by_warehouse_ids
|
2023-01-17 11:20:27 +07:00 |
|
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
|
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 |
|
Nguyen Minh
|
67b99f7774
|
campaign-get-seller-statistic
|
2023-01-11 09:27:49 +07:00 |
|
Sinh
|
df1fbbcf57
|
Merge branch 'master' into supplier-setup-product
|
2023-01-10 16:55:55 +07: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 |
|
anbuiselly
|
39614ca4c5
|
add get-detail-supplier-info
|
2023-01-10 11:27:36 +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
|
f09f9412fd
|
fix conflict
|
2022-12-29 13:51:37 +07:00 |
|
buiphuan0211
|
4fd0a89acd
|
edit check token supplier user
|
2022-12-29 13:49:04 +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 |
|
buiphuan0211
|
ec9dedad0d
|
change res check-token-supllier
|
2022-12-27 23:49:25 +07: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 |
|
buiphuan0211
|
7f548f0931
|
fix
|
2022-12-27 16:37:48 +07: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 |
|
buiphuan0211
|
71be64db27
|
edit requestPayload check token supplier
|
2022-12-27 16:16:08 +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 |
|
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 |