Commit Graph

145 Commits

Author SHA1 Message Date
sinhluu df352f8bd5 Merge pull request 'integrate-onpoint' (#54) from integrate-onpoint into master
Reviewed-on: #54
2022-10-31 09:33:37 +00:00
Tue 79528f72e4 Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop 2022-10-31 10:09:31 +07:00
Tue f6a2b34a7f build authsms 2022-10-31 10:07:08 +07:00
Tue 7f03b98f90 build authsms 2022-10-31 10:04:13 +07:00
QuanTT0110 7377519ead Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-28 11:19:26 +07:00
QuanTT0110 a86003caf0 fix get supplier free ship info 2022-10-28 11:19:15 +07:00
Tue 1e2d10b3ce build auth sms 2022-10-28 09:39:20 +07:00
Tue e324b88fe6 build authsms 2022-10-28 09:31:39 +07:00
QuanTT0110 73e2a8a7c8 get supplier freeship info 2022-10-27 15:52:39 +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
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
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 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
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
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
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
QuanTT0110 b7d963cc90 get list warehouse freeship 2022-10-17 15:09:50 +07:00
Sinh 45291bf323 Merge branch 'master' into integrate-onpoint 2022-10-13 16:49:32 +07:00
Tue af44ea63f4 fix warehouse 2022-10-12 11:38:54 +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
trunglt251292 c11419a3ad [Update] Package 2022-10-10 11:11:39 +07:00
quang1472001 cebb3214cf update location add slug & DistinctWithField 2022-10-06 10:55:49 +07:00
quang1472001 b9b55d144e update fix GetDistrictByCondition 2022-10-06 10:20:47 +07:00
quang1472001 863e924a5e update location 2022-10-05 18:12:42 +07:00
quang1472001 7a3e50ef97 update location 2022-10-05 17:59:44 +07:00
Sinh baf8a98e35 Merge branch 'master' of github.com:Selly-Modules/natsio into integrate-onpoint 2022-10-04 15:33:53 +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
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 d7c0138d6a Merge branch 'develop' of github.com:Selly-Modules/natsio into develop 2022-09-22 15:18:06 +07:00
quang1472001 021df099cc update location 2022-09-22 14:56:31 +07:00
Minh Nguyen 08a9fdabe0
Merge pull request #30 from Selly-Modules/feature/seller-by-id
support chat get seller info
2022-09-22 13:49:48 +07:00
Nguyen Minh 4ac7ec3b0c support chat get seller info 2022-09-22 13:49:11 +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 a9cc99994f Merge branch 'update-inventory-detail' of github.com:Selly-Modules/natsio into develop 2022-09-20 14:47:19 +07:00
trunglt251292 952c09ccba fix news to bytes 2022-09-20 14:46:29 +07:00
trunglt251292 34c61ccfcc [Update] 2022-09-20 10:57:08 +07:00
trunglt251292 3c5c95b103 [Update] 2022-09-20 10:56:45 +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
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
Tue 22cd1eb18f bank info 2022-09-17 10:59:30 +07:00
Tue 44f0e4be44 bank info 2022-09-17 10:55:37 +07:00
trunglt251292 ddc0af6338 Merge branch 'selly-food' of github.com:Selly-Modules/natsio into develop 2022-09-16 15:36:57 +07:00
trunglt251292 92040d0b9f [Update] Payload 2022-09-16 15:36:32 +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
Tue 4546d0e89b add bank branch info 2022-09-15 11:20:34 +07:00
QuanTT0110 fffcc281cc push 2022-09-14 23:30:22 +07:00
Tue 42a6d04413 bank info 2022-09-14 17:33:18 +07:00
Tue ee32f2d8bb bank info 2022-09-14 17:23:01 +07:00
Tue e1a18df726 bank info 2022-09-14 14:14:27 +07:00
Tue b32ceefab1 add bank info 2022-09-14 14:09:48 +07:00
Sinh 943fff292d add order func 2022-09-08 14:47:52 +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 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
trunglt251292 d65c98f646
Merge pull request #16 from Selly-Modules/warehouse-nats
[Update] Action create + update warehouse
2022-08-31 16:51:59 +07:00
trunglt251292 e0a4a508a6 [Update] Action create + update warehouse 2022-08-31 16:51:13 +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
trunglt251292 8cdfdcb4e6 [Update] Condition dao 2022-08-30 15:15:11 +07:00
trunglt251292 6a7db08c98 [Update] Add 2022-08-30 14:44:48 +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