Commit Graph

600 Commits

Author SHA1 Message Date
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 2ba590a0a0 Merge branch 'feature/selly-mall-v1-kin' 2023-09-22 15:50:25 +07:00
kingphon a62eeb60d2 fix 2023-09-22 15:50:06 +07:00
kingphon 31a13546bb Revert "add-migration"
This reverts commit f58dfd4291.
2023-09-22 15:47:55 +07:00
kingphon b240d7a9d1 Merge pull request 'add-migration' (#159) from feature/selly-mall-v1-kin into master
Reviewed-on: #159
2023-09-22 07:47:36 +00:00
kingphon f58dfd4291 add-migration 2023-09-22 14:47:16 +07:00
kingphon ba8af50460 Merge pull request 'add-field-mall' (#158) from feature/selly-mall-v1-kin into master
Reviewed-on: #158
2023-09-22 04:26:06 +00: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
trunglam 10aec9f710 Merge pull request '[Update] warehouse response' (#156) from fundiin into master
Reviewed-on: #156
2023-05-10 07:00:58 +00: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
sinhluu 1ca2e5720e Merge pull request 'update warehouse config' (#154) from order/notify-on-new-order-for-warehouse into master
Reviewed-on: #154
2023-04-11 02:52:36 +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 a432e7fd44 update socket client 2023-03-27 15:44:39 +07:00
Sinh 041dd43616 update order client 2023-03-27 15:10:21 +07:00
Minh Nguyen aaf8de9830 Merge pull request 'saving campaign' (#153) from feature/saving-campaign-bk into master
Reviewed-on: #153
2023-03-24 07:25:45 +00: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
Minh Nguyen d6f50295c7 Merge pull request 'feauture-subject-subscriber-topic' (#150) from feauture-subject-subscriber-topic into master
Reviewed-on: #150
2023-03-20 04:07:04 +00:00
sinhluu 983731715b Merge pull request 'notify change price product' (#149) from product/notify-change-price into master
Reviewed-on: #149
2023-03-14 08:02:54 +00:00
Sinh d03758a32d Merge master 2023-03-14 15:02:32 +07:00
Minh Nguyen ff408fd394 Merge pull request 'update' (#148) from feature/saving-campaign-bk into develop
Reviewed-on: #148
2023-03-14 04:47:30 +00:00
Nguyen Minh 71d674b74c update 2023-03-14 11:47:16 +07:00
Minh Nguyen c773effcc0 Merge pull request 'jet stream generate voucher promotion' (#147) from feature/saving-campaign-bk into develop
Reviewed-on: #147
2023-03-14 04:34:55 +00:00
Nguyen Minh 41b79b4ae8 jet stream generate voucher promotion 2023-03-14 11:34:38 +07:00
sinhluu 53b2215309 Merge pull request 'product request multi step' (#146) from product/update-request-multi-step into master
Reviewed-on: #146
2023-03-14 03:53:10 +00:00
Minh Nguyen 58e4945cfb Merge pull request 'rerun' (#145) from feature/saving-campaign-bk into develop
Reviewed-on: #145
2023-03-02 07:16:49 +00:00
Nguyen Minh ffe9418671 rerun 2023-03-02 14:15:15 +07:00
Nguyen Minh aef6c7d30c Fix conflict 2023-03-02 11:46:03 +07:00
Nguyen Minh 7b01640583 update js model 2023-03-02 11:44:13 +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