anbuiselly
|
67a5afa933
|
add field IsPendingInactive
|
2022-12-14 10:52:38 +07:00 |
phuanbui
|
7fd0729494
|
Merge pull request 'edit res warehouse' (#106) from setup-holiday-warehouse-admin into develop
Reviewed-on: #106
|
2022-12-12 07:26:12 +00:00 |
|
anbuiselly
|
c1a5444e5e
|
edit res warehouse
|
2022-12-12 14:25:40 +07:00 |
|
phuanbui
|
0fc3119b61
|
Merge pull request 'setup-holiday-warehouse-admin' (#105) from setup-holiday-warehouse-admin into develop
Reviewed-on: #105
|
2022-12-12 07:08:37 +00:00 |
|
anbuiselly
|
aa3a201b18
|
edit response warehouse
|
2022-12-12 14:07:28 +07:00 |
Sinh
|
46539db236
|
update get warehouse condition
|
2022-12-09 10:05:41 +07:00 |
 trunglam
|
b39948c635
|
Merge pull request 'export-data-affiliate-transaction' (#103) from export-data-affiliate-transaction into master
Reviewed-on: #103
|
2022-12-07 06:53:36 +00:00 |
|
phuanbui
|
6e9dedb8e2
|
Merge pull request 'change code' (#104) from export-data-affiliate-transaction into develop
Reviewed-on: #104
|
2022-12-07 06:50:23 +00:00 |
|
anbuiselly
|
23eebdce8a
|
change code
|
2022-12-07 13:48:43 +07:00 |
 Minh Nguyen
|
fa80e0d707
|
Merge pull request 'add response' (#102) from feature/add-response-data-export-update into master
Reviewed-on: #102
|
2022-12-05 10:25:33 +00:00 |
tuanngo
|
1737a6053a
|
Merge pull request 'add response' (#101) from feature/add-response-data-export-update into develop
Reviewed-on: #101
|
2022-12-05 05:05:26 +00:00 |
tuannt20
|
99894963e6
|
add response
|
2022-12-05 12:04:43 +07:00 |
|
phuanbui
|
8415059365
|
Merge pull request 'change model get transaction' (#100) from export-data-affiliate-transaction into develop
Reviewed-on: #100
|
2022-12-04 14:26:15 +00:00 |
|
anbuiselly
|
0d69cc3357
|
change model get transaction
|
2022-12-04 21:25:42 +07:00 |
|
phuanbui
|
9a6980f3f9
|
Merge pull request 'update model gettransaction' (#99) from export-data-affiliate-transaction into develop
Reviewed-on: #99
|
2022-12-04 14:06:00 +00:00 |
|
anbuiselly
|
5b7d8329ae
|
update model gettransaction
|
2022-12-04 21:05:25 +07:00 |
|
phuanbui
|
9615a51334
|
Merge pull request 'edit getTransactionRequest' (#98) from export-data-affiliate-transaction into develop
Reviewed-on: #98
|
2022-12-04 14:02:07 +00:00 |
|
anbuiselly
|
d7c2660ae2
|
edit getTransactionRequest
|
2022-12-04 21:01:43 +07:00 |
|
phuanbui
|
9052e9a786
|
Merge pull request 'edit getTransactionRequest' (#97) from export-data-affiliate-transaction into develop
Reviewed-on: #97
|
2022-12-04 13:57:50 +00:00 |
|
anbuiselly
|
599d36120e
|
edit getTransactionRequest
|
2022-12-04 20:57:25 +07:00 |
|
phuanbui
|
39c6ec26b4
|
Merge pull request 'export-data-affiliate-transaction-merge-dev' (#96) from export-data-affiliate-transaction-merge-dev into develop
Reviewed-on: #96
|
2022-12-04 13:48:24 +00:00 |
|
anbuiselly
|
577e993e48
|
fix conflict
|
2022-12-04 20:47:23 +07:00 |
|
anbuiselly
|
7c05aa7011
|
get list affiliate-transaction
|
2022-12-04 20:43:54 +07:00 |
|
Minh Nguyen
|
24f0e88472
|
Merge pull request 'feature/campaign-completed' (#94) from feature/campaign-completed into master
Reviewed-on: #94
|
2022-12-02 06:58:08 +00: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 |
|
Sinh
|
9e188c3eb6
|
Merge branch 'integrate-shiip' into develop
|
2022-12-01 14:11:31 +07:00 |
|
Sinh
|
437a67e4b4
|
add warehouse subject
|
2022-11-30 17:39:41 +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 |
|
tuanngo
|
64079b6cad
|
Merge pull request 'add response' (#91) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #91
|
2022-11-29 06:56:21 +00:00 |
|
tuannt20
|
aff5a872e3
|
add response
|
2022-11-29 13:54:39 +07:00 |
 sinhluu
|
1d722f31a5
|
Merge pull request 'admin-push-notification-supplier' (#90) from admin-push-notification-supplier into master
Reviewed-on: #90
|
2022-11-28 03:32:05 +00: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 |
|
tuanngo
|
8a30a03810
|
Merge pull request 'add response' (#88) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #88
|
2022-11-24 08:59:53 +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 |
|
Minh Nguyen
|
1fe67e7356
|
Merge pull request 'fix response' (#86) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #86
|
2022-11-24 07:45:59 +00:00 |
|
Minh Nguyen
|
2b238cabde
|
Merge pull request 'feature/campaign-completed' (#85) from feature/campaign-completed into develop
Reviewed-on: #85
|
2022-11-24 07:16:33 +00:00 |
|
Nguyen Minh
|
6d6fe6acd2
|
Merge branch 'feature/campaign-completed' of git.selly.red:Selly-Modules/natsio into feature/campaign-completed
|
2022-11-24 14:16:06 +07:00 |
|
Nguyen Minh
|
8858688f0f
|
update options
|
2022-11-24 14:15:53 +07:00 |
|
tuannt20
|
af807784ec
|
fix response
|
2022-11-24 11:14:15 +07:00 |
|
Minh Nguyen
|
83d795fcee
|
Merge pull request 'feature/campaign-completed' (#84) from feature/campaign-completed into develop
Reviewed-on: #84
|
2022-11-24 03:08:16 +00:00 |
|
Minh Nguyen
|
b7f3c061c8
|
Merge pull request 'add GetCampaign' (#83) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #83
|
2022-11-24 03:07:49 +00:00 |
|
tuannt20
|
2f278526a9
|
add GetCampaign
|
2022-11-24 09:49:41 +07:00 |
|
Sinh
|
3307ae3abd
|
Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-24 09:46:01 +07:00 |
|
Sinh
|
fa693cc60b
|
fix nats
|
2022-11-24 09:45:53 +07:00 |
|
Nguyen Minh
|
5b935df169
|
fix conflcit
|
2022-11-24 09:42:31 +07:00 |
|
Minh Nguyen
|
436a713725
|
Merge pull request 'add nasts campaign transaction' (#81) from feature/export-data-campaign-transaction into feature/campaign-completed
Reviewed-on: #81
|
2022-11-24 02:41:01 +00:00 |