 Minh Nguyen
|
58e4945cfb
|
Merge pull request 'rerun' (#145) from feature/saving-campaign-bk into develop
Reviewed-on: #145
|
2023-03-02 07:16:49 +00:00 |
Nguyen Minh
|
ffe9418671
|
rerun
|
2023-03-02 14:15:15 +07:00 |
|
Nguyen Minh
|
aef6c7d30c
|
Fix conflict
|
2023-03-02 11:46:03 +07:00 |
|
Nguyen Minh
|
7b01640583
|
update js model
|
2023-03-02 11:44:13 +07:00 |
Sinh
|
0b3bb76e26
|
Merge branch 'product/update-request-multi-step' into develop
|
2023-03-01 14:51:22 +07:00 |
|
Sinh
|
2e069b94e7
|
product request multi step
|
2023-03-01 14:40:34 +07:00 |
|
Sinh
|
2841d02165
|
Merge branch 'product/notify-change-price' into develop
|
2023-03-01 11:20:51 +07:00 |
|
Sinh
|
aee7b01b40
|
notify change price product
|
2023-03-01 10:42:54 +07:00 |
tuanngo
|
5882a84e04
|
Merge pull request 'update' (#143) from feature/saving-campaign-bk into develop
Reviewed-on: #143
|
2023-02-28 11:04:37 +00:00 |
tuannt20
|
2f64f1fa37
|
update
|
2023-02-28 18:04:14 +07:00 |
|
tuanngo
|
1fc8f9cfc1
|
Merge pull request 'add field get list seller by ids' (#142) from feature/saving-campaign-bk into develop
Reviewed-on: #142
|
2023-02-28 10:15:21 +00:00 |
|
tuannt20
|
a1d6840fd9
|
add field get list seller by ids
|
2023-02-28 17:14:49 +07:00 |
|
Minh Nguyen
|
bf22b8aa93
|
Merge pull request 'add model subject subscriber topic' (#141) from feauture-subject-subscriber-topic into develop
Reviewed-on: #141
|
2023-02-28 08:15:08 +00:00 |
|
Nguyen Minh
|
0401a57930
|
add model subject subscriber topic
|
2023-02-28 15:14:49 +07:00 |
|
Minh Nguyen
|
355568236a
|
Merge pull request 'feauture-subject-subscriber-topic' (#140) from feauture-subject-subscriber-topic into develop
Reviewed-on: #140
|
2023-02-28 08:06:28 +00:00 |
|
Nguyen Minh
|
79ad5c401c
|
subject-subscriber-topic
|
2023-02-28 15:06:06 +07:00 |
 trunglam
|
e64ba040b0
|
Merge pull request 'init' (#139) from location-by-ward-code into master
Reviewed-on: #139
|
2023-02-06 02:29:03 +00:00 |
quang
|
2e96466d4c
|
Merge branch 'location-by-ward-code' into develop
|
2023-02-03 17:21:15 +07:00 |
|
quang
|
dba7cf4691
|
init
|
2023-02-03 17:20:44 +07:00 |
 sinhluu
|
0269010ce8
|
Merge pull request 'supplier-setup-product' (#138) from supplier-setup-product into master
Reviewed-on: #138
|
2023-02-03 07:53:48 +00:00 |
|
Sinh
|
c68f5644fe
|
Merge branch 'supplier-setup-product' into develop
|
2023-01-31 16:27:28 +07:00 |
|
Sinh
|
4c328c0858
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into supplier-setup-product
|
2023-01-31 16:21:24 +07:00 |
|
trunglam
|
6626bc8588
|
Merge pull request 'fix-holiday-product' (#137) from fix-holiday-product into master
Reviewed-on: #137
|
2023-01-31 03:31:48 +00:00 |
anbuiselly
|
fd0fd4c0ad
|
Merge branch 'fix-holiday-product' of git.selly.red:Selly-Modules/natsio into develop
|
2023-01-18 14:42:44 +07:00 |
|
anbuiselly
|
f4f15ea224
|
Merge branch 'master' of git.selly.red:Selly-Modules/natsio into fix-holiday-product
|
2023-01-18 14:29:13 +07:00 |
|
trunglam
|
f43a99628e
|
Merge pull request 'location' (#135) from refactor-location-1701 into master
Reviewed-on: #135
|
2023-01-18 02:27:48 +00:00 |
trunglt251292
|
860985eb60
|
fix conflict
|
2023-01-17 17:25:21 +07:00 |
|
trunglt251292
|
5a47acc373
|
change name
|
2023-01-17 17:22:28 +07:00 |
|
quang
|
f32844916a
|
location
|
2023-01-17 16:29:47 +07:00 |
phuanbui
|
3958b49cd9
|
Merge pull request 'update_pending_active_product_by_warehouse_ids' (#130) from fix-holiday-product into develop
Reviewed-on: #130
|
2023-01-17 07:23:44 +00:00 |
|
anbuiselly
|
49156e576d
|
fix
|
2023-01-17 14:23:24 +07:00 |
|
phuanbui
|
eb242f5b52
|
Merge pull request 'fix-holiday-product-merge-dev' (#133) from fix-holiday-product-merge-dev into develop
Reviewed-on: #133
|
2023-01-17 07:18:52 +00:00 |
|
anbuiselly
|
d94c6c8430
|
fixconflict
|
2023-01-17 14:17:52 +07:00 |
|
anbuiselly
|
292c7733f0
|
edit struct update_status_warehouse_pending_inactive
|
2023-01-17 14:15:27 +07:00 |
|
phuanbui
|
e6bb5bdf0c
|
Merge pull request 'fix-holiday-product-merge-dev' (#132) from fix-holiday-product-merge-dev into develop
Reviewed-on: #132
|
2023-01-17 04:37:23 +00:00 |
|
anbuiselly
|
dcba547b14
|
fix conflict
|
2023-01-17 11:37:03 +07:00 |
|
anbuiselly
|
9a30faa3a2
|
edit update update_pending_in_active_product_by_warehouse_ids
|
2023-01-17 11:35:38 +07:00 |
|
phuanbui
|
e0d614a3e3
|
Merge pull request 'fix-holiday-product_merge_dev' (#131) from fix-holiday-product_merge_dev into develop
Reviewed-on: #131
|
2023-01-17 04:23:59 +00:00 |
|
anbuiselly
|
b5e4e97b2f
|
fix conflict
|
2023-01-17 11:23:16 +07:00 |
|
anbuiselly
|
f9b2edb032
|
update_pending_active_product_by_warehouse_ids
|
2023-01-17 11:20:27 +07:00 |
quangthai
|
a78c327201
|
Merge pull request 'dev-refactor-location' (#129) from dev-refactor-location into develop
Reviewed-on: #129
|
2023-01-16 07:09:21 +00:00 |
|
quang
|
90a8b41081
|
Merge branch 'develop' into refactor-location
|
2023-01-16 14:07:05 +07:00 |
|
quang
|
f69ac3ba0c
|
test
|
2023-01-16 14:03:09 +07:00 |
|
quang
|
d50a1a56fa
|
Merge branch 'master' into refactor-location
|
2023-01-16 11:21:27 +07:00 |
|
Minh Nguyen
|
cf88c46708
|
Merge pull request 'feature-campaign-get-seller-statistic' (#127) from feature-campaign-get-seller-statistic into master
Reviewed-on: #127
|
2023-01-12 03:44:46 +00:00 |
|
Minh Nguyen
|
1f77ded036
|
Merge pull request 'update' (#126) from feature-campaign-get-seller-statistic into develop
Reviewed-on: #126
|
2023-01-11 03:21:24 +00:00 |
|
Nguyen Minh
|
2003cb4e49
|
update
|
2023-01-11 10:21:02 +07:00 |
|
Minh Nguyen
|
09c4f03186
|
Merge pull request 'feature-campaign-get-seller-statistic' (#125) from feature-campaign-get-seller-statistic into develop
Reviewed-on: #125
|
2023-01-11 02:29:06 +00:00 |
|
Nguyen Minh
|
67b99f7774
|
campaign-get-seller-statistic
|
2023-01-11 09:27:49 +07:00 |
|
Sinh
|
df1fbbcf57
|
Merge branch 'master' into supplier-setup-product
|
2023-01-10 16:55:55 +07:00 |