phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								25b22ad5a3
								
							
						 | 
						
							
							
								
								Merge pull request 'add field from-to holiday WarehouseNatsResponse' (#108) from setup-holiday-warehouse-admin into develop
							
							
							
							
							
							
							
							Reviewed-on: #108 
							
						 | 
						
							2022-12-20 04:13:33 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								ea80206619
								
							
						 | 
						
							
							
								
								add field from-to holiday WarehouseNatsResponse
							
							
							
							
							
						 | 
						
							2022-12-20 11:13:11 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								3a9f8b1436
								
							
						 | 
						
							
							
								
								Merge pull request 'add field IsPendingInactive' (#107) from setup-holiday-warehouse-admin into develop
							
							
							
							
							
							
							
							Reviewed-on: #107 
							
						 | 
						
							2022-12-14 03:53:40 +00:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 |