Commit Graph

363 Commits

Author SHA1 Message Date
Minh Nguyen 085a8103de Merge pull request 'update model warehouse response nats' (#170) from feature/limit-create-order-based-warehouse-conditions into develop
Reviewed-on: #170
2024-07-03 08:37:14 +00:00
Nguyen Minh ff223e2b46 update model warehouse response nats 2024-07-03 15:36:56 +07:00
Sinh b891bfc9c5 merge branch viettel-ffm into develop 2024-06-20 09:24:29 +07:00
Sinh dfdccfa86a add partner product code 2024-06-18 11:11:24 +07:00
sinhluu 1384cae433 Merge pull request 'onpoint-stock-update' (#166) from onpoint-stock-update into master
Reviewed-on: #166
2024-05-08 07:18:01 +00:00
sinhluu c82bf48503 Merge pull request 'feat(wh_cfg): update warehouse config model' (#169) from warehouse-label-size into master
Reviewed-on: #169
2024-05-06 03:09:19 +00:00
Minh Nguyen da329c3176 Merge pull request '/warehouse-international' (#167) from feature/warehouse-international into develop
Reviewed-on: #167
2024-04-15 05:00:07 +00:00
Nguyen Minh 2d04611fee /warehouse-international 2024-04-15 11:59:54 +07:00
Sinh 7724fd665e Merge branch 'warehouse-label-size' into develop 2024-04-12 10:17:50 +07:00
Sinh 1d0b13285a feat(wh_cfg): update warehouse config model 2024-04-12 10:17:40 +07:00
Minh Nguyen 2b9092ecbe Merge pull request 'feature/update-location-ward' (#164) from feature/update-location-ward into master
Reviewed-on: #164
Reviewed-by: trunglam <trunglam@selly.vn>
2024-04-10 07:23:49 +00:00
Sinh 013f41210f Merge branch 'onpoint-stock-update' into develop 2024-04-09 13:39:50 +07:00
Sinh fd41b1eadf feat(onpoint): update payload 2024-04-09 12:07:51 +07:00
Sinh ac018fa08e Merge branch 'onpoint-stock-update' into develop 2024-04-08 15:40:41 +07:00
Sinh 524db8391f Merge branch 'master' of git.selly.red:Selly-Modules/natsio into onpoint-stock-update 2024-04-08 14:26:45 +07:00
Sinh 3a5046f65d feat(nats): add warehouse method get list warehouse config 2024-04-08 14:25:18 +07:00
Minh Nguyen 4dd7e3a49f Merge pull request 'feature/update-location-ward' (#163) from feature/update-location-ward into develop
Reviewed-on: #163
2024-03-15 07:44:39 +00:00
Nguyen Minh 02b699f144 feature/update-location-ward 2024-03-15 14:44:15 +07:00
Sinh 0fd838c4e0 Merge branch 'onpoint' into develop 2023-11-29 14:26:31 +07:00
Sinh a409c0d17c onpoint 2023-11-29 14:10:08 +07:00
Sinh 0dadf9f683 Merge branch 'kiotviet' into develop 2023-10-12 15:49:51 +07:00
Sinh 430e07b7d0 add webhook model 2023-10-12 15:43:49 +07:00
Sinh 43285a4854 Merge branch 'kiotviet' into develop 2023-10-10 16:17:49 +07:00
Sinh 28178e0c31 add func update warehouse config 2023-10-10 16:11:19 +07:00
Sinh 6e29c480c5 Merge branch 'kiotviet' into develop 2023-10-06 17:06:36 +07:00
Sinh b3bde5cd09 update communication model 2023-10-06 16:39:40 +07:00
kingphon 4b728e559d Merge branch 'feature/selly-mall-v1-kin' into develop 2023-09-22 16:25:16 +07:00
kingphon a62eeb60d2 fix 2023-09-22 15:50:06 +07:00
kingphon 1b2dd9376a Merge branch 'feature/selly-mall-v1-kin' into develop 2023-09-22 11:17:04 +07:00
kingphon 8dd914ca4e add-field-mall 2023-09-22 11:15:56 +07:00
trunglt251292 3a6f5e4cfe Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2023-05-10 14:54:10 +07:00
trunglt251292 1c7e947344 [Update] warehouse response 2023-05-10 14:00:08 +07:00
sinhluu 898ee7822f Merge pull request 'order-warning' (#155) from order-warning into master
Reviewed-on: #155
2023-04-14 02:37:55 +00:00
Sinh 622c6719c0 Merge branch 'order/notify-on-new-order-for-warehouse' into develop 2023-04-05 16:11:16 +07:00
Sinh 202dca2c28 update warehouse config 2023-04-05 16:00:36 +07:00
Sinh b96058fcf9 Merge branch 'order-warning' into develop 2023-03-31 15:05:36 +07:00
Sinh 1579e563ac update nats order response 2023-03-31 14:56:34 +07:00
Sinh f6447a771a Merge branch 'order-warning' into develop 2023-03-27 15:51:46 +07:00
Sinh 041dd43616 update order client 2023-03-27 15:10:21 +07:00
Nguyen Minh 9c2f55e434 fix conflict 2023-03-24 14:19:33 +07:00
Minh Nguyen b0f5d41ef0 Merge pull request 'change struct socket reward payload' (#152) from feature/saving-campaign-bk into develop
Reviewed-on: #152
2023-03-23 07:31:30 +00:00
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