Commit Graph

553 Commits

Author SHA1 Message Date
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 9b758ee785 fix 2022-12-29 14:10:44 +07:00
buiphuan0211 1d0c2f3aa4 fix conflict 2022-12-29 13:59:36 +07:00
buiphuan0211 64c7fca2cc rename subj 2022-12-29 13:58:16 +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 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
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
sinhluu 1f4edb64ab Merge pull request 'setup-holiday-warehouse-admin' (#110) from setup-holiday-warehouse-admin into master
Reviewed-on: #110
2022-12-21 09:07:50 +00: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
Minh Nguyen fa80e0d707 Merge pull request 'add response' (#102) from feature/add-response-data-export-update into master
Reviewed-on: #102
2022-12-05 10:25:33 +00:00