Commit Graph

318 Commits

Author SHA1 Message Date
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 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