Commit Graph

333 Commits

Author SHA1 Message Date
Tue e324b88fe6 build authsms 2022-10-28 09:31:39 +07:00
QuanTT0110 0dafeb6f1f Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-27 17:17:02 +07:00
QuanTT0110 0f4ba10479 get supplier freeship info 2022-10-27 17:16:45 +07:00
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 0bed9a6dfb [location] refactor code 2022-10-27 14:30:40 +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
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 97686ff405 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-10-27 09:16:36 +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 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
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
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
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
Tue 546592f8ce update auth sms 2022-10-20 15:10:42 +07:00
Tue 9297f2d9bd update auth sms 2022-10-20 14:39:41 +07:00
Tue 87158679a7 update auth sms 2022-10-20 14:32:32 +07:00
Sinh f3ef44279b Merge branch 'integrate-onpoint' into develop 2022-10-18 15:05:12 +07:00
Sinh 91d8ffe40f add warehouse client method 2022-10-18 14:57:14 +07:00
Sinh ae36115495 Merge branch 'master' of git.selly.red:Selly-Modules/natsio into integrate-onpoint 2022-10-18 11:50:08 +07:00
Minh Nguyen f6386332de Merge pull request 'get list warehouse freeship' (#46) from feature/get-list-warehouse-freeship into develop
Reviewed-on: #46
2022-10-17 08:13:42 +00:00
QuanTT0110 b7d963cc90 get list warehouse freeship 2022-10-17 15:09:50 +07:00
Sinh 65fe4d8380 Merge branch 'integrate-onpoint' into develop 2022-10-17 14:44:25 +07:00
Sinh 22396d8f40 update nats payload 2022-10-17 14:32:14 +07:00
Sinh 8d571022fc Merge branch 'integrate-onpoint' into develop 2022-10-17 11:25:33 +07:00
Sinh 722fa1aacf Merge branch 'update-payload' into develop 2022-10-17 11:24:30 +07:00
Sinh 831e4b8247 update payload 2022-10-17 11:09:27 +07:00
Sinh 45291bf323 Merge branch 'master' into integrate-onpoint 2022-10-13 16:49:32 +07:00
quang1472001 d71d7f0eb4 [location] add Keyword to WardRequestCondition struct 2022-10-13 10:23:11 +07:00
Tue b40eb42b2b rebuild 2022-10-11 14:22:26 +07:00
Tue 1c10210bb9 rebuild 2022-10-11 14:13:15 +07:00
Tue c7ad6baf4c Merge branch 'feature/get-bank-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-11 14:02:55 +07:00
Minh Nguyen 539aa79128
Merge pull request #41 from Selly-Modules/feature/seller-add-field-planPackage
seller-add-field-planPackage
2022-10-10 09:06:46 +07:00
Nguyen Minh 42874f4937 seller-add-field-planPackage 2022-10-10 09:06:20 +07:00
quang1472001 ed0f16623a add old slug to location response struct 2022-10-07 15:23:02 +07:00
quang1472001 3e13cb55b3 update location request condition 2022-10-06 11:22:10 +07:00
quang1472001 cebb3214cf update location add slug & DistinctWithField 2022-10-06 10:55:49 +07:00
quang1472001 29b2b861ff update location add find by slug 2022-10-06 09:19:21 +07:00
quang1472001 a86a097886 update location 2022-10-05 18:15:36 +07:00
quang1472001 7a3e50ef97 update location 2022-10-05 17:59:44 +07:00
Sinh 1b89d5f368 update onpoint payload 2022-10-05 09:19:54 +07:00
Sinh 86845399e3 update onpoint payload 2022-10-05 09:15:36 +07:00
Sinh baf8a98e35 Merge branch 'master' of github.com:Selly-Modules/natsio into integrate-onpoint 2022-10-04 15:33:53 +07:00
Sinh 9ba66dae05 Merge branch 'master' of github.com:Selly-Modules/natsio into global-care-car-insurance 2022-10-04 11:38:47 +07:00
trunglt251292 89f4e1a11d
Merge pull request #38 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-10-03 10:48:13 +07:00
Sinh 7f57a9bd97 Merge branch 'export-warehouse-data' into develop 2022-09-30 10:41:46 +07:00
Sinh aab1103fc8 define warehouse method 2022-09-30 10:32:33 +07:00
Sinh 68146c7c2a Merge branch 'integrate-onpoint' into develop 2022-09-28 09:37:32 +07:00
Sinh 439d1a0d5a Merge branch 'global-care-car-insurance' into develop 2022-09-28 09:33:32 +07:00
Sinh 57d6cb18a9 update global care - integrate car insurance 2022-09-28 08:59:18 +07:00
Minh Nguyen e61ae3c10d
Merge pull request #32 from Selly-Modules/feature/seller-by-id
jestream
2022-09-23 11:17:31 +07:00
Nguyen Minh f80f89e793 jestream 2022-09-23 11:17:03 +07:00
Nguyen Minh 36ad0b4972 Merge branch 'feature/seller-by-id' into develop 2022-09-23 10:14:24 +07:00
Nguyen Minh b718162cd4 jestream-push-notification 2022-09-23 10:13:14 +07:00
Nguyen Minh e16a537ed2 Merge branch 'master' into feature/seller-by-id 2022-09-22 23:18:01 +07:00
trunglt251292 cc89feac0d
Merge pull request #31 from Selly-Modules/update-inventory-detail
Update inventory detail
2022-09-22 17:58:29 +07:00
quang1472001 021df099cc update location 2022-09-22 14:56:31 +07:00
Sinh d06719b0e6 define api get supplier orders 2022-09-22 09:34:16 +07:00
Sinh 73181bc583 add order func 2022-09-21 17:40:49 +07:00
Tue 6b168cd98a bank info 2022-09-21 14:06:59 +07:00
Minh Nguyen 4a5adc610e
Merge pull request #28 from Selly-Modules/feature/seller-by-id
get seller info support chat
2022-09-21 10:19:57 +07:00
Nguyen Minh 583f2abda5 get seller info support chat 2022-09-21 10:19:17 +07:00
trunglt251292 a261c32dc4 Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 10:29:13 +07:00
trunglt251292 1d58e55af7 [Update] Request news 2022-09-20 10:28:35 +07:00
anbuiselly c449dd44f1
Merge pull request #27 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 14:54:08 +07:00
phuanbui 35a811886b edit type id 2022-09-19 14:52:26 +07:00
Sinh af85d25516 Merge branch 'integrate-onpoint' into develop 2022-09-19 14:19:07 +07:00
Sinh b5ba7c7bf1 update OR nats model 2022-09-19 14:18:51 +07:00
Minh Nguyen 389507050a
Merge pull request #25 from Selly-Modules/feature/seller-by-id
Feature/seller by
2022-09-19 11:51:05 +07:00
phuanbui 89967955ea get list seller by ids 2022-09-19 11:48:30 +07:00
Sinh 86269e4292 Merge branch 'integrate-onpoint' into develop 2022-09-19 11:10:46 +07:00
Sinh 48e585dc16 update OR request model 2022-09-19 11:10:23 +07:00
trunglt251292 5f5bfeb182 fix conflict 2022-09-16 14:52:01 +07:00
trunglt251292 fb8a8bd471 [Update] Add request updateIsClosedSupplier 2022-09-16 14:49:53 +07:00
Nguyen Minh 139dc6a865 Fix conflict 2022-09-15 17:04:26 +07:00
Nguyen Minh 40533e1805 seller by id 2022-09-15 14:09:54 +07:00
QuanTT0110 fffcc281cc push 2022-09-14 23:30:22 +07:00
QuanTT0110 f731be7b62 push 2022-09-14 18:04:18 +07:00
Tue ee32f2d8bb bank info 2022-09-14 17:23:01 +07:00
trunglt251292 9f1f2faf9e [Update] Response supplier 2022-09-14 14:39:16 +07:00
Tue 0e35b6aec3 bank info 2022-09-14 14:25:16 +07:00
Tue b32ceefab1 add bank info 2022-09-14 14:09:48 +07:00
trunglt251292 cc48a083f2 [Update] Response warehouse 2022-09-13 11:47:46 +07:00
Sinh 26a116a2a4 add json tag 2022-09-12 10:01:47 +07:00
Sinh 943fff292d add order func 2022-09-08 14:47:52 +07:00
trunglt251292 06b2398e3d
Merge pull request #20 from Selly-Modules/warehouse-nats
[Update] WarehouseNatsResponse
2022-09-07 17:04:07 +07:00
trunglt251292 6059889551 [Update] WarehouseNatsResponse 2022-09-07 17:03:29 +07:00
Sinh Luu 6cf422cf59
Merge pull request #19 from Selly-Modules/get-location-warehouse
fix get-location-warehouse
2022-09-07 14:18:17 +07:00
phuanbui 218123ccfb fix 2022-09-07 14:10:23 +07:00
phuanbui 9b40f5f9ba fix get-location-warehouse 2022-09-07 14:01:29 +07:00
Sinh 367dc7edd9 add order func 2022-09-07 12:00:40 +07:00
Sinh af6e0843b9 update order OR model 2022-09-06 11:09:52 +07:00
trunglt251292 9413158b8a
Merge pull request #17 from Selly-Modules/warehouse-nats
[Update] Add reponse other
2022-08-31 18:06:27 +07:00
trunglt251292 e387471efe [Update] Add reponse other 2022-08-31 18:06:00 +07:00
nguyenphamquangtue 9295a8e13f
Intergrate model for supplier (#15)
* build nats supplier

* build nats supplier

* build nats supplier

* build nats supplier
2022-08-31 14:48:24 +07:00
Sinh 12afbd81fe add order func 2022-08-31 10:53:51 +07:00
Sinh b9a7d9648e Merge branch develop into integrate-global-care 2022-08-31 09:43:46 +07:00
trunglt251292 868c3166ce [Update] Add dao request warehouse 2022-08-30 14:03:49 +07:00
trunglt251292 4bf17d74fa [Update] Add dao request warehouse 2022-08-30 11:03:02 +07:00
Sinh 43aa67fa2e update GC 2022-08-29 15:55:17 +07:00
Sinh 9acd7e48b4 Merge branch 'develop' of github.com:Selly-Modules/natsio into integrate-global-care 2022-08-27 09:53:07 +07:00
phuanbui 3c4e331c6f get supplier info 2022-08-26 23:13:18 +07:00
phuanbui cab7525f50 Merge branch 'master' of github.com:Selly-Modules/natsio into get-location-warehouse 2022-08-26 17:22:16 +07:00
phuanbui 3458f885ec nats-location-supplier 2022-08-26 17:15:49 +07:00
Sinh 35737a34ab Merge branch 'master' of github.com:Selly-Modules/natsio into integrate-global-care 2022-08-26 16:40:13 +07:00
namhq1989 6593315859 refactor subject name 2022-08-26 15:56:36 +07:00
Sinh 5ca473ffc1 define model 2022-08-26 10:28:49 +07:00
Sinh caaa9f098d define order client 2022-08-23 14:26:49 +07:00
Sinh 2344c5a738 update OR payload 2022-08-22 11:02:37 +07:00
Sinh 56e810378e define order client 2022-08-20 21:21:51 +07:00
Sinh 3a57e9e85f update model 2022-08-18 17:59:09 +07:00
Sinh 572120c26a define communication, warehouse func 2022-08-18 17:47:47 +07:00