Commit Graph

461 Commits

Author SHA1 Message Date
trunglt251292 9b59a6bc6a Merge branch 'refactor-location' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 16:31:17 +07:00
trunglt251292 006accb415 [Update] Response warehouse 2022-10-27 16:29:38 +07:00
QuanTT0110 37c20ac3c7 get supplier freeship info 2022-10-27 16:16:09 +07:00
quang1472001 8c82fe548b Merge branch 'refactor-location' into develop 2022-10-27 16:03:35 +07:00
quang1472001 cb45dbb694 [location] add slug to ResponseLocationAdress 2022-10-27 16:03:11 +07:00
QuanTT0110 73e2a8a7c8 get supplier freeship info 2022-10-27 15:52:39 +07:00
quang1472001 e020db1c74 resolve conflict 2022-10-27 14:32:08 +07:00
quang1472001 0bed9a6dfb [location] refactor code 2022-10-27 14:30:40 +07:00
quang1472001 d395f8944f Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 13:42:17 +07:00
quang1472001 6e5080c430 [location] update location client 2022-10-27 13:41:58 +07:00
QuanTT0110 ebb3cd070a Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:58:29 +07:00
QuanTT0110 72aaea5b87 fix get bank info 2022-10-27 11:58:19 +07:00
QuanTT0110 1c5666d7c1 Merge branch 'feature/get-freeship-by-supplierids' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:30:48 +07:00
QuanTT0110 389a26ad6f fix get bank info 2022-10-27 11:30:17 +07:00
Sinh ecb51cc5da Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 11:13:25 +07:00
quang1472001 86cfda6dce [location] create RequestCondition 2022-10-27 11:11:45 +07:00
QuanTT0110 96bc454514 fix conflict 2022-10-27 09:41:38 +07:00
QuanTT0110 33bc508f1f get bank and branches by bank ids 2022-10-27 09:37:07 +07:00
Sinh 708fad7c59 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-10-27 09:19:13 +07:00
Tue caaf630b5e Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio 2022-10-27 09:18:32 +07:00
Tue 574f61fe2f Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:18:06 +07:00
Tue 81c7be0304 build auth sms 2022-10-27 09:17:57 +07:00
Tue 112c1c0f7d build auth sms 2022-10-27 09:17:20 +07:00
Sinh 97686ff405 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-10-27 09:16:36 +07:00
Tue bab221fcb5 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:16:08 +07:00
Sinh ef6a15e939 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 09:16:07 +07:00
Tue bb2405471b build auth sms 2022-10-27 09:15:14 +07:00
Tue 77a7b3ae6b Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio 2022-10-27 09:10:14 +07:00
Tue 1c62c3c710 build auth sms 2022-10-27 09:09:48 +07:00
Sinh 8df9dc1138 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 08:52:28 +07:00
Sinh 855cf4ad5f Merge branch 'refactor-supplier' into develop 2022-10-26 17:58:34 +07:00
Sinh 20f460b4ef create supplier cashflow 2022-10-26 17:56:15 +07:00
Minh Nguyen 5b77344442 Merge pull request 'feature/seller-add-field-planPackage' (#52) from feature/seller-add-field-planPackage into master
Reviewed-on: #52
2022-10-26 08:15:15 +00:00
sinhluu e3d80ab251 Merge pull request 'add queue subscribe json encoder' (#51) from add-queue-subscribe into master
Reviewed-on: #51
2022-10-26 08:08:16 +00:00
trunglam f35d61e456 Merge pull request 'move-config-suppliers' (#50) from move-config-suppliers into master
Reviewed-on: #50
2022-10-26 04:34:58 +00:00
tuenguyen fd7c0ad0fd Merge pull request 'build-auth-sms' (#49) from build-auth-sms into master
Reviewed-on: #49
2022-10-25 08:27:23 +00:00
Tue 9a2bd21534 build auth sms 2022-10-25 15:27:05 +07:00
QuanTT0110 dcbf82a4d0 Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into feature/get-freeship-by-supplierids 2022-10-25 12:00:45 +07:00
QuanTT0110 27b14aa122 get freeships by supplier ids 2022-10-25 12:00:37 +07:00
trunglt251292 5dbde84ea9 Merge branch 'move-config-suppliers' of git.selly.red:Selly-Modules/natsio into develop 2022-10-24 10:56:03 +07:00
trunglt251292 6065636a59 [Update] Response warehouse 2022-10-24 10:43:29 +07:00
trunglt251292 6293e62cb4 [Update] Response warehouse 2022-10-24 10:41:18 +07:00
Minh Nguyen e35090e490 Merge pull request 'rerun' (#48) from feature/seller-add-field-planPackage into develop
Reviewed-on: #48
2022-10-24 03:07:44 +00:00
Nguyen Minh b35a018d0a rerun 2022-10-24 10:07:14 +07:00
QuanTT0110 f0eb62f3f5 get list permission authsms 2022-10-21 11:49:48 +07:00
Sinh b5fe2c5a71 Merge branch 'integrate-onpoint' into develop 2022-10-21 09:27:07 +07:00
Sinh 4bc7195563 update OR payload 2022-10-21 09:26:37 +07:00
Tue 2b890e01ef Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:18:00 +07:00
Tue 25cb392d93 update auth sms 2022-10-20 15:17:50 +07:00
Tue a6f9f9eac7 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-20 15:10:50 +07:00