Commit Graph

207 Commits

Author SHA1 Message Date
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
phuanbui 913c762897 Merge pull request 'add get segment info' (#70) from feaure/staff-getinfo into develop
Reviewed-on: #70
2022-11-21 22:44:59 +00:00
anbuiselly 2719017b61 add cmt 2022-11-22 05:44:36 +07:00
anbuiselly 0a1c76bb88 add get segment info 2022-11-22 05:43:02 +07:00
thaingocquang 4d19b6d7cf Merge branch 'refactor-location' into develop 2022-11-21 16:20:33 +07:00
thaingocquang e3599d1903 [location] update location subject 2022-11-21 16:20:06 +07:00
anbuiselly 2199bb4eef fix get list staff 2022-11-18 21:49:42 +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 17dace7edf remove err method email 2022-11-18 10:24:06 +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
Tue d293fb7412 Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop 2022-11-17 13:56:08 +07:00
Tue 035fb59f64 build email 2022-11-17 13:55:44 +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 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 44e7cca0d7 Merge branch 'feature/campaign' into develop 2022-11-14 15:11:18 +07:00
Nguyen Minh 18f4444156 fix 2022-11-14 15:11:04 +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
Tue 2872e4f75b build auth sms 2022-11-08 14:15:47 +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
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 0b82072bea Merge branch 'master' of git.selly.red:Selly-Modules/natsio into build-auth-sms 2022-11-04 17:28:55 +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
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
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
Sinh 21435db9b3 Merge branch 'refactor-supplier' into develop 2022-11-02 17:27:22 +07:00
Sinh ac1ec030db define nats func - get supplier order cash and supplier withdraw cash 2022-11-02 17:27:10 +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 868df4713d Merge branch 'master' of git.selly.red:Selly-Modules/natsio into refactor-supplier 2022-11-02 16:24:07 +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
Sinh 7d00af18b4 Merge branch 'integrate-onpoint' into develop 2022-11-02 09:41:23 +07:00
Sinh 4d8a64364f Merge branch 'master' of git.selly.red:Selly-Modules/natsio into integrate-onpoint 2022-11-02 09:39:52 +07:00
Sinh c007a41a06 fix subject update OR delivery 2022-11-02 09:38:52 +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 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 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 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
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