Selly-Modules
/
natsio
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
589 Commits 41 Branches 33 Tags 1,016 KiB
Commit Graph

335 Commits

Author SHA1 Message Date
anbuiselly 7c05aa7011 get list affiliate-transaction 2022-12-04 20:43:54 +07:00
Nguyen Minh 4d766bbcea fix conflict 2022-12-02 13:57:40 +07:00
tuanngo e21f1d586a Merge pull request 'update field' (#93) from feature/campaign-completed into develop 
Reviewed-on: #93
 2022-12-02 03:16:32 +00:00
tuannt20 9cec9d8c2f update field 2022-12-02 10:15:58 +07:00
tuanngo d0b2f408b0 Merge pull request 'feature/campaign-completed' (#92) from feature/campaign-completed into develop 
Reviewed-on: #92
 2022-11-29 06:56:54 +00:00
tuannt20 aff5a872e3 add response 2022-11-29 13:54:39 +07:00
Sinh 25890d58bc merge branch master into 'admin-push-notification-supplier 2022-11-28 10:31:05 +07:00
tuanngo 8509b1b8b7 Merge pull request 'feature/campaign-completed' (#89) from feature/campaign-completed into develop 
Reviewed-on: #89
 2022-11-24 09:00:32 +00:00
tuannt20 83e9aef3c9 add response 2022-11-24 15:44:25 +07:00
Minh Nguyen 97d62c9a6b Merge pull request 'feature/campaign-completed' (#87) from feature/campaign-completed into develop 
Reviewed-on: #87
 2022-11-24 07:46:34 +00:00
tuannt20 af807784ec fix response 2022-11-24 11:14:15 +07:00
Nguyen Minh 5b935df169 fix conflcit 2022-11-24 09:42:31 +07:00
Sinh 9d7ebe2ef0 Merge branch 'admin-push-notification-supplier' into develop 2022-11-24 09:40:11 +07:00
Sinh fb87ac7911 update nats 2022-11-24 09:38:10 +07:00
tuannt20 e3e498ed23 add nasts campaign transaction 2022-11-24 09:06:48 +07:00
Minh Nguyen 3853ab9893 Merge pull request 'fix' (#78) from feature/social-post into develop 
Reviewed-on: #78
 2022-11-23 09:54:52 +00:00
Nguyen Minh dbf8ad502f fix 2022-11-23 16:54:31 +07:00
anbuiselly c47768308c add nats 2022-11-23 10:29:50 +07:00
Sinh 1f31cbdf76 Merge branch 'admin-push-notification-supplier' into develop 2022-11-23 10:24:07 +07:00
Sinh 8248069bb8 count supplier 2022-11-23 10:08:52 +07:00
tuannt20 0dd3dce224 add nats staff 2022-11-22 10:04:40 +07:00
anbuiselly 0a1c76bb88 add get segment info 2022-11-22 05:43:02 +07:00
anbuiselly f8658523a2 change request get staff 2022-11-21 10:37:53 +07:00
thaingocquang 56cdb74646 Merge branch 'refactor-location' into develop 2022-11-21 00:29:44 +07:00
thaingocquang 1a77ac3d8e [location] update location resp model 2022-11-21 00:29:18 +07:00
thaingocquang 5eb76d813c Merge branch 'refactor-location' into develop 2022-11-21 00:09:03 +07:00
thaingocquang be18b81589 [location] update location resp model 2022-11-21 00:08:21 +07:00
anbuiselly 0a9381065f edit get staff-info 2022-11-18 17:47:26 +07:00
anbuiselly 8cceae74ef get staff by notification action 2022-11-18 16:22:17 +07:00
Sinh 23df6da6bf Merge branch 'admin-push-notification-supplier' into develop 2022-11-18 10:14:21 +07:00
Sinh d45da3e74c nats - get supplier from old server 2022-11-18 10:13:41 +07:00
thaingocquang 89d10dbb7f Merge branch 'refactor-location' into develop 2022-11-17 17:19:24 +07:00
thaingocquang b9885a2a02 [location] RequestCondition oldSlugs 2022-11-17 17:19:04 +07:00
thaingocquang 35e98d866f Merge branch 'refactor-location' into develop 2022-11-17 16:50:03 +07:00
thaingocquang f602e17ef2 [location] add oldSlug to RequestCondition 2022-11-17 16:49:02 +07:00
Minh Nguyen d10f445bf2 Merge pull request 'feature/campaign' (#62) from feature/campaign into develop 
Reviewed-on: #62
 2022-11-17 02:33:10 +00:00
tuannt20 b8f10912c1 rename 2022-11-17 09:27:45 +07:00
Minh Nguyen b3722384f8 Merge pull request 'feature/campaign' (#60) from feature/campaign into develop 
Reviewed-on: #60
 2022-11-16 10:35:35 +00:00
tuannt20 26f8b64258 fix 2022-11-16 17:33:29 +07:00
Minh Nguyen d04712a560 Merge pull request 'feature/campaign' (#58) from feature/campaign into develop 
Reviewed-on: #58
 2022-11-16 10:23:51 +00:00
tuannt20 6e21f72ac0 fix name func 2022-11-16 17:21:37 +07:00
tuannt20 7a213f4b4d nats model campaign admin 2022-11-16 16:43:17 +07:00
Nguyen Minh 3e1dcb2fe1 fix conflict 2022-11-14 14:47:20 +07:00
Nguyen Minh 598c886aa6 nats model campaign 2022-11-14 14:45:26 +07:00
Tue 87d6bba079 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-09 14:28:29 +07:00
Tue a3206ebdd4 build auth sms 2022-11-09 14:28:10 +07:00
Tue 77547914e0 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 18:05:00 +07:00
Tue 3507d17029 build auth sms 2022-11-08 18:02:42 +07:00
QuanTT0110 c95d28870f Merge branch 'refactor-supplier' of git.selly.red:Selly-Modules/natsio into develop 2022-11-08 14:54:57 +07:00
QuanTT0110 b45fb1d19a sync data warehouse into service supplier 2022-11-08 14:20:05 +07:00
Tue 2872e4f75b build auth sms 2022-11-08 14:15:47 +07:00
Tue 7e433426cb build auth sms 2022-11-08 14:02:07 +07:00
Tue 1cacdae547 build authsms 2022-11-08 13:58:30 +07:00
Tue 4d501a437c build authsms 2022-11-08 13:57:22 +07:00
Tue ffff325e78 build authsms 2022-11-08 13:53:52 +07:00
QuanTT0110 dc33b5ac71 sync data warehouse into service supplier 2022-11-08 11:12:02 +07:00
QuanTT0110 5c3c5b6dcb sync data warehouse into service supplier 2022-11-08 11:09:35 +07:00
QuanTT0110 ae16428783 sync data warehouse into service supplier 2022-11-08 11:05:34 +07:00
thaingocquang d80b305b1a [location] update request model page & limit 2022-11-07 16:04:12 +07:00
thaingocquang 34b1de6d42 [location] update request model add page & limit 2022-11-07 15:48:28 +07:00
Tue d946b993ee build auth sms 2022-11-07 11:21:37 +07:00
Tue 70b38d05cf build auth sms 2022-11-07 11:21:27 +07:00
Tue 382a2b7dfa build auth sms 2022-11-04 17:28:51 +07:00
Tue 283974d869 build auth sms 2022-11-04 17:28:33 +07:00
Tue b6f390064b build auth sms 2022-11-04 15:21:03 +07:00
Tue 88931f9c53 build auth sms 2022-11-04 15:20:31 +07:00
Sinh 174b4b0594 Merge branch 'refactor-supplier' into develop 2022-11-04 10:28:19 +07:00
Sinh 0d3c931c87 define nats func - supplier balance 2022-11-04 10:28:09 +07:00
Sinh 70a8d4e847 Merge branch 'refactor-supplier' into develop 2022-11-03 16:03:48 +07:00
Sinh aeec881299 define nats func - supplier balance 2022-11-03 16:02:43 +07:00
Tue 5797eb1a23 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 14:14:54 +07:00
Tue 32e93323b7 build auth sms 2022-11-03 14:14:25 +07:00
Tue b4811f091e build auth sms 2022-11-03 11:35:38 +07:00
Tue 634239a9f1 build auth sms 2022-11-03 11:35:23 +07:00
Sinh b345cd5395 Pull origin build-auth-sms into refactor-supplier 2022-11-03 11:09:36 +07:00
Tue 9407b2df6b build auth sms 2022-11-03 10:47:19 +07:00
Tue 6cade7d133 build auth sms 2022-11-03 10:46:56 +07:00
Tue 77f22993d4 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-03 00:17:59 +07:00
Tue 49426e322c build auth sms 2022-11-03 00:17:49 +07:00
Sinh 01900b64e4 Merge branch 'refactor-supplier' into develop 2022-11-02 17:19:05 +07:00
Sinh 816316b558 define nats func - get supplier order cash and supplier withdraw cash 2022-11-02 17:18:11 +07:00
Tue bd5825b7f8 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-02 16:49:20 +07:00
Tue 55e3c07cf6 build auth sms 2022-11-02 16:49:12 +07:00
Sinh e26762916c Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-11-02 16:11:41 +07:00
Tue 19349b9813 build auth sms 2022-11-02 14:57:26 +07:00
Tue cdbbf9fc73 build auth sms 2022-11-02 14:56:58 +07:00
Tue 15fd01d5d3 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-01 11:40:51 +07:00
Tue 285ddb75e7 build auth sms 2022-11-01 11:40:37 +07:00
Tue 56d210bf2d build auth sms 2022-11-01 10:44:41 +07:00
Tue 645effaa04 build authsms 2022-11-01 10:43:20 +07:00
Tue 9a69327679 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-10-31 17:02:49 +07:00
Tue 0d8e3969db build auth sms 2022-10-31 16:59:38 +07:00
Tue 64ad17016c Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms 2022-10-31 16:59:28 +07:00
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 2dbeab594a Merge branch 'feature/get-freeship-info' of git.selly.red:Selly-Modules/natsio into develop 2022-10-28 11:39:47 +07:00
QuanTT0110 2602b22e40 fix get supplier free ship info 2022-10-28 11:39:29 +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 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